diff options
Diffstat (limited to 'Linux-5.15.1-rc1.patch')
| -rw-r--r-- | Linux-5.15.1-rc1.patch | 829 |
1 files changed, 829 insertions, 0 deletions
diff --git a/Linux-5.15.1-rc1.patch b/Linux-5.15.1-rc1.patch new file mode 100644 index 000000000000..2812c0fdf56d --- /dev/null +++ b/Linux-5.15.1-rc1.patch @@ -0,0 +1,829 @@ +From 6adeecffa50f38f177de111a930087d444458160 Mon Sep 17 00:00:00 2001 +From: Scott B <arglebargle@arglebargle.dev> +Date: Thu, 4 Nov 2021 19:57:50 -0700 +Subject: [PATCH] Linux 5.15.1-rc1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Squashed commit of the following: + +commit feb80b14f66dd9b7c828d80089ab163ed5478840 +Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Thu Nov 4 15:11:59 2021 +0100 + + Linux 5.15.1-rc1 + +commit 0b319aec83939b2c6129c3ea864dea9760f3e3f6 +Author: Takashi Iwai <tiwai@suse.de> +Date: Tue Nov 2 17:18:59 2021 +0100 + + ALSA: usb-audio: Add quirk for Audient iD14 + + commit df0380b9539b04c1ae8854a984098da06d5f1e67 upstream. + + Audient iD14 (2708:0002) may get a control message error that + interferes the operation e.g. with alsactl. Add the quirk to ignore + such errors like other devices. + + BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1191247 + Cc: <stable@vger.kernel.org> + Link: https://lore.kernel.org/r/20211102161859.19301-1-tiwai@suse.de + Signed-off-by: Takashi Iwai <tiwai@suse.de> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit 3903803b0078aabdec33788660d2d09f4746727f +Author: Matthew Brost <matthew.brost@intel.com> +Date: Thu Sep 9 09:47:28 2021 -0700 + + Revert "drm/i915/gt: Propagate change in error status to children on unhold" + + commit ac653dd7996edf1770959e11a078312928bd7315 upstream. + + Propagating errors to dependent fences is broken and can lead to errors + from one client ending up in another. In commit 3761baae908a ("Revert + "drm/i915: Propagate errors on awaiting already signaled fences""), we + attempted to get rid of fence error propagation but missed the case + added in commit 8e9f84cf5cac ("drm/i915/gt: Propagate change in error + status to children on unhold"). Revert that one too. This error was + found by an up-and-coming selftest which triggers a reset during + request cancellation and verifies that subsequent requests complete + successfully. + + v2: + (Daniel Vetter) + - Use revert + v3: + (Jason) + - Update commit message + + v4 (Daniele): + - fix checkpatch error in commit message. + + References: '3761baae908a ("Revert "drm/i915: Propagate errors on awaiting already signaled fences"")' + Signed-off-by: Matthew Brost <matthew.brost@intel.com> + Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> + Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> + Signed-off-by: John Harrison <John.C.Harrison@Intel.com> + Link: https://patchwork.freedesktop.org/patch/msgid/20210909164744.31249-8-matthew.brost@intel.com + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit 04a693b76ca79d95fb36f568495e7c5697789bb2 +Author: Anson Jacob <Anson.Jacob@amd.com> +Date: Tue Aug 24 09:32:53 2021 -0400 + + drm/amd/display: Revert "Directly retrain link from debugfs" + + commit 1131cadfd7563975f3a4efcc6f7c1fdc872db38b upstream. + + This reverts commit f5b6a20c7ef40599095c796b0500d842ffdbc639. + + This patch broke new settings from taking effect. Hotplug is + required for new settings to take effect. + + Reviewed-by: Mikita Lipski <mikita.lipski@amd.com> + Acked-by: Mikita Lipski <mikita.lipski@amd.com> + Signed-off-by: Anson Jacob <Anson.Jacob@amd.com> + Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> + Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit e819e0776cffaa6b31ef5f8e91c55df3446d6cfe +Author: Christian König <christian.koenig@amd.com> +Date: Thu Sep 30 11:22:51 2021 +0200 + + drm/amdgpu: revert "Add autodump debugfs node for gpu reset v8" + + commit c8365dbda056578eebe164bf110816b1a39b4b7f upstream. + + This reverts commit 728e7e0cd61899208e924472b9e641dbeb0775c4. + + Further discussion reveals that this feature is severely broken + and needs to be reverted ASAP. + + GPU reset can never be delayed by userspace even for debugging or + otherwise we can run into in kernel deadlocks. + + Signed-off-by: Christian König <christian.koenig@amd.com> + Acked-by: Alex Deucher <alexander.deucher@amd.com> + Acked-by: Nirmoy Das <nirmoy.das@amd.com> + Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit e85b2b361dbcbe3309234e63e3a2e783f8760fca +Author: Bryan O'Donoghue <bryan.odonoghue@linaro.org> +Date: Fri Oct 22 15:04:47 2021 +0100 + + Revert "wcn36xx: Disable bmps when encryption is disabled" + + commit 285bb1738e196507bf985574d0bc1e9dd72d46b1 upstream. + + This reverts commit c6522a5076e1a65877c51cfee313a74ef61cabf8. + + Testing on tip-of-tree shows that this is working now. Revert this and + re-enable BMPS for Open APs. + + Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> + Signed-off-by: Kalle Valo <kvalo@codeaurora.org> + Link: https://lore.kernel.org/r/20211022140447.2846248-3-bryan.odonoghue@linaro.org + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit c368fbf3a63a022e58a25feb49d90f69a0c463cb +Author: Wang Kefeng <wangkefeng.wang@huawei.com> +Date: Mon Aug 23 10:41:42 2021 +0100 + + ARM: 9120/1: Revert "amba: make use of -1 IRQs warn" + + commit eb4f756915875b0ea0757751cd29841f0504d547 upstream. + + After commit 77a7300abad7 ("of/irq: Get rid of NO_IRQ usage"), + no irq case has been removed, irq_of_parse_and_map() will return + 0 in all cases when get error from parse and map an interrupt into + linux virq space. + + amba_device_register() is only used on no-DT initialization, see + s3c64xx_pl080_init() arch/arm/mach-s3c/pl080.c + ep93xx_init_devices() arch/arm/mach-ep93xx/core.c + + They won't set -1 to irq[0], so no need the warn. + + This reverts commit 2eac58d5026e4ec8b17ff8b62877fea9e1d2f1b3. + + Reviewed-by: Rob Herring <robh@kernel.org> + Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> + Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit de867e1f164779b5872226f1dbaeb1815e8e9c2b +Author: Lucas Stach <l.stach@pengutronix.de> +Date: Sat Oct 2 02:59:37 2021 +0200 + + Revert "soc: imx: gpcv2: move reset assert after requesting domain power up" + + commit 2b2f106eb55276a60a89ac27a52d0d738b57a546 upstream. + + This reverts commit a77ebdd9f553. It turns out that the VPU domain has no + different requirements, even though the downstream ATF implementation seems + to suggest otherwise. Powering on the domain with the reset asserted works + fine. As the changed sequence has caused sporadic issues with the GPU + domains, just revert the change to go back to the working sequence. + + Cc: <stable@vger.kernel.org> # 5.14 + Signed-off-by: Lucas Stach <l.stach@pengutronix.de> + Acked-by: Peng Fan <peng.fan@nxp.com> + Tested-by: Adam Ford <aford173@gmail.com> #imx8mm-beacon + Signed-off-by: Shawn Guo <shawnguo@kernel.org> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit cd8973fd8c59b0ffc7a3737b2575c15e88117290 +Author: Yifan Zhang <yifan1.zhang@amd.com> +Date: Mon Oct 11 20:37:01 2021 +0800 + + drm/amdkfd: fix boot failure when iommu is disabled in Picasso. + + commit afd18180c07026f94a80ff024acef5f4159084a4 upstream. + + When IOMMU disabled in sbios and kfd in iommuv2 path, iommuv2 + init will fail. But this failure should not block amdgpu driver init. + + Reported-by: youling <youling257@gmail.com> + Tested-by: youling <youling257@gmail.com> + Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com> + Reviewed-by: James Zhu <James.Zhu@amd.com> + Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit 278d476f35636d0df40983b45130928c7e599066 +Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed Nov 3 16:51:36 2021 +0100 + + Revert "usb: core: hcd: Add support for deferring roothub registration" + + This reverts commit 58877b0824da15698bd85a0a9dbfa8c354e6ecb7. + + It has been reported to be causing problems in Arch and Fedora bug + reports. + + Reported-by: Hans de Goede <hdegoede@redhat.com> + Link: https://bbs.archlinux.org/viewtopic.php?pid=2000956#p2000956 + Link: https://bugzilla.redhat.com/show_bug.cgi?id=2019542 + Link: https://bugzilla.redhat.com/show_bug.cgi?id=2019576 + Link: https://lore.kernel.org/r/42bcbea6-5eb8-16c7-336a-2cb72e71bc36@redhat.com + Cc: Mathias Nyman <mathias.nyman@linux.intel.com> + Cc: Chris Chiu <chris.chiu@canonical.com> + Cc: Alan Stern <stern@rowland.harvard.edu> + Cc: Kishon Vijay Abraham I <kishon@ti.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit 3aa6ff297f5f82226d668d7f11cf3dd5bdd4a3ab +Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed Nov 3 16:51:12 2021 +0100 + + Revert "xhci: Set HCD flag to defer primary roothub registration" + + This reverts commit b7a0a792f864583207c593b50fd1b752ed89f4c1. + + It has been reported to be causing problems in Arch and Fedora bug + reports. + + Reported-by: Hans de Goede <hdegoede@redhat.com> + Link: https://bbs.archlinux.org/viewtopic.php?pid=2000956#p2000956 + Link: https://bugzilla.redhat.com/show_bug.cgi?id=2019542 + Link: https://bugzilla.redhat.com/show_bug.cgi?id=2019576 + Link: https://lore.kernel.org/r/42bcbea6-5eb8-16c7-336a-2cb72e71bc36@redhat.com + Cc: Mathias Nyman <mathias.nyman@linux.intel.com> + Cc: Chris Chiu <chris.chiu@canonical.com> + Cc: Alan Stern <stern@rowland.harvard.edu> + Cc: Kishon Vijay Abraham I <kishon@ti.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit b5c2edd4a3868c186e0af37d76b86a958ff8bbcc +Author: Dan Carpenter <dan.carpenter@oracle.com> +Date: Mon Jun 7 17:23:48 2021 +0200 + + media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt() + + commit 35d2969ea3c7d32aee78066b1f3cf61a0d935a4e upstream. + + The bounds checking in avc_ca_pmt() is not strict enough. It should + be checking "read_pos + 4" because it's reading 5 bytes. If the + "es_info_length" is non-zero then it reads a 6th byte so there needs to + be an additional check for that. + + I also added checks for the "write_pos". I don't think these are + required because "read_pos" and "write_pos" are tied together so + checking one ought to be enough. But they make the code easier to + understand for me. The check on write_pos is: + + if (write_pos + 4 >= sizeof(c->operand) - 4) { + + The first "+ 4" is because we're writing 5 bytes and the last " - 4" + is to leave space for the CRC. + + The other problem is that "length" can be invalid. It comes from + "data_length" in fdtv_ca_pmt(). + + Cc: stable@vger.kernel.org + Reported-by: Luo Likang <luolikang@nsfocus.com> + Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> + Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> + Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +commit 1fd3b5308200bb6bce0d2447997efc7758e57da8 +Author: Erik Ekman <erik@kryo.se> +Date: Sun Oct 17 19:16:57 2021 +0200 + + sfc: Fix reading non-legacy supported link modes + + commit 041c61488236a5a84789083e3d9f0a51139b6edf upstream. + + Everything except the first 32 bits was lost when the pause flags were + added. This makes the 50000baseCR2 mode flag (bit 34) not appear. + + I have tested this with a 10G card (SFN5122F-R7) by modifying it to + return a non-legacy link mode (10000baseCR). + + Signed-off-by: Erik Ekman <erik@kryo.se> + Signed-off-by: David S. Miller <davem@davemloft.net> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + Makefile | 4 +- + drivers/amba/bus.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 80 ------------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 5 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 -- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 + + .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 3 +- + .../drm/i915/gt/intel_execlists_submission.c | 4 - + drivers/media/firewire/firedtv-avc.c | 14 +++- + drivers/media/firewire/firedtv-ci.c | 2 + + drivers/net/ethernet/sfc/ethtool_common.c | 10 +-- + drivers/net/wireless/ath/wcn36xx/main.c | 10 --- + drivers/net/wireless/ath/wcn36xx/pmc.c | 5 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 - + drivers/soc/imx/gpcv2.c | 4 +- + drivers/usb/core/hcd.c | 29 ++----- + drivers/usb/host/xhci.c | 1 - + include/linux/usb/hcd.h | 2 - + sound/usb/quirks.c | 2 + + 20 files changed, 33 insertions(+), 159 deletions(-) + +diff --git a/Makefile b/Makefile +index ed6e7ec60eff..ba874e6cdc3f 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 15 +-SUBLEVEL = 0 +-EXTRAVERSION = ++SUBLEVEL = 1 ++EXTRAVERSION = -rc1 + NAME = Trick or Treat + + # *DOCUMENTATION* +diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c +index 962041148482..6c0f7f4f7d1d 100644 +--- a/drivers/amba/bus.c ++++ b/drivers/amba/bus.c +@@ -377,9 +377,6 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) + void __iomem *tmp; + int i, ret; + +- WARN_ON(dev->irq[0] == (unsigned int)-1); +- WARN_ON(dev->irq[1] == (unsigned int)-1); +- + ret = request_resource(parent, &dev->res); + if (ret) + goto err_out; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 269437b01328..289c7dc05363 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1078,8 +1078,6 @@ struct amdgpu_device { + char product_name[32]; + char serial[20]; + +- struct amdgpu_autodump autodump; +- + atomic_t throttling_logging_enabled; + struct ratelimit_state throttling_logging_rs; + uint32_t ras_hw_enabled; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +index 463b9c0283f7..ec30d81586a7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +@@ -27,7 +27,6 @@ + #include <linux/pci.h> + #include <linux/uaccess.h> + #include <linux/pm_runtime.h> +-#include <linux/poll.h> + + #include "amdgpu.h" + #include "amdgpu_pm.h" +@@ -37,85 +36,7 @@ + #include "amdgpu_securedisplay.h" + #include "amdgpu_fw_attestation.h" + +-int amdgpu_debugfs_wait_dump(struct amdgpu_device *adev) +-{ + #if defined(CONFIG_DEBUG_FS) +- unsigned long timeout = 600 * HZ; +- int ret; +- +- wake_up_interruptible(&adev->autodump.gpu_hang); +- +- ret = wait_for_completion_interruptible_timeout(&adev->autodump.dumping, timeout); +- if (ret == 0) { +- pr_err("autodump: timeout, move on to gpu recovery\n"); +- return -ETIMEDOUT; +- } +-#endif +- return 0; +-} +- +-#if defined(CONFIG_DEBUG_FS) +- +-static int amdgpu_debugfs_autodump_open(struct inode *inode, struct file *file) +-{ +- struct amdgpu_device *adev = inode->i_private; +- int ret; +- +- file->private_data = adev; +- +- ret = down_read_killable(&adev->reset_sem); +- if (ret) +- return ret; +- +- if (adev->autodump.dumping.done) { +- reinit_completion(&adev->autodump.dumping); +- ret = 0; +- } else { +- ret = -EBUSY; +- } +- +- up_read(&adev->reset_sem); +- +- return ret; +-} +- +-static int amdgpu_debugfs_autodump_release(struct inode *inode, struct file *file) +-{ +- struct amdgpu_device *adev = file->private_data; +- +- complete_all(&adev->autodump.dumping); +- return 0; +-} +- +-static unsigned int amdgpu_debugfs_autodump_poll(struct file *file, struct poll_table_struct *poll_table) +-{ +- struct amdgpu_device *adev = file->private_data; +- +- poll_wait(file, &adev->autodump.gpu_hang, poll_table); +- +- if (amdgpu_in_reset(adev)) +- return POLLIN | POLLRDNORM | POLLWRNORM; +- +- return 0; +-} +- +-static const struct file_operations autodump_debug_fops = { +- .owner = THIS_MODULE, +- .open = amdgpu_debugfs_autodump_open, +- .poll = amdgpu_debugfs_autodump_poll, +- .release = amdgpu_debugfs_autodump_release, +-}; +- +-static void amdgpu_debugfs_autodump_init(struct amdgpu_device *adev) +-{ +- init_completion(&adev->autodump.dumping); +- complete_all(&adev->autodump.dumping); +- init_waitqueue_head(&adev->autodump.gpu_hang); +- +- debugfs_create_file("amdgpu_autodump", 0600, +- adev_to_drm(adev)->primary->debugfs_root, +- adev, &autodump_debug_fops); +-} + + /** + * amdgpu_debugfs_process_reg_op - Handle MMIO register reads/writes +@@ -1588,7 +1509,6 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) + } + + amdgpu_ras_debugfs_create_all(adev); +- amdgpu_debugfs_autodump_init(adev); + amdgpu_rap_debugfs_init(adev); + amdgpu_securedisplay_debugfs_init(adev); + amdgpu_fw_attestation_debugfs_init(adev); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h +index 141a8474e24f..8b641f40fdf6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h +@@ -26,10 +26,6 @@ + /* + * Debugfs + */ +-struct amdgpu_autodump { +- struct completion dumping; +- struct wait_queue_head gpu_hang; +-}; + + int amdgpu_debugfs_regs_init(struct amdgpu_device *adev); + int amdgpu_debugfs_init(struct amdgpu_device *adev); +@@ -37,4 +33,3 @@ void amdgpu_debugfs_fini(struct amdgpu_device *adev); + void amdgpu_debugfs_fence_init(struct amdgpu_device *adev); + void amdgpu_debugfs_firmware_init(struct amdgpu_device *adev); + void amdgpu_debugfs_gem_init(struct amdgpu_device *adev); +-int amdgpu_debugfs_wait_dump(struct amdgpu_device *adev); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index af9bdf16eefd..b8d9004fb163 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2432,10 +2432,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) + if (!adev->gmc.xgmi.pending_reset) + amdgpu_amdkfd_device_init(adev); + +- r = amdgpu_amdkfd_resume_iommu(adev); +- if (r) +- goto init_failed; +- + amdgpu_fru_get_product_info(adev); + + init_failed: +@@ -4466,10 +4462,6 @@ int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev, + if (reset_context->reset_req_dev == adev) + job = reset_context->job; + +- /* no need to dump if device is not in good state during probe period */ +- if (!adev->gmc.xgmi.pending_reset) +- amdgpu_debugfs_wait_dump(adev); +- + if (amdgpu_sriov_vf(adev)) { + /* stop the data exchange thread */ + amdgpu_virt_fini_data_exchange(adev); +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +index 4a416231b24c..a6afacc3b10c 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -924,6 +924,9 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, + + svm_migrate_init((struct amdgpu_device *)kfd->kgd); + ++ if(kgd2kfd_resume_iommu(kfd)) ++ goto device_iommu_error; ++ + if (kfd_resume(kfd)) + goto kfd_resume_error; + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +index 8080bba5b7a7..de9ec5ddb6c7 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +@@ -247,6 +247,7 @@ static ssize_t dp_link_settings_write(struct file *f, const char __user *buf, + { + struct amdgpu_dm_connector *connector = file_inode(f)->i_private; + struct dc_link *link = connector->dc_link; ++ struct dc *dc = (struct dc *)link->dc; + struct dc_link_settings prefer_link_settings; + char *wr_buf = NULL; + const uint32_t wr_buf_size = 40; +@@ -313,7 +314,7 @@ static ssize_t dp_link_settings_write(struct file *f, const char __user *buf, + prefer_link_settings.lane_count = param[0]; + prefer_link_settings.link_rate = param[1]; + +- dp_retrain_link_dp_test(link, &prefer_link_settings, false); ++ dc_link_set_preferred_training_settings(dc, &prefer_link_settings, NULL, link, true); + + kfree(wr_buf); + return size; +diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +index de5f9c86b9a4..cafb0608ffb4 100644 +--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c ++++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +@@ -2140,10 +2140,6 @@ static void __execlists_unhold(struct i915_request *rq) + if (p->flags & I915_DEPENDENCY_WEAK) + continue; + +- /* Propagate any change in error status */ +- if (rq->fence.error) +- i915_request_set_error_once(w, rq->fence.error); +- + if (w->engine != rq->engine) + continue; + +diff --git a/drivers/media/firewire/firedtv-avc.c b/drivers/media/firewire/firedtv-avc.c +index 2bf9467b917d..71991f8638e6 100644 +--- a/drivers/media/firewire/firedtv-avc.c ++++ b/drivers/media/firewire/firedtv-avc.c +@@ -1165,7 +1165,11 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) + read_pos += program_info_length; + write_pos += program_info_length; + } +- while (read_pos < length) { ++ while (read_pos + 4 < length) { ++ if (write_pos + 4 >= sizeof(c->operand) - 4) { ++ ret = -EINVAL; ++ goto out; ++ } + c->operand[write_pos++] = msg[read_pos++]; + c->operand[write_pos++] = msg[read_pos++]; + c->operand[write_pos++] = msg[read_pos++]; +@@ -1177,13 +1181,17 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) + c->operand[write_pos++] = es_info_length >> 8; + c->operand[write_pos++] = es_info_length & 0xff; + if (es_info_length > 0) { ++ if (read_pos >= length) { ++ ret = -EINVAL; ++ goto out; ++ } + pmt_cmd_id = msg[read_pos++]; + if (pmt_cmd_id != 1 && pmt_cmd_id != 4) + dev_err(fdtv->device, "invalid pmt_cmd_id %d at stream level\n", + pmt_cmd_id); + +- if (es_info_length > sizeof(c->operand) - 4 - +- write_pos) { ++ if (es_info_length > sizeof(c->operand) - 4 - write_pos || ++ es_info_length > length - read_pos) { + ret = -EINVAL; + goto out; + } +diff --git a/drivers/media/firewire/firedtv-ci.c b/drivers/media/firewire/firedtv-ci.c +index 9363d005e2b6..e0d57e09dab0 100644 +--- a/drivers/media/firewire/firedtv-ci.c ++++ b/drivers/media/firewire/firedtv-ci.c +@@ -134,6 +134,8 @@ static int fdtv_ca_pmt(struct firedtv *fdtv, void *arg) + } else { + data_length = msg->msg[3]; + } ++ if (data_length > sizeof(msg->msg) - data_pos) ++ return -EINVAL; + + return avc_ca_pmt(fdtv, &msg->msg[data_pos], data_length); + } +diff --git a/drivers/net/ethernet/sfc/ethtool_common.c b/drivers/net/ethernet/sfc/ethtool_common.c +index bf1443539a1a..bd552c7dffcb 100644 +--- a/drivers/net/ethernet/sfc/ethtool_common.c ++++ b/drivers/net/ethernet/sfc/ethtool_common.c +@@ -563,20 +563,14 @@ int efx_ethtool_get_link_ksettings(struct net_device *net_dev, + { + struct efx_nic *efx = netdev_priv(net_dev); + struct efx_link_state *link_state = &efx->link_state; +- u32 supported; + + mutex_lock(&efx->mac_lock); + efx_mcdi_phy_get_link_ksettings(efx, cmd); + mutex_unlock(&efx->mac_lock); + + /* Both MACs support pause frames (bidirectional and respond-only) */ +- ethtool_convert_link_mode_to_legacy_u32(&supported, +- cmd->link_modes.supported); +- +- supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; +- +- ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported, +- supported); ++ ethtool_link_ksettings_add_link_mode(cmd, supported, Pause); ++ ethtool_link_ksettings_add_link_mode(cmd, supported, Asym_Pause); + + if (LOOPBACK_INTERNAL(efx)) { + cmd->base.speed = link_state->speed; +diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c +index ec913ec991f3..6e91bdb2e08d 100644 +--- a/drivers/net/wireless/ath/wcn36xx/main.c ++++ b/drivers/net/wireless/ath/wcn36xx/main.c +@@ -604,15 +604,6 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, + } + } + } +- /* FIXME: Only enable bmps support when encryption is enabled. +- * For any reasons, when connected to open/no-security BSS, +- * the wcn36xx controller in bmps mode does not forward +- * 'wake-up' beacons despite AP sends DTIM with station AID. +- * It could be due to a firmware issue or to the way driver +- * configure the station. +- */ +- if (vif->type == NL80211_IFTYPE_STATION) +- vif_priv->allow_bmps = true; + break; + case DISABLE_KEY: + if (!(IEEE80211_KEY_FLAG_PAIRWISE & key_conf->flags)) { +@@ -913,7 +904,6 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw, + vif->addr, + bss_conf->aid); + vif_priv->sta_assoc = false; +- vif_priv->allow_bmps = false; + wcn36xx_smd_set_link_st(wcn, + bss_conf->bssid, + vif->addr, +diff --git a/drivers/net/wireless/ath/wcn36xx/pmc.c b/drivers/net/wireless/ath/wcn36xx/pmc.c +index 2d0780fefd47..2936aaf53273 100644 +--- a/drivers/net/wireless/ath/wcn36xx/pmc.c ++++ b/drivers/net/wireless/ath/wcn36xx/pmc.c +@@ -23,10 +23,7 @@ int wcn36xx_pmc_enter_bmps_state(struct wcn36xx *wcn, + { + int ret = 0; + struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif); +- +- if (!vif_priv->allow_bmps) +- return -ENOTSUPP; +- ++ /* TODO: Make sure the TX chain clean */ + ret = wcn36xx_smd_enter_bmps(wcn, vif); + if (!ret) { + wcn36xx_dbg(WCN36XX_DBG_PMC, "Entered BMPS\n"); +diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +index add6e527e833..e9560f35e9bc 100644 +--- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h ++++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +@@ -128,7 +128,6 @@ struct wcn36xx_vif { + enum wcn36xx_hal_bss_type bss_type; + + /* Power management */ +- bool allow_bmps; + enum wcn36xx_power_state pw_state; + + u8 bss_index; +diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c +index 34a9ac1f2b9b..8b7a01773aec 100644 +--- a/drivers/soc/imx/gpcv2.c ++++ b/drivers/soc/imx/gpcv2.c +@@ -244,6 +244,8 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd) + goto out_regulator_disable; + } + ++ reset_control_assert(domain->reset); ++ + if (domain->bits.pxx) { + /* request the domain to power up */ + regmap_update_bits(domain->regmap, GPC_PU_PGC_SW_PUP_REQ, +@@ -266,8 +268,6 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd) + GPC_PGC_CTRL_PCR); + } + +- reset_control_assert(domain->reset); +- + /* delay for reset to propagate */ + udelay(5); + +diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c +index 7ee6e4cc0d89..00d35fe1fef0 100644 +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c +@@ -2795,7 +2795,6 @@ int usb_add_hcd(struct usb_hcd *hcd, + { + int retval; + struct usb_device *rhdev; +- struct usb_hcd *shared_hcd; + + if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) { + hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev); +@@ -2956,26 +2955,13 @@ int usb_add_hcd(struct usb_hcd *hcd, + goto err_hcd_driver_start; + } + +- /* starting here, usbcore will pay attention to the shared HCD roothub */ +- shared_hcd = hcd->shared_hcd; +- if (!usb_hcd_is_primary_hcd(hcd) && shared_hcd && HCD_DEFER_RH_REGISTER(shared_hcd)) { +- retval = register_root_hub(shared_hcd); +- if (retval != 0) +- goto err_register_root_hub; +- +- if (shared_hcd->uses_new_polling && HCD_POLL_RH(shared_hcd)) +- usb_hcd_poll_rh_status(shared_hcd); +- } +- + /* starting here, usbcore will pay attention to this root hub */ +- if (!HCD_DEFER_RH_REGISTER(hcd)) { +- retval = register_root_hub(hcd); +- if (retval != 0) +- goto err_register_root_hub; ++ retval = register_root_hub(hcd); ++ if (retval != 0) ++ goto err_register_root_hub; + +- if (hcd->uses_new_polling && HCD_POLL_RH(hcd)) +- usb_hcd_poll_rh_status(hcd); +- } ++ if (hcd->uses_new_polling && HCD_POLL_RH(hcd)) ++ usb_hcd_poll_rh_status(hcd); + + return retval; + +@@ -3013,7 +2999,6 @@ EXPORT_SYMBOL_GPL(usb_add_hcd); + void usb_remove_hcd(struct usb_hcd *hcd) + { + struct usb_device *rhdev = hcd->self.root_hub; +- bool rh_registered; + + dev_info(hcd->self.controller, "remove, state %x\n", hcd->state); + +@@ -3024,7 +3009,6 @@ void usb_remove_hcd(struct usb_hcd *hcd) + + dev_dbg(hcd->self.controller, "roothub graceful disconnect\n"); + spin_lock_irq (&hcd_root_hub_lock); +- rh_registered = hcd->rh_registered; + hcd->rh_registered = 0; + spin_unlock_irq (&hcd_root_hub_lock); + +@@ -3034,8 +3018,7 @@ void usb_remove_hcd(struct usb_hcd *hcd) + cancel_work_sync(&hcd->died_work); + + mutex_lock(&usb_bus_idr_lock); +- if (rh_registered) +- usb_disconnect(&rhdev); /* Sets rhdev to NULL */ ++ usb_disconnect(&rhdev); /* Sets rhdev to NULL */ + mutex_unlock(&usb_bus_idr_lock); + + /* +diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c +index 541fe4dcc43a..902f410874e8 100644 +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -692,7 +692,6 @@ int xhci_run(struct usb_hcd *hcd) + if (ret) + xhci_free_command(xhci, command); + } +- set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags); + xhci_dbg_trace(xhci, trace_xhci_dbg_init, + "Finished xhci_run for USB2 roothub"); + +diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h +index 2c1fc9212cf2..548a028f2dab 100644 +--- a/include/linux/usb/hcd.h ++++ b/include/linux/usb/hcd.h +@@ -124,7 +124,6 @@ struct usb_hcd { + #define HCD_FLAG_RH_RUNNING 5 /* root hub is running? */ + #define HCD_FLAG_DEAD 6 /* controller has died? */ + #define HCD_FLAG_INTF_AUTHORIZED 7 /* authorize interfaces? */ +-#define HCD_FLAG_DEFER_RH_REGISTER 8 /* Defer roothub registration */ + + /* The flags can be tested using these macros; they are likely to + * be slightly faster than test_bit(). +@@ -135,7 +134,6 @@ struct usb_hcd { + #define HCD_WAKEUP_PENDING(hcd) ((hcd)->flags & (1U << HCD_FLAG_WAKEUP_PENDING)) + #define HCD_RH_RUNNING(hcd) ((hcd)->flags & (1U << HCD_FLAG_RH_RUNNING)) + #define HCD_DEAD(hcd) ((hcd)->flags & (1U << HCD_FLAG_DEAD)) +-#define HCD_DEFER_RH_REGISTER(hcd) ((hcd)->flags & (1U << HCD_FLAG_DEFER_RH_REGISTER)) + + /* + * Specifies if interfaces are authorized by default +diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c +index 8929d9abe8aa..74e5bd2cc932 100644 +--- a/sound/usb/quirks.c ++++ b/sound/usb/quirks.c +@@ -1887,6 +1887,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { + QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER), + DEVICE_FLG(0x21b4, 0x0081, /* AudioQuest DragonFly */ + QUIRK_FLAG_GET_SAMPLE_RATE), ++ DEVICE_FLG(0x2708, 0x0002, /* Audient iD14 */ ++ QUIRK_FLAG_IGNORE_CTL_ERROR), + DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */ + QUIRK_FLAG_GET_SAMPLE_RATE), + DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */ +-- +2.33.1 + |