]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Fixes for 6.1
authorSasha Levin <sashal@kernel.org>
Fri, 13 Sep 2024 14:11:21 +0000 (10:11 -0400)
committerSasha Levin <sashal@kernel.org>
Fri, 13 Sep 2024 14:11:21 +0000 (10:11 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-6.1/arm64-dts-rockchip-fix-pmic-interrupt-pin-in-pinctrl.patch [new file with mode: 0644]
queue-6.1/cxl-core-fix-incorrect-vendor-debug-uuid-define.patch [new file with mode: 0644]
queue-6.1/eeprom-digsy_mtc-fix-93xx46-driver-probe-failure.patch [new file with mode: 0644]
queue-6.1/selftests-bpf-support-sock_stream-in-unix_inet_redir.patch [new file with mode: 0644]
queue-6.1/series

diff --git a/queue-6.1/arm64-dts-rockchip-fix-pmic-interrupt-pin-in-pinctrl.patch b/queue-6.1/arm64-dts-rockchip-fix-pmic-interrupt-pin-in-pinctrl.patch
new file mode 100644 (file)
index 0000000..4ec1533
--- /dev/null
@@ -0,0 +1,37 @@
+From 44ac10c99f142161bb00ffc3d0f1232a8817b68b Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 22 Jul 2024 18:52:16 +0900
+Subject: arm64: dts: rockchip: fix PMIC interrupt pin in pinctrl for ROCK Pi E
+
+From: FUKAUMI Naoki <naoki@radxa.com>
+
+[ Upstream commit c623e9daf60a0275d623ce054601550e54987f5b ]
+
+use GPIO0_A2 as PMIC interrupt pin in pinctrl.
+(I forgot to fix this part in previous commit.)
+
+Fixes: 02afd3d5b9fa ("arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E")
+Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
+Link: https://lore.kernel.org/r/20240722095216.1656081-1-naoki@radxa.com
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+index d9905a08c6ce..66443d52cd34 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+@@ -332,7 +332,7 @@ led_pin: led-pin {
+       pmic {
+               pmic_int_l: pmic-int-l {
+-                      rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
++                      rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
+               };
+       };
+-- 
+2.43.0
+
diff --git a/queue-6.1/cxl-core-fix-incorrect-vendor-debug-uuid-define.patch b/queue-6.1/cxl-core-fix-incorrect-vendor-debug-uuid-define.patch
new file mode 100644 (file)
index 0000000..d21cc52
--- /dev/null
@@ -0,0 +1,52 @@
+From 6794ce0d6ecc19b6750133d51bfbed2a66202a86 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 10 Jul 2024 10:31:12 +0800
+Subject: cxl/core: Fix incorrect vendor debug UUID define
+
+From: peng guo <engguopeng@buaa.edu.cn>
+
+[ Upstream commit 8ecef8e01a08c7e3e4ffc8f08d9f9663984f334b ]
+
+When user send a mbox command whose opcode is CXL_MBOX_OP_CLEAR_LOG and
+the in_payload is normal vendor debug log UUID according to
+the CXL specification cxl_payload_from_user_allowed() will return
+false unexpectedly, Sending mbox cmd operation fails and the kernel
+log will print:
+Clear Log: input payload not allowed.
+
+All CXL devices that support a debug log shall support the Vendor Debug
+Log to allow the log to be accessed through a common host driver, for any
+device, all versions of the CXL specification define the same value with
+Log Identifier of: 5e1819d9-11a9-400c-811f-d60719403d86
+
+Refer to CXL spec r3.1 Table 8-71
+
+Fix the definition value of DEFINE_CXL_VENDOR_DEBUG_UUID to match the
+CXL specification.
+
+Fixes: 472b1ce6e9d6 ("cxl/mem: Enable commands via CEL")
+Signed-off-by: peng guo <engguopeng@buaa.edu.cn>
+Reviewed-by: Alison Schofield <alison.schofield@intel.com>
+Link: https://patch.msgid.link/20240710023112.8063-1-engguopeng@buaa.edu.cn
+Signed-off-by: Dave Jiang <dave.jiang@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/cxl/cxlmem.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
+index b58a5b782e5d..0be48441d0f2 100644
+--- a/drivers/cxl/cxlmem.h
++++ b/drivers/cxl/cxlmem.h
+@@ -293,7 +293,7 @@ enum cxl_opcode {
+                 0x3b, 0x3f, 0x17)
+ #define DEFINE_CXL_VENDOR_DEBUG_UUID                                           \
+-      UUID_INIT(0xe1819d9, 0x11a9, 0x400c, 0x81, 0x1f, 0xd6, 0x07, 0x19,     \
++      UUID_INIT(0x5e1819d9, 0x11a9, 0x400c, 0x81, 0x1f, 0xd6, 0x07, 0x19,     \
+                 0x40, 0x3d, 0x86)
+ struct cxl_mbox_get_supported_logs {
+-- 
+2.43.0
+
diff --git a/queue-6.1/eeprom-digsy_mtc-fix-93xx46-driver-probe-failure.patch b/queue-6.1/eeprom-digsy_mtc-fix-93xx46-driver-probe-failure.patch
new file mode 100644 (file)
index 0000000..9c46192
--- /dev/null
@@ -0,0 +1,39 @@
+From 7aeff161986421372cc99ca42260a610a92bc271 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 8 May 2024 21:46:55 +0300
+Subject: eeprom: digsy_mtc: Fix 93xx46 driver probe failure
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+[ Upstream commit 2b82641ad0620b2d71dc05024b20f82db7e1c0b6 ]
+
+The update to support other (bigger) types of EEPROMs broke
+the driver loading due to removal of the default size.
+
+Fix this by adding the respective (new) flag to the platform data.
+
+Fixes: 14374fbb3f06 ("misc: eeprom_93xx46: Add new 93c56 and 93c66 compatible strings")
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Link: https://lore.kernel.org/r/20240508184905.2102633-3-andriy.shevchenko@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/misc/eeprom/digsy_mtc_eeprom.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/misc/eeprom/digsy_mtc_eeprom.c b/drivers/misc/eeprom/digsy_mtc_eeprom.c
+index f1f766b70965..4eddc5ba1af9 100644
+--- a/drivers/misc/eeprom/digsy_mtc_eeprom.c
++++ b/drivers/misc/eeprom/digsy_mtc_eeprom.c
+@@ -42,7 +42,7 @@ static void digsy_mtc_op_finish(void *p)
+ }
+ struct eeprom_93xx46_platform_data digsy_mtc_eeprom_data = {
+-      .flags          = EE_ADDR8,
++      .flags          = EE_ADDR8 | EE_SIZE1K,
+       .prepare        = digsy_mtc_op_prepare,
+       .finish         = digsy_mtc_op_finish,
+ };
+-- 
+2.43.0
+
diff --git a/queue-6.1/selftests-bpf-support-sock_stream-in-unix_inet_redir.patch b/queue-6.1/selftests-bpf-support-sock_stream-in-unix_inet_redir.patch
new file mode 100644 (file)
index 0000000..3d76346
--- /dev/null
@@ -0,0 +1,48 @@
+From 620b1f48a161dae6239668dd978654259adbb2b1 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 13 Jul 2024 21:41:39 +0200
+Subject: selftests/bpf: Support SOCK_STREAM in unix_inet_redir_to_connected()
+
+From: Michal Luczaj <mhal@rbox.co>
+
+[ Upstream commit 1b0ad43177c097d38b967b99c2b71d8be28b0223 ]
+
+Function ignores the AF_UNIX socket type argument, SOCK_DGRAM is hardcoded.
+Fix to respect the argument provided.
+
+Fixes: 75e0e27db6cf ("selftest/bpf: Change udp to inet in some function names")
+Suggested-by: Jakub Sitnicki <jakub@cloudflare.com>
+Signed-off-by: Michal Luczaj <mhal@rbox.co>
+Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
+Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
+Link: https://lore.kernel.org/bpf/20240713200218.2140950-3-mhal@rbox.co
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+index 2cf0c7a3fe23..cef5d3595171 100644
+--- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
++++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+@@ -1909,7 +1909,7 @@ static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd,
+       if (err)
+               return;
+-      if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0, sfd))
++      if (socketpair(AF_UNIX, type | SOCK_NONBLOCK, 0, sfd))
+               goto close_cli0;
+       c1 = sfd[0], p1 = sfd[1];
+@@ -1944,7 +1944,6 @@ static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd,
+ close_cli0:
+       xclose(c0);
+       xclose(p0);
+-
+ }
+ static void unix_inet_skb_redir_to_connected(struct test_sockmap_listen *skel,
+-- 
+2.43.0
+
index d8b35b65c1f94243932038b44fb47d605dce9c34..ffabd0b184df08acb31897a6eda53b534cc76c4d 100644 (file)
@@ -30,3 +30,7 @@ mm-avoid-leaving-partial-pfn-mappings-around-in-error-case.patch
 net-xilinx-axienet-fix-race-in-axienet_stop.patch
 pmdomain-ti-add-a-null-pointer-check-to-the-omap_prm_domain_init.patch
 fs-ntfs3-use-kvfree-to-free-memory-allocated-by-kvmalloc.patch
+arm64-dts-rockchip-fix-pmic-interrupt-pin-in-pinctrl.patch
+eeprom-digsy_mtc-fix-93xx46-driver-probe-failure.patch
+cxl-core-fix-incorrect-vendor-debug-uuid-define.patch
+selftests-bpf-support-sock_stream-in-unix_inet_redir.patch