Fixes for 5.15

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/arm64-dts-rockchip-fix-pmic-interrupt-pin-in-pinctrl.patch b/queue-5.15/arm64-dts-rockchip-fix-pmic-interrupt-pin-in-pinctrl.patch
new file mode 100644 (file)
index 0000000..d07fc4d
--- /dev/null
+++ b/queue-5.15/arm64-dts-rockchip-fix-pmic-interrupt-pin-in-pinctrl.patch
@@ -0,0 +1,37 @@
+From 56acdcfb94da15651b3cef46df0c47cabe2ba6b0 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-5.15/eeprom-digsy_mtc-fix-93xx46-driver-probe-failure.patch b/queue-5.15/eeprom-digsy_mtc-fix-93xx46-driver-probe-failure.patch
new file mode 100644 (file)
index 0000000..6146438
--- /dev/null
+++ b/queue-5.15/eeprom-digsy_mtc-fix-93xx46-driver-probe-failure.patch
@@ -0,0 +1,39 @@
+From 42345236e2abf99e313429527b9c52dfc30094e5 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-5.15/selftests-bpf-support-sock_stream-in-unix_inet_redir.patch b/queue-5.15/selftests-bpf-support-sock_stream-in-unix_inet_redir.patch
new file mode 100644 (file)
index 0000000..69c65a3
--- /dev/null
+++ b/queue-5.15/selftests-bpf-support-sock_stream-in-unix_inet_redir.patch
@@ -0,0 +1,48 @@
+From 9855bac1ffdc6187e368cfc81c480052274be8ea 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 d88bb65b74cc..1a0c678cba90 100644
+--- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
++++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+@@ -1911,7 +1911,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];
+ 
+@@ -1946,7 +1946,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
+

diff --git a/queue-5.15/series b/queue-5.15/series
index 89978441fb3bc52fce6b1a5355e981c523279476..ddd8df7a0011f80092be9d00d4ecbe240aacc079 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -20,3 +20,6 @@ minmax-reduce-min-max-macro-expansion-in-atomisp-driver.patch
 net-tighten-bad-gso-csum-offset-check-in-virtio_net_hdr.patch
 mm-avoid-leaving-partial-pfn-mappings-around-in-error-case.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
+selftests-bpf-support-sock_stream-in-unix_inet_redir.patch