From: Sasha Levin Date: Wed, 16 Jun 2021 11:58:18 +0000 (-0400) Subject: Fixes for 5.12 X-Git-Tag: v5.4.127~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=646bd92f8afd56c64739b20ae46b8bdace484f8c;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.12 Signed-off-by: Sasha Levin --- diff --git a/queue-5.12/alsa-hda-add-alderlake-m-pci-id.patch b/queue-5.12/alsa-hda-add-alderlake-m-pci-id.patch new file mode 100644 index 00000000000..011d6e68317 --- /dev/null +++ b/queue-5.12/alsa-hda-add-alderlake-m-pci-id.patch @@ -0,0 +1,60 @@ +From 221f2ca7e1a7840271ad5c66fd64aeba9f02f661 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 May 2021 21:51:23 +0300 +Subject: ALSA: hda: Add AlderLake-M PCI ID +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Kai Vehmanen + +[ Upstream commit 4ad7935df6a566225c3d51900bde8f2f0f8b6de3 ] + +Add HD Audio PCI ID for Intel AlderLake-M. Add rules to +snd_intel_dsp_find_config() to choose SOF driver for ADL-M systems with +PCH-DMIC or Soundwire codecs, and legacy driver for the rest. + +Signed-off-by: Kai Vehmanen +Reviewed-by: Péter Ujfalusi +Reviewed-by: Ranjani Sridharan +Reviewed-by: Pierre-Louis Bossart +Link: https://lore.kernel.org/r/20210528185123.48332-1-kai.vehmanen@linux.intel.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/hda/intel-dsp-config.c | 4 ++++ + sound/pci/hda/hda_intel.c | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c +index ab5ff7867eb9..d8be146793ee 100644 +--- a/sound/hda/intel-dsp-config.c ++++ b/sound/hda/intel-dsp-config.c +@@ -331,6 +331,10 @@ static const struct config_entry config_table[] = { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0x51c8, + }, ++ { ++ .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, ++ .device = 0x51cc, ++ }, + #endif + + }; +diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c +index 79ade335c8a0..470753b36c8a 100644 +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2485,6 +2485,9 @@ static const struct pci_device_id azx_ids[] = { + /* Alderlake-P */ + { PCI_DEVICE(0x8086, 0x51c8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, ++ /* Alderlake-M */ ++ { PCI_DEVICE(0x8086, 0x51cc), ++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* Elkhart Lake */ + { PCI_DEVICE(0x8086, 0x4b55), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, +-- +2.30.2 + diff --git a/queue-5.12/arm-omap1-fix-use-of-possibly-uninitialized-irq-vari.patch b/queue-5.12/arm-omap1-fix-use-of-possibly-uninitialized-irq-vari.patch new file mode 100644 index 00000000000..8fa5f1a825e --- /dev/null +++ b/queue-5.12/arm-omap1-fix-use-of-possibly-uninitialized-irq-vari.patch @@ -0,0 +1,70 @@ +From d2e2c37104fa0afe411b1e6a718b612211fd86c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Apr 2021 18:11:27 +0200 +Subject: ARM: OMAP1: Fix use of possibly uninitialized irq variable + +From: Maciej Falkowski + +[ Upstream commit 3c4e0147c269738a19c7d70cd32395600bcc0714 ] + +The current control flow of IRQ number assignment to `irq` variable +allows a request of IRQ of unspecified value, +generating a warning under Clang compilation with omap1_defconfig on +linux-next: + +arch/arm/mach-omap1/pm.c:656:11: warning: variable 'irq' is used +uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] + else if (cpu_is_omap16xx()) + ^~~~~~~~~~~~~~~~~ +./arch/arm/mach-omap1/include/mach/soc.h:123:30: note: expanded from macro +'cpu_is_omap16xx' + ^~~~~~~~~~~~~ +arch/arm/mach-omap1/pm.c:658:18: note: uninitialized use occurs here + if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup", + ^~~ +arch/arm/mach-omap1/pm.c:656:7: note: remove the 'if' if its condition is +always true + else if (cpu_is_omap16xx()) + ^~~~~~~~~~~~~~~~~~~~~~ +arch/arm/mach-omap1/pm.c:611:9: note: initialize the variable 'irq' to +silence this warning + int irq; + ^ + = 0 +1 warning generated. + +The patch provides a default value to the `irq` variable +along with a validity check. + +Signed-off-by: Maciej Falkowski +Link: https://github.com/ClangBuiltLinux/linux/issues/1324 +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/mach-omap1/pm.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c +index 2c1e2b32b9b3..a745d64d4699 100644 +--- a/arch/arm/mach-omap1/pm.c ++++ b/arch/arm/mach-omap1/pm.c +@@ -655,9 +655,13 @@ static int __init omap_pm_init(void) + irq = INT_7XX_WAKE_UP_REQ; + else if (cpu_is_omap16xx()) + irq = INT_1610_WAKE_UP_REQ; +- if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup", +- NULL)) +- pr_err("Failed to request irq %d (peripheral wakeup)\n", irq); ++ else ++ irq = -1; ++ ++ if (irq >= 0) { ++ if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup", NULL)) ++ pr_err("Failed to request irq %d (peripheral wakeup)\n", irq); ++ } + + /* Program new power ramp-up time + * (0 for most boards since we don't lower voltage when in deep sleep) +-- +2.30.2 + diff --git a/queue-5.12/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch b/queue-5.12/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch new file mode 100644 index 00000000000..e4cd9789870 --- /dev/null +++ b/queue-5.12/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch @@ -0,0 +1,49 @@ +From 7e08c605a66d22c0df76c8c15ab3ae1153a30687 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Apr 2021 13:15:33 +0000 +Subject: ARM: OMAP2+: Fix build warning when mmc_omap is not built + +From: Yongqiang Liu + +[ Upstream commit 040ab72ee10ea88e1883ad143b3e2b77596abc31 ] + +GCC reports the following warning with W=1: + +arch/arm/mach-omap2/board-n8x0.c:325:19: warning: +variable 'index' set but not used [-Wunused-but-set-variable] +325 | int bit, *openp, index; + | ^~~~~ + +Fix this by moving CONFIG_MMC_OMAP to cover the rest codes +in the n8x0_mmc_callback(). + +Signed-off-by: Yongqiang Liu +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/mach-omap2/board-n8x0.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c +index 418a61ecb827..5e86145db0e2 100644 +--- a/arch/arm/mach-omap2/board-n8x0.c ++++ b/arch/arm/mach-omap2/board-n8x0.c +@@ -322,6 +322,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot) + + static void n8x0_mmc_callback(void *data, u8 card_mask) + { ++#ifdef CONFIG_MMC_OMAP + int bit, *openp, index; + + if (board_is_n800()) { +@@ -339,7 +340,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask) + else + *openp = 0; + +-#ifdef CONFIG_MMC_OMAP + omap_mmc_notify_cover_event(mmc_device, index, *openp); + #else + pr_warn("MMC: notify cover event not available\n"); +-- +2.30.2 + diff --git a/queue-5.12/bluetooth-add-a-new-usb-id-for-rtl8822ce.patch b/queue-5.12/bluetooth-add-a-new-usb-id-for-rtl8822ce.patch new file mode 100644 index 00000000000..7c098cef8a9 --- /dev/null +++ b/queue-5.12/bluetooth-add-a-new-usb-id-for-rtl8822ce.patch @@ -0,0 +1,35 @@ +From 228c41fb128e3547eecbc5463af4569a677365a4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jun 2021 14:04:18 -0500 +Subject: Bluetooth: Add a new USB ID for RTL8822CE + +From: Larry Finger + +[ Upstream commit 4d96d3b0efee6416ef0d61b76aaac6f4a2e15b12 ] + +Some models of the RTL8822ce utilize a different USB ID. Add this +new one to the Bluetooth driver. + +Signed-off-by: Larry Finger +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/btusb.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c +index 4a901508e48e..ddc7b86725cd 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -388,6 +388,8 @@ static const struct usb_device_id blacklist_table[] = { + /* Realtek 8822CE Bluetooth devices */ + { USB_DEVICE(0x0bda, 0xb00c), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, ++ { USB_DEVICE(0x0bda, 0xc822), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, + + /* Realtek 8852AE Bluetooth devices */ + { USB_DEVICE(0x0bda, 0xc852), .driver_info = BTUSB_REALTEK | +-- +2.30.2 + diff --git a/queue-5.12/drm-amd-amdgpu-save-psp-ring-wptr-to-avoid-attack.patch b/queue-5.12/drm-amd-amdgpu-save-psp-ring-wptr-to-avoid-attack.patch new file mode 100644 index 00000000000..44a190c0f1a --- /dev/null +++ b/queue-5.12/drm-amd-amdgpu-save-psp-ring-wptr-to-avoid-attack.patch @@ -0,0 +1,86 @@ +From 5518b40a552c5d23948ad4fd0060cc33170c69e0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Mar 2021 13:44:35 +0800 +Subject: drm/amd/amdgpu:save psp ring wptr to avoid attack + +From: Victor Zhao + +[ Upstream commit 2370eba9f552eaae3d8aa1f70b8e9eec5c560f9e ] + +[Why] +When some tools performing psp mailbox attack, the readback value +of register can be a random value which may break psp. + +[How] +Use a psp wptr cache machanism to aovid the change made by attack. + +v2: unify change and add detailed reason + +Signed-off-by: Victor Zhao +Signed-off-by: Jingwen Chen +Reviewed-by: Monk Liu +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 3 ++- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 3 ++- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +index cb50ba445f8c..0fd62a8e68c2 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +@@ -76,6 +76,7 @@ struct psp_ring + uint64_t ring_mem_mc_addr; + void *ring_mem_handle; + uint32_t ring_size; ++ uint32_t ring_wptr; + }; + + /* More registers may will be supported */ +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +index c325d6f53a71..d39735a89a25 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +@@ -720,7 +720,7 @@ static uint32_t psp_v11_0_ring_get_wptr(struct psp_context *psp) + struct amdgpu_device *adev = psp->adev; + + if (amdgpu_sriov_vf(adev)) +- data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102); ++ data = psp->km_ring.ring_wptr; + else + data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67); + +@@ -734,6 +734,7 @@ static void psp_v11_0_ring_set_wptr(struct psp_context *psp, uint32_t value) + if (amdgpu_sriov_vf(adev)) { + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value); + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD); ++ psp->km_ring.ring_wptr = value; + } else + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value); + } +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +index f2e725f72d2f..908664a5774b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +@@ -379,7 +379,7 @@ static uint32_t psp_v3_1_ring_get_wptr(struct psp_context *psp) + struct amdgpu_device *adev = psp->adev; + + if (amdgpu_sriov_vf(adev)) +- data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102); ++ data = psp->km_ring.ring_wptr; + else + data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67); + return data; +@@ -394,6 +394,7 @@ static void psp_v3_1_ring_set_wptr(struct psp_context *psp, uint32_t value) + /* send interrupt to PSP for SRIOV ring write pointer update */ + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, + GFX_CTRL_CMD_ID_CONSUME_CMD); ++ psp->km_ring.ring_wptr = value; + } else + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value); + } +-- +2.30.2 + diff --git a/queue-5.12/drm-amd-display-allow-bandwidth-validation-for-0-str.patch b/queue-5.12/drm-amd-display-allow-bandwidth-validation-for-0-str.patch new file mode 100644 index 00000000000..8674b9ec33f --- /dev/null +++ b/queue-5.12/drm-amd-display-allow-bandwidth-validation-for-0-str.patch @@ -0,0 +1,43 @@ +From e9002705ee32ad2a6e9908bfc0e6224153533e29 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 May 2021 10:06:04 -0400 +Subject: drm/amd/display: Allow bandwidth validation for 0 streams. + +From: Bindu Ramamurthy + +[ Upstream commit ba8e59773ae59818695d1e20b8939282da80ec8c ] + +[Why] +Bandwidth calculations are triggered for non zero streams, and +in case of 0 streams, these calculations were skipped with +pstate status not being updated. + +[How] +As the pstate status is applicable for non zero streams, check +added for allowing 0 streams inline with dcn internal bandwidth +validations. + +Signed-off-by: Bindu Ramamurthy +Reviewed-by: Roman Li +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +index bfbc23b76cd5..3e3c898848bd 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +@@ -3231,7 +3231,7 @@ static noinline bool dcn20_validate_bandwidth_fp(struct dc *dc, + voltage_supported = dcn20_validate_bandwidth_internal(dc, context, false); + dummy_pstate_supported = context->bw_ctx.bw.dcn.clk.p_state_change_support; + +- if (voltage_supported && dummy_pstate_supported) { ++ if (voltage_supported && (dummy_pstate_supported || !(context->stream_count))) { + context->bw_ctx.bw.dcn.clk.p_state_change_support = false; + goto restore_dml_state; + } +-- +2.30.2 + diff --git a/queue-5.12/drm-amd-display-fix-overlay-validation-by-considerin.patch b/queue-5.12/drm-amd-display-fix-overlay-validation-by-considerin.patch new file mode 100644 index 00000000000..15b77b1dd5a --- /dev/null +++ b/queue-5.12/drm-amd-display-fix-overlay-validation-by-considerin.patch @@ -0,0 +1,73 @@ +From 7739f4d290c08f5007df2795a04ca2631e95511d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 May 2021 07:47:34 -0400 +Subject: drm/amd/display: Fix overlay validation by considering cursors + +From: Rodrigo Siqueira + +[ Upstream commit 33f409e60eb0c59a4d0d06a62ab4642a988e17f7 ] + +A few weeks ago, we saw a two cursor issue in a ChromeOS system. We +fixed it in the commit: + + drm/amd/display: Fix two cursor duplication when using overlay + (read the commit message for more details) + +After this change, we noticed that some IGT subtests related to +kms_plane and kms_plane_scaling started to fail. After investigating +this issue, we noticed that all subtests that fail have a primary plane +covering the overlay plane, which is currently rejected by amdgpu dm. +Fail those IGT tests highlight that our verification was too broad and +compromises the overlay usage in our drive. This patch fixes this issue +by ensuring that we only reject commits where the primary plane is not +fully covered by the overlay when the cursor hardware is enabled. With +this fix, all IGT tests start to pass again, which means our overlay +support works as expected. + +Cc: Tianci.Yin +Cc: Harry Wentland +Cc: Nicholas Choi +Cc: Bhawanpreet Lakha +Cc: Nicholas Kazlauskas +Cc: Mark Yacoub +Cc: Daniel Wheeler + +Tested-by: Daniel Wheeler +Signed-off-by: Rodrigo Siqueira +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index b63f55ea8758..69023b4b0a8b 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -9349,7 +9349,7 @@ static int validate_overlay(struct drm_atomic_state *state) + int i; + struct drm_plane *plane; + struct drm_plane_state *old_plane_state, *new_plane_state; +- struct drm_plane_state *primary_state, *overlay_state = NULL; ++ struct drm_plane_state *primary_state, *cursor_state, *overlay_state = NULL; + + /* Check if primary plane is contained inside overlay */ + for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) { +@@ -9379,6 +9379,14 @@ static int validate_overlay(struct drm_atomic_state *state) + if (!primary_state->crtc) + return 0; + ++ /* check if cursor plane is enabled */ ++ cursor_state = drm_atomic_get_plane_state(state, overlay_state->crtc->cursor); ++ if (IS_ERR(cursor_state)) ++ return PTR_ERR(cursor_state); ++ ++ if (drm_atomic_plane_disabling(plane->state, cursor_state)) ++ return 0; ++ + /* Perform the bounds check to ensure the overlay plane covers the primary */ + if (primary_state->crtc_x < overlay_state->crtc_x || + primary_state->crtc_y < overlay_state->crtc_y || +-- +2.30.2 + diff --git a/queue-5.12/drm-amd-display-fix-potential-memory-leak-in-dmub-hw.patch b/queue-5.12/drm-amd-display-fix-potential-memory-leak-in-dmub-hw.patch new file mode 100644 index 00000000000..46620832141 --- /dev/null +++ b/queue-5.12/drm-amd-display-fix-potential-memory-leak-in-dmub-hw.patch @@ -0,0 +1,55 @@ +From b8513abb0979fee82182ff2cb3ce6e261a215599 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 May 2021 11:58:54 -0400 +Subject: drm/amd/display: Fix potential memory leak in DMUB hw_init + +From: Roman Li + +[ Upstream commit c5699e2d863f58221044efdc3fa712dd32d55cde ] + +[Why] +On resume we perform DMUB hw_init which allocates memory: +dm_resume->dm_dmub_hw_init->dc_dmub_srv_create->kzalloc +That results in memory leak in suspend/resume scenarios. + +[How] +Allocate memory for the DC wrapper to DMUB only if it was not +allocated before. +No need to reallocate it on suspend/resume. + +Signed-off-by: Lang Yu +Signed-off-by: Roman Li +Reviewed-by: Nicholas Kazlauskas +Acked-by: Qingqing Zhuo +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 69023b4b0a8b..95d5bc2da178 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -871,7 +871,8 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev) + abm->dmcu_is_running = dmcu->funcs->is_dmcu_initialized(dmcu); + } + +- adev->dm.dc->ctx->dmub_srv = dc_dmub_srv_create(adev->dm.dc, dmub_srv); ++ if (!adev->dm.dc->ctx->dmub_srv) ++ adev->dm.dc->ctx->dmub_srv = dc_dmub_srv_create(adev->dm.dc, dmub_srv); + if (!adev->dm.dc->ctx->dmub_srv) { + DRM_ERROR("Couldn't allocate DC DMUB server!\n"); + return -ENOMEM; +@@ -1863,7 +1864,6 @@ static int dm_suspend(void *handle) + + amdgpu_dm_irq_suspend(adev); + +- + dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D3); + + return 0; +-- +2.30.2 + diff --git a/queue-5.12/drm-amdgpu-refine-amdgpu_fru_get_product_info.patch b/queue-5.12/drm-amdgpu-refine-amdgpu_fru_get_product_info.patch new file mode 100644 index 00000000000..d0d1f86dc03 --- /dev/null +++ b/queue-5.12/drm-amdgpu-refine-amdgpu_fru_get_product_info.patch @@ -0,0 +1,137 @@ +From cbdc481de8bd609707b67e4ba4ae1a6cd8b7021c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 May 2021 14:14:58 +0800 +Subject: drm/amdgpu: refine amdgpu_fru_get_product_info + +From: Jiansong Chen + +[ Upstream commit 5cfc912582e13b05d71fb7acc4ec69ddfa9af320 ] + +1. eliminate potential array index out of bounds. +2. return meaningful value for failure. + +Signed-off-by: Jiansong Chen +Reviewed-by: Jack Gui +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + .../gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 42 ++++++++++--------- + 1 file changed, 23 insertions(+), 19 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c +index 8f4a8f8d8146..39b6c6bfab45 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c +@@ -101,7 +101,8 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr, + int amdgpu_fru_get_product_info(struct amdgpu_device *adev) + { + unsigned char buff[34]; +- int addrptr = 0, size = 0; ++ int addrptr, size; ++ int len; + + if (!is_fru_eeprom_supported(adev)) + return 0; +@@ -109,7 +110,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) + /* If algo exists, it means that the i2c_adapter's initialized */ + if (!adev->pm.smu_i2c.algo) { + DRM_WARN("Cannot access FRU, EEPROM accessor not initialized"); +- return 0; ++ return -ENODEV; + } + + /* There's a lot of repetition here. This is due to the FRU having +@@ -128,7 +129,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) + size = amdgpu_fru_read_eeprom(adev, addrptr, buff); + if (size < 1) { + DRM_ERROR("Failed to read FRU Manufacturer, ret:%d", size); +- return size; ++ return -EINVAL; + } + + /* Increment the addrptr by the size of the field, and 1 due to the +@@ -138,43 +139,45 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) + size = amdgpu_fru_read_eeprom(adev, addrptr, buff); + if (size < 1) { + DRM_ERROR("Failed to read FRU product name, ret:%d", size); +- return size; ++ return -EINVAL; + } + ++ len = size; + /* Product name should only be 32 characters. Any more, + * and something could be wrong. Cap it at 32 to be safe + */ +- if (size > 32) { ++ if (len >= sizeof(adev->product_name)) { + DRM_WARN("FRU Product Number is larger than 32 characters. This is likely a mistake"); +- size = 32; ++ len = sizeof(adev->product_name) - 1; + } + /* Start at 2 due to buff using fields 0 and 1 for the address */ +- memcpy(adev->product_name, &buff[2], size); +- adev->product_name[size] = '\0'; ++ memcpy(adev->product_name, &buff[2], len); ++ adev->product_name[len] = '\0'; + + addrptr += size + 1; + size = amdgpu_fru_read_eeprom(adev, addrptr, buff); + if (size < 1) { + DRM_ERROR("Failed to read FRU product number, ret:%d", size); +- return size; ++ return -EINVAL; + } + ++ len = size; + /* Product number should only be 16 characters. Any more, + * and something could be wrong. Cap it at 16 to be safe + */ +- if (size > 16) { ++ if (len >= sizeof(adev->product_number)) { + DRM_WARN("FRU Product Number is larger than 16 characters. This is likely a mistake"); +- size = 16; ++ len = sizeof(adev->product_number) - 1; + } +- memcpy(adev->product_number, &buff[2], size); +- adev->product_number[size] = '\0'; ++ memcpy(adev->product_number, &buff[2], len); ++ adev->product_number[len] = '\0'; + + addrptr += size + 1; + size = amdgpu_fru_read_eeprom(adev, addrptr, buff); + + if (size < 1) { + DRM_ERROR("Failed to read FRU product version, ret:%d", size); +- return size; ++ return -EINVAL; + } + + addrptr += size + 1; +@@ -182,18 +185,19 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) + + if (size < 1) { + DRM_ERROR("Failed to read FRU serial number, ret:%d", size); +- return size; ++ return -EINVAL; + } + ++ len = size; + /* Serial number should only be 16 characters. Any more, + * and something could be wrong. Cap it at 16 to be safe + */ +- if (size > 16) { ++ if (len >= sizeof(adev->serial)) { + DRM_WARN("FRU Serial Number is larger than 16 characters. This is likely a mistake"); +- size = 16; ++ len = sizeof(adev->serial) - 1; + } +- memcpy(adev->serial, &buff[2], size); +- adev->serial[size] = '\0'; ++ memcpy(adev->serial, &buff[2], len); ++ adev->serial[len] = '\0'; + + return 0; + } +-- +2.30.2 + diff --git a/queue-5.12/drm-tegra-sor-do-not-leak-runtime-pm-reference.patch b/queue-5.12/drm-tegra-sor-do-not-leak-runtime-pm-reference.patch new file mode 100644 index 00000000000..e764d14fcf1 --- /dev/null +++ b/queue-5.12/drm-tegra-sor-do-not-leak-runtime-pm-reference.patch @@ -0,0 +1,80 @@ +From 960327ca3053969f36657585cfb01ebe8636d65a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Apr 2021 13:54:14 +0200 +Subject: drm/tegra: sor: Do not leak runtime PM reference + +From: Pavel Machek (CIP) + +[ Upstream commit 73a395c46704304b96bc5e2ee19be31124025c0c ] + +It's theoretically possible for the runtime PM reference to leak if the +code fails anywhere between the pm_runtime_resume_and_get() and +pm_runtime_put() calls, so make sure to release the runtime PM reference +in that case. + +Practically this will never happen because none of the functions will +fail on Tegra, but it's better for the code to be pedantic in case these +assumptions will ever become wrong. + +Signed-off-by: Pavel Machek (CIP) +[treding@nvidia.com: add commit message] +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/tegra/sor.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c +index 7b88261f57bb..67a80dae1c00 100644 +--- a/drivers/gpu/drm/tegra/sor.c ++++ b/drivers/gpu/drm/tegra/sor.c +@@ -3125,21 +3125,21 @@ static int tegra_sor_init(struct host1x_client *client) + if (err < 0) { + dev_err(sor->dev, "failed to acquire SOR reset: %d\n", + err); +- return err; ++ goto rpm_put; + } + + err = reset_control_assert(sor->rst); + if (err < 0) { + dev_err(sor->dev, "failed to assert SOR reset: %d\n", + err); +- return err; ++ goto rpm_put; + } + } + + err = clk_prepare_enable(sor->clk); + if (err < 0) { + dev_err(sor->dev, "failed to enable clock: %d\n", err); +- return err; ++ goto rpm_put; + } + + usleep_range(1000, 3000); +@@ -3150,7 +3150,7 @@ static int tegra_sor_init(struct host1x_client *client) + dev_err(sor->dev, "failed to deassert SOR reset: %d\n", + err); + clk_disable_unprepare(sor->clk); +- return err; ++ goto rpm_put; + } + + reset_control_release(sor->rst); +@@ -3171,6 +3171,12 @@ static int tegra_sor_init(struct host1x_client *client) + } + + return 0; ++ ++rpm_put: ++ if (sor->rst) ++ pm_runtime_put(sor->dev); ++ ++ return err; + } + + static int tegra_sor_exit(struct host1x_client *client) +-- +2.30.2 + diff --git a/queue-5.12/drm-tegra-sor-fully-initialize-sor-before-registrati.patch b/queue-5.12/drm-tegra-sor-fully-initialize-sor-before-registrati.patch new file mode 100644 index 00000000000..1d737da1a96 --- /dev/null +++ b/queue-5.12/drm-tegra-sor-fully-initialize-sor-before-registrati.patch @@ -0,0 +1,90 @@ +From 153f50dc55b7067d282288a1b77c031f9a0a4211 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Apr 2021 17:41:05 +0200 +Subject: drm/tegra: sor: Fully initialize SOR before registration + +From: Thierry Reding + +[ Upstream commit 5dea42759bcef74b0802ea64b904409bc37f9045 ] + +Before registering the SOR host1x client, make sure that it is fully +initialized. This avoids a potential race condition between the SOR's +probe and the host1x device initialization in cases where the SOR is +the final sub-device to register to a host1x instance. + +Reported-by: Jonathan Hunter +Signed-off-by: Thierry Reding +Tested-by: Jon Hunter +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/tegra/sor.c | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c +index 67a80dae1c00..32c83f2e386c 100644 +--- a/drivers/gpu/drm/tegra/sor.c ++++ b/drivers/gpu/drm/tegra/sor.c +@@ -3922,17 +3922,10 @@ static int tegra_sor_probe(struct platform_device *pdev) + platform_set_drvdata(pdev, sor); + pm_runtime_enable(&pdev->dev); + +- INIT_LIST_HEAD(&sor->client.list); ++ host1x_client_init(&sor->client); + sor->client.ops = &sor_client_ops; + sor->client.dev = &pdev->dev; + +- err = host1x_client_register(&sor->client); +- if (err < 0) { +- dev_err(&pdev->dev, "failed to register host1x client: %d\n", +- err); +- goto rpm_disable; +- } +- + /* + * On Tegra210 and earlier, provide our own implementation for the + * pad output clock. +@@ -3944,13 +3937,13 @@ static int tegra_sor_probe(struct platform_device *pdev) + sor->index); + if (!name) { + err = -ENOMEM; +- goto unregister; ++ goto uninit; + } + + err = host1x_client_resume(&sor->client); + if (err < 0) { + dev_err(sor->dev, "failed to resume: %d\n", err); +- goto unregister; ++ goto uninit; + } + + sor->clk_pad = tegra_clk_sor_pad_register(sor, name); +@@ -3961,14 +3954,20 @@ static int tegra_sor_probe(struct platform_device *pdev) + err = PTR_ERR(sor->clk_pad); + dev_err(sor->dev, "failed to register SOR pad clock: %d\n", + err); +- goto unregister; ++ goto uninit; ++ } ++ ++ err = __host1x_client_register(&sor->client); ++ if (err < 0) { ++ dev_err(&pdev->dev, "failed to register host1x client: %d\n", ++ err); ++ goto uninit; + } + + return 0; + +-unregister: +- host1x_client_unregister(&sor->client); +-rpm_disable: ++uninit: ++ host1x_client_exit(&sor->client); + pm_runtime_disable(&pdev->dev); + remove: + tegra_output_remove(&sor->output); +-- +2.30.2 + diff --git a/queue-5.12/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch b/queue-5.12/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch new file mode 100644 index 00000000000..6f7ff61cc2c --- /dev/null +++ b/queue-5.12/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch @@ -0,0 +1,40 @@ +From 7dc9e64687793e18ea21369804e64124390ae271 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jun 2021 19:04:51 +0800 +Subject: ethernet: myri10ge: Fix missing error code in myri10ge_probe() + +From: Jiapeng Chong + +[ Upstream commit f336d0b93ae978f12c5e27199f828da89b91e56a ] + +The error code is missing in this code scenario, add the error code +'-EINVAL' to the return value 'status'. + +Eliminate the follow smatch warning: + +drivers/net/ethernet/myricom/myri10ge/myri10ge.c:3818 myri10ge_probe() +warn: missing error code 'status'. + +Reported-by: Abaci Robot +Signed-off-by: Jiapeng Chong +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +index c84c8bf2bc20..fc99ad8e4a38 100644 +--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c ++++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +@@ -3815,6 +3815,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + dev_err(&pdev->dev, + "invalid sram_size %dB or board span %ldB\n", + mgp->sram_size, mgp->board_span); ++ status = -EINVAL; + goto abort_with_ioremap; + } + memcpy_fromio(mgp->eeprom_strings, +-- +2.30.2 + diff --git a/queue-5.12/fib-return-the-correct-errno-code.patch b/queue-5.12/fib-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..37e54d3b096 --- /dev/null +++ b/queue-5.12/fib-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From 7b8beb1939826f432aedaa66600c77634326e6ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 22:06:58 +0800 +Subject: fib: Return the correct errno code + +From: Zheng Yongjun + +[ Upstream commit 59607863c54e9eb3f69afc5257dfe71c38bb751e ] + +When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF. + +Signed-off-by: Zheng Yongjun +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/core/fib_rules.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c +index cd80ffed6d26..a9f937975080 100644 +--- a/net/core/fib_rules.c ++++ b/net/core/fib_rules.c +@@ -1168,7 +1168,7 @@ static void notify_rule_change(int event, struct fib_rule *rule, + { + struct net *net; + struct sk_buff *skb; +- int err = -ENOBUFS; ++ int err = -ENOMEM; + + net = ops->fro_net; + skb = nlmsg_new(fib_rule_nlmsg_size(ops, rule), GFP_KERNEL); +-- +2.30.2 + diff --git a/queue-5.12/gfs2-clean-up-revokes-on-normal-withdraws.patch b/queue-5.12/gfs2-clean-up-revokes-on-normal-withdraws.patch new file mode 100644 index 00000000000..0476c8eddc1 --- /dev/null +++ b/queue-5.12/gfs2-clean-up-revokes-on-normal-withdraws.patch @@ -0,0 +1,123 @@ +From 7b1ec449ac0aca6719f49fba1c3c0b2d4a3be028 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 May 2021 14:54:02 -0400 +Subject: gfs2: Clean up revokes on normal withdraws + +From: Bob Peterson + +[ Upstream commit f5456b5d67cf812fd31fe3e130ca216b2e0908e5 ] + +Before this patch, the system ail lists were cleaned up if the logd +process withdrew, but on other withdraws, they were not cleaned up. +This included the cleaning up of the revokes as well. + +This patch reorganizes things a bit so that all withdraws (not just logd) +clean up the ail lists, including any pending revokes. + +Signed-off-by: Bob Peterson +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/log.c | 6 +++--- + fs/gfs2/log.h | 1 + + fs/gfs2/lops.c | 7 ++++++- + fs/gfs2/lops.h | 1 + + fs/gfs2/util.c | 1 + + 5 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c +index 6410281546f9..47287a7056fe 100644 +--- a/fs/gfs2/log.c ++++ b/fs/gfs2/log.c +@@ -923,10 +923,10 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags) + } + + /** +- * ail_drain - drain the ail lists after a withdraw ++ * gfs2_ail_drain - drain the ail lists after a withdraw + * @sdp: Pointer to GFS2 superblock + */ +-static void ail_drain(struct gfs2_sbd *sdp) ++void gfs2_ail_drain(struct gfs2_sbd *sdp) + { + struct gfs2_trans *tr; + +@@ -953,6 +953,7 @@ static void ail_drain(struct gfs2_sbd *sdp) + list_del(&tr->tr_list); + gfs2_trans_free(sdp, tr); + } ++ gfs2_drain_revokes(sdp); + spin_unlock(&sdp->sd_ail_lock); + } + +@@ -1159,7 +1160,6 @@ out_withdraw: + if (tr && list_empty(&tr->tr_list)) + list_add(&tr->tr_list, &sdp->sd_ail1_list); + spin_unlock(&sdp->sd_ail_lock); +- ail_drain(sdp); /* frees all transactions */ + tr = NULL; + goto out_end; + } +diff --git a/fs/gfs2/log.h b/fs/gfs2/log.h +index eea58015710e..fc905c2af53c 100644 +--- a/fs/gfs2/log.h ++++ b/fs/gfs2/log.h +@@ -93,5 +93,6 @@ extern int gfs2_logd(void *data); + extern void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd); + extern void gfs2_glock_remove_revoke(struct gfs2_glock *gl); + extern void gfs2_flush_revokes(struct gfs2_sbd *sdp); ++extern void gfs2_ail_drain(struct gfs2_sbd *sdp); + + #endif /* __LOG_DOT_H__ */ +diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c +index a82f4747aa8d..ef44d325e518 100644 +--- a/fs/gfs2/lops.c ++++ b/fs/gfs2/lops.c +@@ -882,7 +882,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) + gfs2_log_write_page(sdp, page); + } + +-static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) ++void gfs2_drain_revokes(struct gfs2_sbd *sdp) + { + struct list_head *head = &sdp->sd_log_revokes; + struct gfs2_bufdata *bd; +@@ -897,6 +897,11 @@ static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) + } + } + ++static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) ++{ ++ gfs2_drain_revokes(sdp); ++} ++ + static void revoke_lo_before_scan(struct gfs2_jdesc *jd, + struct gfs2_log_header_host *head, int pass) + { +diff --git a/fs/gfs2/lops.h b/fs/gfs2/lops.h +index 31b6dd0d2e5d..f707601597dc 100644 +--- a/fs/gfs2/lops.h ++++ b/fs/gfs2/lops.h +@@ -20,6 +20,7 @@ extern void gfs2_log_submit_bio(struct bio **biop, int opf); + extern void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh); + extern int gfs2_find_jhead(struct gfs2_jdesc *jd, + struct gfs2_log_header_host *head, bool keep_cache); ++extern void gfs2_drain_revokes(struct gfs2_sbd *sdp); + static inline unsigned int buf_limit(struct gfs2_sbd *sdp) + { + return sdp->sd_ldptrs; +diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c +index 4f034b87b427..cffb346fb9b3 100644 +--- a/fs/gfs2/util.c ++++ b/fs/gfs2/util.c +@@ -130,6 +130,7 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp) + if (test_bit(SDF_NORECOVERY, &sdp->sd_flags) || !sdp->sd_jdesc) + return; + ++ gfs2_ail_drain(sdp); /* frees all transactions */ + inode = sdp->sd_jdesc->jd_inode; + ip = GFS2_I(inode); + i_gl = ip->i_gl; +-- +2.30.2 + diff --git a/queue-5.12/gfs2-fix-a-deadlock-on-withdraw-during-mount.patch b/queue-5.12/gfs2-fix-a-deadlock-on-withdraw-during-mount.patch new file mode 100644 index 00000000000..d0e76cccea8 --- /dev/null +++ b/queue-5.12/gfs2-fix-a-deadlock-on-withdraw-during-mount.patch @@ -0,0 +1,100 @@ +From 984945736eef2e6a012063884e343e76adbfac03 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 May 2021 09:14:31 -0400 +Subject: gfs2: fix a deadlock on withdraw-during-mount + +From: Bob Peterson + +[ Upstream commit 865cc3e9cc0b1d4b81c10d53174bced76decf888 ] + +Before this patch, gfs2 would deadlock because of the following +sequence during mount: + +mount + gfs2_fill_super + gfs2_make_fs_rw <--- Detects IO error with glock + kthread_stop(sdp->sd_quotad_process); + <--- Blocked waiting for quotad to finish + +logd + Detects IO error and the need to withdraw + calls gfs2_withdraw + gfs2_make_fs_ro + kthread_stop(sdp->sd_quotad_process); + <--- Blocked waiting for quotad to finish + +gfs2_quotad + gfs2_statfs_sync + gfs2_glock_wait <---- Blocked waiting for statfs glock to be granted + +glock_work_func + do_xmote <---Detects IO error, can't release glock: blocked on withdraw + glops->go_inval + glock_blocked_by_withdraw + requeue glock work & exit <--- work requeued, blocked by withdraw + +This patch makes a special exception for the statfs system inode glock, +which allows the statfs glock UNLOCK to proceed normally. That allows the +quotad daemon to exit during the withdraw, which allows the logd daemon +to exit during the withdraw, which allows the mount to exit. + +Signed-off-by: Bob Peterson +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/glock.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c +index 7c2ba81213da..611c56febf8c 100644 +--- a/fs/gfs2/glock.c ++++ b/fs/gfs2/glock.c +@@ -583,6 +583,16 @@ out_locked: + spin_unlock(&gl->gl_lockref.lock); + } + ++static bool is_system_glock(struct gfs2_glock *gl) ++{ ++ struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; ++ struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode); ++ ++ if (gl == m_ip->i_gl) ++ return true; ++ return false; ++} ++ + /** + * do_xmote - Calls the DLM to change the state of a lock + * @gl: The lock state +@@ -672,17 +682,25 @@ skip_inval: + * to see sd_log_error and withdraw, and in the meantime, requeue the + * work for later. + * ++ * We make a special exception for some system glocks, such as the ++ * system statfs inode glock, which needs to be granted before the ++ * gfs2_quotad daemon can exit, and that exit needs to finish before ++ * we can unmount the withdrawn file system. ++ * + * However, if we're just unlocking the lock (say, for unmount, when + * gfs2_gl_hash_clear calls clear_glock) and recovery is complete + * then it's okay to tell dlm to unlock it. + */ + if (unlikely(sdp->sd_log_error && !gfs2_withdrawn(sdp))) + gfs2_withdraw_delayed(sdp); +- if (glock_blocked_by_withdraw(gl)) { +- if (target != LM_ST_UNLOCKED || +- test_bit(SDF_WITHDRAW_RECOVERY, &sdp->sd_flags)) { ++ if (glock_blocked_by_withdraw(gl) && ++ (target != LM_ST_UNLOCKED || ++ test_bit(SDF_WITHDRAW_RECOVERY, &sdp->sd_flags))) { ++ if (!is_system_glock(gl)) { + gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD); + goto out; ++ } else { ++ clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags); + } + } + +-- +2.30.2 + diff --git a/queue-5.12/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch b/queue-5.12/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch new file mode 100644 index 00000000000..c8bdeced99c --- /dev/null +++ b/queue-5.12/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch @@ -0,0 +1,51 @@ +From 71616eccd42d6674bc5383d2f154b002bc0ded76 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 May 2021 16:46:25 +0800 +Subject: gfs2: Fix use-after-free in gfs2_glock_shrink_scan + +From: Hillf Danton + +[ Upstream commit 1ab19c5de4c537ec0d9b21020395a5b5a6c059b2 ] + +The GLF_LRU flag is checked under lru_lock in gfs2_glock_remove_from_lru() to +remove the glock from the lru list in __gfs2_glock_put(). + +On the shrink scan path, the same flag is cleared under lru_lock but because +of cond_resched_lock(&lru_lock) in gfs2_dispose_glock_lru(), progress on the +put side can be made without deleting the glock from the lru list. + +Keep GLF_LRU across the race window opened by cond_resched_lock(&lru_lock) to +ensure correct behavior on both sides - clear GLF_LRU after list_del under +lru_lock. + +Reported-by: syzbot +Signed-off-by: Hillf Danton +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/glock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c +index 611c56febf8c..4d70faa606dc 100644 +--- a/fs/gfs2/glock.c ++++ b/fs/gfs2/glock.c +@@ -1792,6 +1792,7 @@ __acquires(&lru_lock) + while(!list_empty(list)) { + gl = list_first_entry(list, struct gfs2_glock, gl_lru); + list_del_init(&gl->gl_lru); ++ clear_bit(GLF_LRU, &gl->gl_flags); + if (!spin_trylock(&gl->gl_lockref.lock)) { + add_back_to_lru: + list_add(&gl->gl_lru, &lru_list); +@@ -1837,7 +1838,6 @@ static long gfs2_scan_glock_lru(int nr) + if (!test_bit(GLF_LOCK, &gl->gl_flags)) { + list_move(&gl->gl_lru, &dispose); + atomic_dec(&lru_count); +- clear_bit(GLF_LRU, &gl->gl_flags); + freed++; + continue; + } +-- +2.30.2 + diff --git a/queue-5.12/gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch b/queue-5.12/gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch new file mode 100644 index 00000000000..9b2fe46f3fe --- /dev/null +++ b/queue-5.12/gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch @@ -0,0 +1,39 @@ +From 89e10e618ef69c17fa5ec9e493c02756c346db6b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 May 2021 12:25:59 +0200 +Subject: gfs2: Prevent direct-I/O write fallback errors from getting lost + +From: Andreas Gruenbacher + +[ Upstream commit 43a511c44e58e357a687d61a20cf5ef1dc9e5a7c ] + +When a direct I/O write falls entirely and falls back to buffered I/O and the +buffered I/O fails, the write failed with return value 0 instead of the error +number reported by the buffered I/O. Fix that. + +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/file.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c +index 2d500f90cdac..a86e6810237a 100644 +--- a/fs/gfs2/file.c ++++ b/fs/gfs2/file.c +@@ -935,8 +935,11 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) + current->backing_dev_info = inode_to_bdi(inode); + buffered = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); + current->backing_dev_info = NULL; +- if (unlikely(buffered <= 0)) ++ if (unlikely(buffered <= 0)) { ++ if (!ret) ++ ret = buffered; + goto out_unlock; ++ } + + /* + * We need to ensure that the page cache pages are written to +-- +2.30.2 + diff --git a/queue-5.12/gpu-host1x-split-up-client-initalization-and-registr.patch b/queue-5.12/gpu-host1x-split-up-client-initalization-and-registr.patch new file mode 100644 index 00000000000..3e64a5a2fa9 --- /dev/null +++ b/queue-5.12/gpu-host1x-split-up-client-initalization-and-registr.patch @@ -0,0 +1,122 @@ +From 4c42b7f0d2a8f68c7b74e353f8c3c26f6d91f32e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Apr 2021 17:41:04 +0200 +Subject: gpu: host1x: Split up client initalization and registration + +From: Thierry Reding + +[ Upstream commit 0cfe5a6e758fb20be8ad3e8f10cb087cc8033eeb ] + +In some cases we may need to initialize the host1x client first before +registering it. This commit adds a new helper that will do nothing but +the initialization of the data structure. + +At the same time, the initialization is removed from the registration +function. Note, however, that for simplicity we explicitly initialize +the client when the host1x_client_register() function is called, as +opposed to the low-level __host1x_client_register() function. This +allows existing callers to remain unchanged. + +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/gpu/host1x/bus.c | 30 ++++++++++++++++++++++++------ + include/linux/host1x.h | 30 ++++++++++++++++++++++++------ + 2 files changed, 48 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c +index 68a766ff0e9d..b98d746141a8 100644 +--- a/drivers/gpu/host1x/bus.c ++++ b/drivers/gpu/host1x/bus.c +@@ -704,6 +704,29 @@ void host1x_driver_unregister(struct host1x_driver *driver) + } + EXPORT_SYMBOL(host1x_driver_unregister); + ++/** ++ * __host1x_client_init() - initialize a host1x client ++ * @client: host1x client ++ * @key: lock class key for the client-specific mutex ++ */ ++void __host1x_client_init(struct host1x_client *client, struct lock_class_key *key) ++{ ++ INIT_LIST_HEAD(&client->list); ++ __mutex_init(&client->lock, "host1x client lock", key); ++ client->usecount = 0; ++} ++EXPORT_SYMBOL(__host1x_client_init); ++ ++/** ++ * host1x_client_exit() - uninitialize a host1x client ++ * @client: host1x client ++ */ ++void host1x_client_exit(struct host1x_client *client) ++{ ++ mutex_destroy(&client->lock); ++} ++EXPORT_SYMBOL(host1x_client_exit); ++ + /** + * __host1x_client_register() - register a host1x client + * @client: host1x client +@@ -716,16 +739,11 @@ EXPORT_SYMBOL(host1x_driver_unregister); + * device and call host1x_device_init(), which will in turn call each client's + * &host1x_client_ops.init implementation. + */ +-int __host1x_client_register(struct host1x_client *client, +- struct lock_class_key *key) ++int __host1x_client_register(struct host1x_client *client) + { + struct host1x *host1x; + int err; + +- INIT_LIST_HEAD(&client->list); +- __mutex_init(&client->lock, "host1x client lock", key); +- client->usecount = 0; +- + mutex_lock(&devices_lock); + + list_for_each_entry(host1x, &devices, list) { +diff --git a/include/linux/host1x.h b/include/linux/host1x.h +index 9eb77c87a83b..ed0005ce4285 100644 +--- a/include/linux/host1x.h ++++ b/include/linux/host1x.h +@@ -320,12 +320,30 @@ static inline struct host1x_device *to_host1x_device(struct device *dev) + int host1x_device_init(struct host1x_device *device); + int host1x_device_exit(struct host1x_device *device); + +-int __host1x_client_register(struct host1x_client *client, +- struct lock_class_key *key); +-#define host1x_client_register(class) \ +- ({ \ +- static struct lock_class_key __key; \ +- __host1x_client_register(class, &__key); \ ++void __host1x_client_init(struct host1x_client *client, struct lock_class_key *key); ++void host1x_client_exit(struct host1x_client *client); ++ ++#define host1x_client_init(client) \ ++ ({ \ ++ static struct lock_class_key __key; \ ++ __host1x_client_init(client, &__key); \ ++ }) ++ ++int __host1x_client_register(struct host1x_client *client); ++ ++/* ++ * Note that this wrapper calls __host1x_client_init() for compatibility ++ * with existing callers. Callers that want to separately initialize and ++ * register a host1x client must first initialize using either of the ++ * __host1x_client_init() or host1x_client_init() functions and then use ++ * the low-level __host1x_client_register() function to avoid the client ++ * getting reinitialized. ++ */ ++#define host1x_client_register(client) \ ++ ({ \ ++ static struct lock_class_key __key; \ ++ __host1x_client_init(client, &__key); \ ++ __host1x_client_register(client); \ + }) + + int host1x_client_unregister(struct host1x_client *client); +-- +2.30.2 + diff --git a/queue-5.12/hid-a4tech-use-a4_2wheel_mouse_hack_b8-for-a4tech-nb.patch b/queue-5.12/hid-a4tech-use-a4_2wheel_mouse_hack_b8-for-a4tech-nb.patch new file mode 100644 index 00000000000..0781a0d7304 --- /dev/null +++ b/queue-5.12/hid-a4tech-use-a4_2wheel_mouse_hack_b8-for-a4tech-nb.patch @@ -0,0 +1,89 @@ +From ccf2b7465839f67be19baf0fd6783a54978d9379 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Apr 2021 20:25:38 +0200 +Subject: HID: a4tech: use A4_2WHEEL_MOUSE_HACK_B8 for A4TECH NB-95 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mateusz Jończyk + +[ Upstream commit 9858c74c29e12be5886280725e781cb735b2aca6 ] + +This mouse has a horizontal wheel that requires special handling. +Without this patch, the horizontal wheel acts like a vertical wheel. + +In the output of `hidrd-convert` for this mouse, there is a +`Usage (B8h)` field. It corresponds to a byte in packets sent by the +device that specifies which wheel generated an input event. + +The name "A4TECH" is spelled in all capitals on the company website. + +Signed-off-by: Mateusz Jończyk +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/Kconfig | 4 ++-- + drivers/hid/hid-a4tech.c | 2 ++ + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 4 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig +index 786b71ef7738..c6a643f4fc5f 100644 +--- a/drivers/hid/Kconfig ++++ b/drivers/hid/Kconfig +@@ -93,11 +93,11 @@ menu "Special HID drivers" + depends on HID + + config HID_A4TECH +- tristate "A4 tech mice" ++ tristate "A4TECH mice" + depends on HID + default !EXPERT + help +- Support for A4 tech X5 and WOP-35 / Trust 450L mice. ++ Support for some A4TECH mice with two scroll wheels. + + config HID_ACCUTOUCH + tristate "Accutouch touch device" +diff --git a/drivers/hid/hid-a4tech.c b/drivers/hid/hid-a4tech.c +index 3a8c4a5971f7..2cbc32dda7f7 100644 +--- a/drivers/hid/hid-a4tech.c ++++ b/drivers/hid/hid-a4tech.c +@@ -147,6 +147,8 @@ static const struct hid_device_id a4_devices[] = { + .driver_data = A4_2WHEEL_MOUSE_HACK_B8 }, + { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649), + .driver_data = A4_2WHEEL_MOUSE_HACK_B8 }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_NB_95), ++ .driver_data = A4_2WHEEL_MOUSE_HACK_B8 }, + { } + }; + MODULE_DEVICE_TABLE(hid, a4_devices); +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 6e25c505f813..20ac618f0f5b 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -26,6 +26,7 @@ + #define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006 + #define USB_DEVICE_ID_A4TECH_X5_005D 0x000a + #define USB_DEVICE_ID_A4TECH_RP_649 0x001a ++#define USB_DEVICE_ID_A4TECH_NB_95 0x022b + + #define USB_VENDOR_ID_AASHIMA 0x06d6 + #define USB_DEVICE_ID_AASHIMA_GAMEPAD 0x0025 +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index 05d3f498fd44..2dcb5cb97f79 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -213,6 +213,7 @@ static const struct hid_device_id hid_have_special_driver[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, + { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, + { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_NB_95) }, + #endif + #if IS_ENABLED(CONFIG_HID_ACCUTOUCH) + { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_ACCUTOUCH_2216) }, +-- +2.30.2 + diff --git a/queue-5.12/hid-add-bus_virtual-to-hid_connect-logging.patch b/queue-5.12/hid-add-bus_virtual-to-hid_connect-logging.patch new file mode 100644 index 00000000000..799ff481f26 --- /dev/null +++ b/queue-5.12/hid-add-bus_virtual-to-hid_connect-logging.patch @@ -0,0 +1,36 @@ +From ffee91ffd420f38757b4faf51843b9197e225019 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 May 2021 17:39:38 +0100 +Subject: HID: Add BUS_VIRTUAL to hid_connect logging + +From: Mark Bolhuis + +[ Upstream commit 48e33befe61a7d407753c53d1a06fc8d6b5dab80 ] + +Add BUS_VIRTUAL to hid_connect logging since it's a valid hid bus type and it +should not print + +Signed-off-by: Mark Bolhuis +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-core.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c +index 097cb1ee3126..0f69f35f2957 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -2005,6 +2005,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) + case BUS_I2C: + bus = "I2C"; + break; ++ case BUS_VIRTUAL: ++ bus = "VIRTUAL"; ++ break; + default: + bus = ""; + } +-- +2.30.2 + diff --git a/queue-5.12/hid-asus-filter-g713-g733-key-event-to-prevent-shutd.patch b/queue-5.12/hid-asus-filter-g713-g733-key-event-to-prevent-shutd.patch new file mode 100644 index 00000000000..1eaf69d5ec8 --- /dev/null +++ b/queue-5.12/hid-asus-filter-g713-g733-key-event-to-prevent-shutd.patch @@ -0,0 +1,47 @@ +From 039d921df35545bf07c57e6c68580519547749c3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 18 Apr 2021 21:12:29 +1200 +Subject: HID: asus: filter G713/G733 key event to prevent shutdown + +From: Luke D Jones + +[ Upstream commit c980512b4512adf2c6f9edb948ce19423b23124d ] + +The G713 and G733 both emit an unexpected keycode on some key +presses such as Fn+Pause. The device in this case is emitting +two events on key down, and 3 on key up, the third key up event +is report ID 0x02 and is unfiltered, causing incorrect event. + +This patch filters out the single problematic event. + +Signed-off-by: Luke D Jones +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-asus.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c +index 1ed1c05c3d54..60606c11bdaf 100644 +--- a/drivers/hid/hid-asus.c ++++ b/drivers/hid/hid-asus.c +@@ -355,6 +355,16 @@ static int asus_raw_event(struct hid_device *hdev, + return -1; + } + } ++ if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) { ++ /* ++ * G713 and G733 send these codes on some keypresses, depending on ++ * the key pressed it can trigger a shutdown event if not caught. ++ */ ++ if(data[0] == 0x02 && data[1] == 0x30) { ++ return -1; ++ } ++ } ++ + } + + return 0; +-- +2.30.2 + diff --git a/queue-5.12/hid-asus-filter-keyboard-ec-for-old-rog-keyboard.patch b/queue-5.12/hid-asus-filter-keyboard-ec-for-old-rog-keyboard.patch new file mode 100644 index 00000000000..d741527bdef --- /dev/null +++ b/queue-5.12/hid-asus-filter-keyboard-ec-for-old-rog-keyboard.patch @@ -0,0 +1,38 @@ +From 91d3656f4b0096027393004b1ec2908cf293d906 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Feb 2021 10:38:46 +1300 +Subject: HID: asus: Filter keyboard EC for old ROG keyboard + +From: Luke D Jones + +[ Upstream commit 4bfb2c72b2bfca8684c2f5c25a3119bad016a9d3 ] + +Older ROG keyboards emit a similar stream of bytes to the new +N-Key keyboards and require filtering to prevent a lot of +unmapped key warnings showing. As all the ROG keyboards use +QUIRK_USE_KBD_BACKLIGHT this is now used to branch to filtering +in asus_raw_event. + +Signed-off-by: Luke D Jones +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-asus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c +index 2ab22b925941..1ed1c05c3d54 100644 +--- a/drivers/hid/hid-asus.c ++++ b/drivers/hid/hid-asus.c +@@ -335,7 +335,7 @@ static int asus_raw_event(struct hid_device *hdev, + if (drvdata->quirks & QUIRK_MEDION_E1239T) + return asus_e1239t_event(drvdata, data, size); + +- if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) { ++ if (drvdata->quirks & QUIRK_USE_KBD_BACKLIGHT) { + /* + * Skip these report ID, the device emits a continuous stream associated + * with the AURA mode it is in which looks like an 'echo'. +-- +2.30.2 + diff --git a/queue-5.12/hid-gt683r-add-missing-module_device_table.patch b/queue-5.12/hid-gt683r-add-missing-module_device_table.patch new file mode 100644 index 00000000000..b6a4c77e7eb --- /dev/null +++ b/queue-5.12/hid-gt683r-add-missing-module_device_table.patch @@ -0,0 +1,36 @@ +From 31bdd246610c9e9478f5dc02db7610623656143c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 11:14:48 +0800 +Subject: HID: gt683r: add missing MODULE_DEVICE_TABLE + +From: Bixuan Cui + +[ Upstream commit a4b494099ad657f1cb85436d333cf38870ee95bc ] + +This patch adds missing MODULE_DEVICE_TABLE definition which generates +correct modalias for automatic loading of this driver when it is built +as an external module. + +Reported-by: Hulk Robot +Signed-off-by: Bixuan Cui +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-gt683r.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/hid/hid-gt683r.c b/drivers/hid/hid-gt683r.c +index 898871c8c768..29ccb0accfba 100644 +--- a/drivers/hid/hid-gt683r.c ++++ b/drivers/hid/hid-gt683r.c +@@ -54,6 +54,7 @@ static const struct hid_device_id gt683r_led_id[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, + { } + }; ++MODULE_DEVICE_TABLE(hid, gt683r_led_id); + + static void gt683r_brightness_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +-- +2.30.2 + diff --git a/queue-5.12/hid-hid-input-add-mapping-for-emoji-picker-key.patch b/queue-5.12/hid-hid-input-add-mapping-for-emoji-picker-key.patch new file mode 100644 index 00000000000..ecfcd4fe06e --- /dev/null +++ b/queue-5.12/hid-hid-input-add-mapping-for-emoji-picker-key.patch @@ -0,0 +1,66 @@ +From 2e788e26163220a03d3c452f45dbd9eed0a1efde Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 10 Apr 2021 19:56:05 -0700 +Subject: HID: hid-input: add mapping for emoji picker key + +From: Dmitry Torokhov + +[ Upstream commit 7b229b13d78d112e2c5d4a60a3c6f602289959fa ] + +HUTRR101 added a new usage code for a key that is supposed to invoke and +dismiss an emoji picker widget to assist users to locate and enter emojis. + +This patch adds a new key definition KEY_EMOJI_PICKER and maps 0x0c/0x0d9 +usage code to this new keycode. Additionally hid-debug is adjusted to +recognize this new usage code as well. + +Signed-off-by: Dmitry Torokhov +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-input.c | 3 +++ + include/uapi/linux/input-event-codes.h | 1 + + 3 files changed, 5 insertions(+) + +diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c +index d7eaf9100370..982737827b87 100644 +--- a/drivers/hid/hid-debug.c ++++ b/drivers/hid/hid-debug.c +@@ -929,6 +929,7 @@ static const char *keys[KEY_MAX + 1] = { + [KEY_APPSELECT] = "AppSelect", + [KEY_SCREENSAVER] = "ScreenSaver", + [KEY_VOICECOMMAND] = "VoiceCommand", ++ [KEY_EMOJI_PICKER] = "EmojiPicker", + [KEY_BRIGHTNESS_MIN] = "BrightnessMin", + [KEY_BRIGHTNESS_MAX] = "BrightnessMax", + [KEY_BRIGHTNESS_AUTO] = "BrightnessAuto", +diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c +index 236bccd37760..e982d8173c9c 100644 +--- a/drivers/hid/hid-input.c ++++ b/drivers/hid/hid-input.c +@@ -963,6 +963,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel + + case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break; + case 0x0cf: map_key_clear(KEY_VOICECOMMAND); break; ++ ++ case 0x0d9: map_key_clear(KEY_EMOJI_PICKER); break; ++ + case 0x0e0: map_abs_clear(ABS_VOLUME); break; + case 0x0e2: map_key_clear(KEY_MUTE); break; + case 0x0e5: map_key_clear(KEY_BASSBOOST); break; +diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h +index ee93428ced9a..225ec87d4f22 100644 +--- a/include/uapi/linux/input-event-codes.h ++++ b/include/uapi/linux/input-event-codes.h +@@ -611,6 +611,7 @@ + #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ + #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ + #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ ++#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ + + #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ + #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ +-- +2.30.2 + diff --git a/queue-5.12/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch b/queue-5.12/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch new file mode 100644 index 00000000000..60fdccc8424 --- /dev/null +++ b/queue-5.12/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch @@ -0,0 +1,53 @@ +From 18f6af3871d270ec55977052243b5c2ffce93334 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 15 Apr 2021 11:52:31 -0700 +Subject: HID: hid-sensor-hub: Return error for hid_set_field() failure + +From: Srinivas Pandruvada + +[ Upstream commit edb032033da0dc850f6e7740fa1023c73195bc89 ] + +In the function sensor_hub_set_feature(), return error when hid_set_field() +fails. + +Signed-off-by: Srinivas Pandruvada +Acked-by: Jonathan Cameron +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-sensor-hub.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c +index 3dd7d3246737..f9983145d4e7 100644 +--- a/drivers/hid/hid-sensor-hub.c ++++ b/drivers/hid/hid-sensor-hub.c +@@ -210,16 +210,21 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, + buffer_size = buffer_size / sizeof(__s32); + if (buffer_size) { + for (i = 0; i < buffer_size; ++i) { +- hid_set_field(report->field[field_index], i, +- (__force __s32)cpu_to_le32(*buf32)); ++ ret = hid_set_field(report->field[field_index], i, ++ (__force __s32)cpu_to_le32(*buf32)); ++ if (ret) ++ goto done_proc; ++ + ++buf32; + } + } + if (remaining_bytes) { + value = 0; + memcpy(&value, (u8 *)buf32, remaining_bytes); +- hid_set_field(report->field[field_index], i, +- (__force __s32)cpu_to_le32(value)); ++ ret = hid_set_field(report->field[field_index], i, ++ (__force __s32)cpu_to_le32(value)); ++ if (ret) ++ goto done_proc; + } + hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT); + hid_hw_wait(hsdev->hdev); +-- +2.30.2 + diff --git a/queue-5.12/hid-intel-ish-hid-ipc-add-alder-lake-device-ids.patch b/queue-5.12/hid-intel-ish-hid-ipc-add-alder-lake-device-ids.patch new file mode 100644 index 00000000000..2f60b2afd1f --- /dev/null +++ b/queue-5.12/hid-intel-ish-hid-ipc-add-alder-lake-device-ids.patch @@ -0,0 +1,48 @@ +From b97105dcd307d3b955711d21fe7ede1ac1b3cad0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 May 2021 14:36:09 +0800 +Subject: HID: intel-ish-hid: ipc: Add Alder Lake device IDs + +From: Ye Xiang + +[ Upstream commit 22db5e0003e1441cd829180cebb42f7a6b7a46b7 ] + +Add Alder Lake PCI device IDs to the supported device list. + +Signed-off-by: Ye Xiang +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 ++ + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h +index 21b87e4003af..07e3cbc86bef 100644 +--- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h ++++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h +@@ -28,6 +28,8 @@ + #define EHL_Ax_DEVICE_ID 0x4BB3 + #define TGL_LP_DEVICE_ID 0xA0FC + #define TGL_H_DEVICE_ID 0x43FC ++#define ADL_S_DEVICE_ID 0x7AF8 ++#define ADL_P_DEVICE_ID 0x51FC + + #define REVISION_ID_CHT_A0 0x6 + #define REVISION_ID_CHT_Ax_SI 0x0 +diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c +index 06081cf9b85a..a6d5173ac003 100644 +--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c ++++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c +@@ -39,6 +39,8 @@ static const struct pci_device_id ish_pci_tbl[] = { + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_LP_DEVICE_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_H_DEVICE_ID)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_S_DEVICE_ID)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_P_DEVICE_ID)}, + {0, } + }; + MODULE_DEVICE_TABLE(pci, ish_pci_tbl); +-- +2.30.2 + diff --git a/queue-5.12/hid-multitouch-disable-event-reporting-on-suspend-on.patch b/queue-5.12/hid-multitouch-disable-event-reporting-on-suspend-on.patch new file mode 100644 index 00000000000..a0773b0b412 --- /dev/null +++ b/queue-5.12/hid-multitouch-disable-event-reporting-on-suspend-on.patch @@ -0,0 +1,104 @@ +From eab461f56001413193366402a09b46c6063c3924 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 May 2021 23:39:32 +0200 +Subject: HID: multitouch: Disable event reporting on suspend on the Asus + T101HA touchpad + +From: Hans de Goede + +[ Upstream commit 31a4cf1d223dc6144d2e7c679cc3a98f84a1607b ] + +The Asus T101HA has a problem with spurious wakeups when the lid is +closed, this is caused by the screen sitting so close to the touchpad +that the touchpad ends up reporting touch events, causing these wakeups. + +Add a quirk which disables event reporting on suspend when set, and +enable this quirk for the Asus T101HA touchpad fixing the spurious +wakeups, while still allowing the device to be woken by pressing a +key on the keyboard (which is part of the same USB device). + +Signed-off-by: Hans de Goede +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-multitouch.c | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c +index eed81bdc2e86..2e4fb76c45f3 100644 +--- a/drivers/hid/hid-multitouch.c ++++ b/drivers/hid/hid-multitouch.c +@@ -70,6 +70,7 @@ MODULE_LICENSE("GPL"); + #define MT_QUIRK_WIN8_PTP_BUTTONS BIT(18) + #define MT_QUIRK_SEPARATE_APP_REPORT BIT(19) + #define MT_QUIRK_FORCE_MULTI_INPUT BIT(20) ++#define MT_QUIRK_DISABLE_WAKEUP BIT(21) + + #define MT_INPUTMODE_TOUCHSCREEN 0x02 + #define MT_INPUTMODE_TOUCHPAD 0x03 +@@ -191,6 +192,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app); + #define MT_CLS_EXPORT_ALL_INPUTS 0x0013 + /* reserved 0x0014 */ + #define MT_CLS_WIN_8_FORCE_MULTI_INPUT 0x0015 ++#define MT_CLS_WIN_8_DISABLE_WAKEUP 0x0016 + + /* vendor specific classes */ + #define MT_CLS_3M 0x0101 +@@ -283,6 +285,15 @@ static const struct mt_class mt_classes[] = { + MT_QUIRK_WIN8_PTP_BUTTONS | + MT_QUIRK_FORCE_MULTI_INPUT, + .export_all_inputs = true }, ++ { .name = MT_CLS_WIN_8_DISABLE_WAKEUP, ++ .quirks = MT_QUIRK_ALWAYS_VALID | ++ MT_QUIRK_IGNORE_DUPLICATES | ++ MT_QUIRK_HOVERING | ++ MT_QUIRK_CONTACT_CNT_ACCURATE | ++ MT_QUIRK_STICKY_FINGERS | ++ MT_QUIRK_WIN8_PTP_BUTTONS | ++ MT_QUIRK_DISABLE_WAKEUP, ++ .export_all_inputs = true }, + + /* + * vendor specific classes +@@ -763,7 +774,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, + return 1; + case HID_DG_CONFIDENCE: + if ((cls->name == MT_CLS_WIN_8 || +- cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT) && ++ cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT || ++ cls->name == MT_CLS_WIN_8_DISABLE_WAKEUP) && + (field->application == HID_DG_TOUCHPAD || + field->application == HID_DG_TOUCHSCREEN)) + app->quirks |= MT_QUIRK_CONFIDENCE; +@@ -1753,8 +1765,14 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) + #ifdef CONFIG_PM + static int mt_suspend(struct hid_device *hdev, pm_message_t state) + { ++ struct mt_device *td = hid_get_drvdata(hdev); ++ + /* High latency is desirable for power savings during S3/S0ix */ +- mt_set_modes(hdev, HID_LATENCY_HIGH, true, true); ++ if (td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP) ++ mt_set_modes(hdev, HID_LATENCY_HIGH, false, false); ++ else ++ mt_set_modes(hdev, HID_LATENCY_HIGH, true, true); ++ + return 0; + } + +@@ -1813,6 +1831,12 @@ static const struct hid_device_id mt_devices[] = { + MT_USB_DEVICE(USB_VENDOR_ID_ANTON, + USB_DEVICE_ID_ANTON_TOUCH_PAD) }, + ++ /* Asus T101HA */ ++ { .driver_data = MT_CLS_WIN_8_DISABLE_WAKEUP, ++ HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8, ++ USB_VENDOR_ID_ASUSTEK, ++ USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD) }, ++ + /* Asus T304UA */ + { .driver_data = MT_CLS_ASUS, + HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8, +-- +2.30.2 + diff --git a/queue-5.12/hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch b/queue-5.12/hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch new file mode 100644 index 00000000000..b80b79b2eb3 --- /dev/null +++ b/queue-5.12/hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch @@ -0,0 +1,48 @@ +From 7a68558e327861daaff497fadc5ef9d0e64d9423 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Mar 2021 18:42:08 +0100 +Subject: HID: multitouch: set Stylus suffix for Stylus-application devices, + too +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ahelenia Ziemiańska + +[ Upstream commit bc8b796f618c3ccb0a2a8ed1e96c00a1a7849415 ] + +This re-adds the suffix to Win8 stylus-on-touchscreen devices, +now that they aren't erroneously marked as MT + +Signed-off-by: Ahelenia Ziemiańska +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-multitouch.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c +index 55dcb8536286..eed81bdc2e86 100644 +--- a/drivers/hid/hid-multitouch.c ++++ b/drivers/hid/hid-multitouch.c +@@ -1580,13 +1580,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi) + /* we do not set suffix = "Touchscreen" */ + hi->input->name = hdev->name; + break; +- case HID_DG_STYLUS: +- /* force BTN_STYLUS to allow tablet matching in udev */ +- __set_bit(BTN_STYLUS, hi->input->keybit); +- break; + case HID_VD_ASUS_CUSTOM_MEDIA_KEYS: + suffix = "Custom Media Keys"; + break; ++ case HID_DG_STYLUS: ++ /* force BTN_STYLUS to allow tablet matching in udev */ ++ __set_bit(BTN_STYLUS, hi->input->keybit); ++ fallthrough; + case HID_DG_PEN: + suffix = "Stylus"; + break; +-- +2.30.2 + diff --git a/queue-5.12/hid-quirks-add-hid_quirk_no_init_reports-quirk-for-d.patch b/queue-5.12/hid-quirks-add-hid_quirk_no_init_reports-quirk-for-d.patch new file mode 100644 index 00000000000..9508e3fe516 --- /dev/null +++ b/queue-5.12/hid-quirks-add-hid_quirk_no_init_reports-quirk-for-d.patch @@ -0,0 +1,66 @@ +From 53c621896aad3e71e7d9086450816a82588a3a9d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 4 Apr 2021 17:40:54 +0200 +Subject: HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K15A + keyboard-dock + +From: Hans de Goede + +[ Upstream commit ed80bdc4571fae177c44eba0997a0d551fc21e15 ] + +Just like the K12A the Dell K15A keyboard-dock has problems with +get_feature requests. This sometimes leads to several +"failed to fetch feature 8" messages getting logged, after which the +touchpad may or may not work. + +Just like the K15A these errors are triggered by undocking and docking +the tablet. + +There also seem to be other problems when undocking and then docking again +in quick succession. It seems that in this case the keyboard-controller +still retains some power from capacitors and does not go through a +power-on-reset leaving it in a confuses state, symptoms of this are: + +1. The USB-ids changing to 048d:8910 +2. Failure to read the HID descriptors on the second (mouse) USB intf. +3. The touchpad freezing after a while + +These problems can all be cleared by undocking the keyboard and waiting +a full minute before redocking it. Unfortunately there is nothing we can +do about this in the kernel. + +Signed-off-by: Hans de Goede +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 1eccdb353ab0..6e25c505f813 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -1153,6 +1153,7 @@ + #define USB_DEVICE_ID_SYNAPTICS_DELL_K12A 0x2819 + #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012 0x2968 + #define USB_DEVICE_ID_SYNAPTICS_TP_V103 0x5710 ++#define USB_DEVICE_ID_SYNAPTICS_DELL_K15A 0x6e21 + #define USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1002 0x73f4 + #define USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003 0x73f5 + #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5 0x81a7 +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index df68dd7a4e80..05d3f498fd44 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -177,6 +177,7 @@ static const struct hid_device_id hid_quirks[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_QUAD_HD), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_TP_V103), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DELL_K12A), HID_QUIRK_NO_INIT_REPORTS }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DELL_K15A), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD), HID_QUIRK_BADPAD }, + { HID_USB_DEVICE(USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882), HID_QUIRK_NOGET }, +-- +2.30.2 + diff --git a/queue-5.12/hid-quirks-add-quirk-for-lenovo-optical-mouse.patch b/queue-5.12/hid-quirks-add-quirk-for-lenovo-optical-mouse.patch new file mode 100644 index 00000000000..c1d51d04c31 --- /dev/null +++ b/queue-5.12/hid-quirks-add-quirk-for-lenovo-optical-mouse.patch @@ -0,0 +1,57 @@ +From edd1d878f880667a1698676b78e35afd6d1ea1ee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Apr 2021 11:50:39 -0700 +Subject: HID: quirks: Add quirk for Lenovo optical mouse + +From: Saeed Mirzamohammadi + +[ Upstream commit 3b2520076822f15621509a6da3bc4a8636cd33b4 ] + +The Lenovo optical mouse with vendor id of 0x17ef and product id of +0x600e experiences disconnecting issues every 55 seconds: + +[38565.706242] usb 1-1.4: Product: Lenovo Optical Mouse +[38565.728603] input: Lenovo Optical Mouse as /devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-1/1-1.4/1-1.4:1.0/0003:17EF:600E.029A/input/input665 +[38565.755949] hid-generic 0003:17EF:600E.029A: input,hidraw1: USB HID v1.11 Mouse [Lenovo Optical Mouse] on usb-0000:01:00.0-1.4/input0 +[38619.360692] usb 1-1.4: USB disconnect, device number 48 +[38620.864990] usb 1-1.4: new low-speed USB device number 49 using xhci_hcd +[38620.984011] usb 1-1.4: New USB device found, idVendor=17ef,idProduct=600e, bcdDevice= 1.00 +[38620.998117] usb 1-1.4: New USB device strings: Mfr=0, Product=2,SerialNumber=0 + +This adds HID_QUIRK_ALWAYS_POLL for this device in order to work properly. + +Signed-off-by: Saeed Mirzamohammadi +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 20ac618f0f5b..03978111d944 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -750,6 +750,7 @@ + #define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085 + #define USB_DEVICE_ID_LENOVO_X1_TAB 0x60a3 + #define USB_DEVICE_ID_LENOVO_X1_TAB3 0x60b5 ++#define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E 0x600e + #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D 0x608d + #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019 0x6019 + #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E 0x602e +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index 2dcb5cb97f79..bb2b60bc618f 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -110,6 +110,7 @@ static const struct hid_device_id hid_quirks[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E), HID_QUIRK_ALWAYS_POLL }, +-- +2.30.2 + diff --git a/queue-5.12/hid-quirks-set-increment_usage_on_duplicate-for-sait.patch b/queue-5.12/hid-quirks-set-increment_usage_on_duplicate-for-sait.patch new file mode 100644 index 00000000000..d82e2ee1bf9 --- /dev/null +++ b/queue-5.12/hid-quirks-set-increment_usage_on_duplicate-for-sait.patch @@ -0,0 +1,51 @@ +From 9b93a678a67826c4edfe4324ad7ddf125153784d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Mar 2021 09:10:02 -0700 +Subject: HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65 + +From: Nirenjan Krishnan + +[ Upstream commit 25bdbfbb2d8331a67824dd03d0087e9c98835f3a ] + +The Saitek X65 joystick has a pair of axes that were used as mouse +pointer controls by the Windows driver. The corresponding usage page is +the Game Controls page, which is not recognized by the generic HID +driver, and therefore, both axes get mapped to ABS_MISC. The quirk makes +the second axis get mapped to ABS_MISC+1, and therefore made available +separately. + +Signed-off-by: Nirenjan Krishnan +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index ba338973e968..1eccdb353ab0 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -1042,6 +1042,7 @@ + #define USB_DEVICE_ID_SAITEK_X52 0x075c + #define USB_DEVICE_ID_SAITEK_X52_2 0x0255 + #define USB_DEVICE_ID_SAITEK_X52_PRO 0x0762 ++#define USB_DEVICE_ID_SAITEK_X65 0x0b6a + + #define USB_VENDOR_ID_SAMSUNG 0x0419 + #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index 1a9daf03dbfa..df68dd7a4e80 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -158,6 +158,7 @@ static const struct hid_device_id hid_quirks[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_2), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_PRO), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X65), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD2), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB), HID_QUIRK_NOGET }, +-- +2.30.2 + diff --git a/queue-5.12/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch b/queue-5.12/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch new file mode 100644 index 00000000000..2a976b1933a --- /dev/null +++ b/queue-5.12/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch @@ -0,0 +1,59 @@ +From dd231da307e7a5d0fe2ac94dd0e4701a40e01630 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 25 Apr 2021 23:03:53 +0530 +Subject: HID: usbhid: fix info leak in hid_submit_ctrl + +From: Anirudh Rayabharam + +[ Upstream commit 6be388f4a35d2ce5ef7dbf635a8964a5da7f799f ] + +In hid_submit_ctrl(), the way of calculating the report length doesn't +take into account that report->size can be zero. When running the +syzkaller reproducer, a report of size 0 causes hid_submit_ctrl) to +calculate transfer_buffer_length as 16384. When this urb is passed to +the usb core layer, KMSAN reports an info leak of 16384 bytes. + +To fix this, first modify hid_report_len() to account for the zero +report size case by using DIV_ROUND_UP for the division. Then, call it +from hid_submit_ctrl(). + +Reported-by: syzbot+7c2bb71996f95a82524c@syzkaller.appspotmail.com +Signed-off-by: Anirudh Rayabharam +Acked-by: Benjamin Tissoires +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/usbhid/hid-core.c | 2 +- + include/linux/hid.h | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c +index 86257ce6d619..4e9077363c96 100644 +--- a/drivers/hid/usbhid/hid-core.c ++++ b/drivers/hid/usbhid/hid-core.c +@@ -374,7 +374,7 @@ static int hid_submit_ctrl(struct hid_device *hid) + raw_report = usbhid->ctrl[usbhid->ctrltail].raw_report; + dir = usbhid->ctrl[usbhid->ctrltail].dir; + +- len = ((report->size - 1) >> 3) + 1 + (report->id > 0); ++ len = hid_report_len(report); + if (dir == USB_DIR_OUT) { + usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0); + usbhid->urbctrl->transfer_buffer_length = len; +diff --git a/include/linux/hid.h b/include/linux/hid.h +index 3e33eb14118c..5e79a21c696f 100644 +--- a/include/linux/hid.h ++++ b/include/linux/hid.h +@@ -1164,8 +1164,7 @@ static inline void hid_hw_wait(struct hid_device *hdev) + */ + static inline u32 hid_report_len(struct hid_report *report) + { +- /* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */ +- return ((report->size - 1) >> 3) + 1 + (report->id > 0); ++ return DIV_ROUND_UP(report->size, 8) + (report->id > 0); + } + + int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size, +-- +2.30.2 + diff --git a/queue-5.12/hwmon-pmbus-q54sj108a2-the-pmbus_mfr_id-is-actually-.patch b/queue-5.12/hwmon-pmbus-q54sj108a2-the-pmbus_mfr_id-is-actually-.patch new file mode 100644 index 00000000000..1341558f120 --- /dev/null +++ b/queue-5.12/hwmon-pmbus-q54sj108a2-the-pmbus_mfr_id-is-actually-.patch @@ -0,0 +1,40 @@ +From 6d7f523e0a66aa1b60c484fe953aafe794ad879c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 May 2021 22:26:06 +0000 +Subject: hwmon/pmbus: (q54sj108a2) The PMBUS_MFR_ID is actually 6 chars + instead of 5 + +From: Chu Lin + +[ Upstream commit f0fb26c456a30d6009faa2c9d44aa22f5bf88c90 ] + +The PMBUS_MFR_ID block is actually 6 chars for q54sj108a2. +/sys/bus/i2c/drivers/q54sj108a2_test# iotools smbus_read8 $BUS $ADDR 0x99 +0x06 + +Tested: Devices are able to bind to the q54sj108a2 driver successfully. + +Signed-off-by: Chu Lin +Link: https://lore.kernel.org/r/20210517222606.3457594-1-linchuyuan@google.com +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/pmbus/q54sj108a2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hwmon/pmbus/q54sj108a2.c b/drivers/hwmon/pmbus/q54sj108a2.c +index aec512766c31..0976268b2670 100644 +--- a/drivers/hwmon/pmbus/q54sj108a2.c ++++ b/drivers/hwmon/pmbus/q54sj108a2.c +@@ -299,7 +299,7 @@ static int q54sj108a2_probe(struct i2c_client *client) + dev_err(&client->dev, "Failed to read Manufacturer ID\n"); + return ret; + } +- if (ret != 5 || strncmp(buf, "DELTA", 5)) { ++ if (ret != 6 || strncmp(buf, "DELTA", 5)) { + buf[ret] = '\0'; + dev_err(dev, "Unsupported Manufacturer ID '%s'\n", buf); + return -ENODEV; +-- +2.30.2 + diff --git a/queue-5.12/mt76-mt7921-fix-max-aggregation-subframes-setting.patch b/queue-5.12/mt76-mt7921-fix-max-aggregation-subframes-setting.patch new file mode 100644 index 00000000000..9f4906d83c1 --- /dev/null +++ b/queue-5.12/mt76-mt7921-fix-max-aggregation-subframes-setting.patch @@ -0,0 +1,38 @@ +From 04d55d5aa0f7c856b4f710c7d017c80ba3dc633f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 7 May 2021 12:02:11 +0200 +Subject: mt76: mt7921: fix max aggregation subframes setting + +From: Felix Fietkau + +[ Upstream commit 94bb18b03d43f32e9440e8e350b7f533137c40f6 ] + +The hardware can only handle 64 subframes in rx direction and 128 for tx. +Improves throughput with APs that can handle more than that + +Signed-off-by: Felix Fietkau +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20210507100211.15709-2-nbd@nbd.name +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c +index 89a13b4a74a4..c0001e38fcce 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c +@@ -74,8 +74,8 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) + struct wiphy *wiphy = hw->wiphy; + + hw->queues = 4; +- hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF; +- hw->max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF; ++ hw->max_rx_aggregation_subframes = 64; ++ hw->max_tx_aggregation_subframes = 128; + + phy->slottime = 9; + +-- +2.30.2 + diff --git a/queue-5.12/mt76-mt7921-remove-leftover-80-80-he-capability.patch b/queue-5.12/mt76-mt7921-remove-leftover-80-80-he-capability.patch new file mode 100644 index 00000000000..cb1e09ba762 --- /dev/null +++ b/queue-5.12/mt76-mt7921-remove-leftover-80-80-he-capability.patch @@ -0,0 +1,36 @@ +From 611ea7ac00ae24c59655ba8ee7ea28f4b70878fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 May 2021 14:03:04 +0200 +Subject: mt76: mt7921: remove leftover 80+80 HE capability + +From: Felix Fietkau + +[ Upstream commit d4826d17b3931cf0d8351d8f614332dd4b71efc4 ] + +Fixes interop issues with some APs that disable HE Tx if this is present + +Signed-off-by: Felix Fietkau +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20210528120304.34751-1-nbd@nbd.name +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c +index ada943c7a950..2c781b6f89e5 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c +@@ -74,8 +74,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band, + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G; + else if (band == NL80211_BAND_5GHZ) + he_cap_elem->phy_cap_info[0] = +- IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | +- IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G; ++ IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G; + + he_cap_elem->phy_cap_info[1] = + IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD; +-- +2.30.2 + diff --git a/queue-5.12/net-ieee802154-fix-null-deref-in-parse-dev-addr.patch b/queue-5.12/net-ieee802154-fix-null-deref-in-parse-dev-addr.patch new file mode 100644 index 00000000000..9cc01748fae --- /dev/null +++ b/queue-5.12/net-ieee802154-fix-null-deref-in-parse-dev-addr.patch @@ -0,0 +1,53 @@ +From 9210b448654a9b9d026a8ac5169fe28939274b41 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Apr 2021 00:02:13 -0400 +Subject: net: ieee802154: fix null deref in parse dev addr + +From: Dan Robertson + +[ Upstream commit 9fdd04918a452980631ecc499317881c1d120b70 ] + +Fix a logic error that could result in a null deref if the user sets +the mode incorrectly for the given addr type. + +Signed-off-by: Dan Robertson +Acked-by: Alexander Aring +Link: https://lore.kernel.org/r/20210423040214.15438-2-dan@dlrobertson.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Sasha Levin +--- + net/ieee802154/nl802154.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c +index 05f6bd89a7dd..0cf2374c143b 100644 +--- a/net/ieee802154/nl802154.c ++++ b/net/ieee802154/nl802154.c +@@ -1298,19 +1298,20 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *nla, + if (!nla || nla_parse_nested_deprecated(attrs, NL802154_DEV_ADDR_ATTR_MAX, nla, nl802154_dev_addr_policy, NULL)) + return -EINVAL; + +- if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] || +- !attrs[NL802154_DEV_ADDR_ATTR_MODE] || +- !(attrs[NL802154_DEV_ADDR_ATTR_SHORT] || +- attrs[NL802154_DEV_ADDR_ATTR_EXTENDED])) ++ if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] || !attrs[NL802154_DEV_ADDR_ATTR_MODE]) + return -EINVAL; + + addr->pan_id = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_PAN_ID]); + addr->mode = nla_get_u32(attrs[NL802154_DEV_ADDR_ATTR_MODE]); + switch (addr->mode) { + case NL802154_DEV_ADDR_SHORT: ++ if (!attrs[NL802154_DEV_ADDR_ATTR_SHORT]) ++ return -EINVAL; + addr->short_addr = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_SHORT]); + break; + case NL802154_DEV_ADDR_EXTENDED: ++ if (!attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]) ++ return -EINVAL; + addr->extended_addr = nla_get_le64(attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]); + break; + default: +-- +2.30.2 + diff --git a/queue-5.12/net-ipconfig-don-t-override-command-line-hostnames-o.patch b/queue-5.12/net-ipconfig-don-t-override-command-line-hostnames-o.patch new file mode 100644 index 00000000000..0a01b2f0ca6 --- /dev/null +++ b/queue-5.12/net-ipconfig-don-t-override-command-line-hostnames-o.patch @@ -0,0 +1,62 @@ +From 2ecd6da1b2cc452a88be2bbbcf382cbc64ea8d9a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jun 2021 18:38:41 -0700 +Subject: net: ipconfig: Don't override command-line hostnames or domains + +From: Josh Triplett + +[ Upstream commit b508d5fb69c2211a1b860fc058aafbefc3b3c3cd ] + +If the user specifies a hostname or domain name as part of the ip= +command-line option, preserve it and don't overwrite it with one +supplied by DHCP/BOOTP. + +For instance, ip=::::myhostname::dhcp will use "myhostname" rather than +ignoring and overwriting it. + +Fix the comment on ic_bootp_string that suggests it only copies a string +"if not already set"; it doesn't have any such logic. + +Signed-off-by: Josh Triplett +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/ipconfig.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c +index bc2f6ca97152..816d8aad5a68 100644 +--- a/net/ipv4/ipconfig.c ++++ b/net/ipv4/ipconfig.c +@@ -886,7 +886,7 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d + + + /* +- * Copy BOOTP-supplied string if not already set. ++ * Copy BOOTP-supplied string + */ + static int __init ic_bootp_string(char *dest, char *src, int len, int max) + { +@@ -935,12 +935,15 @@ static void __init ic_do_bootp_ext(u8 *ext) + } + break; + case 12: /* Host name */ +- ic_bootp_string(utsname()->nodename, ext+1, *ext, +- __NEW_UTS_LEN); +- ic_host_name_set = 1; ++ if (!ic_host_name_set) { ++ ic_bootp_string(utsname()->nodename, ext+1, *ext, ++ __NEW_UTS_LEN); ++ ic_host_name_set = 1; ++ } + break; + case 15: /* Domain name (DNS) */ +- ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); ++ if (!ic_domain[0]) ++ ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); + break; + case 17: /* Root path */ + if (!root_server_path[0]) +-- +2.30.2 + diff --git a/queue-5.12/net-return-the-correct-errno-code.patch b/queue-5.12/net-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..9d8555a579d --- /dev/null +++ b/queue-5.12/net-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From 75c7c34cb6de5b5b3a141a5bcccd2501eeb2d6a1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 22:06:40 +0800 +Subject: net: Return the correct errno code + +From: Zheng Yongjun + +[ Upstream commit 49251cd00228a3c983651f6bb2f33f6a0b8f152e ] + +When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF. + +Signed-off-by: Zheng Yongjun +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/compat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/compat.c b/net/compat.c +index ddd15af3a283..210fc3b4d0d8 100644 +--- a/net/compat.c ++++ b/net/compat.c +@@ -177,7 +177,7 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk, + if (kcmlen > stackbuf_size) + kcmsg_base = kcmsg = sock_kmalloc(sk, kcmlen, GFP_KERNEL); + if (kcmsg == NULL) +- return -ENOBUFS; ++ return -ENOMEM; + + /* Now copy them over neatly. */ + memset(kcmsg, 0, kcmlen); +-- +2.30.2 + diff --git a/queue-5.12/net-x25-return-the-correct-errno-code.patch b/queue-5.12/net-x25-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..7d2a8fefa7c --- /dev/null +++ b/queue-5.12/net-x25-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From 89e4c31a93560e8fbb382d96262ef08de4dcdd8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 22:06:30 +0800 +Subject: net/x25: Return the correct errno code + +From: Zheng Yongjun + +[ Upstream commit d7736958668c4facc15f421e622ffd718f5be80a ] + +When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF. + +Signed-off-by: Zheng Yongjun +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/x25/af_x25.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c +index ff687b97b2d9..401901c8ad42 100644 +--- a/net/x25/af_x25.c ++++ b/net/x25/af_x25.c +@@ -536,7 +536,7 @@ static int x25_create(struct net *net, struct socket *sock, int protocol, + if (protocol) + goto out; + +- rc = -ENOBUFS; ++ rc = -ENOMEM; + if ((sk = x25_alloc_socket(net, kern)) == NULL) + goto out; + +-- +2.30.2 + diff --git a/queue-5.12/nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch b/queue-5.12/nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch new file mode 100644 index 00000000000..878572eb85a --- /dev/null +++ b/queue-5.12/nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch @@ -0,0 +1,39 @@ +From 2ae498ca128854f2139bb61ed7ff34fea8c5417e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:23:17 +0200 +Subject: nvme-loop: check for NVME_LOOP_Q_LIVE in + nvme_loop_destroy_admin_queue() + +From: Hannes Reinecke + +[ Upstream commit 4237de2f73a669e4f89ac0aa2b44fb1a1d9ec583 ] + +We need to check the NVME_LOOP_Q_LIVE flag in +nvme_loop_destroy_admin_queue() to protect against duplicate +invocations eg during concurrent reset and remove calls. + +Signed-off-by: Hannes Reinecke +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/target/loop.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c +index c34f785e699d..fe14609d2254 100644 +--- a/drivers/nvme/target/loop.c ++++ b/drivers/nvme/target/loop.c +@@ -261,7 +261,8 @@ static const struct blk_mq_ops nvme_loop_admin_mq_ops = { + + static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl) + { +- clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags); ++ if (!test_and_clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags)) ++ return; + nvmet_sq_destroy(&ctrl->queues[0].nvme_sq); + blk_cleanup_queue(ctrl->ctrl.admin_q); + blk_cleanup_queue(ctrl->ctrl.fabrics_q); +-- +2.30.2 + diff --git a/queue-5.12/nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch b/queue-5.12/nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch new file mode 100644 index 00000000000..26c7d2310f0 --- /dev/null +++ b/queue-5.12/nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch @@ -0,0 +1,36 @@ +From 42e82444ce397707a4c4b7f0741c6efd3dfed8c6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:23:16 +0200 +Subject: nvme-loop: clear NVME_LOOP_Q_LIVE when + nvme_loop_configure_admin_queue() fails + +From: Hannes Reinecke + +[ Upstream commit 1c5f8e882a05de5c011e8c3fbeceb0d1c590eb53 ] + +When the call to nvme_enable_ctrl() in nvme_loop_configure_admin_queue() +fails the NVME_LOOP_Q_LIVE flag is not cleared. + +Signed-off-by: Hannes Reinecke +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/target/loop.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c +index 4b2a6330feb5..c34f785e699d 100644 +--- a/drivers/nvme/target/loop.c ++++ b/drivers/nvme/target/loop.c +@@ -404,6 +404,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) + return 0; + + out_cleanup_queue: ++ clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags); + blk_cleanup_queue(ctrl->ctrl.admin_q); + out_cleanup_fabrics_q: + blk_cleanup_queue(ctrl->ctrl.fabrics_q); +-- +2.30.2 + diff --git a/queue-5.12/nvme-loop-do-not-warn-for-deleted-controllers-during.patch b/queue-5.12/nvme-loop-do-not-warn-for-deleted-controllers-during.patch new file mode 100644 index 00000000000..c49472dfd38 --- /dev/null +++ b/queue-5.12/nvme-loop-do-not-warn-for-deleted-controllers-during.patch @@ -0,0 +1,41 @@ +From 10a11620426704b908ae6a258a1947b63b3e311f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:23:18 +0200 +Subject: nvme-loop: do not warn for deleted controllers during reset + +From: Hannes Reinecke + +[ Upstream commit 6622f9acd29cd4f6272720e827e6406f5a970cb0 ] + +During concurrent reset and delete calls the reset workqueue is +flushed, causing nvme_loop_reset_ctrl_work() to be executed when +the controller is in state DELETING or DELETING_NOIO. +But this is expected, so we shouldn't issue a WARN_ON here. + +Signed-off-by: Hannes Reinecke +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/target/loop.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c +index fe14609d2254..0f22f333ff24 100644 +--- a/drivers/nvme/target/loop.c ++++ b/drivers/nvme/target/loop.c +@@ -463,8 +463,10 @@ static void nvme_loop_reset_ctrl_work(struct work_struct *work) + nvme_loop_shutdown_ctrl(ctrl); + + if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) { +- /* state change failure should never happen */ +- WARN_ON_ONCE(1); ++ if (ctrl->ctrl.state != NVME_CTRL_DELETING && ++ ctrl->ctrl.state != NVME_CTRL_DELETING_NOIO) ++ /* state change failure for non-deleted ctrl? */ ++ WARN_ON_ONCE(1); + return; + } + +-- +2.30.2 + diff --git a/queue-5.12/nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch b/queue-5.12/nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch new file mode 100644 index 00000000000..2e41114dff5 --- /dev/null +++ b/queue-5.12/nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch @@ -0,0 +1,37 @@ +From 837ce557de3214278e9746561a324cc2a953187d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:23:15 +0200 +Subject: nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() + +From: Hannes Reinecke + +[ Upstream commit a6c144f3d2e230f2b3ac5ed8c51e0f0391556197 ] + +The queue count is increased in nvme_loop_init_io_queues(), so we +need to reset it to 1 at the end of nvme_loop_destroy_io_queues(). +Otherwise the function is not re-entrant safe, and crash will happen +during concurrent reset and remove calls. + +Signed-off-by: Hannes Reinecke +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/target/loop.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c +index 14913a4588ec..4b2a6330feb5 100644 +--- a/drivers/nvme/target/loop.c ++++ b/drivers/nvme/target/loop.c +@@ -297,6 +297,7 @@ static void nvme_loop_destroy_io_queues(struct nvme_loop_ctrl *ctrl) + clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[i].flags); + nvmet_sq_destroy(&ctrl->queues[i].nvme_sq); + } ++ ctrl->ctrl.queue_count = 1; + } + + static int nvme_loop_init_io_queues(struct nvme_loop_ctrl *ctrl) +-- +2.30.2 + diff --git a/queue-5.12/riscv-use-mno-relax-when-using-lld-linker.patch b/queue-5.12/riscv-use-mno-relax-when-using-lld-linker.patch new file mode 100644 index 00000000000..a4508cca0f2 --- /dev/null +++ b/queue-5.12/riscv-use-mno-relax-when-using-lld-linker.patch @@ -0,0 +1,51 @@ +From 83ceba4735260d244fb74a8c7b43a2ddd1f6fb44 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 May 2021 14:37:41 -0700 +Subject: riscv: Use -mno-relax when using lld linker + +From: Khem Raj + +[ Upstream commit ec3a5cb61146c91f0f7dcec8b7e7157a4879a9ee ] + +lld does not implement the RISCV relaxation optimizations like GNU ld +therefore disable it when building with lld, Also pass it to +assembler when using external GNU assembler ( LLVM_IAS != 1 ), this +ensures that relevant assembler option is also enabled along. if these +options are not used then we see following relocations in objects + +0000000000000000 R_RISCV_ALIGN *ABS*+0x0000000000000002 + +These are then rejected by lld +ld.lld: error: capability.c:(.fixup+0x0): relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax but the .o is already compiled with -mno-relax + +Signed-off-by: Khem Raj +Reviewed-by: Nathan Chancellor +Signed-off-by: Palmer Dabbelt +Signed-off-by: Sasha Levin +--- + arch/riscv/Makefile | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 1368d943f1f3..5243bf2327c0 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -38,6 +38,15 @@ else + KBUILD_LDFLAGS += -melf32lriscv + endif + ++ifeq ($(CONFIG_LD_IS_LLD),y) ++ KBUILD_CFLAGS += -mno-relax ++ KBUILD_AFLAGS += -mno-relax ++ifneq ($(LLVM_IAS),1) ++ KBUILD_CFLAGS += -Wa,-mno-relax ++ KBUILD_AFLAGS += -Wa,-mno-relax ++endif ++endif ++ + # ISA string setting + riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima + riscv-march-$(CONFIG_ARCH_RV64I) := rv64ima +-- +2.30.2 + diff --git a/queue-5.12/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch b/queue-5.12/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch new file mode 100644 index 00000000000..186b94265b2 --- /dev/null +++ b/queue-5.12/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch @@ -0,0 +1,44 @@ +From cbfcb0f77d4e680b6a10ddffc139f30c85944ca7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 18:15:04 +0800 +Subject: rtnetlink: Fix missing error code in rtnl_bridge_notify() + +From: Jiapeng Chong + +[ Upstream commit a8db57c1d285c758adc7fb43d6e2bad2554106e1 ] + +The error code is missing in this code scenario, add the error code +'-EINVAL' to the return value 'err'. + +Eliminate the follow smatch warning: + +net/core/rtnetlink.c:4834 rtnl_bridge_notify() warn: missing error code +'err'. + +Reported-by: Abaci Robot +Signed-off-by: Jiapeng Chong +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/core/rtnetlink.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c +index 3485b16a7ff3..9ad046917b34 100644 +--- a/net/core/rtnetlink.c ++++ b/net/core/rtnetlink.c +@@ -4833,8 +4833,10 @@ static int rtnl_bridge_notify(struct net_device *dev) + if (err < 0) + goto errout; + +- if (!skb->len) ++ if (!skb->len) { ++ err = -EINVAL; + goto errout; ++ } + + rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC); + return 0; +-- +2.30.2 + diff --git a/queue-5.12/scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch b/queue-5.12/scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch new file mode 100644 index 00000000000..bf93af09c3e --- /dev/null +++ b/queue-5.12/scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch @@ -0,0 +1,95 @@ +From afbe491c93c5050c9ac422e100692b249f92203a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 May 2021 16:34:40 +0200 +Subject: scsi: qedf: Do not put host in qedf_vport_create() unconditionally + +From: Daniel Wagner + +[ Upstream commit 79c932cd6af9829432888c4a0001d01793a09f12 ] + +Do not drop reference count on vn_port->host in qedf_vport_create() +unconditionally. Instead drop the reference count in qedf_vport_destroy(). + +Link: https://lore.kernel.org/r/20210521143440.84816-1-dwagner@suse.de +Reported-by: Javed Hasan +Signed-off-by: Daniel Wagner +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qedf/qedf_main.c | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c +index e5076f09d5ed..16a0470aedfc 100644 +--- a/drivers/scsi/qedf/qedf_main.c ++++ b/drivers/scsi/qedf/qedf_main.c +@@ -1827,22 +1827,20 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + fcoe_wwn_to_str(vport->port_name, buf, sizeof(buf)); + QEDF_WARN(&(base_qedf->dbg_ctx), "Failed to create vport, " + "WWPN (0x%s) already exists.\n", buf); +- goto err1; ++ return rc; + } + + if (atomic_read(&base_qedf->link_state) != QEDF_LINK_UP) { + QEDF_WARN(&(base_qedf->dbg_ctx), "Cannot create vport " + "because link is not up.\n"); +- rc = -EIO; +- goto err1; ++ return -EIO; + } + + vn_port = libfc_vport_create(vport, sizeof(struct qedf_ctx)); + if (!vn_port) { + QEDF_WARN(&(base_qedf->dbg_ctx), "Could not create lport " + "for vport.\n"); +- rc = -ENOMEM; +- goto err1; ++ return -ENOMEM; + } + + fcoe_wwn_to_str(vport->port_name, buf, sizeof(buf)); +@@ -1866,7 +1864,7 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + if (rc) { + QEDF_ERR(&(base_qedf->dbg_ctx), "Could not allocate memory " + "for lport stats.\n"); +- goto err2; ++ goto err; + } + + fc_set_wwnn(vn_port, vport->node_name); +@@ -1884,7 +1882,7 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + if (rc) { + QEDF_WARN(&base_qedf->dbg_ctx, + "Error adding Scsi_Host rc=0x%x.\n", rc); +- goto err2; ++ goto err; + } + + /* Set default dev_loss_tmo based on module parameter */ +@@ -1925,9 +1923,10 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + vport_qedf->dbg_ctx.host_no = vn_port->host->host_no; + vport_qedf->dbg_ctx.pdev = base_qedf->pdev; + +-err2: ++ return 0; ++ ++err: + scsi_host_put(vn_port->host); +-err1: + return rc; + } + +@@ -1968,8 +1967,7 @@ static int qedf_vport_destroy(struct fc_vport *vport) + fc_lport_free_stats(vn_port); + + /* Release Scsi_Host */ +- if (vn_port->host) +- scsi_host_put(vn_port->host); ++ scsi_host_put(vn_port->host); + + out: + return 0; +-- +2.30.2 + diff --git a/queue-5.12/scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch b/queue-5.12/scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch new file mode 100644 index 00000000000..5cffed66099 --- /dev/null +++ b/queue-5.12/scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch @@ -0,0 +1,34 @@ +From ed1e0b9355115bc645007834ea3ec708dcb2e161 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jun 2021 13:52:14 -0400 +Subject: scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V + +From: Ewan D. Milne + +[ Upstream commit e57f5cd99ca60cddf40201b0f4ced9f1938e299c ] + +Apparently some arrays are now returning "HPE" as the vendor. + +Link: https://lore.kernel.org/r/20210601175214.25719-1-emilne@redhat.com +Signed-off-by: Ewan D. Milne +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_devinfo.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c +index d92cec12454c..d33355ab6e14 100644 +--- a/drivers/scsi/scsi_devinfo.c ++++ b/drivers/scsi/scsi_devinfo.c +@@ -184,6 +184,7 @@ static struct { + {"HP", "C3323-300", "4269", BLIST_NOTQ}, + {"HP", "C5713A", NULL, BLIST_NOREPORTLUN}, + {"HP", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2}, ++ {"HPE", "OPEN-", "*", BLIST_REPORTLUN2 | BLIST_TRY_VPD_PAGES}, + {"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN}, + {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, + {"IBM", "2105", NULL, BLIST_RETRY_HWERROR}, +-- +2.30.2 + diff --git a/queue-5.12/scsi-target-core-fix-warning-on-realtime-kernels.patch b/queue-5.12/scsi-target-core-fix-warning-on-realtime-kernels.patch new file mode 100644 index 00000000000..d7eac15d2a7 --- /dev/null +++ b/queue-5.12/scsi-target-core-fix-warning-on-realtime-kernels.patch @@ -0,0 +1,43 @@ +From 8e91609ddbe72198545c2272a1e3541745b59494 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 May 2021 14:13:26 +0200 +Subject: scsi: target: core: Fix warning on realtime kernels + +From: Maurizio Lombardi + +[ Upstream commit 515da6f4295c2c42b8c54572cce3d2dd1167c41e ] + +On realtime kernels, spin_lock_irq*(spinlock_t) do not disable the +interrupts, a call to irqs_disabled() will return false thus firing a +warning in __transport_wait_for_tasks(). + +Remove the warning and also replace assert_spin_locked() with +lockdep_assert_held() + +Link: https://lore.kernel.org/r/20210531121326.3649-1-mlombard@redhat.com +Reviewed-by: Bart Van Assche +Signed-off-by: Maurizio Lombardi +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/target_core_transport.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c +index 9e8cd07179d7..28479addb2d1 100644 +--- a/drivers/target/target_core_transport.c ++++ b/drivers/target/target_core_transport.c +@@ -2995,9 +2995,7 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop, + __releases(&cmd->t_state_lock) + __acquires(&cmd->t_state_lock) + { +- +- assert_spin_locked(&cmd->t_state_lock); +- WARN_ON_ONCE(!irqs_disabled()); ++ lockdep_assert_held(&cmd->t_state_lock); + + if (fabric_stop) + cmd->transport_state |= CMD_T_FABRIC_STOP; +-- +2.30.2 + diff --git a/queue-5.12/series b/queue-5.12/series new file mode 100644 index 00000000000..abd67b03e94 --- /dev/null +++ b/queue-5.12/series @@ -0,0 +1,48 @@ +net-ieee802154-fix-null-deref-in-parse-dev-addr.patch +hid-asus-filter-keyboard-ec-for-old-rog-keyboard.patch +hid-quirks-set-increment_usage_on_duplicate-for-sait.patch +hid-quirks-add-hid_quirk_no_init_reports-quirk-for-d.patch +hid-a4tech-use-a4_2wheel_mouse_hack_b8-for-a4tech-nb.patch +hid-hid-input-add-mapping-for-emoji-picker-key.patch +hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch +hid-asus-filter-g713-g733-key-event-to-prevent-shutd.patch +hid-quirks-add-quirk-for-lenovo-optical-mouse.patch +hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch +hid-add-bus_virtual-to-hid_connect-logging.patch +hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch +mt76-mt7921-fix-max-aggregation-subframes-setting.patch +drm-tegra-sor-do-not-leak-runtime-pm-reference.patch +gpu-host1x-split-up-client-initalization-and-registr.patch +drm-tegra-sor-fully-initialize-sor-before-registrati.patch +hwmon-pmbus-q54sj108a2-the-pmbus_mfr_id-is-actually-.patch +arm-omap1-fix-use-of-possibly-uninitialized-irq-vari.patch +arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch +gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch +gfs2-fix-a-deadlock-on-withdraw-during-mount.patch +gfs2-clean-up-revokes-on-normal-withdraws.patch +hid-multitouch-disable-event-reporting-on-suspend-on.patch +hid-gt683r-add-missing-module_device_table.patch +hid-intel-ish-hid-ipc-add-alder-lake-device-ids.patch +riscv-use-mno-relax-when-using-lld-linker.patch +alsa-hda-add-alderlake-m-pci-id.patch +mt76-mt7921-remove-leftover-80-80-he-capability.patch +gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch +scsi-target-core-fix-warning-on-realtime-kernels.patch +ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch +scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch +bluetooth-add-a-new-usb-id-for-rtl8822ce.patch +scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch +nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch +nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch +nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch +nvme-loop-do-not-warn-for-deleted-controllers-during.patch +net-ipconfig-don-t-override-command-line-hostnames-o.patch +drm-amd-display-allow-bandwidth-validation-for-0-str.patch +drm-amdgpu-refine-amdgpu_fru_get_product_info.patch +drm-amd-display-fix-overlay-validation-by-considerin.patch +drm-amd-display-fix-potential-memory-leak-in-dmub-hw.patch +drm-amd-amdgpu-save-psp-ring-wptr-to-avoid-attack.patch +rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch +net-x25-return-the-correct-errno-code.patch +net-return-the-correct-errno-code.patch +fib-return-the-correct-errno-code.patch