From: Sasha Levin Date: Mon, 9 Mar 2020 14:51:44 +0000 (-0400) Subject: fixes for 4.19 X-Git-Tag: v4.4.216~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b18bc213791ab400b696390c34a2da6691d18b42;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/alsa-hda-do-not-override-bus-codec_mask-in-link_get.patch b/queue-4.19/alsa-hda-do-not-override-bus-codec_mask-in-link_get.patch new file mode 100644 index 00000000000..bb7a21572f3 --- /dev/null +++ b/queue-4.19/alsa-hda-do-not-override-bus-codec_mask-in-link_get.patch @@ -0,0 +1,61 @@ +From 93651a6ad3d53ff216ee4b3599027b6ba8df10ab Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Feb 2020 22:02:21 +0200 +Subject: ALSA: hda: do not override bus codec_mask in link_get() + +From: Kai Vehmanen + +[ Upstream commit 43bcb1c0507858cdc95e425017dcc33f8105df39 ] + +snd_hdac_ext_bus_link_get() does not work correctly in case +there are multiple codecs on the bus. It unconditionally +resets the bus->codec_mask value. As per documentation in +hdaudio.h and existing use in client code, this field should +be used to store bit flag of detected codecs on the bus. + +By overwriting value of the codec_mask, information on all +detected codecs is lost. No current user of hdac is impacted, +but use of bus->codec_mask is planned in future patches +for SOF. + +Signed-off-by: Kai Vehmanen +Reviewed-by: Ranjani Sridharan +Reviewed-by: Pierre-Louis Bossart +Reviewed-by: Takashi Iwai +Link: https://lore.kernel.org/r/20200206200223.7715-1-kai.vehmanen@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/hda/ext/hdac_ext_controller.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/sound/hda/ext/hdac_ext_controller.c b/sound/hda/ext/hdac_ext_controller.c +index 60cb00fd0c693..84b44cdae28a1 100644 +--- a/sound/hda/ext/hdac_ext_controller.c ++++ b/sound/hda/ext/hdac_ext_controller.c +@@ -262,6 +262,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down_all); + int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, + struct hdac_ext_link *link) + { ++ unsigned long codec_mask; + int ret = 0; + + mutex_lock(&bus->lock); +@@ -283,9 +284,11 @@ int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, + * HDA spec section 4.3 - Codec Discovery + */ + udelay(521); +- bus->codec_mask = snd_hdac_chip_readw(bus, STATESTS); +- dev_dbg(bus->dev, "codec_mask = 0x%lx\n", bus->codec_mask); +- snd_hdac_chip_writew(bus, STATESTS, bus->codec_mask); ++ codec_mask = snd_hdac_chip_readw(bus, STATESTS); ++ dev_dbg(bus->dev, "codec_mask = 0x%lx\n", codec_mask); ++ snd_hdac_chip_writew(bus, STATESTS, codec_mask); ++ if (!bus->codec_mask) ++ bus->codec_mask = codec_mask; + } + + mutex_unlock(&bus->lock); +-- +2.20.1 + diff --git a/queue-4.19/drm-msm-dsi-pll-call-vco-set-rate-explicitly.patch b/queue-4.19/drm-msm-dsi-pll-call-vco-set-rate-explicitly.patch new file mode 100644 index 00000000000..38f24376a56 --- /dev/null +++ b/queue-4.19/drm-msm-dsi-pll-call-vco-set-rate-explicitly.patch @@ -0,0 +1,43 @@ +From 525de65c5b654b1f3c21afcc5e9cc25bceba8aef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Feb 2020 14:42:01 +0530 +Subject: drm/msm/dsi/pll: call vco set rate explicitly + +From: Harigovindan P + +[ Upstream commit c6659785dfb3f8d75f1fe637e4222ff8178f5280 ] + +For a given byte clock, if VCO recalc value is exactly same as +vco set rate value, vco_set_rate does not get called assuming +VCO is already set to required value. But Due to GDSC toggle, +VCO values are erased in the HW. To make sure VCO is programmed +correctly, we forcefully call set_rate from vco_prepare. + +Signed-off-by: Harigovindan P +Reviewed-by: Jeffrey Hugo +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +index 31205625c7346..21a69b046625a 100644 +--- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c ++++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +@@ -406,6 +406,12 @@ static int dsi_pll_10nm_vco_prepare(struct clk_hw *hw) + if (pll_10nm->slave) + dsi_pll_enable_pll_bias(pll_10nm->slave); + ++ rc = dsi_pll_10nm_vco_set_rate(hw,pll_10nm->vco_current_rate, 0); ++ if (rc) { ++ pr_err("vco_set_rate failed, rc=%d\n", rc); ++ return rc; ++ } ++ + /* Start PLL */ + pll_write(pll_10nm->phy_cmn_mmio + REG_DSI_10nm_PHY_CMN_PLL_CNTRL, + 0x01); +-- +2.20.1 + diff --git a/queue-4.19/drm-msm-dsi-save-pll-state-before-dsi-host-is-powere.patch b/queue-4.19/drm-msm-dsi-save-pll-state-before-dsi-host-is-powere.patch new file mode 100644 index 00000000000..e3b21795e39 --- /dev/null +++ b/queue-4.19/drm-msm-dsi-save-pll-state-before-dsi-host-is-powere.patch @@ -0,0 +1,61 @@ +From dc85fb540dca96ce05021ba204e700620e06c626 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Feb 2020 14:26:15 +0530 +Subject: drm/msm/dsi: save pll state before dsi host is powered off + +From: Harigovindan P + +[ Upstream commit a1028dcfd0dd97884072288d0c8ed7f30399b528 ] + +Save pll state before dsi host is powered off. Without this change +some register values gets resetted. + +Signed-off-by: Harigovindan P +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 5 +++++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 ---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c +index bd66d2aac41f7..b01762a7778ae 100644 +--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c ++++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c +@@ -471,6 +471,7 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge) + struct msm_dsi *msm_dsi1 = dsi_mgr_get_dsi(DSI_1); + struct mipi_dsi_host *host = msm_dsi->host; + struct drm_panel *panel = msm_dsi->panel; ++ struct msm_dsi_pll *src_pll; + bool is_dual_dsi = IS_DUAL_DSI(); + int ret; + +@@ -511,6 +512,10 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge) + id, ret); + } + ++ /* Save PLL status if it is a clock source */ ++ src_pll = msm_dsi_phy_get_pll(msm_dsi->phy); ++ msm_dsi_pll_save_state(src_pll); ++ + ret = msm_dsi_host_power_off(host); + if (ret) + pr_err("%s: host %d power off failed,%d\n", __func__, id, ret); +diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +index 9a9fa0c75a131..c630871de7c5b 100644 +--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c ++++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +@@ -726,10 +726,6 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy) + if (!phy || !phy->cfg->ops.disable) + return; + +- /* Save PLL status if it is a clock source */ +- if (phy->usecase != MSM_DSI_PHY_SLAVE) +- msm_dsi_pll_save_state(phy->pll); +- + phy->cfg->ops.disable(phy); + + dsi_phy_regulator_disable(phy); +-- +2.20.1 + diff --git a/queue-4.19/drm-msm-fix-return-type-of-dsi_mgr_connector_mode_va.patch b/queue-4.19/drm-msm-fix-return-type-of-dsi_mgr_connector_mode_va.patch new file mode 100644 index 00000000000..818ec401723 --- /dev/null +++ b/queue-4.19/drm-msm-fix-return-type-of-dsi_mgr_connector_mode_va.patch @@ -0,0 +1,55 @@ +From bafafaa37f1491653e3ca0adb29df28f01fa6f3b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Jan 2020 20:12:44 +0000 +Subject: drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI + +From: John Stultz + +[ Upstream commit 7fd2dfc3694922eb7ace4801b7208cf9f62ebc7d ] + +I was hitting kCFI crashes when building with clang, and after +some digging finally narrowed it down to the +dsi_mgr_connector_mode_valid() function being implemented as +returning an int, instead of an enum drm_mode_status. + +This patch fixes it, and appeases the opaque word of the kCFI +gods (seriously, clang inlining everything makes the kCFI +backtraces only really rough estimates of where things went +wrong). + +Thanks as always to Sami for his help narrowing this down. + +Cc: Rob Clark +Cc: Sean Paul +Cc: Sami Tolvanen +Cc: Todd Kjos +Cc: Alistair Delva +Cc: Amit Pundir +Cc: Sumit Semwal +Cc: freedreno@lists.freedesktop.org +Cc: clang-built-linux@googlegroups.com +Signed-off-by: John Stultz +Reviewed-by: Nick Desaulniers +Tested-by: Amit Pundir +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c +index 5224010d90e4a..bd66d2aac41f7 100644 +--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c ++++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c +@@ -328,7 +328,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector) + return num; + } + +-static int dsi_mgr_connector_mode_valid(struct drm_connector *connector, ++static enum drm_mode_status dsi_mgr_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) + { + int id = dsi_mgr_connector_get_id(connector); +-- +2.20.1 + diff --git a/queue-4.19/drm-msm-mdp5-rate-limit-pp-done-timeout-warnings.patch b/queue-4.19/drm-msm-mdp5-rate-limit-pp-done-timeout-warnings.patch new file mode 100644 index 00000000000..754184ac749 --- /dev/null +++ b/queue-4.19/drm-msm-mdp5-rate-limit-pp-done-timeout-warnings.patch @@ -0,0 +1,37 @@ +From 9443947f029c68ca91ea9fce5e58de6c5751991a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 18 Jan 2020 15:41:20 -0500 +Subject: drm/msm/mdp5: rate limit pp done timeout warnings + +From: Brian Masney + +[ Upstream commit ef8c9809acb0805c991bba8bdd4749fc46d44a98 ] + +Add rate limiting of the 'pp done time out' warnings since these +warnings can quickly fill the dmesg buffer. + +Signed-off-by: Brian Masney +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +index b1da9ce543790..aa28a43ff842c 100644 +--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c ++++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +@@ -1118,8 +1118,8 @@ static void mdp5_crtc_wait_for_pp_done(struct drm_crtc *crtc) + ret = wait_for_completion_timeout(&mdp5_crtc->pp_completion, + msecs_to_jiffies(50)); + if (ret == 0) +- dev_warn(dev->dev, "pp done time out, lm=%d\n", +- mdp5_cstate->pipeline.mixer->lm); ++ dev_warn_ratelimited(dev->dev, "pp done time out, lm=%d\n", ++ mdp5_cstate->pipeline.mixer->lm); + } + + static void mdp5_crtc_wait_for_flush_done(struct drm_crtc *crtc) +-- +2.20.1 + diff --git a/queue-4.19/ice-don-t-tell-the-os-that-link-is-going-down.patch b/queue-4.19/ice-don-t-tell-the-os-that-link-is-going-down.patch new file mode 100644 index 00000000000..faca1cf7196 --- /dev/null +++ b/queue-4.19/ice-don-t-tell-the-os-that-link-is-going-down.patch @@ -0,0 +1,48 @@ +From d64b264b08450e3b7fcf92caf1a87f44833e61d7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 13 Feb 2020 13:31:24 -0800 +Subject: ice: Don't tell the OS that link is going down + +From: Michal Swiatkowski + +[ Upstream commit 8a55c08d3bbc9ffc9639f69f742e59ebd99f913b ] + +Remove code that tell the OS that link is going down when user +change flow control via ethtool. When link is up it isn't certain +that link goes down after 0x0605 aq command. If link doesn't go +down, OS thinks that link is down, but physical link is up. To +reset this state user have to take interface down and up. + +If link goes down after 0x0605 command, FW send information +about that and after that driver tells the OS that the link goes +down. So this code in ethtool is unnecessary. + +Signed-off-by: Michal Swiatkowski +Tested-by: Andrew Bowers +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c +index 4c5c87b158f55..627abef829c9a 100644 +--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c ++++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c +@@ -772,13 +772,6 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) + else + return -EINVAL; + +- /* Tell the OS link is going down, the link will go back up when fw +- * says it is ready asynchronously +- */ +- ice_print_link_msg(vsi, false); +- netif_carrier_off(netdev); +- netif_tx_stop_all_queues(netdev); +- + /* Set the FC mode and only restart AN if link is up */ + status = ice_set_fc(pi, &aq_failures, link_up); + +-- +2.20.1 + diff --git a/queue-4.19/net-dsa-b53-ensure-the-default-vid-is-untagged.patch b/queue-4.19/net-dsa-b53-ensure-the-default-vid-is-untagged.patch new file mode 100644 index 00000000000..2809c0d7548 --- /dev/null +++ b/queue-4.19/net-dsa-b53-ensure-the-default-vid-is-untagged.patch @@ -0,0 +1,40 @@ +From 94139c5d3df2a2f3aea33c0d3bb5ab571dc0c8cb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 Feb 2020 15:26:19 -0800 +Subject: net: dsa: b53: Ensure the default VID is untagged + +From: Florian Fainelli + +[ Upstream commit d965a5432d4c3e6b9c3d2bc1d4a800013bbf76f6 ] + +We need to ensure that the default VID is untagged otherwise the switch +will be sending tagged frames and the results can be problematic. This +is especially true with b53 switches that use VID 0 as their default +VLAN since VID 0 has a special meaning. + +Fixes: fea83353177a ("net: dsa: b53: Fix default VLAN ID") +Fixes: 061f6a505ac3 ("net: dsa: Add ndo_vlan_rx_{add, kill}_vid implementation") +Signed-off-by: Florian Fainelli +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/b53/b53_common.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c +index 51436e7eae103..ac5d945b934a0 100644 +--- a/drivers/net/dsa/b53/b53_common.c ++++ b/drivers/net/dsa/b53/b53_common.c +@@ -1165,6 +1165,9 @@ void b53_vlan_add(struct dsa_switch *ds, int port, + + b53_get_vlan_entry(dev, vid, vl); + ++ if (vid == 0 && vid == b53_default_pvid(dev)) ++ untagged = true; ++ + vl->members |= BIT(port); + if (untagged && !dsa_is_cpu_port(ds, port)) + vl->untag |= BIT(port); +-- +2.20.1 + diff --git a/queue-4.19/net-ks8851-ml-fix-16-bit-data-access.patch b/queue-4.19/net-ks8851-ml-fix-16-bit-data-access.patch new file mode 100644 index 00000000000..608a8d4077a --- /dev/null +++ b/queue-4.19/net-ks8851-ml-fix-16-bit-data-access.patch @@ -0,0 +1,48 @@ +From aca35a7d0e3ee4746f828de20223c32c2cf68919 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 Feb 2020 17:54:18 +0100 +Subject: net: ks8851-ml: Fix 16-bit data access + +From: Marek Vasut + +[ Upstream commit edacb098ea9c31589276152f09b4439052c0f2b1 ] + +The packet data written to and read from Micrel KSZ8851-16MLLI must be +byte-swapped in 16-bit mode, add this byte-swapping. + +Signed-off-by: Marek Vasut +Cc: David S. Miller +Cc: Lukas Wunner +Cc: Petr Stetiar +Cc: YueHaibing +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/micrel/ks8851_mll.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c +index 29ac83f4683a6..aff1619fb0e0e 100644 +--- a/drivers/net/ethernet/micrel/ks8851_mll.c ++++ b/drivers/net/ethernet/micrel/ks8851_mll.c +@@ -516,7 +516,7 @@ static inline void ks_inblk(struct ks_net *ks, u16 *wptr, u32 len) + { + len >>= 1; + while (len--) +- *wptr++ = (u16)ioread16(ks->hw_addr); ++ *wptr++ = be16_to_cpu(ioread16(ks->hw_addr)); + } + + /** +@@ -530,7 +530,7 @@ static inline void ks_outblk(struct ks_net *ks, u16 *wptr, u32 len) + { + len >>= 1; + while (len--) +- iowrite16(*wptr++, ks->hw_addr); ++ iowrite16(cpu_to_be16(*wptr++), ks->hw_addr); + } + + static void ks_disable_int(struct ks_net *ks) +-- +2.20.1 + diff --git a/queue-4.19/net-ks8851-ml-fix-16-bit-io-operation.patch b/queue-4.19/net-ks8851-ml-fix-16-bit-io-operation.patch new file mode 100644 index 00000000000..f168bfc4f0e --- /dev/null +++ b/queue-4.19/net-ks8851-ml-fix-16-bit-io-operation.patch @@ -0,0 +1,51 @@ +From 07abb2c85b21da75d5b61a5f65a4a2e2ee5a1298 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 Feb 2020 17:54:19 +0100 +Subject: net: ks8851-ml: Fix 16-bit IO operation + +From: Marek Vasut + +[ Upstream commit 58292104832fef6cb4a89f736012c0e0724c3442 ] + +The Micrel KSZ8851-16MLLI datasheet DS00002357B page 12 states that +BE[3:0] signals are active high. This contradicts the measurements +of the behavior of the actual chip, where these signals behave as +active low. For example, to read the CIDER register, the bus must +expose 0xc0c0 during the address phase, which means BE[3:0]=4'b1100. + +Signed-off-by: Marek Vasut +Cc: David S. Miller +Cc: Lukas Wunner +Cc: Petr Stetiar +Cc: YueHaibing +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/micrel/ks8851_mll.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c +index aff1619fb0e0e..9de59facec218 100644 +--- a/drivers/net/ethernet/micrel/ks8851_mll.c ++++ b/drivers/net/ethernet/micrel/ks8851_mll.c +@@ -485,7 +485,7 @@ static int msg_enable; + + static u16 ks_rdreg16(struct ks_net *ks, int offset) + { +- ks->cmd_reg_cache = (u16)offset | ((BE1 | BE0) << (offset & 0x02)); ++ ks->cmd_reg_cache = (u16)offset | ((BE3 | BE2) >> (offset & 0x02)); + iowrite16(ks->cmd_reg_cache, ks->hw_addr_cmd); + return ioread16(ks->hw_addr); + } +@@ -500,7 +500,7 @@ static u16 ks_rdreg16(struct ks_net *ks, int offset) + + static void ks_wrreg16(struct ks_net *ks, int offset, u16 value) + { +- ks->cmd_reg_cache = (u16)offset | ((BE1 | BE0) << (offset & 0x02)); ++ ks->cmd_reg_cache = (u16)offset | ((BE3 | BE2) >> (offset & 0x02)); + iowrite16(ks->cmd_reg_cache, ks->hw_addr_cmd); + iowrite16(value, ks->hw_addr); + } +-- +2.20.1 + diff --git a/queue-4.19/net-ks8851-ml-remove-8-bit-bus-accessors.patch b/queue-4.19/net-ks8851-ml-remove-8-bit-bus-accessors.patch new file mode 100644 index 00000000000..d2e39cbb017 --- /dev/null +++ b/queue-4.19/net-ks8851-ml-remove-8-bit-bus-accessors.patch @@ -0,0 +1,138 @@ +From 34d04b2c99974dbb39fdbe51443bc10868c7865d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 Feb 2020 17:54:17 +0100 +Subject: net: ks8851-ml: Remove 8-bit bus accessors + +From: Marek Vasut + +[ Upstream commit 69233bba6543a37755158ca3382765387b8078df ] + +This driver is mixing 8-bit and 16-bit bus accessors for reasons unknown, +however the speculation is that this was some sort of attempt to support +the 8-bit bus mode. + +As per the KS8851-16MLL documentation, all two registers accessed via the +8-bit accessors are internally 16-bit registers, so reading them using +16-bit accessors is fine. The KS_CCR read can be converted to 16-bit read +outright, as it is already a concatenation of two 8-bit reads of that +register. The KS_RXQCR accesses are 8-bit only, however writing the top +8 bits of the register is OK as well, since the driver caches the entire +16-bit register value anyway. + +Finally, the driver is not used by any hardware in the kernel right now. +The only hardware available to me is one with 16-bit bus, so I have no +way to test the 8-bit bus mode, however it is unlikely this ever really +worked anyway. If the 8-bit bus mode is ever required, it can be easily +added by adjusting the 16-bit accessors to do 2 consecutive accesses, +which is how this should have been done from the beginning. + +Signed-off-by: Marek Vasut +Cc: David S. Miller +Cc: Lukas Wunner +Cc: Petr Stetiar +Cc: YueHaibing +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/micrel/ks8851_mll.c | 45 +++--------------------- + 1 file changed, 5 insertions(+), 40 deletions(-) + +diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c +index 35f8c9ef204d9..29ac83f4683a6 100644 +--- a/drivers/net/ethernet/micrel/ks8851_mll.c ++++ b/drivers/net/ethernet/micrel/ks8851_mll.c +@@ -475,24 +475,6 @@ static int msg_enable; + * chip is busy transferring packet data (RX/TX FIFO accesses). + */ + +-/** +- * ks_rdreg8 - read 8 bit register from device +- * @ks : The chip information +- * @offset: The register address +- * +- * Read a 8bit register from the chip, returning the result +- */ +-static u8 ks_rdreg8(struct ks_net *ks, int offset) +-{ +- u16 data; +- u8 shift_bit = offset & 0x03; +- u8 shift_data = (offset & 1) << 3; +- ks->cmd_reg_cache = (u16) offset | (u16)(BE0 << shift_bit); +- iowrite16(ks->cmd_reg_cache, ks->hw_addr_cmd); +- data = ioread16(ks->hw_addr); +- return (u8)(data >> shift_data); +-} +- + /** + * ks_rdreg16 - read 16 bit register from device + * @ks : The chip information +@@ -508,22 +490,6 @@ static u16 ks_rdreg16(struct ks_net *ks, int offset) + return ioread16(ks->hw_addr); + } + +-/** +- * ks_wrreg8 - write 8bit register value to chip +- * @ks: The chip information +- * @offset: The register address +- * @value: The value to write +- * +- */ +-static void ks_wrreg8(struct ks_net *ks, int offset, u8 value) +-{ +- u8 shift_bit = (offset & 0x03); +- u16 value_write = (u16)(value << ((offset & 1) << 3)); +- ks->cmd_reg_cache = (u16)offset | (BE0 << shift_bit); +- iowrite16(ks->cmd_reg_cache, ks->hw_addr_cmd); +- iowrite16(value_write, ks->hw_addr); +-} +- + /** + * ks_wrreg16 - write 16bit register value to chip + * @ks: The chip information +@@ -643,8 +609,7 @@ static void ks_read_config(struct ks_net *ks) + u16 reg_data = 0; + + /* Regardless of bus width, 8 bit read should always work.*/ +- reg_data = ks_rdreg8(ks, KS_CCR) & 0x00FF; +- reg_data |= ks_rdreg8(ks, KS_CCR+1) << 8; ++ reg_data = ks_rdreg16(ks, KS_CCR); + + /* addr/data bus are multiplexed */ + ks->sharedbus = (reg_data & CCR_SHARED) == CCR_SHARED; +@@ -748,7 +713,7 @@ static inline void ks_read_qmu(struct ks_net *ks, u16 *buf, u32 len) + + /* 1. set sudo DMA mode */ + ks_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI); +- ks_wrreg8(ks, KS_RXQCR, (ks->rc_rxqcr | RXQCR_SDA) & 0xff); ++ ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA); + + /* 2. read prepend data */ + /** +@@ -765,7 +730,7 @@ static inline void ks_read_qmu(struct ks_net *ks, u16 *buf, u32 len) + ks_inblk(ks, buf, ALIGN(len, 4)); + + /* 4. reset sudo DMA Mode */ +- ks_wrreg8(ks, KS_RXQCR, ks->rc_rxqcr); ++ ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); + } + + /** +@@ -998,13 +963,13 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len) + ks->txh.txw[1] = cpu_to_le16(len); + + /* 1. set sudo-DMA mode */ +- ks_wrreg8(ks, KS_RXQCR, (ks->rc_rxqcr | RXQCR_SDA) & 0xff); ++ ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA); + /* 2. write status/lenth info */ + ks_outblk(ks, ks->txh.txw, 4); + /* 3. write pkt data */ + ks_outblk(ks, (u16 *)pdata, ALIGN(len, 4)); + /* 4. reset sudo-DMA mode */ +- ks_wrreg8(ks, KS_RXQCR, ks->rc_rxqcr); ++ ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); + /* 5. Enqueue Tx(move the pkt from TX buffer into TXQ) */ + ks_wrreg16(ks, KS_TXQCR, TXQCR_METFE); + /* 6. wait until TXQCR_METFE is auto-cleared */ +-- +2.20.1 + diff --git a/queue-4.19/net-thunderx-workaround-bgx-tx-underflow-issue.patch b/queue-4.19/net-thunderx-workaround-bgx-tx-underflow-issue.patch new file mode 100644 index 00000000000..7e9f81fb844 --- /dev/null +++ b/queue-4.19/net-thunderx-workaround-bgx-tx-underflow-issue.patch @@ -0,0 +1,155 @@ +From c465212ae0eb6041ba4db4529ee4cd4044697eee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 Feb 2020 15:19:36 -0800 +Subject: net: thunderx: workaround BGX TX Underflow issue + +From: Tim Harvey + +[ Upstream commit 971617c3b761c876d686a2188220a33898c90e99 ] + +While it is not yet understood why a TX underflow can easily occur +for SGMII interfaces resulting in a TX wedge. It has been found that +disabling/re-enabling the LMAC resolves the issue. + +Signed-off-by: Tim Harvey +Reviewed-by: Robert Jones +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + .../net/ethernet/cavium/thunder/thunder_bgx.c | 62 ++++++++++++++++++- + .../net/ethernet/cavium/thunder/thunder_bgx.h | 9 +++ + 2 files changed, 68 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +index 8ae28f82aafdc..e5fc89813852c 100644 +--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c ++++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +@@ -413,10 +413,19 @@ void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable) + lmac = &bgx->lmac[lmacid]; + + cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG); +- if (enable) ++ if (enable) { + cfg |= CMR_PKT_RX_EN | CMR_PKT_TX_EN; +- else ++ ++ /* enable TX FIFO Underflow interrupt */ ++ bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1S, ++ GMI_TXX_INT_UNDFLW); ++ } else { + cfg &= ~(CMR_PKT_RX_EN | CMR_PKT_TX_EN); ++ ++ /* Disable TX FIFO Underflow interrupt */ ++ bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1C, ++ GMI_TXX_INT_UNDFLW); ++ } + bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cfg); + + if (bgx->is_rgx) +@@ -1544,6 +1553,48 @@ static int bgx_init_phy(struct bgx *bgx) + return bgx_init_of_phy(bgx); + } + ++static irqreturn_t bgx_intr_handler(int irq, void *data) ++{ ++ struct bgx *bgx = (struct bgx *)data; ++ u64 status, val; ++ int lmac; ++ ++ for (lmac = 0; lmac < bgx->lmac_count; lmac++) { ++ status = bgx_reg_read(bgx, lmac, BGX_GMP_GMI_TXX_INT); ++ if (status & GMI_TXX_INT_UNDFLW) { ++ pci_err(bgx->pdev, "BGX%d lmac%d UNDFLW\n", ++ bgx->bgx_id, lmac); ++ val = bgx_reg_read(bgx, lmac, BGX_CMRX_CFG); ++ val &= ~CMR_EN; ++ bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val); ++ val |= CMR_EN; ++ bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val); ++ } ++ /* clear interrupts */ ++ bgx_reg_write(bgx, lmac, BGX_GMP_GMI_TXX_INT, status); ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++static void bgx_register_intr(struct pci_dev *pdev) ++{ ++ struct bgx *bgx = pci_get_drvdata(pdev); ++ int ret; ++ ++ ret = pci_alloc_irq_vectors(pdev, BGX_LMAC_VEC_OFFSET, ++ BGX_LMAC_VEC_OFFSET, PCI_IRQ_ALL_TYPES); ++ if (ret < 0) { ++ pci_err(pdev, "Req for #%d msix vectors failed\n", ++ BGX_LMAC_VEC_OFFSET); ++ return; ++ } ++ ret = pci_request_irq(pdev, GMPX_GMI_TX_INT, bgx_intr_handler, NULL, ++ bgx, "BGX%d", bgx->bgx_id); ++ if (ret) ++ pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx); ++} ++ + static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + { + int err; +@@ -1559,7 +1610,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + + pci_set_drvdata(pdev, bgx); + +- err = pci_enable_device(pdev); ++ err = pcim_enable_device(pdev); + if (err) { + dev_err(dev, "Failed to enable PCI device\n"); + pci_set_drvdata(pdev, NULL); +@@ -1613,6 +1664,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + + bgx_init_hw(bgx); + ++ bgx_register_intr(pdev); ++ + /* Enable all LMACs */ + for (lmac = 0; lmac < bgx->lmac_count; lmac++) { + err = bgx_lmac_enable(bgx, lmac); +@@ -1629,6 +1682,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + + err_enable: + bgx_vnic[bgx->bgx_id] = NULL; ++ pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx); + err_release_regions: + pci_release_regions(pdev); + err_disable_device: +@@ -1646,6 +1700,8 @@ static void bgx_remove(struct pci_dev *pdev) + for (lmac = 0; lmac < bgx->lmac_count; lmac++) + bgx_lmac_disable(bgx, lmac); + ++ pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx); ++ + bgx_vnic[bgx->bgx_id] = NULL; + pci_release_regions(pdev); + pci_disable_device(pdev); +diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +index cbdd20b9ee6f1..ac0c89cd5c3d2 100644 +--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h ++++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +@@ -183,6 +183,15 @@ + #define BGX_GMP_GMI_TXX_BURST 0x38228 + #define BGX_GMP_GMI_TXX_MIN_PKT 0x38240 + #define BGX_GMP_GMI_TXX_SGMII_CTL 0x38300 ++#define BGX_GMP_GMI_TXX_INT 0x38500 ++#define BGX_GMP_GMI_TXX_INT_W1S 0x38508 ++#define BGX_GMP_GMI_TXX_INT_ENA_W1C 0x38510 ++#define BGX_GMP_GMI_TXX_INT_ENA_W1S 0x38518 ++#define GMI_TXX_INT_PTP_LOST BIT_ULL(4) ++#define GMI_TXX_INT_LATE_COL BIT_ULL(3) ++#define GMI_TXX_INT_XSDEF BIT_ULL(2) ++#define GMI_TXX_INT_XSCOL BIT_ULL(1) ++#define GMI_TXX_INT_UNDFLW BIT_ULL(0) + + #define BGX_MSIX_VEC_0_29_ADDR 0x400000 /* +(0..29) << 4 */ + #define BGX_MSIX_VEC_0_29_CTL 0x400008 +-- +2.20.1 + diff --git a/queue-4.19/nvme-fix-uninitialized-variable-warning.patch b/queue-4.19/nvme-fix-uninitialized-variable-warning.patch new file mode 100644 index 00000000000..3b5a02d832d --- /dev/null +++ b/queue-4.19/nvme-fix-uninitialized-variable-warning.patch @@ -0,0 +1,38 @@ +From 448d128250f70abbb1804a20c3c43effebaffeff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Feb 2020 00:59:36 +0900 +Subject: nvme: Fix uninitialized-variable warning + +From: Keith Busch + +[ Upstream commit 15755854d53b4bbb0bb37a0fce66f0156cfc8a17 ] + +gcc may detect a false positive on nvme using an unintialized variable +if setting features fails. Since this is not a fast path, explicitly +initialize this variable to suppress the warning. + +Reported-by: Arnd Bergmann +Reviewed-by: Christoph Hellwig +Signed-off-by: Keith Busch +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c +index f41fd15b7b7c2..a8132e8d72bb4 100644 +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -1058,8 +1058,8 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl, + static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11, + void *buffer, size_t buflen, u32 *result) + { ++ union nvme_result res = { 0 }; + struct nvme_command c; +- union nvme_result res; + int ret; + + memset(&c, 0, sizeof(c)); +-- +2.20.1 + diff --git a/queue-4.19/s390-cio-cio_ignore_proc_seq_next-should-increase-po.patch b/queue-4.19/s390-cio-cio_ignore_proc_seq_next-should-increase-po.patch new file mode 100644 index 00000000000..13a10bdf6c7 --- /dev/null +++ b/queue-4.19/s390-cio-cio_ignore_proc_seq_next-should-increase-po.patch @@ -0,0 +1,50 @@ +From 27642297370ebbdfe95427d64339d79568c47ae9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jan 2020 08:48:55 +0300 +Subject: s390/cio: cio_ignore_proc_seq_next should increase position index + +From: Vasily Averin + +[ Upstream commit 8b101a5e14f2161869636ff9cb4907b7749dc0c2 ] + +if seq_file .next fuction does not change position index, +read after some lseek can generate unexpected output. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=206283 +Link: https://lore.kernel.org/r/d44c53a7-9bc1-15c7-6d4a-0c10cb9dffce@virtuozzo.com +Reviewed-by: Cornelia Huck +Signed-off-by: Christian Borntraeger +Signed-off-by: Vasily Averin +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + drivers/s390/cio/blacklist.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c +index 2a3f874a21d54..9cebff8e8d740 100644 +--- a/drivers/s390/cio/blacklist.c ++++ b/drivers/s390/cio/blacklist.c +@@ -303,8 +303,10 @@ static void * + cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset) + { + struct ccwdev_iter *iter; ++ loff_t p = *offset; + +- if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1)) ++ (*offset)++; ++ if (p >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1)) + return NULL; + iter = it; + if (iter->devno == __MAX_SUBCHANNEL) { +@@ -314,7 +316,6 @@ cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset) + return NULL; + } else + iter->devno++; +- (*offset)++; + return iter; + } + +-- +2.20.1 + diff --git a/queue-4.19/s390-make-install-not-depend-on-vmlinux.patch b/queue-4.19/s390-make-install-not-depend-on-vmlinux.patch new file mode 100644 index 00000000000..91f1153a31c --- /dev/null +++ b/queue-4.19/s390-make-install-not-depend-on-vmlinux.patch @@ -0,0 +1,53 @@ +From a5da05e8a1de70c1433b2fbd0f995b4de02bc5c1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Feb 2020 23:48:29 +0900 +Subject: s390: make 'install' not depend on vmlinux + +From: Masahiro Yamada + +[ Upstream commit 94e90f727f7424d827256023cace829cad6896f4 ] + +For the same reason as commit 19514fc665ff ("arm, kbuild: make "make +install" not depend on vmlinux"), the install targets should never +trigger the rebuild of the kernel. + +The variable, CONFIGURE, is not set by anyone. Remove it as well. + +Link: https://lkml.kernel.org/r/20200216144829.27023-1-masahiroy@kernel.org +Signed-off-by: Masahiro Yamada +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + arch/s390/Makefile | 2 +- + arch/s390/boot/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/Makefile b/arch/s390/Makefile +index 4bccde36cb161..9a3a698c8fca5 100644 +--- a/arch/s390/Makefile ++++ b/arch/s390/Makefile +@@ -140,7 +140,7 @@ all: bzImage + #KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg... + KBUILD_IMAGE := $(boot)/bzImage + +-install: vmlinux ++install: + $(Q)$(MAKE) $(build)=$(boot) $@ + + bzImage: vmlinux +diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile +index f6a9b0c203553..45c72d1f9e7d2 100644 +--- a/arch/s390/boot/Makefile ++++ b/arch/s390/boot/Makefile +@@ -46,7 +46,7 @@ quiet_cmd_ar = AR $@ + $(obj)/startup.a: $(OBJECTS) FORCE + $(call if_changed,ar) + +-install: $(CONFIGURE) $(obj)/bzImage ++install: + sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ + System.map "$(INSTALL_PATH)" + +-- +2.20.1 + diff --git a/queue-4.19/s390-qdio-fill-sl-with-absolute-addresses.patch b/queue-4.19/s390-qdio-fill-sl-with-absolute-addresses.patch new file mode 100644 index 00000000000..76f2fee95e8 --- /dev/null +++ b/queue-4.19/s390-qdio-fill-sl-with-absolute-addresses.patch @@ -0,0 +1,112 @@ +From f191fb5b36e966f0718bfdeda9f2d3d9afa0d9f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Feb 2020 10:48:11 +0100 +Subject: s390/qdio: fill SL with absolute addresses + +From: Julian Wiedmann + +[ Upstream commit e9091ffd6a0aaced111b5d6ead5eaab5cd7101bc ] + +As the comment says, sl->sbal holds an absolute address. qeth currently +solves this through wild casting, while zfcp doesn't care. + +Handle this properly in the code that actually builds the SL. + +Signed-off-by: Julian Wiedmann +Reviewed-by: Alexandra Winter +Reviewed-by: Steffen Maier [for qdio] +Reviewed-by: Benjamin Block +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + arch/s390/include/asm/qdio.h | 2 +- + drivers/s390/cio/qdio_setup.c | 3 ++- + drivers/s390/net/qeth_core_main.c | 23 +++++++++++------------ + 3 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h +index 9c9970a5dfb10..1f2cd98dcb058 100644 +--- a/arch/s390/include/asm/qdio.h ++++ b/arch/s390/include/asm/qdio.h +@@ -228,7 +228,7 @@ struct qdio_buffer { + * @sbal: absolute SBAL address + */ + struct sl_element { +- unsigned long sbal; ++ u64 sbal; + } __attribute__ ((packed)); + + /** +diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c +index 034528a5453ec..d040c4920ee78 100644 +--- a/drivers/s390/cio/qdio_setup.c ++++ b/drivers/s390/cio/qdio_setup.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + + #include "cio.h" +@@ -208,7 +209,7 @@ static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr, + + /* fill in sl */ + for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++) +- q->sl->element[j].sbal = (unsigned long)q->sbal[j]; ++ q->sl->element[j].sbal = virt_to_phys(q->sbal[j]); + } + + static void setup_queues(struct qdio_irq *irq_ptr, +diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c +index 81e2c591acb0b..d99bfbfcafb76 100644 +--- a/drivers/s390/net/qeth_core_main.c ++++ b/drivers/s390/net/qeth_core_main.c +@@ -4929,10 +4929,10 @@ static void qeth_qdio_establish_cq(struct qeth_card *card, + if (card->options.cq == QETH_CQ_ENABLED) { + int offset = QDIO_MAX_BUFFERS_PER_Q * + (card->qdio.no_in_queues - 1); +- for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i) { +- in_sbal_ptrs[offset + i] = (struct qdio_buffer *) +- virt_to_phys(card->qdio.c_q->bufs[i].buffer); +- } ++ ++ for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; i++) ++ in_sbal_ptrs[offset + i] = ++ card->qdio.c_q->bufs[i].buffer; + + queue_start_poll[card->qdio.no_in_queues - 1] = NULL; + } +@@ -4967,10 +4967,9 @@ static int qeth_qdio_establish(struct qeth_card *card) + rc = -ENOMEM; + goto out_free_qib_param; + } +- for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i) { +- in_sbal_ptrs[i] = (struct qdio_buffer *) +- virt_to_phys(card->qdio.in_q->bufs[i].buffer); +- } ++ ++ for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; i++) ++ in_sbal_ptrs[i] = card->qdio.in_q->bufs[i].buffer; + + queue_start_poll = kcalloc(card->qdio.no_in_queues, sizeof(void *), + GFP_KERNEL); +@@ -4991,11 +4990,11 @@ static int qeth_qdio_establish(struct qeth_card *card) + rc = -ENOMEM; + goto out_free_queue_start_poll; + } ++ + for (i = 0, k = 0; i < card->qdio.no_out_queues; ++i) +- for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j, ++k) { +- out_sbal_ptrs[k] = (struct qdio_buffer *)virt_to_phys( +- card->qdio.out_qs[i]->bufs[j]->buffer); +- } ++ for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++, k++) ++ out_sbal_ptrs[k] = ++ card->qdio.out_qs[i]->bufs[j]->buffer; + + memset(&init_data, 0, sizeof(struct qdio_initialize)); + init_data.cdev = CARD_DDEV(card); +-- +2.20.1 + diff --git a/queue-4.19/scsi-megaraid_sas-silence-a-warning.patch b/queue-4.19/scsi-megaraid_sas-silence-a-warning.patch new file mode 100644 index 00000000000..46003f84aa4 --- /dev/null +++ b/queue-4.19/scsi-megaraid_sas-silence-a-warning.patch @@ -0,0 +1,59 @@ +From 9946dd37ec27de1777820bb4e467fe1e3d52734d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 4 Feb 2020 16:24:13 +0100 +Subject: scsi: megaraid_sas: silence a warning + +From: Tomas Henzl + +[ Upstream commit 0e99b2c625da181aebf1a3d13493e3f7a5057a9c ] + +Add a flag to DMA memory allocation to silence a warning. + +This driver allocates DMA memory for IO frames. This allocation may exceed +MAX_ORDER pages for few megaraid_sas controllers (controllers with very +high queue depth). Consequently, the driver has logic to keep reducing the +controller queue depth until the DMA memory allocation succeeds. + +On impacted megaraid_sas controllers there would be multiple DMA allocation +failures until driver settled on an allocation that fit. These failed DMA +allocation requests caused stack traces in system logs. These were not +harmful and this patch silences those warnings/stack traces. + +[mkp: clarified commit desc] + +Link: https://lore.kernel.org/r/20200204152413.7107-1-thenzl@redhat.com +Signed-off-by: Tomas Henzl +Acked-by: Sumit Saxena +Reviewed-by: Lee Duncan +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c +index b094a4e55c32f..81bd824bb9d99 100644 +--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c ++++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c +@@ -530,7 +530,8 @@ megasas_alloc_request_fusion(struct megasas_instance *instance) + + fusion->io_request_frames = + dma_pool_alloc(fusion->io_request_frames_pool, +- GFP_KERNEL, &fusion->io_request_frames_phys); ++ GFP_KERNEL | __GFP_NOWARN, ++ &fusion->io_request_frames_phys); + if (!fusion->io_request_frames) { + if (instance->max_fw_cmds >= (MEGASAS_REDUCE_QD_COUNT * 2)) { + instance->max_fw_cmds -= MEGASAS_REDUCE_QD_COUNT; +@@ -568,7 +569,7 @@ megasas_alloc_request_fusion(struct megasas_instance *instance) + + fusion->io_request_frames = + dma_pool_alloc(fusion->io_request_frames_pool, +- GFP_KERNEL, ++ GFP_KERNEL | __GFP_NOWARN, + &fusion->io_request_frames_phys); + + if (!fusion->io_request_frames) { +-- +2.20.1 + diff --git a/queue-4.19/selftests-fix-too-long-argument.patch b/queue-4.19/selftests-fix-too-long-argument.patch new file mode 100644 index 00000000000..0c38b2d66db --- /dev/null +++ b/queue-4.19/selftests-fix-too-long-argument.patch @@ -0,0 +1,75 @@ +From 75cf2bf80e24bf7dd5b8f2c16d7a5aae210f751a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Feb 2020 09:40:52 +0100 +Subject: selftests: fix too long argument + +From: Jiri Benc + +[ Upstream commit c363eb48ada5cf732b3f489fab799fc881097842 ] + +With some shells, the command construed for install of bpf selftests becomes +too large due to long list of files: + +make[1]: execvp: /bin/sh: Argument list too long +make[1]: *** [../lib.mk:73: install] Error 127 + +Currently, each of the file lists is replicated three times in the command: +in the shell 'if' condition, in the 'echo' and in the 'rsync'. Reduce that +by one instance by using make conditionals and separate the echo and rsync +into two shell commands. (One would be inclined to just remove the '@' at +the beginning of the rsync command and let 'make' echo it by itself; +unfortunately, it appears that the '@' in the front of mkdir silences output +also for the following commands.) + +Also, separate handling of each of the lists to its own shell command. + +The semantics of the makefile is unchanged before and after the patch. The +ability of individual test directories to override INSTALL_RULE is retained. + +Reported-by: Yauheni Kaliuta +Tested-by: Yauheni Kaliuta +Signed-off-by: Jiri Benc +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/lib.mk | 23 +++++++++++++---------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk +index 8b0f16409ed7e..0ef203ec59fdc 100644 +--- a/tools/testing/selftests/lib.mk ++++ b/tools/testing/selftests/lib.mk +@@ -85,17 +85,20 @@ else + $(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS)) + endif + ++define INSTALL_SINGLE_RULE ++ $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)) ++ $(if $(INSTALL_LIST),@echo rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) ++ $(if $(INSTALL_LIST),@rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) ++endef ++ + define INSTALL_RULE +- @if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \ +- mkdir -p ${INSTALL_PATH}; \ +- echo "rsync -a $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/"; \ +- rsync -a $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/; \ +- fi +- @if [ "X$(TEST_GEN_PROGS)$(TEST_CUSTOM_PROGS)$(TEST_GEN_PROGS_EXTENDED)$(TEST_GEN_FILES)" != "X" ]; then \ +- mkdir -p ${INSTALL_PATH}; \ +- echo "rsync -a $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/"; \ +- rsync -a $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/; \ +- fi ++ $(eval INSTALL_LIST = $(TEST_PROGS)) $(INSTALL_SINGLE_RULE) ++ $(eval INSTALL_LIST = $(TEST_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE) ++ $(eval INSTALL_LIST = $(TEST_FILES)) $(INSTALL_SINGLE_RULE) ++ $(eval INSTALL_LIST = $(TEST_GEN_PROGS)) $(INSTALL_SINGLE_RULE) ++ $(eval INSTALL_LIST = $(TEST_CUSTOM_PROGS)) $(INSTALL_SINGLE_RULE) ++ $(eval INSTALL_LIST = $(TEST_GEN_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE) ++ $(eval INSTALL_LIST = $(TEST_GEN_FILES)) $(INSTALL_SINGLE_RULE) + endef + + install: all +-- +2.20.1 + diff --git a/queue-4.19/selftests-forwarding-use-proto-icmp-for-gretap-ip6gr.patch b/queue-4.19/selftests-forwarding-use-proto-icmp-for-gretap-ip6gr.patch new file mode 100644 index 00000000000..da44e6c1112 --- /dev/null +++ b/queue-4.19/selftests-forwarding-use-proto-icmp-for-gretap-ip6gr.patch @@ -0,0 +1,119 @@ +From 4966b0d6b3e3f9873aa8434c71a506242cb99d70 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Feb 2020 15:32:56 +0800 +Subject: selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac + testing + +From: Hangbin Liu + +[ Upstream commit e8023b030ce1748930e2dc76353a262fe47d4745 ] + +For tc ip_proto filter, when we extract the flow via __skb_flow_dissect() +without flag FLOW_DISSECTOR_F_STOP_AT_ENCAP, we will continue extract to +the inner proto. + +So for GRE + ICMP messages, we should not track GRE proto, but inner ICMP +proto. + +For test mirror_gre.sh, it may make user confused if we capture ICMP +message on $h3(since the flow is GRE message). So I move the capture +dev to h3-gt{4,6}, and only capture ICMP message. + +Before the fix: +]# ./mirror_gre.sh +TEST: ingress mirror to gretap (skip_hw) [ OK ] +TEST: egress mirror to gretap (skip_hw) [ OK ] +TEST: ingress mirror to ip6gretap (skip_hw) [ OK ] +TEST: egress mirror to ip6gretap (skip_hw) [ OK ] +TEST: ingress mirror to gretap: envelope MAC (skip_hw) [FAIL] + Expected to capture 10 packets, got 0. +TEST: egress mirror to gretap: envelope MAC (skip_hw) [FAIL] + Expected to capture 10 packets, got 0. +TEST: ingress mirror to ip6gretap: envelope MAC (skip_hw) [FAIL] + Expected to capture 10 packets, got 0. +TEST: egress mirror to ip6gretap: envelope MAC (skip_hw) [FAIL] + Expected to capture 10 packets, got 0. +TEST: two simultaneously configured mirrors (skip_hw) [ OK ] +WARN: Could not test offloaded functionality + +After fix: +]# ./mirror_gre.sh +TEST: ingress mirror to gretap (skip_hw) [ OK ] +TEST: egress mirror to gretap (skip_hw) [ OK ] +TEST: ingress mirror to ip6gretap (skip_hw) [ OK ] +TEST: egress mirror to ip6gretap (skip_hw) [ OK ] +TEST: ingress mirror to gretap: envelope MAC (skip_hw) [ OK ] +TEST: egress mirror to gretap: envelope MAC (skip_hw) [ OK ] +TEST: ingress mirror to ip6gretap: envelope MAC (skip_hw) [ OK ] +TEST: egress mirror to ip6gretap: envelope MAC (skip_hw) [ OK ] +TEST: two simultaneously configured mirrors (skip_hw) [ OK ] +WARN: Could not test offloaded functionality + +Fixes: ba8d39871a10 ("selftests: forwarding: Add test for mirror to gretap") +Signed-off-by: Hangbin Liu +Reviewed-by: Petr Machata +Tested-by: Petr Machata +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + .../selftests/net/forwarding/mirror_gre.sh | 25 ++++++++++--------- + 1 file changed, 13 insertions(+), 12 deletions(-) + +diff --git a/tools/testing/selftests/net/forwarding/mirror_gre.sh b/tools/testing/selftests/net/forwarding/mirror_gre.sh +index e6fd7a18c655f..0266443601bc0 100755 +--- a/tools/testing/selftests/net/forwarding/mirror_gre.sh ++++ b/tools/testing/selftests/net/forwarding/mirror_gre.sh +@@ -63,22 +63,23 @@ test_span_gre_mac() + { + local tundev=$1; shift + local direction=$1; shift +- local prot=$1; shift + local what=$1; shift + +- local swp3mac=$(mac_get $swp3) +- local h3mac=$(mac_get $h3) ++ case "$direction" in ++ ingress) local src_mac=$(mac_get $h1); local dst_mac=$(mac_get $h2) ++ ;; ++ egress) local src_mac=$(mac_get $h2); local dst_mac=$(mac_get $h1) ++ ;; ++ esac + + RET=0 + + mirror_install $swp1 $direction $tundev "matchall $tcflags" +- tc filter add dev $h3 ingress pref 77 prot $prot \ +- flower ip_proto 0x2f src_mac $swp3mac dst_mac $h3mac \ +- action pass ++ icmp_capture_install h3-${tundev} "src_mac $src_mac dst_mac $dst_mac" + +- mirror_test v$h1 192.0.2.1 192.0.2.2 $h3 77 10 ++ mirror_test v$h1 192.0.2.1 192.0.2.2 h3-${tundev} 100 10 + +- tc filter del dev $h3 ingress pref 77 ++ icmp_capture_uninstall h3-${tundev} + mirror_uninstall $swp1 $direction + + log_test "$direction $what: envelope MAC ($tcflags)" +@@ -120,14 +121,14 @@ test_ip6gretap() + + test_gretap_mac() + { +- test_span_gre_mac gt4 ingress ip "mirror to gretap" +- test_span_gre_mac gt4 egress ip "mirror to gretap" ++ test_span_gre_mac gt4 ingress "mirror to gretap" ++ test_span_gre_mac gt4 egress "mirror to gretap" + } + + test_ip6gretap_mac() + { +- test_span_gre_mac gt6 ingress ipv6 "mirror to ip6gretap" +- test_span_gre_mac gt6 egress ipv6 "mirror to ip6gretap" ++ test_span_gre_mac gt6 ingress "mirror to ip6gretap" ++ test_span_gre_mac gt6 egress "mirror to ip6gretap" + } + + test_all() +-- +2.20.1 + diff --git a/queue-4.19/serial-ar933x_uart-set-uart_cs_-rx-tx-_ready_oride.patch b/queue-4.19/serial-ar933x_uart-set-uart_cs_-rx-tx-_ready_oride.patch new file mode 100644 index 00000000000..1421429b72a --- /dev/null +++ b/queue-4.19/serial-ar933x_uart-set-uart_cs_-rx-tx-_ready_oride.patch @@ -0,0 +1,58 @@ +From 7adc5e165e4f3be4d42e7c1ebb86720adf9193c5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 7 Feb 2020 11:53:35 +0200 +Subject: serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE + +From: Daniel Golle + +[ Upstream commit 87c5cbf71ecbb9e289d60a2df22eb686c70bf196 ] + +On AR934x this UART is usually not initialized by the bootloader +as it is only used as a secondary serial port while the primary +UART is a newly introduced NS16550-compatible. +In order to make use of the ar933x-uart on AR934x without RTS/CTS +hardware flow control, one needs to set the +UART_CS_{RX,TX}_READY_ORIDE bits as other than on AR933x where this +UART is used as primary/console, the bootloader on AR934x typically +doesn't set those bits. +Setting them explicitely on AR933x should not do any harm, so just +set them unconditionally. + +Tested-by: Chuanhong Guo +Signed-off-by: Daniel Golle +Link: https://lore.kernel.org/r/20200207095335.GA179836@makrotopia.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/ar933x_uart.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c +index 3bdd56a1021b2..ea12f10610b64 100644 +--- a/drivers/tty/serial/ar933x_uart.c ++++ b/drivers/tty/serial/ar933x_uart.c +@@ -286,6 +286,10 @@ static void ar933x_uart_set_termios(struct uart_port *port, + ar933x_uart_rmw_set(up, AR933X_UART_CS_REG, + AR933X_UART_CS_HOST_INT_EN); + ++ /* enable RX and TX ready overide */ ++ ar933x_uart_rmw_set(up, AR933X_UART_CS_REG, ++ AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE); ++ + /* reenable the UART */ + ar933x_uart_rmw(up, AR933X_UART_CS_REG, + AR933X_UART_CS_IF_MODE_M << AR933X_UART_CS_IF_MODE_S, +@@ -418,6 +422,10 @@ static int ar933x_uart_startup(struct uart_port *port) + ar933x_uart_rmw_set(up, AR933X_UART_CS_REG, + AR933X_UART_CS_HOST_INT_EN); + ++ /* enable RX and TX ready overide */ ++ ar933x_uart_rmw_set(up, AR933X_UART_CS_REG, ++ AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE); ++ + /* Enable RX interrupts */ + up->ier = AR933X_UART_INT_RX_VALID; + ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier); +-- +2.20.1 + diff --git a/queue-4.19/series b/queue-4.19/series index c385fc0f137..bbcf6d8bb74 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -4,3 +4,28 @@ net-dsa-bcm_sf2-forcibly-configure-imp-port-for-1gb-.patch rdma-core-fix-pkey-and-port-assignment-in-get_new_pp.patch rdma-core-fix-use-of-logical-or-in-get_new_pps.patch kprobes-fix-optimize_kprobe-unoptimize_kprobe-cancel.patch +alsa-hda-do-not-override-bus-codec_mask-in-link_get.patch +serial-ar933x_uart-set-uart_cs_-rx-tx-_ready_oride.patch +selftests-fix-too-long-argument.patch +usb-gadget-composite-support-more-than-500ma-maxpowe.patch +usb-gadget-ffs-ffs_aio_cancel-save-restore-irq-flags.patch +usb-gadget-serial-fix-tx-stall-after-buffer-overflow.patch +drm-msm-mdp5-rate-limit-pp-done-timeout-warnings.patch +drm-msm-fix-return-type-of-dsi_mgr_connector_mode_va.patch +scsi-megaraid_sas-silence-a-warning.patch +drm-msm-dsi-save-pll-state-before-dsi-host-is-powere.patch +drm-msm-dsi-pll-call-vco-set-rate-explicitly.patch +selftests-forwarding-use-proto-icmp-for-gretap-ip6gr.patch +net-dsa-b53-ensure-the-default-vid-is-untagged.patch +net-ks8851-ml-remove-8-bit-bus-accessors.patch +net-ks8851-ml-fix-16-bit-data-access.patch +net-ks8851-ml-fix-16-bit-io-operation.patch +watchdog-da9062-do-not-ping-the-hw-during-stop.patch +s390-cio-cio_ignore_proc_seq_next-should-increase-po.patch +s390-make-install-not-depend-on-vmlinux.patch +x86-boot-compressed-don-t-declare-__force_order-in-k.patch +s390-qdio-fill-sl-with-absolute-addresses.patch +nvme-fix-uninitialized-variable-warning.patch +ice-don-t-tell-the-os-that-link-is-going-down.patch +x86-xen-distribute-switch-variables-for-initializati.patch +net-thunderx-workaround-bgx-tx-underflow-issue.patch diff --git a/queue-4.19/usb-gadget-composite-support-more-than-500ma-maxpowe.patch b/queue-4.19/usb-gadget-composite-support-more-than-500ma-maxpowe.patch new file mode 100644 index 00000000000..d798a3fc33c --- /dev/null +++ b/queue-4.19/usb-gadget-composite-support-more-than-500ma-maxpowe.patch @@ -0,0 +1,115 @@ +From b69f6ca6cbb545cf0b9b5df44eeb86fd89034b3a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jan 2020 19:10:36 -0800 +Subject: usb: gadget: composite: Support more than 500mA MaxPower + +From: Jack Pham + +[ Upstream commit a2035411fa1d1206cea7d5dfe833e78481844a76 ] + +USB 3.x SuperSpeed peripherals can draw up to 900mA of VBUS power +when in configured state. However, if a configuration wanting to +take advantage of this is added with MaxPower greater than 500 +(currently possible if using a ConfigFS gadget) the composite +driver fails to accommodate this for a couple reasons: + + - usb_gadget_vbus_draw() when called from set_config() and + composite_resume() will be passed the MaxPower value without + regard for the current connection speed, resulting in a + violation for USB 2.0 since the max is 500mA. + + - the bMaxPower of the configuration descriptor would be + incorrectly encoded, again if the connection speed is only + at USB 2.0 or below, likely wrapping around U8_MAX since + the 2mA multiplier corresponds to a maximum of 510mA. + +Fix these by adding checks against the current gadget->speed +when the c->MaxPower value is used (set_config() and +composite_resume()) and appropriately limit based on whether +it is currently at a low-/full-/high- or super-speed connection. + +Because 900 is not divisible by 8, with the round-up division +currently used in encode_bMaxPower() a MaxPower of 900mA will +result in an encoded value of 0x71. When a host stack (including +Linux and Windows) enumerates this on a single port root hub, it +reads this value back and decodes (multiplies by 8) to get 904mA +which is strictly greater than 900mA that is typically budgeted +for that port, causing it to reject the configuration. Instead, +we should be using the round-down behavior of normal integral +division so that 900 / 8 -> 0x70 or 896mA to stay within range. +And we might as well change it for the high/full/low case as well +for consistency. + +N.B. USB 3.2 Gen N x 2 allows for up to 1500mA but there doesn't +seem to be any any peripheral controller supported by Linux that +does two lane operation, so for now keeping the clamp at 900 +should be fine. + +Signed-off-by: Jack Pham +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/composite.c | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) + +diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c +index fea7c7e0143f2..30aefd1adbadd 100644 +--- a/drivers/usb/gadget/composite.c ++++ b/drivers/usb/gadget/composite.c +@@ -438,9 +438,13 @@ static u8 encode_bMaxPower(enum usb_device_speed speed, + if (!val) + return 0; + if (speed < USB_SPEED_SUPER) +- return DIV_ROUND_UP(val, 2); ++ return min(val, 500U) / 2; + else +- return DIV_ROUND_UP(val, 8); ++ /* ++ * USB 3.x supports up to 900mA, but since 900 isn't divisible ++ * by 8 the integral division will effectively cap to 896mA. ++ */ ++ return min(val, 900U) / 8; + } + + static int config_buf(struct usb_configuration *config, +@@ -838,6 +842,10 @@ static int set_config(struct usb_composite_dev *cdev, + + /* when we return, be sure our power usage is valid */ + power = c->MaxPower ? c->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW; ++ if (gadget->speed < USB_SPEED_SUPER) ++ power = min(power, 500U); ++ else ++ power = min(power, 900U); + done: + usb_gadget_vbus_draw(gadget, power); + if (result >= 0 && cdev->delayed_status) +@@ -2264,7 +2272,7 @@ void composite_resume(struct usb_gadget *gadget) + { + struct usb_composite_dev *cdev = get_gadget_data(gadget); + struct usb_function *f; +- u16 maxpower; ++ unsigned maxpower; + + /* REVISIT: should we have config level + * suspend/resume callbacks? +@@ -2278,10 +2286,14 @@ void composite_resume(struct usb_gadget *gadget) + f->resume(f); + } + +- maxpower = cdev->config->MaxPower; ++ maxpower = cdev->config->MaxPower ? ++ cdev->config->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW; ++ if (gadget->speed < USB_SPEED_SUPER) ++ maxpower = min(maxpower, 500U); ++ else ++ maxpower = min(maxpower, 900U); + +- usb_gadget_vbus_draw(gadget, maxpower ? +- maxpower : CONFIG_USB_GADGET_VBUS_DRAW); ++ usb_gadget_vbus_draw(gadget, maxpower); + } + + cdev->suspended = 0; +-- +2.20.1 + diff --git a/queue-4.19/usb-gadget-ffs-ffs_aio_cancel-save-restore-irq-flags.patch b/queue-4.19/usb-gadget-ffs-ffs_aio_cancel-save-restore-irq-flags.patch new file mode 100644 index 00000000000..6ed531058fd --- /dev/null +++ b/queue-4.19/usb-gadget-ffs-ffs_aio_cancel-save-restore-irq-flags.patch @@ -0,0 +1,53 @@ +From b146a6d1a693e82b9954e732cc2f375313fca97d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jan 2020 15:29:01 +0200 +Subject: usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags + +From: Lars-Peter Clausen + +[ Upstream commit 43d565727a3a6fd24e37c7c2116475106af71806 ] + +ffs_aio_cancel() can be called from both interrupt and thread context. Make +sure that the current IRQ state is saved and restored by using +spin_{un,}lock_irq{save,restore}(). + +Otherwise undefined behavior might occur. + +Acked-by: Michal Nazarewicz +Signed-off-by: Lars-Peter Clausen +Signed-off-by: Alexandru Ardelean +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/f_fs.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c +index 2050993fb58b7..a9239455eb6d8 100644 +--- a/drivers/usb/gadget/function/f_fs.c ++++ b/drivers/usb/gadget/function/f_fs.c +@@ -1077,18 +1077,19 @@ static int ffs_aio_cancel(struct kiocb *kiocb) + { + struct ffs_io_data *io_data = kiocb->private; + struct ffs_epfile *epfile = kiocb->ki_filp->private_data; ++ unsigned long flags; + int value; + + ENTER(); + +- spin_lock_irq(&epfile->ffs->eps_lock); ++ spin_lock_irqsave(&epfile->ffs->eps_lock, flags); + + if (likely(io_data && io_data->ep && io_data->req)) + value = usb_ep_dequeue(io_data->ep, io_data->req); + else + value = -EINVAL; + +- spin_unlock_irq(&epfile->ffs->eps_lock); ++ spin_unlock_irqrestore(&epfile->ffs->eps_lock, flags); + + return value; + } +-- +2.20.1 + diff --git a/queue-4.19/usb-gadget-serial-fix-tx-stall-after-buffer-overflow.patch b/queue-4.19/usb-gadget-serial-fix-tx-stall-after-buffer-overflow.patch new file mode 100644 index 00000000000..de4ef672dbf --- /dev/null +++ b/queue-4.19/usb-gadget-serial-fix-tx-stall-after-buffer-overflow.patch @@ -0,0 +1,50 @@ +From 7a174156510713fd5be3c20ba5d2f2846ba1b79e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Jan 2020 14:21:46 +0300 +Subject: usb: gadget: serial: fix Tx stall after buffer overflow +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sergey Organov + +[ Upstream commit e4bfded56cf39b8d02733c1e6ef546b97961e18a ] + +Symptom: application opens /dev/ttyGS0 and starts sending (writing) to +it while either USB cable is not connected, or nobody listens on the +other side of the cable. If driver circular buffer overflows before +connection is established, no data will be written to the USB layer +until/unless /dev/ttyGS0 is closed and re-opened again by the +application (the latter besides having no means of being notified about +the event of establishing of the connection.) + +Fix: on open and/or connect, kick Tx to flush circular buffer data to +USB layer. + +Signed-off-by: Sergey Organov +Reviewed-by: Michał Mirosław +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/u_serial.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c +index d4d317db89df5..38afe96c5cd26 100644 +--- a/drivers/usb/gadget/function/u_serial.c ++++ b/drivers/usb/gadget/function/u_serial.c +@@ -567,8 +567,10 @@ static int gs_start_io(struct gs_port *port) + port->n_read = 0; + started = gs_start_rx(port); + +- /* unblock any pending writes into our circular buffer */ + if (started) { ++ gs_start_tx(port); ++ /* Unblock any pending writes into our circular buffer, in case ++ * we didn't in gs_start_tx() */ + tty_wakeup(port->port.tty); + } else { + gs_free_requests(ep, head, &port->read_allocated); +-- +2.20.1 + diff --git a/queue-4.19/watchdog-da9062-do-not-ping-the-hw-during-stop.patch b/queue-4.19/watchdog-da9062-do-not-ping-the-hw-during-stop.patch new file mode 100644 index 00000000000..6a892aa9d35 --- /dev/null +++ b/queue-4.19/watchdog-da9062-do-not-ping-the-hw-during-stop.patch @@ -0,0 +1,51 @@ +From 68143e4fca509a8c770f70a1df432d294d9b59db Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Jan 2020 10:17:29 +0100 +Subject: watchdog: da9062: do not ping the hw during stop() + +From: Marco Felsch + +[ Upstream commit e9a0e65eda3f78d0b04ec6136c591c000cbc3b76 ] + +The da9062 hw has a minimum ping cool down phase of at least 200ms. The +driver takes that into account by setting the min_hw_heartbeat_ms to +300ms and the core guarantees that the hw limit is observed for the +ping() calls. But the core can't guarantee the required minimum ping +cool down phase if a stop() command is send immediately after the ping() +command. So it is not allowed to ping the watchdog within the stop() +command as the driver does. Remove the ping can be done without doubts +because the watchdog gets disabled anyway and a (re)start resets the +watchdog counter too. + +Signed-off-by: Marco Felsch +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20200120091729.16256-1-m.felsch@pengutronix.de +[groeck: Updated description] +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/da9062_wdt.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c +index fe169d8e1fb2f..7f0a8e6352860 100644 +--- a/drivers/watchdog/da9062_wdt.c ++++ b/drivers/watchdog/da9062_wdt.c +@@ -99,13 +99,6 @@ static int da9062_wdt_stop(struct watchdog_device *wdd) + struct da9062_watchdog *wdt = watchdog_get_drvdata(wdd); + int ret; + +- ret = da9062_reset_watchdog_timer(wdt); +- if (ret) { +- dev_err(wdt->hw->dev, "Failed to ping the watchdog (err = %d)\n", +- ret); +- return ret; +- } +- + ret = regmap_update_bits(wdt->hw->regmap, + DA9062AA_CONTROL_D, + DA9062AA_TWDSCALE_MASK, +-- +2.20.1 + diff --git a/queue-4.19/x86-boot-compressed-don-t-declare-__force_order-in-k.patch b/queue-4.19/x86-boot-compressed-don-t-declare-__force_order-in-k.patch new file mode 100644 index 00000000000..1448cf096fe --- /dev/null +++ b/queue-4.19/x86-boot-compressed-don-t-declare-__force_order-in-k.patch @@ -0,0 +1,44 @@ +From 82f80ee1ef34628ba320dd9026e0421f80409427 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jan 2020 12:46:51 -0800 +Subject: x86/boot/compressed: Don't declare __force_order in kaslr_64.c + +From: H.J. Lu + +[ Upstream commit df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc ] + +GCC 10 changed the default to -fno-common, which leads to + + LD arch/x86/boot/compressed/vmlinux + ld: arch/x86/boot/compressed/pgtable_64.o:(.bss+0x0): multiple definition of `__force_order'; \ + arch/x86/boot/compressed/kaslr_64.o:(.bss+0x0): first defined here + make[2]: *** [arch/x86/boot/compressed/Makefile:119: arch/x86/boot/compressed/vmlinux] Error 1 + +Since __force_order is already provided in pgtable_64.c, there is no +need to declare __force_order in kaslr_64.c. + +Signed-off-by: H.J. Lu +Signed-off-by: Borislav Petkov +Link: https://lkml.kernel.org/r/20200124181811.4780-1-hjl.tools@gmail.com +Signed-off-by: Sasha Levin +--- + arch/x86/boot/compressed/kaslr_64.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/arch/x86/boot/compressed/kaslr_64.c b/arch/x86/boot/compressed/kaslr_64.c +index 748456c365f46..9557c5a15b91e 100644 +--- a/arch/x86/boot/compressed/kaslr_64.c ++++ b/arch/x86/boot/compressed/kaslr_64.c +@@ -29,9 +29,6 @@ + #define __PAGE_OFFSET __PAGE_OFFSET_BASE + #include "../../mm/ident_map.c" + +-/* Used by pgtable.h asm code to force instruction serialization. */ +-unsigned long __force_order; +- + /* Used to track our page table allocation area. */ + struct alloc_pgt_data { + unsigned char *pgt_buf; +-- +2.20.1 + diff --git a/queue-4.19/x86-xen-distribute-switch-variables-for-initializati.patch b/queue-4.19/x86-xen-distribute-switch-variables-for-initializati.patch new file mode 100644 index 00000000000..bcc8a2c3d9d --- /dev/null +++ b/queue-4.19/x86-xen-distribute-switch-variables-for-initializati.patch @@ -0,0 +1,69 @@ +From 1f4c676a0ae0556c8d16fedc38d30e541d22db42 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 Feb 2020 22:23:18 -0800 +Subject: x86/xen: Distribute switch variables for initialization +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Kees Cook + +[ Upstream commit 9038ec99ceb94fb8d93ade5e236b2928f0792c7c ] + +Variables declared in a switch statement before any case statements +cannot be automatically initialized with compiler instrumentation (as +they are not part of any execution flow). With GCC's proposed automatic +stack variable initialization feature, this triggers a warning (and they +don't get initialized). Clang's automatic stack variable initialization +(via CONFIG_INIT_STACK_ALL=y) doesn't throw a warning, but it also +doesn't initialize such variables[1]. Note that these warnings (or silent +skipping) happen before the dead-store elimination optimization phase, +so even when the automatic initializations are later elided in favor of +direct initializations, the warnings remain. + +To avoid these problems, move such variables into the "case" where +they're used or lift them up into the main function body. + +arch/x86/xen/enlighten_pv.c: In function ‘xen_write_msr_safe’: +arch/x86/xen/enlighten_pv.c:904:12: warning: statement will never be executed [-Wswitch-unreachable] + 904 | unsigned which; + | ^~~~~ + +[1] https://bugs.llvm.org/show_bug.cgi?id=44916 + +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/20200220062318.69299-1-keescook@chromium.org +Reviewed-by: Juergen Gross +[boris: made @which an 'unsigned int'] +Signed-off-by: Boris Ostrovsky +Signed-off-by: Sasha Levin +--- + arch/x86/xen/enlighten_pv.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c +index 1730a26ff6abc..76864ea591605 100644 +--- a/arch/x86/xen/enlighten_pv.c ++++ b/arch/x86/xen/enlighten_pv.c +@@ -908,14 +908,15 @@ static u64 xen_read_msr_safe(unsigned int msr, int *err) + static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) + { + int ret; ++#ifdef CONFIG_X86_64 ++ unsigned int which; ++ u64 base; ++#endif + + ret = 0; + + switch (msr) { + #ifdef CONFIG_X86_64 +- unsigned which; +- u64 base; +- + case MSR_FS_BASE: which = SEGBASE_FS; goto set; + case MSR_KERNEL_GS_BASE: which = SEGBASE_GS_USER; goto set; + case MSR_GS_BASE: which = SEGBASE_GS_KERNEL; goto set; +-- +2.20.1 +