From 21f0ab503c57d72a49d0e889d384f724b38ea406 Mon Sep 17 00:00:00 2001 From: Mathew McBride Date: Fri, 21 Jul 2023 01:38:30 +0000 Subject: [PATCH] kernel: move NXP DPAA2 SFP patches to generic patches These are used by both the armsr (EFI boot) and layerscape targets for phylink-controlled SFP support on NXP DPAA2 platforms (LS1088,LS2088,LX2160). This is in place of commit a7bd96c98f8f ("layerscape: add patches for SFP support on DPAA2 platforms") in the main branch. armsr in main started at kernel 6.1 so there is not an equivalent 5.15 commit to cherry pick. Signed-off-by: Mathew McBride --- ...-v5.16-net-dpaa2-mac-add-support-for-more-10G-modes.patch} | 0 .../726-net-eth-dpaa2-eth-do-not-hold-rtnl_lock.patch} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename target/linux/{armsr/patches-5.15/702-net-dpaa2-mac-add-support-for-more-10G-modes.patch => generic/backport-5.15/792-v5.16-net-dpaa2-mac-add-support-for-more-10G-modes.patch} (100%) rename target/linux/{armsr/patches-5.15/701-dpaa2-eth-do-not-hold-rtnl_lock.patch => generic/hack-5.15/726-net-eth-dpaa2-eth-do-not-hold-rtnl_lock.patch} (95%) diff --git a/target/linux/armsr/patches-5.15/702-net-dpaa2-mac-add-support-for-more-10G-modes.patch b/target/linux/generic/backport-5.15/792-v5.16-net-dpaa2-mac-add-support-for-more-10G-modes.patch similarity index 100% rename from target/linux/armsr/patches-5.15/702-net-dpaa2-mac-add-support-for-more-10G-modes.patch rename to target/linux/generic/backport-5.15/792-v5.16-net-dpaa2-mac-add-support-for-more-10G-modes.patch diff --git a/target/linux/armsr/patches-5.15/701-dpaa2-eth-do-not-hold-rtnl_lock.patch b/target/linux/generic/hack-5.15/726-net-eth-dpaa2-eth-do-not-hold-rtnl_lock.patch similarity index 95% rename from target/linux/armsr/patches-5.15/701-dpaa2-eth-do-not-hold-rtnl_lock.patch rename to target/linux/generic/hack-5.15/726-net-eth-dpaa2-eth-do-not-hold-rtnl_lock.patch index 447266fa14..c7d16e5c4c 100644 --- a/target/linux/armsr/patches-5.15/701-dpaa2-eth-do-not-hold-rtnl_lock.patch +++ b/target/linux/generic/hack-5.15/726-net-eth-dpaa2-eth-do-not-hold-rtnl_lock.patch @@ -52,7 +52,7 @@ Signed-off-by: Russell King dpaa2_eth_dl_traps_unregister(priv); --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c -@@ -351,7 +351,9 @@ int dpaa2_mac_connect(struct dpaa2_mac * +@@ -357,7 +357,9 @@ int dpaa2_mac_connect(struct dpaa2_mac * if (mac->pcs) phylink_set_pcs(mac->phylink, &mac->pcs->pcs); @@ -62,7 +62,7 @@ Signed-off-by: Russell King if (err) { netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err); goto err_phylink_destroy; -@@ -372,7 +374,9 @@ void dpaa2_mac_disconnect(struct dpaa2_m +@@ -378,7 +380,9 @@ void dpaa2_mac_disconnect(struct dpaa2_m if (!mac->phylink) return; -- 2.30.2