From: Sasha Levin Date: Wed, 22 Jul 2020 17:30:23 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v4.14.190~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e46893cae8d155d4fe839790d87f676a97de7e32;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch b/queue-4.19/drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch new file mode 100644 index 00000000000..050dddc0ec2 --- /dev/null +++ b/queue-4.19/drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch @@ -0,0 +1,50 @@ +From 7d06c9d46ec96a22f4f19aeed9c45def34ededee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Jun 2020 17:52:27 +1000 +Subject: drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() + +From: Gavin Shan + +[ Upstream commit c377e67c6271954969384f9be1b1b71de13eba30 ] + +The CPU mask (@tmp) should be released on failing to allocate +@cpu_groups or any of its elements. Otherwise, it leads to memory +leakage because the CPU mask variable is dynamically allocated +when CONFIG_CPUMASK_OFFSTACK is enabled. + +Signed-off-by: Gavin Shan +Reviewed-by: Sudeep Holla +Link: https://lore.kernel.org/r/20200630075227.199624-1-gshan@redhat.com +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + drivers/firmware/psci_checker.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci_checker.c +index cbd53cb1b2d47..9f1a913933d53 100644 +--- a/drivers/firmware/psci_checker.c ++++ b/drivers/firmware/psci_checker.c +@@ -164,8 +164,10 @@ static int alloc_init_cpu_groups(cpumask_var_t **pcpu_groups) + + cpu_groups = kcalloc(nb_available_cpus, sizeof(cpu_groups), + GFP_KERNEL); +- if (!cpu_groups) ++ if (!cpu_groups) { ++ free_cpumask_var(tmp); + return -ENOMEM; ++ } + + cpumask_copy(tmp, cpu_online_mask); + +@@ -174,6 +176,7 @@ static int alloc_init_cpu_groups(cpumask_var_t **pcpu_groups) + topology_core_cpumask(cpumask_any(tmp)); + + if (!alloc_cpumask_var(&cpu_groups[num_groups], GFP_KERNEL)) { ++ free_cpumask_var(tmp); + free_cpu_groups(num_groups, &cpu_groups); + return -ENOMEM; + } +-- +2.25.1 + diff --git a/queue-4.19/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch b/queue-4.19/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch new file mode 100644 index 00000000000..2155fd6c786 --- /dev/null +++ b/queue-4.19/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch @@ -0,0 +1,58 @@ +From 8b7a0ed4f27a5b1650a7e66562fc92f2d4af34b2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 5 Jul 2020 17:45:21 -0700 +Subject: drivers/net/wan/lapbether: Fixed the value of hard_header_len + +From: Xie He + +[ Upstream commit 9dc829a135fb5927f1519de11286e2bbb79f5b66 ] + +When this driver transmits data, + first this driver will remove a pseudo header of 1 byte, + then the lapb module will prepend the LAPB header of 2 or 3 bytes, + then this driver will prepend a length field of 2 bytes, + then the underlying Ethernet device will prepend its own header. + +So, the header length required should be: + -1 + 3 + 2 + "the header length needed by the underlying device". + +This patch fixes kernel panic when this driver is used with AF_PACKET +SOCK_DGRAM sockets. + +Signed-off-by: Xie He +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/wan/lapbether.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c +index 0e3f8ed84660e..ac34257e9f203 100644 +--- a/drivers/net/wan/lapbether.c ++++ b/drivers/net/wan/lapbether.c +@@ -308,7 +308,6 @@ static void lapbeth_setup(struct net_device *dev) + dev->netdev_ops = &lapbeth_netdev_ops; + dev->needs_free_netdev = true; + dev->type = ARPHRD_X25; +- dev->hard_header_len = 3; + dev->mtu = 1000; + dev->addr_len = 0; + } +@@ -329,6 +328,14 @@ static int lapbeth_new_device(struct net_device *dev) + if (!ndev) + goto out; + ++ /* When transmitting data: ++ * first this driver removes a pseudo header of 1 byte, ++ * then the lapb module prepends an LAPB header of at most 3 bytes, ++ * then this driver prepends a length field of 2 bytes, ++ * then the underlying Ethernet device prepends its own header. ++ */ ++ ndev->hard_header_len = -1 + 3 + 2 + dev->hard_header_len; ++ + lapbeth = netdev_priv(ndev); + lapbeth->axdev = ndev; + +-- +2.25.1 + diff --git a/queue-4.19/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch b/queue-4.19/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch new file mode 100644 index 00000000000..7ac2b617085 --- /dev/null +++ b/queue-4.19/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch @@ -0,0 +1,56 @@ +From 33bc14f02e1c653675e3be5b131186b06679fe64 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Jun 2020 16:39:13 +1000 +Subject: drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout + +From: Ben Skeggs + +[ Upstream commit 0156e76d388310a490aeb0f2fbb5b284ded3aecc ] + +Tegra TRM says worst-case reply time is 1216us, and this should fix some +spurious timeouts that have been popping up. + +Signed-off-by: Ben Skeggs +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 ++-- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c +index c8ab1b5741a3e..db7769cb33eba 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c +@@ -118,10 +118,10 @@ g94_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, + if (retries) + udelay(400); + +- /* transaction request, wait up to 1ms for it to complete */ ++ /* transaction request, wait up to 2ms for it to complete */ + nvkm_wr32(device, 0x00e4e4 + base, 0x00010000 | ctrl); + +- timeout = 1000; ++ timeout = 2000; + do { + ctrl = nvkm_rd32(device, 0x00e4e4 + base); + udelay(1); +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c +index 7ef60895f43a7..edb6148cbca04 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c +@@ -118,10 +118,10 @@ gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, + if (retries) + udelay(400); + +- /* transaction request, wait up to 1ms for it to complete */ ++ /* transaction request, wait up to 2ms for it to complete */ + nvkm_wr32(device, 0x00d954 + base, 0x00010000 | ctrl); + +- timeout = 1000; ++ timeout = 2000; + do { + ctrl = nvkm_rd32(device, 0x00d954 + base); + udelay(1); +-- +2.25.1 + diff --git a/queue-4.19/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch b/queue-4.19/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch new file mode 100644 index 00000000000..f2c662cfb6a --- /dev/null +++ b/queue-4.19/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch @@ -0,0 +1,37 @@ +From 6d0a05ed6ca3170aa8c590e7d9ed91025146d35a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 21:52:07 -0500 +Subject: gpio: arizona: handle pm_runtime_get_sync failure case + +From: Navid Emamdoost + +[ Upstream commit e6f390a834b56583e6fc0949822644ce92fbb107 ] + +Calling pm_runtime_get_sync increments the counter even in case of +failure, causing incorrect ref count. Call pm_runtime_put if +pm_runtime_get_sync fails. + +Signed-off-by: Navid Emamdoost +Acked-by: Charles Keepax +Link: https://lore.kernel.org/r/20200605025207.65719-1-navid.emamdoost@gmail.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-arizona.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c +index ba51ea15f3794..485aa45fc5d53 100644 +--- a/drivers/gpio/gpio-arizona.c ++++ b/drivers/gpio/gpio-arizona.c +@@ -111,6 +111,7 @@ static int arizona_gpio_direction_out(struct gpio_chip *chip, + ret = pm_runtime_get_sync(chip->parent); + if (ret < 0) { + dev_err(chip->parent, "Failed to resume: %d\n", ret); ++ pm_runtime_put(chip->parent); + return ret; + } + } +-- +2.25.1 + diff --git a/queue-4.19/gpio-arizona-put-pm_runtime-in-case-of-failure.patch b/queue-4.19/gpio-arizona-put-pm_runtime-in-case-of-failure.patch new file mode 100644 index 00000000000..6d476559db4 --- /dev/null +++ b/queue-4.19/gpio-arizona-put-pm_runtime-in-case-of-failure.patch @@ -0,0 +1,54 @@ +From 4f61bb905b5dec0b0e37583b5b750f839c077a81 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 22:00:52 -0500 +Subject: gpio: arizona: put pm_runtime in case of failure + +From: Navid Emamdoost + +[ Upstream commit 861254d826499944cb4d9b5a15f5a794a6b99a69 ] + +Calling pm_runtime_get_sync increments the counter even in case of +failure, causing incorrect ref count if pm_runtime_put is not called in +error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails. + +Signed-off-by: Navid Emamdoost +Acked-by: Charles Keepax +Link: https://lore.kernel.org/r/20200605030052.78235-1-navid.emamdoost@gmail.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-arizona.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c +index 485aa45fc5d53..c6cf270035b56 100644 +--- a/drivers/gpio/gpio-arizona.c ++++ b/drivers/gpio/gpio-arizona.c +@@ -69,6 +69,7 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset) + ret = pm_runtime_get_sync(chip->parent); + if (ret < 0) { + dev_err(chip->parent, "Failed to resume: %d\n", ret); ++ pm_runtime_put_autosuspend(chip->parent); + return ret; + } + +@@ -77,12 +78,15 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset) + if (ret < 0) { + dev_err(chip->parent, "Failed to drop cache: %d\n", + ret); ++ pm_runtime_put_autosuspend(chip->parent); + return ret; + } + + ret = regmap_read(arizona->regmap, reg, &val); +- if (ret < 0) ++ if (ret < 0) { ++ pm_runtime_put_autosuspend(chip->parent); + return ret; ++ } + + pm_runtime_mark_last_busy(chip->parent); + pm_runtime_put_autosuspend(chip->parent); +-- +2.25.1 + diff --git a/queue-4.19/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch b/queue-4.19/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch new file mode 100644 index 00000000000..a0fe038ecd3 --- /dev/null +++ b/queue-4.19/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch @@ -0,0 +1,80 @@ +From 494c4cdf5266e3cab9634019fd26cc0564a10a8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Jun 2020 12:42:14 +0200 +Subject: mac80211: allow rx of mesh eapol frames with default rx key + +From: Markus Theil + +[ Upstream commit 0b467b63870d9c05c81456aa9bfee894ab2db3b6 ] + +Without this patch, eapol frames cannot be received in mesh +mode, when 802.1X should be used. Initially only a MGTK is +defined, which is found and set as rx->key, when there are +no other keys set. ieee80211_drop_unencrypted would then +drop these eapol frames, as they are data frames without +encryption and there exists some rx->key. + +Fix this by differentiating between mesh eapol frames and +other data frames with existing rx->key. Allow mesh mesh +eapol frames only if they are for our vif address. + +With this patch in-place, ieee80211_rx_h_mesh_fwding continues +after the ieee80211_drop_unencrypted check and notices, that +these eapol frames have to be delivered locally, as they should. + +Signed-off-by: Markus Theil +Link: https://lore.kernel.org/r/20200625104214.50319-1-markus.theil@tu-ilmenau.de +[small code cleanups] +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rx.c | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index c17e148e06e71..5e56719f999c4 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2230,6 +2230,7 @@ static int ieee80211_802_1x_port_control(struct ieee80211_rx_data *rx) + + static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) + { ++ struct ieee80211_hdr *hdr = (void *)rx->skb->data; + struct sk_buff *skb = rx->skb; + struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); + +@@ -2240,6 +2241,31 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) + if (status->flag & RX_FLAG_DECRYPTED) + return 0; + ++ /* check mesh EAPOL frames first */ ++ if (unlikely(rx->sta && ieee80211_vif_is_mesh(&rx->sdata->vif) && ++ ieee80211_is_data(fc))) { ++ struct ieee80211s_hdr *mesh_hdr; ++ u16 hdr_len = ieee80211_hdrlen(fc); ++ u16 ethertype_offset; ++ __be16 ethertype; ++ ++ if (!ether_addr_equal(hdr->addr1, rx->sdata->vif.addr)) ++ goto drop_check; ++ ++ /* make sure fixed part of mesh header is there, also checks skb len */ ++ if (!pskb_may_pull(rx->skb, hdr_len + 6)) ++ goto drop_check; ++ ++ mesh_hdr = (struct ieee80211s_hdr *)(skb->data + hdr_len); ++ ethertype_offset = hdr_len + ieee80211_get_mesh_hdrlen(mesh_hdr) + ++ sizeof(rfc1042_header); ++ ++ if (skb_copy_bits(rx->skb, ethertype_offset, ðertype, 2) == 0 && ++ ethertype == rx->sdata->control_port_protocol) ++ return 0; ++ } ++ ++drop_check: + /* Drop unencrypted frames if key is set. */ + if (unlikely(!ieee80211_has_protected(fc) && + !ieee80211_is_any_nullfunc(fc) && +-- +2.25.1 + diff --git a/queue-4.19/net-sky2-initialize-return-of-gm_phy_read.patch b/queue-4.19/net-sky2-initialize-return-of-gm_phy_read.patch new file mode 100644 index 00000000000..05bf9186250 --- /dev/null +++ b/queue-4.19/net-sky2-initialize-return-of-gm_phy_read.patch @@ -0,0 +1,50 @@ +From 5a5595e942071eff46944edc2cca8e37b4bb5afa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jul 2020 06:33:59 -0700 +Subject: net: sky2: initialize return of gm_phy_read + +From: Tom Rix + +[ Upstream commit 28b18e4eb515af7c6661c3995c6e3c34412c2874 ] + +clang static analysis flags this garbage return + +drivers/net/ethernet/marvell/sky2.c:208:2: warning: Undefined or garbage value returned to caller [core.uninitialized.UndefReturn] + return v; + ^~~~~~~~ + +static inline u16 gm_phy_read( ... +{ + u16 v; + __gm_phy_read(hw, port, reg, &v); + return v; +} + +__gm_phy_read can return without setting v. + +So handle similar to skge.c's gm_phy_read, initialize v. + +Signed-off-by: Tom Rix +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/sky2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c +index d013f30019b69..2452d8ba40730 100644 +--- a/drivers/net/ethernet/marvell/sky2.c ++++ b/drivers/net/ethernet/marvell/sky2.c +@@ -215,7 +215,7 @@ io_error: + + static inline u16 gm_phy_read(struct sky2_hw *hw, unsigned port, u16 reg) + { +- u16 v; ++ u16 v = 0; + __gm_phy_read(hw, port, reg, &v); + return v; + } +-- +2.25.1 + diff --git a/queue-4.19/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch b/queue-4.19/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch new file mode 100644 index 00000000000..9e6e387e444 --- /dev/null +++ b/queue-4.19/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch @@ -0,0 +1,45 @@ +From 3f0a054691a5a011c604f904de8c71ada9352bf2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Jun 2020 09:50:24 +0800 +Subject: pinctrl: amd: fix npins for uart0 in kerncz_groups + +From: Jacky Hu + +[ Upstream commit 69339d083dfb7786b0e0b3fc19eaddcf11fabdfb ] + +uart0_pins is defined as: +static const unsigned uart0_pins[] = {135, 136, 137, 138, 139}; + +which npins is wronly specified as 9 later + { + .name = "uart0", + .pins = uart0_pins, + .npins = 9, + }, + +npins should be 5 instead of 9 according to the definition. + +Signed-off-by: Jacky Hu +Link: https://lore.kernel.org/r/20200616015024.287683-1-hengqing.hu@gmail.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-amd.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pinctrl/pinctrl-amd.h b/drivers/pinctrl/pinctrl-amd.h +index 22af7edfdb38e..91da7527f0020 100644 +--- a/drivers/pinctrl/pinctrl-amd.h ++++ b/drivers/pinctrl/pinctrl-amd.h +@@ -256,7 +256,7 @@ static const struct amd_pingroup kerncz_groups[] = { + { + .name = "uart0", + .pins = uart0_pins, +- .npins = 9, ++ .npins = 5, + }, + { + .name = "uart1", +-- +2.25.1 + diff --git a/queue-4.19/scsi-scsi_transport_spi-fix-function-pointer-check.patch b/queue-4.19/scsi-scsi_transport_spi-fix-function-pointer-check.patch new file mode 100644 index 00000000000..c8144357932 --- /dev/null +++ b/queue-4.19/scsi-scsi_transport_spi-fix-function-pointer-check.patch @@ -0,0 +1,50 @@ +From 880d5d99cc7d70ec372bb8534b4762579b350d05 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 27 Jun 2020 06:32:42 -0700 +Subject: scsi: scsi_transport_spi: Fix function pointer check + +From: Tom Rix + +[ Upstream commit 5aee52c44d9170591df65fafa1cd408acc1225ce ] + +clang static analysis flags several null function pointer problems. + +drivers/scsi/scsi_transport_spi.c:374:1: warning: Called function pointer is null (null dereference) [core.CallAndMessage] +spi_transport_max_attr(offset, "%d\n"); +^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Reviewing the store_spi_store_max macro + + if (i->f->set_##field) + return -EINVAL; + +should be + + if (!i->f->set_##field) + return -EINVAL; + +Link: https://lore.kernel.org/r/20200627133242.21618-1-trix@redhat.com +Reviewed-by: James Bottomley +Signed-off-by: Tom Rix +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_transport_spi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c +index 40b85b752b794..69213842e63e0 100644 +--- a/drivers/scsi/scsi_transport_spi.c ++++ b/drivers/scsi/scsi_transport_spi.c +@@ -352,7 +352,7 @@ store_spi_transport_##field(struct device *dev, \ + struct spi_transport_attrs *tp \ + = (struct spi_transport_attrs *)&starget->starget_data; \ + \ +- if (i->f->set_##field) \ ++ if (!i->f->set_##field) \ + return -EINVAL; \ + val = simple_strtoul(buf, NULL, 0); \ + if (val > tp->max_##field) \ +-- +2.25.1 + diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..21ace1cd012 --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1,11 @@ +gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch +gpio-arizona-put-pm_runtime-in-case-of-failure.patch +pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch +mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch +scsi-scsi_transport_spi-fix-function-pointer-check.patch +xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch +xtensa-update-pos-in-cpuinfo_op.next.patch +drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch +net-sky2-initialize-return-of-gm_phy_read.patch +drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch +drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch diff --git a/queue-4.19/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch b/queue-4.19/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch new file mode 100644 index 00000000000..999c75fe7ee --- /dev/null +++ b/queue-4.19/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch @@ -0,0 +1,53 @@ +From f2f95062919081cdd481fc0463ba508f638de312 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 13:37:10 -0700 +Subject: xtensa: fix __sync_fetch_and_{and,or}_4 declarations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Max Filippov + +[ Upstream commit 73f9941306d5ce030f3ffc7db425c7b2a798cf8e ] + +Building xtensa kernel with gcc-10 produces the following warnings: + arch/xtensa/kernel/xtensa_ksyms.c:90:15: warning: conflicting types + for built-in function ‘__sync_fetch_and_and_4’; + expected ‘unsigned int(volatile void *, unsigned int)’ + [-Wbuiltin-declaration-mismatch] + arch/xtensa/kernel/xtensa_ksyms.c:96:15: warning: conflicting types + for built-in function ‘__sync_fetch_and_or_4’; + expected ‘unsigned int(volatile void *, unsigned int)’ + [-Wbuiltin-declaration-mismatch] + +Fix declarations of these functions to avoid the warning. + +Signed-off-by: Max Filippov +Signed-off-by: Sasha Levin +--- + arch/xtensa/kernel/xtensa_ksyms.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c +index 4092555828b13..24cf6972eacea 100644 +--- a/arch/xtensa/kernel/xtensa_ksyms.c ++++ b/arch/xtensa/kernel/xtensa_ksyms.c +@@ -87,13 +87,13 @@ void __xtensa_libgcc_window_spill(void) + } + EXPORT_SYMBOL(__xtensa_libgcc_window_spill); + +-unsigned long __sync_fetch_and_and_4(unsigned long *p, unsigned long v) ++unsigned int __sync_fetch_and_and_4(volatile void *p, unsigned int v) + { + BUG(); + } + EXPORT_SYMBOL(__sync_fetch_and_and_4); + +-unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v) ++unsigned int __sync_fetch_and_or_4(volatile void *p, unsigned int v) + { + BUG(); + } +-- +2.25.1 + diff --git a/queue-4.19/xtensa-update-pos-in-cpuinfo_op.next.patch b/queue-4.19/xtensa-update-pos-in-cpuinfo_op.next.patch new file mode 100644 index 00000000000..0aa138fbd2f --- /dev/null +++ b/queue-4.19/xtensa-update-pos-in-cpuinfo_op.next.patch @@ -0,0 +1,37 @@ +From 198150ad13a30d3da71a0db76dbcf814fcb2873b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Jul 2020 08:32:25 -0700 +Subject: xtensa: update *pos in cpuinfo_op.next + +From: Max Filippov + +[ Upstream commit 0d5ab144429e8bd80889b856a44d56ab4a5cd59b ] + +Increment *pos in the cpuinfo_op.next to fix the following warning +triggered by cat /proc/cpuinfo: + + seq_file: buggy .next function c_next did not update position index + +Signed-off-by: Max Filippov +Signed-off-by: Sasha Levin +--- + arch/xtensa/kernel/setup.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c +index 15580e4fc766a..6a0167ac803c6 100644 +--- a/arch/xtensa/kernel/setup.c ++++ b/arch/xtensa/kernel/setup.c +@@ -720,7 +720,8 @@ c_start(struct seq_file *f, loff_t *pos) + static void * + c_next(struct seq_file *f, void *v, loff_t *pos) + { +- return NULL; ++ ++*pos; ++ return c_start(f, pos); + } + + static void +-- +2.25.1 +