From: Sasha Levin Date: Wed, 22 Jul 2020 17:30:22 +0000 (-0400) Subject: Fixes for 5.7 X-Git-Tag: v4.14.190~64 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d18fe3c3dec43abc5651dfcff08daeb2e66d7f6;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.7 Signed-off-by: Sasha Levin --- diff --git a/queue-5.7/alsa-hda-hdmi-fix-failures-at-pcm-open-on-intel-icl-.patch b/queue-5.7/alsa-hda-hdmi-fix-failures-at-pcm-open-on-intel-icl-.patch new file mode 100644 index 00000000000..c8870b168dd --- /dev/null +++ b/queue-5.7/alsa-hda-hdmi-fix-failures-at-pcm-open-on-intel-icl-.patch @@ -0,0 +1,105 @@ +From bc413600f3c1a9016c657566bff9329ac51d4edb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jul 2020 18:38:17 +0300 +Subject: ALSA: hda/hdmi: fix failures at PCM open on Intel ICL and later + +From: Kai Vehmanen + +[ Upstream commit 56275036d8185f92eceac7479d48b858ee3dab84 ] + +When HDMI PCM devices are opened in a specific order, with at least one +HDMI/DP receiver connected, ALSA PCM open fails to -EBUSY on the +connected monitor, on recent Intel platforms (ICL/JSL and newer). While +this is not a typical sequence, at least Pulseaudio does this every time +when it is started, to discover the available PCMs. + +The rootcause is an invalid assumption in hdmi_add_pin(), where the +total number of converters is assumed to be known at the time the +function is called. On older Intel platforms this held true, but after +ICL/JSL, the order how pins and converters are in the subnode list as +returned by snd_hda_get_sub_nodes(), was changed. As a result, +information for some converters was not stored to per_pin->mux_nids. +And this means some pins cannot be connected to all converters, and +application instead gets -EBUSY instead at open. + +The assumption that converters are always before pins in the subnode +list, is not really a valid one. Fix the problem in hdmi_parse_codec() +by introducing separate loops for discovering converters and pins. + +BugLink: https://github.com/thesofproject/linux/issues/1978 +BugLink: https://github.com/thesofproject/linux/issues/2216 +BugLink: https://github.com/thesofproject/linux/issues/2217 +Reviewed-by: Ranjani Sridharan +Reviewed-by: Pierre-Louis Bossart +Signed-off-by: Kai Vehmanen +Link: https://lore.kernel.org/r/20200703153818.2808592-1-kai.vehmanen@linux.intel.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_hdmi.c | 36 +++++++++++++++++++++++------------- + 1 file changed, 23 insertions(+), 13 deletions(-) + +diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c +index 137d655fed8f8..e821c9df81070 100644 +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -1804,33 +1804,43 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) + + static int hdmi_parse_codec(struct hda_codec *codec) + { +- hda_nid_t nid; ++ hda_nid_t start_nid; ++ unsigned int caps; + int i, nodes; + +- nodes = snd_hda_get_sub_nodes(codec, codec->core.afg, &nid); +- if (!nid || nodes < 0) { ++ nodes = snd_hda_get_sub_nodes(codec, codec->core.afg, &start_nid); ++ if (!start_nid || nodes < 0) { + codec_warn(codec, "HDMI: failed to get afg sub nodes\n"); + return -EINVAL; + } + +- for (i = 0; i < nodes; i++, nid++) { +- unsigned int caps; +- unsigned int type; ++ /* ++ * hdmi_add_pin() assumes total amount of converters to ++ * be known, so first discover all converters ++ */ ++ for (i = 0; i < nodes; i++) { ++ hda_nid_t nid = start_nid + i; + + caps = get_wcaps(codec, nid); +- type = get_wcaps_type(caps); + + if (!(caps & AC_WCAP_DIGITAL)) + continue; + +- switch (type) { +- case AC_WID_AUD_OUT: ++ if (get_wcaps_type(caps) == AC_WID_AUD_OUT) + hdmi_add_cvt(codec, nid); +- break; +- case AC_WID_PIN: ++ } ++ ++ /* discover audio pins */ ++ for (i = 0; i < nodes; i++) { ++ hda_nid_t nid = start_nid + i; ++ ++ caps = get_wcaps(codec, nid); ++ ++ if (!(caps & AC_WCAP_DIGITAL)) ++ continue; ++ ++ if (get_wcaps_type(caps) == AC_WID_PIN) + hdmi_add_pin(codec, nid); +- break; +- } + } + + return 0; +-- +2.25.1 + diff --git a/queue-5.7/bpf-set-the-number-of-exception-entries-properly-for.patch b/queue-5.7/bpf-set-the-number-of-exception-entries-properly-for.patch new file mode 100644 index 00000000000..dcd3656f85e --- /dev/null +++ b/queue-5.7/bpf-set-the-number-of-exception-entries-properly-for.patch @@ -0,0 +1,70 @@ +From 372788fcbb5bd4ff29a82af3f737b159647774c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Jun 2020 17:10:54 -0700 +Subject: bpf: Set the number of exception entries properly for subprograms + +From: Yonghong Song + +[ Upstream commit c4c0bdc0d2d084ed847c7066bdf59fe2cd25aa17 ] + +Currently, if a bpf program has more than one subprograms, each program will be +jitted separately. For programs with bpf-to-bpf calls the +prog->aux->num_exentries is not setup properly. For example, with +bpf_iter_netlink.c modified to force one function to be not inlined and with +CONFIG_BPF_JIT_ALWAYS_ON the following error is seen: + $ ./test_progs -n 3/3 + ... + libbpf: failed to load program 'iter/netlink' + libbpf: failed to load object 'bpf_iter_netlink' + libbpf: failed to load BPF skeleton 'bpf_iter_netlink': -4007 + test_netlink:FAIL:bpf_iter_netlink__open_and_load skeleton open_and_load failed + #3/3 netlink:FAIL +The dmesg shows the following errors: + ex gen bug +which is triggered by the following code in arch/x86/net/bpf_jit_comp.c: + if (excnt >= bpf_prog->aux->num_exentries) { + pr_err("ex gen bug\n"); + return -EFAULT; + } + +This patch fixes the issue by computing proper num_exentries for each +subprogram before calling JIT. + +Signed-off-by: Yonghong Song +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +--- + kernel/bpf/verifier.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c +index 739d9ba3ba6b7..eebdd5307713b 100644 +--- a/kernel/bpf/verifier.c ++++ b/kernel/bpf/verifier.c +@@ -9613,7 +9613,7 @@ static int jit_subprogs(struct bpf_verifier_env *env) + int i, j, subprog_start, subprog_end = 0, len, subprog; + struct bpf_insn *insn; + void *old_bpf_func; +- int err; ++ int err, num_exentries; + + if (env->subprog_cnt <= 1) + return 0; +@@ -9688,6 +9688,14 @@ static int jit_subprogs(struct bpf_verifier_env *env) + func[i]->aux->nr_linfo = prog->aux->nr_linfo; + func[i]->aux->jited_linfo = prog->aux->jited_linfo; + func[i]->aux->linfo_idx = env->subprog_info[i].linfo_idx; ++ num_exentries = 0; ++ insn = func[i]->insnsi; ++ for (j = 0; j < func[i]->len; j++, insn++) { ++ if (BPF_CLASS(insn->code) == BPF_LDX && ++ BPF_MODE(insn->code) == BPF_PROBE_MEM) ++ num_exentries++; ++ } ++ func[i]->aux->num_exentries = num_exentries; + func[i] = bpf_int_jit_compile(func[i]); + if (!func[i]->jited) { + err = -ENOTSUPP; +-- +2.25.1 + diff --git a/queue-5.7/dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch b/queue-5.7/dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch new file mode 100644 index 00000000000..bc928347515 --- /dev/null +++ b/queue-5.7/dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch @@ -0,0 +1,57 @@ +From 562152652e67d9bde3237d764b0f32a93afbfc9a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 27 Jun 2020 09:31:46 +0200 +Subject: dm: use bio_uninit instead of bio_disassociate_blkg + +From: Christoph Hellwig + +[ Upstream commit 382761dc6312965a11f82f2217e16ec421bf17ae ] + +bio_uninit is the proper API to clean up a BIO that has been allocated +on stack or inside a structure that doesn't come from the BIO allocator. +Switch dm to use that instead of bio_disassociate_blkg, which really is +an implementation detail. Note that the bio_uninit calls are also moved +to the two callers of __send_empty_flush, so that they better pair with +the bio_init calls used to initialize them. + +Signed-off-by: Christoph Hellwig +Reviewed-by: Johannes Thumshirn +Signed-off-by: Mike Snitzer +Signed-off-by: Sasha Levin +--- + drivers/md/dm.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/drivers/md/dm.c b/drivers/md/dm.c +index 05333fc2f8d2b..9793b04e9ff3b 100644 +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -1446,9 +1446,6 @@ static int __send_empty_flush(struct clone_info *ci) + BUG_ON(bio_has_data(ci->bio)); + while ((ti = dm_table_get_target(ci->map, target_nr++))) + __send_duplicate_bios(ci, ti, ti->num_flush_bios, NULL); +- +- bio_disassociate_blkg(ci->bio); +- + return 0; + } + +@@ -1636,6 +1633,7 @@ static blk_qc_t __split_and_process_bio(struct mapped_device *md, + ci.bio = &flush_bio; + ci.sector_count = 0; + error = __send_empty_flush(&ci); ++ bio_uninit(ci.bio); + /* dec_pending submits any data associated with flush */ + } else if (op_is_zone_mgmt(bio_op(bio))) { + ci.bio = bio; +@@ -1710,6 +1708,7 @@ static blk_qc_t __process_bio(struct mapped_device *md, struct dm_table *map, + ci.bio = &flush_bio; + ci.sector_count = 0; + error = __send_empty_flush(&ci); ++ bio_uninit(ci.bio); + /* dec_pending submits any data associated with flush */ + } else { + struct dm_target_io *tio; +-- +2.25.1 + diff --git a/queue-5.7/drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch b/queue-5.7/drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch new file mode 100644 index 00000000000..6587cd029a6 --- /dev/null +++ b/queue-5.7/drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch @@ -0,0 +1,50 @@ +From 105d93189064d25b7353039c8147d1d4c3844db3 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/psci_checker.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c +index 873841af8d575..d9b1a2d71223e 100644 +--- a/drivers/firmware/psci/psci_checker.c ++++ b/drivers/firmware/psci/psci_checker.c +@@ -157,8 +157,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); + +@@ -167,6 +169,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-5.7/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch b/queue-5.7/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch new file mode 100644 index 00000000000..904ab8c2d27 --- /dev/null +++ b/queue-5.7/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch @@ -0,0 +1,58 @@ +From db4af28b3757a0333a32ac7cdb51ae1a5df97aa5 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 e30d91a38cfb6..284832314f310 100644 +--- a/drivers/net/wan/lapbether.c ++++ b/drivers/net/wan/lapbether.c +@@ -303,7 +303,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; + } +@@ -324,6 +323,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-5.7/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch b/queue-5.7/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch new file mode 100644 index 00000000000..d4864e52e4e --- /dev/null +++ b/queue-5.7/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch @@ -0,0 +1,56 @@ +From 99096dbbf5ff792253151765e2f76bd967570eb5 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-5.7/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch b/queue-5.7/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch new file mode 100644 index 00000000000..593ef45bfdb --- /dev/null +++ b/queue-5.7/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch @@ -0,0 +1,37 @@ +From f0fdef595dfadae8362937fd82537e147f20a594 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 5640efe5e7504..7520a13b4c7ca 100644 +--- a/drivers/gpio/gpio-arizona.c ++++ b/drivers/gpio/gpio-arizona.c +@@ -106,6 +106,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-5.7/gpio-arizona-put-pm_runtime-in-case-of-failure.patch b/queue-5.7/gpio-arizona-put-pm_runtime-in-case-of-failure.patch new file mode 100644 index 00000000000..0e391e9200e --- /dev/null +++ b/queue-5.7/gpio-arizona-put-pm_runtime-in-case-of-failure.patch @@ -0,0 +1,54 @@ +From 487b7c21d2feeeddc1ccb083a27281f74cdd0aa3 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 7520a13b4c7ca..5bda38e0780f2 100644 +--- a/drivers/gpio/gpio-arizona.c ++++ b/drivers/gpio/gpio-arizona.c +@@ -64,6 +64,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; + } + +@@ -72,12 +73,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-5.7/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch b/queue-5.7/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch new file mode 100644 index 00000000000..a0a4216996a --- /dev/null +++ b/queue-5.7/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch @@ -0,0 +1,80 @@ +From 9f6f0d0e77082aac8c15962a1c66d4cde9521eaf 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 91a13aee43784..961f37c0701bc 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2357,6 +2357,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); + +@@ -2367,6 +2368,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-5.7/net-sky2-initialize-return-of-gm_phy_read.patch b/queue-5.7/net-sky2-initialize-return-of-gm_phy_read.patch new file mode 100644 index 00000000000..50e636303d6 --- /dev/null +++ b/queue-5.7/net-sky2-initialize-return-of-gm_phy_read.patch @@ -0,0 +1,50 @@ +From bb58edf9cf7bcb50214f3d4e803febfdafc5ebb1 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 241f007169797..fe54764caea9c 100644 +--- a/drivers/net/ethernet/marvell/sky2.c ++++ b/drivers/net/ethernet/marvell/sky2.c +@@ -203,7 +203,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-5.7/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch b/queue-5.7/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch new file mode 100644 index 00000000000..c5fbbd99fb7 --- /dev/null +++ b/queue-5.7/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch @@ -0,0 +1,45 @@ +From 89c69a5276fe720d921db63c5cf0e4a2ff7eadb7 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 3e5760f1a7153..d4a192df5fabd 100644 +--- a/drivers/pinctrl/pinctrl-amd.h ++++ b/drivers/pinctrl/pinctrl-amd.h +@@ -252,7 +252,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-5.7/scsi-dh-add-fujitsu-device-to-devinfo-and-dh-lists.patch b/queue-5.7/scsi-dh-add-fujitsu-device-to-devinfo-and-dh-lists.patch new file mode 100644 index 00000000000..a855a85f81d --- /dev/null +++ b/queue-5.7/scsi-dh-add-fujitsu-device-to-devinfo-and-dh-lists.patch @@ -0,0 +1,47 @@ +From 078a6e3956ddbe057745853a25ae17856e20ad83 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 Jul 2020 17:07:22 +0000 +Subject: scsi: dh: Add Fujitsu device to devinfo and dh lists + +From: Steve Schremmer + +[ Upstream commit e094fd346021b820f37188aaa6b502c7490ab5b5 ] + +Add FUJITSU ETERNUS_AHB + +Link: https://lore.kernel.org/r/DM6PR06MB5276CCA765336BD312C4282E8C660@DM6PR06MB5276.namprd06.prod.outlook.com +Signed-off-by: Steve Schremmer +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_dh.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c +index eed31021e7885..ba84244c1b4f6 100644 +--- a/drivers/scsi/scsi_devinfo.c ++++ b/drivers/scsi/scsi_devinfo.c +@@ -239,6 +239,7 @@ static struct { + {"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, + {"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, + {"LENOVO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, ++ {"FUJITSU", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, + {"SanDisk", "Cruzer Blade", NULL, BLIST_TRY_VPD_PAGES | + BLIST_INQUIRY_36}, + {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36}, +diff --git a/drivers/scsi/scsi_dh.c b/drivers/scsi/scsi_dh.c +index 42f0550d6b11f..6f41e4b5a2b85 100644 +--- a/drivers/scsi/scsi_dh.c ++++ b/drivers/scsi/scsi_dh.c +@@ -63,6 +63,7 @@ static const struct scsi_dh_blist scsi_dh_blist[] = { + {"LSI", "INF-01-00", "rdac", }, + {"ENGENIO", "INF-01-00", "rdac", }, + {"LENOVO", "DE_Series", "rdac", }, ++ {"FUJITSU", "ETERNUS_AHB", "rdac", }, + {NULL, NULL, NULL }, + }; + +-- +2.25.1 + diff --git a/queue-5.7/scsi-mpt3sas-fix-error-returns-in-brm_status_show.patch b/queue-5.7/scsi-mpt3sas-fix-error-returns-in-brm_status_show.patch new file mode 100644 index 00000000000..38877bb40b9 --- /dev/null +++ b/queue-5.7/scsi-mpt3sas-fix-error-returns-in-brm_status_show.patch @@ -0,0 +1,80 @@ +From 45eddfcae706cd1f9ba46c7684d95d710e113da8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Jul 2020 22:14:54 +0900 +Subject: scsi: mpt3sas: Fix error returns in BRM_status_show + +From: Johannes Thumshirn + +[ Upstream commit 0fd181456aa0826057adbfb6c79c40f4083cfd75 ] + +BRM_status_show() has several error branches, but none of them record the +error in the error return. + +Also while at it remove the manual mutex_unlock() of the pci_access_mutex +in case of an ongoing pci error recovery or host removal and jump to the +cleanup label instead. + +Note: We can safely jump to out from here as io_unit_pg3 is initialized to +NULL and if it hasn't been allocated, kfree() skips the NULL pointer. + +[mkp: compilation warning] + +Link: https://lore.kernel.org/r/20200701131454.5255-1-johannes.thumshirn@wdc.com +Reviewed-by: Damien Le Moal +Acked-by: Sreekanth Reddy +Signed-off-by: Johannes Thumshirn +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c +index e94e72de2fc68..983e568ff2317 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c +@@ -3149,15 +3149,14 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, + } + /* pci_access_mutex lock acquired by sysfs show path */ + mutex_lock(&ioc->pci_access_mutex); +- if (ioc->pci_error_recovery || ioc->remove_host) { +- mutex_unlock(&ioc->pci_access_mutex); +- return 0; +- } ++ if (ioc->pci_error_recovery || ioc->remove_host) ++ goto out; + + /* allocate upto GPIOVal 36 entries */ + sz = offsetof(Mpi2IOUnitPage3_t, GPIOVal) + (sizeof(u16) * 36); + io_unit_pg3 = kzalloc(sz, GFP_KERNEL); + if (!io_unit_pg3) { ++ rc = -ENOMEM; + ioc_err(ioc, "%s: failed allocating memory for iounit_pg3: (%d) bytes\n", + __func__, sz); + goto out; +@@ -3167,6 +3166,7 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, + 0) { + ioc_err(ioc, "%s: failed reading iounit_pg3\n", + __func__); ++ rc = -EINVAL; + goto out; + } + +@@ -3174,12 +3174,14 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, + if (ioc_status != MPI2_IOCSTATUS_SUCCESS) { + ioc_err(ioc, "%s: iounit_pg3 failed with ioc_status(0x%04x)\n", + __func__, ioc_status); ++ rc = -EINVAL; + goto out; + } + + if (io_unit_pg3->GPIOCount < 25) { + ioc_err(ioc, "%s: iounit_pg3->GPIOCount less than 25 entries, detected (%d) entries\n", + __func__, io_unit_pg3->GPIOCount); ++ rc = -EINVAL; + goto out; + } + +-- +2.25.1 + diff --git a/queue-5.7/scsi-mpt3sas-fix-unlock-imbalance.patch b/queue-5.7/scsi-mpt3sas-fix-unlock-imbalance.patch new file mode 100644 index 00000000000..e45b3f76071 --- /dev/null +++ b/queue-5.7/scsi-mpt3sas-fix-unlock-imbalance.patch @@ -0,0 +1,82 @@ +From e7f14b1f90b4fc58ea201c9062c342732037a29e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Jul 2020 17:52:54 +0900 +Subject: scsi: mpt3sas: Fix unlock imbalance + +From: Damien Le Moal + +[ Upstream commit cb551b8dc079d2ef189145782627c99cb68c0255 ] + +In BRM_status_show(), if the condition "!ioc->is_warpdrive" tested on entry +to the function is true, a "goto out" is called. This results in unlocking +ioc->pci_access_mutex without this mutex lock being taken. This generates +the following splat: + +[ 1148.539883] mpt3sas_cm2: BRM_status_show: BRM attribute is only for warpdrive +[ 1148.547184] +[ 1148.548708] ===================================== +[ 1148.553501] WARNING: bad unlock balance detected! +[ 1148.558277] 5.8.0-rc3+ #827 Not tainted +[ 1148.562183] ------------------------------------- +[ 1148.566959] cat/5008 is trying to release lock (&ioc->pci_access_mutex) at: +[ 1148.574035] [] BRM_status_show+0xd3/0x100 [mpt3sas] +[ 1148.580574] but there are no more locks to release! +[ 1148.585524] +[ 1148.585524] other info that might help us debug this: +[ 1148.599624] 3 locks held by cat/5008: +[ 1148.607085] #0: ffff92aea3e392c0 (&p->lock){+.+.}-{3:3}, at: seq_read+0x34/0x480 +[ 1148.618509] #1: ffff922ef14c4888 (&of->mutex){+.+.}-{3:3}, at: kernfs_seq_start+0x2a/0xb0 +[ 1148.630729] #2: ffff92aedb5d7310 (kn->active#224){.+.+}-{0:0}, at: kernfs_seq_start+0x32/0xb0 +[ 1148.643347] +[ 1148.643347] stack backtrace: +[ 1148.655259] CPU: 73 PID: 5008 Comm: cat Not tainted 5.8.0-rc3+ #827 +[ 1148.665309] Hardware name: HGST H4060-S/S2600STB, BIOS SE5C620.86B.02.01.0008.031920191559 03/19/2019 +[ 1148.678394] Call Trace: +[ 1148.684750] dump_stack+0x78/0xa0 +[ 1148.691802] lock_release.cold+0x45/0x4a +[ 1148.699451] __mutex_unlock_slowpath+0x35/0x270 +[ 1148.707675] BRM_status_show+0xd3/0x100 [mpt3sas] +[ 1148.716092] dev_attr_show+0x19/0x40 +[ 1148.723664] sysfs_kf_seq_show+0x87/0x100 +[ 1148.731193] seq_read+0xbc/0x480 +[ 1148.737882] vfs_read+0xa0/0x160 +[ 1148.744514] ksys_read+0x58/0xd0 +[ 1148.751129] do_syscall_64+0x4c/0xa0 +[ 1148.757941] entry_SYSCALL_64_after_hwframe+0x44/0xa9 +[ 1148.766240] RIP: 0033:0x7f1230566542 +[ 1148.772957] Code: Bad RIP value. +[ 1148.779206] RSP: 002b:00007ffeac1bcac8 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 +[ 1148.790063] RAX: ffffffffffffffda RBX: 0000000000020000 RCX: 00007f1230566542 +[ 1148.800284] RDX: 0000000000020000 RSI: 00007f1223460000 RDI: 0000000000000003 +[ 1148.810474] RBP: 00007f1223460000 R08: 00007f122345f010 R09: 0000000000000000 +[ 1148.820641] R10: 0000000000000022 R11: 0000000000000246 R12: 0000000000000000 +[ 1148.830728] R13: 0000000000000003 R14: 0000000000020000 R15: 0000000000020000 + +Fix this by returning immediately instead of jumping to the out label. + +Link: https://lore.kernel.org/r/20200701085254.51740-1-damien.lemoal@wdc.com +Reviewed-by: Johannes Thumshirn +Acked-by: Sreekanth Reddy +Signed-off-by: Damien Le Moal +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c +index 62e552838565f..e94e72de2fc68 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c +@@ -3145,7 +3145,7 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, + if (!ioc->is_warpdrive) { + ioc_err(ioc, "%s: BRM attribute is only for warpdrive\n", + __func__); +- goto out; ++ return 0; + } + /* pci_access_mutex lock acquired by sysfs show path */ + mutex_lock(&ioc->pci_access_mutex); +-- +2.25.1 + diff --git a/queue-5.7/scsi-scsi_transport_spi-fix-function-pointer-check.patch b/queue-5.7/scsi-scsi_transport_spi-fix-function-pointer-check.patch new file mode 100644 index 00000000000..63222438f1d --- /dev/null +++ b/queue-5.7/scsi-scsi_transport_spi-fix-function-pointer-check.patch @@ -0,0 +1,50 @@ +From c92dab55b45e13afc6ee2f7ddc75fecd5c5329e5 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 f8661062ef954..f3d5b1bbd5aa7 100644 +--- a/drivers/scsi/scsi_transport_spi.c ++++ b/drivers/scsi/scsi_transport_spi.c +@@ -339,7 +339,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-5.7/series b/queue-5.7/series new file mode 100644 index 00000000000..aa381c88789 --- /dev/null +++ b/queue-5.7/series @@ -0,0 +1,17 @@ +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 +bpf-set-the-number-of-exception-entries-properly-for.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 +scsi-mpt3sas-fix-unlock-imbalance.patch +drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch +alsa-hda-hdmi-fix-failures-at-pcm-open-on-intel-icl-.patch +net-sky2-initialize-return-of-gm_phy_read.patch +drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch +scsi-mpt3sas-fix-error-returns-in-brm_status_show.patch +scsi-dh-add-fujitsu-device-to-devinfo-and-dh-lists.patch +dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch +drivers-firmware-psci-fix-memory-leakage-in-alloc_in.patch diff --git a/queue-5.7/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch b/queue-5.7/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch new file mode 100644 index 00000000000..583db808715 --- /dev/null +++ b/queue-5.7/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch @@ -0,0 +1,53 @@ +From de234398daddc3b79b1c298d332ed935b8afe050 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-5.7/xtensa-update-pos-in-cpuinfo_op.next.patch b/queue-5.7/xtensa-update-pos-in-cpuinfo_op.next.patch new file mode 100644 index 00000000000..66455af4671 --- /dev/null +++ b/queue-5.7/xtensa-update-pos-in-cpuinfo_op.next.patch @@ -0,0 +1,37 @@ +From 05e8ffac6a8938ee4d51341bc34ebc43b67fcaef 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 3880c765d4489..0271e2e47bcdf 100644 +--- a/arch/xtensa/kernel/setup.c ++++ b/arch/xtensa/kernel/setup.c +@@ -725,7 +725,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 +