From: Sasha Levin Date: Sun, 24 Oct 2021 21:48:48 +0000 (-0400) Subject: Fixes for 5.10 X-Git-Tag: v4.4.290~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed013aa8dfc577a0876dd9b30a2534be8640af16;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/alsa-hda-avoid-write-to-statests-if-controller-is-in.patch b/queue-5.10/alsa-hda-avoid-write-to-statests-if-controller-is-in.patch new file mode 100644 index 00000000000..159ea883fa4 --- /dev/null +++ b/queue-5.10/alsa-hda-avoid-write-to-statests-if-controller-is-in.patch @@ -0,0 +1,66 @@ +From 8c7c21d6c17e4081254a47d3d02da84b56e73e9e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Oct 2021 17:29:35 +0300 +Subject: ALSA: hda: avoid write to STATESTS if controller is in reset + +From: Kai Vehmanen + +[ Upstream commit b37a15188eae9d4c49c5bb035e0c8d4058e4d9b3 ] + +The snd_hdac_bus_reset_link() contains logic to clear STATESTS register +before performing controller reset. This code dates back to an old +bugfix in commit e8a7f136f5ed ("[ALSA] hda-intel - Improve HD-audio +codec probing robustness"). Originally the code was added to +azx_reset(). + +The code was moved around in commit a41d122449be ("ALSA: hda - Embed bus +into controller object") and ended up to snd_hdac_bus_reset_link() and +called primarily via snd_hdac_bus_init_chip(). + +The logic to clear STATESTS is correct when snd_hdac_bus_init_chip() is +called when controller is not in reset. In this case, STATESTS can be +cleared. This can be useful e.g. when forcing a controller reset to retry +codec probe. A normal non-power-on reset will not clear the bits. + +However, this old logic is problematic when controller is already in +reset. The HDA specification states that controller must be taken out of +reset before writing to registers other than GCTL.CRST (1.0a spec, +3.3.7). The write to STATESTS in snd_hdac_bus_reset_link() will be lost +if the controller is already in reset per the HDA specification mentioned. + +This has been harmless on older hardware. On newer generation of Intel +PCIe based HDA controllers, if configured to report issues, this write +will emit an unsupported request error. If ACPI Platform Error Interface +(APEI) is enabled in kernel, this will end up to kernel log. + +Fix the code in snd_hdac_bus_reset_link() to only clear the STATESTS if +the function is called when controller is not in reset. Otherwise +clearing the bits is not possible and should be skipped. + +Signed-off-by: Kai Vehmanen +Link: https://lore.kernel.org/r/20211012142935.3731820-1-kai.vehmanen@linux.intel.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/hda/hdac_controller.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c +index b98449fd92f3..522d1897659c 100644 +--- a/sound/hda/hdac_controller.c ++++ b/sound/hda/hdac_controller.c +@@ -421,8 +421,9 @@ int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset) + if (!full_reset) + goto skip_reset; + +- /* clear STATESTS */ +- snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK); ++ /* clear STATESTS if not in reset */ ++ if (snd_hdac_chip_readb(bus, GCTL) & AZX_GCTL_RESET) ++ snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK); + + /* reset controller */ + snd_hdac_bus_enter_link_reset(bus); +-- +2.33.0 + diff --git a/queue-5.10/alsa-hda-intel-allow-repeatedly-probing-on-codec-con.patch b/queue-5.10/alsa-hda-intel-allow-repeatedly-probing-on-codec-con.patch new file mode 100644 index 00000000000..7507f9de066 --- /dev/null +++ b/queue-5.10/alsa-hda-intel-allow-repeatedly-probing-on-codec-con.patch @@ -0,0 +1,292 @@ +From 213e78d1cce34ede2be844fb511daaf0270a83d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Oct 2021 16:19:40 +0200 +Subject: ALSA: hda: intel: Allow repeatedly probing on codec configuration + errors + +From: Takashi Iwai + +[ Upstream commit c0f1886de7e173865f1a0fa7680a1c07954a987f ] + +It seems that a few recent AMD systems show the codec configuration +errors at the early boot, while loading the driver at a later stage +works magically. Although the root cause of the error isn't clear, +it's certainly not bad to allow retrying the codec probe in such a +case if that helps. + +This patch adds the capability for retrying the probe upon codec probe +errors on the certain AMD platforms. The probe_work is changed to a +delayed work, and at the secondary call, it'll jump to the codec +probing. + +Note that, not only adding the re-probing, this includes the behavior +changes in the codec configuration function. Namely, +snd_hda_codec_configure() won't unregister the codec at errors any +longer. Instead, its caller, azx_codec_configure() unregisters the +codecs with the probe failures *if* any codec has been successfully +configured. If all codec probe failed, it doesn't unregister but let +it re-probed -- which is the most case we're seeing and this patch +tries to improve. + +Even if the driver doesn't re-probe or give up, it will go to the +"free-all" error path, hence the leftover codecs shall be disabled / +deleted in anyway. + +BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1190801 +Link: https://lore.kernel.org/r/20211006141940.2897-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + include/sound/hda_codec.h | 1 + + sound/pci/hda/hda_bind.c | 20 +++++++++++--------- + sound/pci/hda/hda_codec.c | 1 + + sound/pci/hda/hda_controller.c | 24 ++++++++++++++++-------- + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_intel.c | 29 +++++++++++++++++++++++------ + sound/pci/hda/hda_intel.h | 4 +++- + 7 files changed, 56 insertions(+), 25 deletions(-) + +diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h +index 73827b7d17e0..cf530e9fb5f5 100644 +--- a/include/sound/hda_codec.h ++++ b/include/sound/hda_codec.h +@@ -225,6 +225,7 @@ struct hda_codec { + #endif + + /* misc flags */ ++ unsigned int configured:1; /* codec was configured */ + unsigned int in_freeing:1; /* being released */ + unsigned int registered:1; /* codec was registered */ + unsigned int display_power_control:1; /* needs display power */ +diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c +index 17a25e453f60..4efbcc41fdfb 100644 +--- a/sound/pci/hda/hda_bind.c ++++ b/sound/pci/hda/hda_bind.c +@@ -301,29 +301,31 @@ int snd_hda_codec_configure(struct hda_codec *codec) + { + int err; + ++ if (codec->configured) ++ return 0; ++ + if (is_generic_config(codec)) + codec->probe_id = HDA_CODEC_ID_GENERIC; + else + codec->probe_id = 0; + +- err = snd_hdac_device_register(&codec->core); +- if (err < 0) +- return err; ++ if (!device_is_registered(&codec->core.dev)) { ++ err = snd_hdac_device_register(&codec->core); ++ if (err < 0) ++ return err; ++ } + + if (!codec->preset) + codec_bind_module(codec); + if (!codec->preset) { + err = codec_bind_generic(codec); + if (err < 0) { +- codec_err(codec, "Unable to bind the codec\n"); +- goto error; ++ codec_dbg(codec, "Unable to bind the codec\n"); ++ return err; + } + } + ++ codec->configured = 1; + return 0; +- +- error: +- snd_hdac_device_unregister(&codec->core); +- return err; + } + EXPORT_SYMBOL_GPL(snd_hda_codec_configure); +diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c +index 4cec1bd77e6f..6dece719be66 100644 +--- a/sound/pci/hda/hda_codec.c ++++ b/sound/pci/hda/hda_codec.c +@@ -791,6 +791,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec) + snd_array_free(&codec->nids); + remove_conn_list(codec); + snd_hdac_regmap_exit(&codec->core); ++ codec->configured = 0; + } + EXPORT_SYMBOL_GPL(snd_hda_codec_cleanup_for_unbind); + +diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c +index b972d59eb1ec..3de7dc34def2 100644 +--- a/sound/pci/hda/hda_controller.c ++++ b/sound/pci/hda/hda_controller.c +@@ -25,6 +25,7 @@ + #include + #include + #include "hda_controller.h" ++#include "hda_local.h" + + #define CREATE_TRACE_POINTS + #include "hda_controller_trace.h" +@@ -1259,17 +1260,24 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs); + int azx_codec_configure(struct azx *chip) + { + struct hda_codec *codec, *next; ++ int success = 0; + +- /* use _safe version here since snd_hda_codec_configure() deregisters +- * the device upon error and deletes itself from the bus list. +- */ +- list_for_each_codec_safe(codec, next, &chip->bus) { +- snd_hda_codec_configure(codec); ++ list_for_each_codec(codec, &chip->bus) { ++ if (!snd_hda_codec_configure(codec)) ++ success++; + } + +- if (!azx_bus(chip)->num_codecs) +- return -ENODEV; +- return 0; ++ if (success) { ++ /* unregister failed codecs if any codec has been probed */ ++ list_for_each_codec_safe(codec, next, &chip->bus) { ++ if (!codec->configured) { ++ codec_err(codec, "Unable to configure, disabling\n"); ++ snd_hdac_device_unregister(&codec->core); ++ } ++ } ++ } ++ ++ return success ? 0 : -ENODEV; + } + EXPORT_SYMBOL_GPL(azx_codec_configure); + +diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h +index 68f9668788ea..324cba13c7ba 100644 +--- a/sound/pci/hda/hda_controller.h ++++ b/sound/pci/hda/hda_controller.h +@@ -41,7 +41,7 @@ + /* 24 unused */ + #define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25) /* Take LPIB as delay */ + #define AZX_DCAPS_PM_RUNTIME (1 << 26) /* runtime PM support */ +-/* 27 unused */ ++#define AZX_DCAPS_RETRY_PROBE (1 << 27) /* retry probe if no codec is configured */ + #define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28) /* CORBRP clears itself after reset */ + #define AZX_DCAPS_NO_MSI64 (1 << 29) /* Stick to 32-bit MSIs */ + #define AZX_DCAPS_SEPARATE_STREAM_TAG (1 << 30) /* capture and playback use separate stream tag */ +diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c +index 4c8b281c3992..8bc27e7c0590 100644 +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -341,7 +341,8 @@ enum { + /* quirks for AMD SB */ + #define AZX_DCAPS_PRESET_AMD_SB \ + (AZX_DCAPS_NO_TCSEL | AZX_DCAPS_AMD_WORKAROUND |\ +- AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME) ++ AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME |\ ++ AZX_DCAPS_RETRY_PROBE) + + /* quirks for Nvidia */ + #define AZX_DCAPS_PRESET_NVIDIA \ +@@ -1758,7 +1759,7 @@ static void azx_check_snoop_available(struct azx *chip) + + static void azx_probe_work(struct work_struct *work) + { +- struct hda_intel *hda = container_of(work, struct hda_intel, probe_work); ++ struct hda_intel *hda = container_of(work, struct hda_intel, probe_work.work); + azx_probe_continue(&hda->chip); + } + +@@ -1867,7 +1868,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, + } + + /* continue probing in work context as may trigger request module */ +- INIT_WORK(&hda->probe_work, azx_probe_work); ++ INIT_DELAYED_WORK(&hda->probe_work, azx_probe_work); + + *rchip = chip; + +@@ -2202,7 +2203,7 @@ static int azx_probe(struct pci_dev *pci, + #endif + + if (schedule_probe) +- schedule_work(&hda->probe_work); ++ schedule_delayed_work(&hda->probe_work, 0); + + dev++; + if (chip->disabled) +@@ -2290,6 +2291,11 @@ static int azx_probe_continue(struct azx *chip) + int dev = chip->dev_index; + int err; + ++ if (chip->disabled || hda->init_failed) ++ return -EIO; ++ if (hda->probe_retry) ++ goto probe_retry; ++ + to_hda_bus(bus)->bus_probing = 1; + hda->probe_continued = 1; + +@@ -2351,10 +2357,20 @@ static int azx_probe_continue(struct azx *chip) + #endif + } + #endif ++ ++ probe_retry: + if (bus->codec_mask && !(probe_only[dev] & 1)) { + err = azx_codec_configure(chip); +- if (err < 0) ++ if (err) { ++ if ((chip->driver_caps & AZX_DCAPS_RETRY_PROBE) && ++ ++hda->probe_retry < 60) { ++ schedule_delayed_work(&hda->probe_work, ++ msecs_to_jiffies(1000)); ++ return 0; /* keep things up */ ++ } ++ dev_err(chip->card->dev, "Cannot probe codecs, giving up\n"); + goto out_free; ++ } + } + + err = snd_card_register(chip->card); +@@ -2384,6 +2400,7 @@ out_free: + display_power(chip, false); + complete_all(&hda->probe_wait); + to_hda_bus(bus)->bus_probing = 0; ++ hda->probe_retry = 0; + return 0; + } + +@@ -2409,7 +2426,7 @@ static void azx_remove(struct pci_dev *pci) + * device during cancel_work_sync() call. + */ + device_unlock(&pci->dev); +- cancel_work_sync(&hda->probe_work); ++ cancel_delayed_work_sync(&hda->probe_work); + device_lock(&pci->dev); + + snd_card_free(card); +diff --git a/sound/pci/hda/hda_intel.h b/sound/pci/hda/hda_intel.h +index 3fb119f09040..0f39418f9328 100644 +--- a/sound/pci/hda/hda_intel.h ++++ b/sound/pci/hda/hda_intel.h +@@ -14,7 +14,7 @@ struct hda_intel { + + /* sync probing */ + struct completion probe_wait; +- struct work_struct probe_work; ++ struct delayed_work probe_work; + + /* card list (for power_save trigger) */ + struct list_head list; +@@ -30,6 +30,8 @@ struct hda_intel { + unsigned int freed:1; /* resources already released */ + + bool need_i915_power:1; /* the hda controller needs i915 power */ ++ ++ int probe_retry; /* being probe-retry */ + }; + + #endif +-- +2.33.0 + diff --git a/queue-5.10/arm-dts-spear3xx-fix-gmac-node.patch b/queue-5.10/arm-dts-spear3xx-fix-gmac-node.patch new file mode 100644 index 00000000000..c25a222fb08 --- /dev/null +++ b/queue-5.10/arm-dts-spear3xx-fix-gmac-node.patch @@ -0,0 +1,41 @@ +From b58949541c3e50eb849ce4b98d7d3b30136c8f0d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Oct 2021 12:34:40 +0200 +Subject: ARM: dts: spear3xx: Fix gmac node + +From: Herve Codina + +[ Upstream commit 6636fec29cdf6665bd219564609e8651f6ddc142 ] + +On SPEAr3xx, ethernet driver is not compatible with the SPEAr600 +one. +Indeed, SPEAr3xx uses an earlier version of this IP (v3.40) and +needs some driver tuning compare to SPEAr600. + +The v3.40 IP support was added to stmmac driver and this patch +fixes this issue and use the correct compatible string for +SPEAr3xx + +Signed-off-by: Herve Codina +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/spear3xx.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/spear3xx.dtsi b/arch/arm/boot/dts/spear3xx.dtsi +index f266b7b03482..cc88ebe7a60c 100644 +--- a/arch/arm/boot/dts/spear3xx.dtsi ++++ b/arch/arm/boot/dts/spear3xx.dtsi +@@ -47,7 +47,7 @@ + }; + + gmac: eth@e0800000 { +- compatible = "st,spear600-gmac"; ++ compatible = "snps,dwmac-3.40a"; + reg = <0xe0800000 0x8000>; + interrupts = <23 22>; + interrupt-names = "macirq", "eth_wake_irq"; +-- +2.33.0 + diff --git a/queue-5.10/btrfs-deal-with-errors-when-checking-if-a-dir-entry-.patch b/queue-5.10/btrfs-deal-with-errors-when-checking-if-a-dir-entry-.patch new file mode 100644 index 00000000000..804390077c3 --- /dev/null +++ b/queue-5.10/btrfs-deal-with-errors-when-checking-if-a-dir-entry-.patch @@ -0,0 +1,121 @@ +From ce911a5a7e47ac44b5f701ecbc2a808dcd75bdb7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 1 Oct 2021 13:52:30 +0100 +Subject: btrfs: deal with errors when checking if a dir entry exists during + log replay + +From: Filipe Manana + +[ Upstream commit 77a5b9e3d14cbce49ceed2766b2003c034c066dc ] + +Currently inode_in_dir() ignores errors returned from +btrfs_lookup_dir_index_item() and from btrfs_lookup_dir_item(), treating +any errors as if the directory entry does not exists in the fs/subvolume +tree, which is obviously not correct, as we can get errors such as -EIO +when reading extent buffers while searching the fs/subvolume's tree. + +Fix that by making inode_in_dir() return the errors and making its only +caller, add_inode_ref(), deal with returned errors as well. + +Signed-off-by: Filipe Manana +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/tree-log.c | 47 ++++++++++++++++++++++++++++----------------- + 1 file changed, 29 insertions(+), 18 deletions(-) + +diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c +index c3bb5c4375ab..3b93a98fd544 100644 +--- a/fs/btrfs/tree-log.c ++++ b/fs/btrfs/tree-log.c +@@ -894,9 +894,11 @@ out: + } + + /* +- * helper function to see if a given name and sequence number found +- * in an inode back reference are already in a directory and correctly +- * point to this inode ++ * See if a given name and sequence number found in an inode back reference are ++ * already in a directory and correctly point to this inode. ++ * ++ * Returns: < 0 on error, 0 if the directory entry does not exists and 1 if it ++ * exists. + */ + static noinline int inode_in_dir(struct btrfs_root *root, + struct btrfs_path *path, +@@ -905,29 +907,35 @@ static noinline int inode_in_dir(struct btrfs_root *root, + { + struct btrfs_dir_item *di; + struct btrfs_key location; +- int match = 0; ++ int ret = 0; + + di = btrfs_lookup_dir_index_item(NULL, root, path, dirid, + index, name, name_len, 0); +- if (di && !IS_ERR(di)) { ++ if (IS_ERR(di)) { ++ if (PTR_ERR(di) != -ENOENT) ++ ret = PTR_ERR(di); ++ goto out; ++ } else if (di) { + btrfs_dir_item_key_to_cpu(path->nodes[0], di, &location); + if (location.objectid != objectid) + goto out; +- } else ++ } else { + goto out; +- btrfs_release_path(path); ++ } + ++ btrfs_release_path(path); + di = btrfs_lookup_dir_item(NULL, root, path, dirid, name, name_len, 0); +- if (di && !IS_ERR(di)) { +- btrfs_dir_item_key_to_cpu(path->nodes[0], di, &location); +- if (location.objectid != objectid) +- goto out; +- } else ++ if (IS_ERR(di)) { ++ ret = PTR_ERR(di); + goto out; +- match = 1; ++ } else if (di) { ++ btrfs_dir_item_key_to_cpu(path->nodes[0], di, &location); ++ if (location.objectid == objectid) ++ ret = 1; ++ } + out: + btrfs_release_path(path); +- return match; ++ return ret; + } + + /* +@@ -1477,10 +1485,12 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans, + if (ret) + goto out; + +- /* if we already have a perfect match, we're done */ +- if (!inode_in_dir(root, path, btrfs_ino(BTRFS_I(dir)), +- btrfs_ino(BTRFS_I(inode)), ref_index, +- name, namelen)) { ++ ret = inode_in_dir(root, path, btrfs_ino(BTRFS_I(dir)), ++ btrfs_ino(BTRFS_I(inode)), ref_index, ++ name, namelen); ++ if (ret < 0) { ++ goto out; ++ } else if (ret == 0) { + /* + * look for a conflicting back reference in the + * metadata. if we find one we have to unlink that name +@@ -1538,6 +1548,7 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans, + + btrfs_update_inode(trans, root, inode); + } ++ /* Else, ret == 1, we already have a perfect match, we're done. */ + + ref_ptr = (unsigned long)(ref_ptr + ref_struct_size) + namelen; + kfree(name); +-- +2.33.0 + diff --git a/queue-5.10/gcc-plugins-structleak-add-makefile-var-for-disablin.patch b/queue-5.10/gcc-plugins-structleak-add-makefile-var-for-disablin.patch new file mode 100644 index 00000000000..f3969ef2a02 --- /dev/null +++ b/queue-5.10/gcc-plugins-structleak-add-makefile-var-for-disablin.patch @@ -0,0 +1,40 @@ +From 63fb7b3b423e52f7aea66bf2a4e677913581c04a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Sep 2021 14:27:09 -0700 +Subject: gcc-plugins/structleak: add makefile var for disabling structleak + +From: Brendan Higgins + +[ Upstream commit 554afc3b9797511e3245864e32aebeb6abbab1e3 ] + +KUnit and structleak don't play nice, so add a makefile variable for +enabling structleak when it complains. + +Co-developed-by: Kees Cook +Signed-off-by: Kees Cook +Signed-off-by: Brendan Higgins +Reviewed-by: David Gow +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + scripts/Makefile.gcc-plugins | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins +index 952e46876329..4aad28480035 100644 +--- a/scripts/Makefile.gcc-plugins ++++ b/scripts/Makefile.gcc-plugins +@@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ + += -fplugin-arg-structleak_plugin-byref + gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \ + += -fplugin-arg-structleak_plugin-byref-all ++ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK ++ DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable ++endif ++export DISABLE_STRUCTLEAK_PLUGIN + gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \ + += -DSTRUCTLEAK_PLUGIN + +-- +2.33.0 + diff --git a/queue-5.10/input-snvs_pwrkey-add-clk-handling.patch b/queue-5.10/input-snvs_pwrkey-add-clk-handling.patch new file mode 100644 index 00000000000..40af9e198bc --- /dev/null +++ b/queue-5.10/input-snvs_pwrkey-add-clk-handling.patch @@ -0,0 +1,96 @@ +From 43561b80038230841fc31881a5f8458ebba87ccb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Oct 2021 21:19:33 -0700 +Subject: Input: snvs_pwrkey - add clk handling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Uwe Kleine-König + +[ Upstream commit d997cc1715df7b6c3df798881fb9941acf0079f8 ] + +On i.MX7S and i.MX8M* (but not i.MX6*) the pwrkey device has an +associated clock. Accessing the registers requires that this clock is +enabled. Binding the driver on at least i.MX7S and i.MX8MP while not +having the clock enabled results in a complete hang of the machine. +(This usually only happens if snvs_pwrkey is built as a module and the +rtc-snvs driver isn't already bound because at bootup the required clk +is on and only gets disabled when the clk framework disables unused clks +late during boot.) + +This completes the fix in commit 135be16d3505 ("ARM: dts: imx7s: add +snvs clock to pwrkey"). + +Signed-off-by: Uwe Kleine-König +Link: https://lore.kernel.org/r/20211013062848.2667192-1-u.kleine-koenig@pengutronix.de +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/keyboard/snvs_pwrkey.c | 29 ++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c +index 2f5e3ab5ed63..65286762b02a 100644 +--- a/drivers/input/keyboard/snvs_pwrkey.c ++++ b/drivers/input/keyboard/snvs_pwrkey.c +@@ -3,6 +3,7 @@ + // Driver for the IMX SNVS ON/OFF Power Key + // Copyright (C) 2015 Freescale Semiconductor, Inc. All Rights Reserved. + ++#include + #include + #include + #include +@@ -99,6 +100,11 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id) + return IRQ_HANDLED; + } + ++static void imx_snvs_pwrkey_disable_clk(void *data) ++{ ++ clk_disable_unprepare(data); ++} ++ + static void imx_snvs_pwrkey_act(void *pdata) + { + struct pwrkey_drv_data *pd = pdata; +@@ -111,6 +117,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) + struct pwrkey_drv_data *pdata; + struct input_dev *input; + struct device_node *np; ++ struct clk *clk; + int error; + u32 vid; + +@@ -134,6 +141,28 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) + dev_warn(&pdev->dev, "KEY_POWER without setting in dts\n"); + } + ++ clk = devm_clk_get_optional(&pdev->dev, NULL); ++ if (IS_ERR(clk)) { ++ dev_err(&pdev->dev, "Failed to get snvs clock (%pe)\n", clk); ++ return PTR_ERR(clk); ++ } ++ ++ error = clk_prepare_enable(clk); ++ if (error) { ++ dev_err(&pdev->dev, "Failed to enable snvs clock (%pe)\n", ++ ERR_PTR(error)); ++ return error; ++ } ++ ++ error = devm_add_action_or_reset(&pdev->dev, ++ imx_snvs_pwrkey_disable_clk, clk); ++ if (error) { ++ dev_err(&pdev->dev, ++ "Failed to register clock cleanup handler (%pe)\n", ++ ERR_PTR(error)); ++ return error; ++ } ++ + pdata->wakeup = of_property_read_bool(np, "wakeup-source"); + + pdata->irq = platform_get_irq(pdev, 0); +-- +2.33.0 + diff --git a/queue-5.10/isdn-misdn-fix-sleeping-function-called-from-invalid.patch b/queue-5.10/isdn-misdn-fix-sleeping-function-called-from-invalid.patch new file mode 100644 index 00000000000..edb2a76dbcb --- /dev/null +++ b/queue-5.10/isdn-misdn-fix-sleeping-function-called-from-invalid.patch @@ -0,0 +1,80 @@ +From 19731f194e6975b3ff10ccf0bb091ba9e7277fc2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 9 Oct 2021 11:33:49 +0000 +Subject: isdn: mISDN: Fix sleeping function called from invalid context + +From: Zheyu Ma + +[ Upstream commit 6510e80a0b81b5d814e3aea6297ba42f5e76f73c ] + +The driver can call card->isac.release() function from an atomic +context. + +Fix this by calling this function after releasing the lock. + +The following log reveals it: + +[ 44.168226 ] BUG: sleeping function called from invalid context at kernel/workqueue.c:3018 +[ 44.168941 ] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 5475, name: modprobe +[ 44.169574 ] INFO: lockdep is turned off. +[ 44.169899 ] irq event stamp: 0 +[ 44.170160 ] hardirqs last enabled at (0): [<0000000000000000>] 0x0 +[ 44.170627 ] hardirqs last disabled at (0): [] copy_process+0x132d/0x3e00 +[ 44.171240 ] softirqs last enabled at (0): [] copy_process+0x135a/0x3e00 +[ 44.171852 ] softirqs last disabled at (0): [<0000000000000000>] 0x0 +[ 44.172318 ] Preemption disabled at: +[ 44.172320 ] [] nj_release+0x69/0x500 [netjet] +[ 44.174441 ] Call Trace: +[ 44.174630 ] dump_stack_lvl+0xa8/0xd1 +[ 44.174912 ] dump_stack+0x15/0x17 +[ 44.175166 ] ___might_sleep+0x3a2/0x510 +[ 44.175459 ] ? nj_release+0x69/0x500 [netjet] +[ 44.175791 ] __might_sleep+0x82/0xe0 +[ 44.176063 ] ? start_flush_work+0x20/0x7b0 +[ 44.176375 ] start_flush_work+0x33/0x7b0 +[ 44.176672 ] ? trace_irq_enable_rcuidle+0x85/0x170 +[ 44.177034 ] ? kasan_quarantine_put+0xaa/0x1f0 +[ 44.177372 ] ? kasan_quarantine_put+0xaa/0x1f0 +[ 44.177711 ] __flush_work+0x11a/0x1a0 +[ 44.177991 ] ? flush_work+0x20/0x20 +[ 44.178257 ] ? lock_release+0x13c/0x8f0 +[ 44.178550 ] ? __kasan_check_write+0x14/0x20 +[ 44.178872 ] ? do_raw_spin_lock+0x148/0x360 +[ 44.179187 ] ? read_lock_is_recursive+0x20/0x20 +[ 44.179530 ] ? __kasan_check_read+0x11/0x20 +[ 44.179846 ] ? do_raw_spin_unlock+0x55/0x900 +[ 44.180168 ] ? ____kasan_slab_free+0x116/0x140 +[ 44.180505 ] ? _raw_spin_unlock_irqrestore+0x41/0x60 +[ 44.180878 ] ? skb_queue_purge+0x1a3/0x1c0 +[ 44.181189 ] ? kfree+0x13e/0x290 +[ 44.181438 ] flush_work+0x17/0x20 +[ 44.181695 ] mISDN_freedchannel+0xe8/0x100 +[ 44.182006 ] isac_release+0x210/0x260 [mISDNipac] +[ 44.182366 ] nj_release+0xf6/0x500 [netjet] +[ 44.182685 ] nj_remove+0x48/0x70 [netjet] +[ 44.182989 ] pci_device_remove+0xa9/0x250 + +Signed-off-by: Zheyu Ma +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/isdn/hardware/mISDN/netjet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c +index 2a1ddd47a096..a52f275f8263 100644 +--- a/drivers/isdn/hardware/mISDN/netjet.c ++++ b/drivers/isdn/hardware/mISDN/netjet.c +@@ -949,8 +949,8 @@ nj_release(struct tiger_hw *card) + nj_disable_hwirq(card); + mode_tiger(&card->bc[0], ISDN_P_NONE); + mode_tiger(&card->bc[1], ISDN_P_NONE); +- card->isac.release(&card->isac); + spin_unlock_irqrestore(&card->lock, flags); ++ card->isac.release(&card->isac); + release_region(card->base, card->base_s); + card->base_s = 0; + } +-- +2.33.0 + diff --git a/queue-5.10/libperf-tests-fix-test_stat_cpu.patch b/queue-5.10/libperf-tests-fix-test_stat_cpu.patch new file mode 100644 index 00000000000..4e8af2895fe --- /dev/null +++ b/queue-5.10/libperf-tests-fix-test_stat_cpu.patch @@ -0,0 +1,105 @@ +From 0c808bd108777b979d78a07cd95da42ae212b7ef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Oct 2021 17:37:04 +0900 +Subject: libperf tests: Fix test_stat_cpu + +From: Shunsuke Nakamura + +[ Upstream commit 3ff6d64e68abc231955d216236615918797614ae ] + +The `cpu` argument of perf_evsel__read() must specify the cpu index. + +perf_cpu_map__for_each_cpu() is for iterating the cpu number (not index) +and is thus not appropriate for use with perf_evsel__read(). + +So, if there is an offline CPU, the cpu number specified in the argument +may point out of range because the cpu number and the cpu index are +different. + +Fix test_stat_cpu(). + +Testing it: + + # make tests -C tools/lib/perf/ + make: Entering directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf' + running static: + - running tests/test-cpumap.c...OK + - running tests/test-threadmap.c...OK + - running tests/test-evlist.c...OK + - running tests/test-evsel.c...OK + running dynamic: + - running tests/test-cpumap.c...OK + - running tests/test-threadmap.c...OK + - running tests/test-evlist.c...OK + - running tests/test-evsel.c...OK + make: Leaving directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf' + +Signed-off-by: Shunsuke Nakamura +Cc: Alexander Shishkin +Cc: Jiri Olsa +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lore.kernel.org/lkml/20211011083704.4108720-1-nakamura.shun@fujitsu.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/lib/perf/tests/test-evlist.c | 6 +++--- + tools/lib/perf/tests/test-evsel.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/lib/perf/tests/test-evlist.c b/tools/lib/perf/tests/test-evlist.c +index bd19cabddaf6..60b5d1801103 100644 +--- a/tools/lib/perf/tests/test-evlist.c ++++ b/tools/lib/perf/tests/test-evlist.c +@@ -38,7 +38,7 @@ static int test_stat_cpu(void) + .type = PERF_TYPE_SOFTWARE, + .config = PERF_COUNT_SW_TASK_CLOCK, + }; +- int err, cpu, tmp; ++ int err, idx; + + cpus = perf_cpu_map__new(NULL); + __T("failed to create cpus", cpus); +@@ -64,10 +64,10 @@ static int test_stat_cpu(void) + perf_evlist__for_each_evsel(evlist, evsel) { + cpus = perf_evsel__cpus(evsel); + +- perf_cpu_map__for_each_cpu(cpu, tmp, cpus) { ++ for (idx = 0; idx < perf_cpu_map__nr(cpus); idx++) { + struct perf_counts_values counts = { .val = 0 }; + +- perf_evsel__read(evsel, cpu, 0, &counts); ++ perf_evsel__read(evsel, idx, 0, &counts); + __T("failed to read value for evsel", counts.val != 0); + } + } +diff --git a/tools/lib/perf/tests/test-evsel.c b/tools/lib/perf/tests/test-evsel.c +index 0ad82d7a2a51..2de98768d844 100644 +--- a/tools/lib/perf/tests/test-evsel.c ++++ b/tools/lib/perf/tests/test-evsel.c +@@ -21,7 +21,7 @@ static int test_stat_cpu(void) + .type = PERF_TYPE_SOFTWARE, + .config = PERF_COUNT_SW_CPU_CLOCK, + }; +- int err, cpu, tmp; ++ int err, idx; + + cpus = perf_cpu_map__new(NULL); + __T("failed to create cpus", cpus); +@@ -32,10 +32,10 @@ static int test_stat_cpu(void) + err = perf_evsel__open(evsel, cpus, NULL); + __T("failed to open evsel", err == 0); + +- perf_cpu_map__for_each_cpu(cpu, tmp, cpus) { ++ for (idx = 0; idx < perf_cpu_map__nr(cpus); idx++) { + struct perf_counts_values counts = { .val = 0 }; + +- perf_evsel__read(evsel, cpu, 0, &counts); ++ perf_evsel__read(evsel, idx, 0, &counts); + __T("failed to read value for evsel", counts.val != 0); + } + +-- +2.33.0 + diff --git a/queue-5.10/net-stmmac-add-support-for-dwmac-3.40a.patch b/queue-5.10/net-stmmac-add-support-for-dwmac-3.40a.patch new file mode 100644 index 00000000000..80bc19ba20d --- /dev/null +++ b/queue-5.10/net-stmmac-add-support-for-dwmac-3.40a.patch @@ -0,0 +1,53 @@ +From 5cf4dafabf5b6f23ccc744d2c683ea66f046ac4c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Oct 2021 12:34:39 +0200 +Subject: net: stmmac: add support for dwmac 3.40a + +From: Herve Codina + +[ Upstream commit 9cb1d19f47fafad7dcf7c8564e633440c946cfd7 ] + +dwmac 3.40a is an old ip version that can be found on SPEAr3xx soc. + +Signed-off-by: Herve Codina +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++++++++ + 2 files changed, 9 insertions(+) + +diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c +index fad503820e04..b3365b34cac7 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c ++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c +@@ -71,6 +71,7 @@ err_remove_config_dt: + + static const struct of_device_id dwmac_generic_match[] = { + { .compatible = "st,spear600-gmac"}, ++ { .compatible = "snps,dwmac-3.40a"}, + { .compatible = "snps,dwmac-3.50a"}, + { .compatible = "snps,dwmac-3.610"}, + { .compatible = "snps,dwmac-3.70a"}, +diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +index 53be8fc1d125..48186cd32ce1 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +@@ -508,6 +508,14 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) + plat->pmt = 1; + } + ++ if (of_device_is_compatible(np, "snps,dwmac-3.40a")) { ++ plat->has_gmac = 1; ++ plat->enh_desc = 1; ++ plat->tx_coe = 1; ++ plat->bugged_jumbo = 1; ++ plat->pmt = 1; ++ } ++ + if (of_device_is_compatible(np, "snps,dwmac-4.00") || + of_device_is_compatible(np, "snps,dwmac-4.10a") || + of_device_is_compatible(np, "snps,dwmac-4.20a") || +-- +2.33.0 + diff --git a/queue-5.10/perf-x86-msr-add-sapphire-rapids-cpu-support.patch b/queue-5.10/perf-x86-msr-add-sapphire-rapids-cpu-support.patch new file mode 100644 index 00000000000..9943aaa9bbc --- /dev/null +++ b/queue-5.10/perf-x86-msr-add-sapphire-rapids-cpu-support.patch @@ -0,0 +1,34 @@ +From 5235454e7215705d71e2883aa48a1d499f9e7d28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Oct 2021 13:12:17 -0700 +Subject: perf/x86/msr: Add Sapphire Rapids CPU support + +From: Kan Liang + +[ Upstream commit 71920ea97d6d1d800ee8b51951dc3fda3f5dc698 ] + +SMI_COUNT MSR is supported on Sapphire Rapids CPU. + +Signed-off-by: Kan Liang +Signed-off-by: Peter Zijlstra (Intel) +Link: https://lkml.kernel.org/r/1633551137-192083-1-git-send-email-kan.liang@linux.intel.com +Signed-off-by: Sasha Levin +--- + arch/x86/events/msr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c +index 4be8f9cabd07..ca8ce64df2ce 100644 +--- a/arch/x86/events/msr.c ++++ b/arch/x86/events/msr.c +@@ -68,6 +68,7 @@ static bool test_intel(int idx, void *data) + case INTEL_FAM6_BROADWELL_D: + case INTEL_FAM6_BROADWELL_G: + case INTEL_FAM6_BROADWELL_X: ++ case INTEL_FAM6_SAPPHIRERAPIDS_X: + + case INTEL_FAM6_ATOM_SILVERMONT: + case INTEL_FAM6_ATOM_SILVERMONT_D: +-- +2.33.0 + diff --git a/queue-5.10/platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch b/queue-5.10/platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch new file mode 100644 index 00000000000..69672e9b276 --- /dev/null +++ b/queue-5.10/platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch @@ -0,0 +1,43 @@ +From f915c8bce3259530f78a0d432120c343231ca8ef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Sep 2021 03:19:34 -0700 +Subject: platform/x86: intel_scu_ipc: Update timeout value in comment + +From: Prashant Malani + +[ Upstream commit a0c5814b9933f25ecb6de169483c5b88cf632bca ] + +The comment decribing the IPC timeout hadn't been updated when the +actual timeout was changed from 3 to 5 seconds in +commit a7d53dbbc70a ("platform/x86: intel_scu_ipc: Increase virtual +timeout from 3 to 5 seconds") . + +Since the value is anyway updated to 10s now, take this opportunity to +update the value in the comment too. + +Signed-off-by: Prashant Malani +Cc: Benson Leung +Reviewed-by: Mika Westerberg +Link: https://lore.kernel.org/r/20210928101932.2543937-4-pmalani@chromium.org +Signed-off-by: Hans de Goede +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c +index 425d2064148f..69d706039cb2 100644 +--- a/drivers/platform/x86/intel_scu_ipc.c ++++ b/drivers/platform/x86/intel_scu_ipc.c +@@ -247,7 +247,7 @@ static inline int busy_loop(struct intel_scu_ipc_dev *scu) + return -ETIMEDOUT; + } + +-/* Wait till ipc ioc interrupt is received or timeout in 3 HZ */ ++/* Wait till ipc ioc interrupt is received or timeout in 10 HZ */ + static inline int ipc_wait_for_interrupt(struct intel_scu_ipc_dev *scu) + { + int status; +-- +2.33.0 + diff --git a/queue-5.10/series b/queue-5.10/series index 1554a1657c7..ffc41820c38 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -67,3 +67,14 @@ selftests-netfilter-remove-stray-bash-debug-line.patch net-bridge-mcast-use-multicast_membership_interval-for-igmpv3.patch drm-mxsfb-fix-null-pointer-dereference-crash-on-unload.patch net-hns3-fix-the-max-tx-size-according-to-user-manual.patch +gcc-plugins-structleak-add-makefile-var-for-disablin.patch +alsa-hda-intel-allow-repeatedly-probing-on-codec-con.patch +btrfs-deal-with-errors-when-checking-if-a-dir-entry-.patch +net-stmmac-add-support-for-dwmac-3.40a.patch +arm-dts-spear3xx-fix-gmac-node.patch +isdn-misdn-fix-sleeping-function-called-from-invalid.patch +platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch +alsa-hda-avoid-write-to-statests-if-controller-is-in.patch +libperf-tests-fix-test_stat_cpu.patch +perf-x86-msr-add-sapphire-rapids-cpu-support.patch +input-snvs_pwrkey-add-clk-handling.patch