From 6a57959e99442e939040067f34301dc5e2aeb669 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 12 Aug 2023 20:31:27 +0200 Subject: [PATCH] drop rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch --- ...error-handling-in-probe-failure-path.patch | 33 ------------------- queue-5.10/series | 1 - ...error-handling-in-probe-failure-path.patch | 33 ------------------- queue-5.15/series | 1 - ...a-fix-handling-ipv4-routes-with-nhid.patch | 13 +++----- ...error-handling-in-probe-failure-path.patch | 33 ------------------- queue-6.1/series | 1 - 7 files changed, 4 insertions(+), 111 deletions(-) delete mode 100644 queue-5.10/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch delete mode 100644 queue-5.15/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch delete mode 100644 queue-6.1/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch diff --git a/queue-5.10/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch b/queue-5.10/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch deleted file mode 100644 index 0c828ef2409..00000000000 --- a/queue-5.10/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5ac8480ae4d01f0ca5dfd561884424046df2478a Mon Sep 17 00:00:00 2001 -From: Kalesh AP -Date: Wed, 9 Aug 2023 21:44:36 -0700 -Subject: RDMA/bnxt_re: Fix error handling in probe failure path - -From: Kalesh AP - -commit 5ac8480ae4d01f0ca5dfd561884424046df2478a upstream. - -During bnxt_re_dev_init(), when bnxt_re_setup_chip_ctx() fails unregister -with L2 first before bailing out probe. - -Fixes: ae8637e13185 ("RDMA/bnxt_re: Add chip context to identify 57500 series") -Link: https://lore.kernel.org/r/1691642677-21369-3-git-send-email-selvin.xavier@broadcom.com -Signed-off-by: Kalesh AP -Signed-off-by: Selvin Xavier -Signed-off-by: Jason Gunthorpe -Signed-off-by: Greg Kroah-Hartman ---- - drivers/infiniband/hw/bnxt_re/main.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/infiniband/hw/bnxt_re/main.c -+++ b/drivers/infiniband/hw/bnxt_re/main.c -@@ -1418,6 +1418,8 @@ static int bnxt_re_dev_init(struct bnxt_ - - rc = bnxt_re_setup_chip_ctx(rdev, wqe_mode); - if (rc) { -+ bnxt_unregister_dev(rdev->en_dev); -+ clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags); - ibdev_err(&rdev->ibdev, "Failed to get chip context\n"); - return -EINVAL; - } diff --git a/queue-5.10/series b/queue-5.10/series index e615d26fd0b..3a728f0e03e 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -45,4 +45,3 @@ dccp-fix-data-race-around-dp-dccps_mss_cache.patch drivers-net-prevent-tun_build_skb-to-exceed-the-packet-size-limit.patch ib-hfi1-fix-possible-panic-during-hotplug-remove.patch wifi-cfg80211-fix-sband-iftype-data-lookup-for-ap_vlan.patch -rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch diff --git a/queue-5.15/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch b/queue-5.15/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch deleted file mode 100644 index a7dae0d3290..00000000000 --- a/queue-5.15/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5ac8480ae4d01f0ca5dfd561884424046df2478a Mon Sep 17 00:00:00 2001 -From: Kalesh AP -Date: Wed, 9 Aug 2023 21:44:36 -0700 -Subject: RDMA/bnxt_re: Fix error handling in probe failure path - -From: Kalesh AP - -commit 5ac8480ae4d01f0ca5dfd561884424046df2478a upstream. - -During bnxt_re_dev_init(), when bnxt_re_setup_chip_ctx() fails unregister -with L2 first before bailing out probe. - -Fixes: ae8637e13185 ("RDMA/bnxt_re: Add chip context to identify 57500 series") -Link: https://lore.kernel.org/r/1691642677-21369-3-git-send-email-selvin.xavier@broadcom.com -Signed-off-by: Kalesh AP -Signed-off-by: Selvin Xavier -Signed-off-by: Jason Gunthorpe -Signed-off-by: Greg Kroah-Hartman ---- - drivers/infiniband/hw/bnxt_re/main.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/infiniband/hw/bnxt_re/main.c -+++ b/drivers/infiniband/hw/bnxt_re/main.c -@@ -1406,6 +1406,8 @@ static int bnxt_re_dev_init(struct bnxt_ - - rc = bnxt_re_setup_chip_ctx(rdev, wqe_mode); - if (rc) { -+ bnxt_unregister_dev(rdev->en_dev); -+ clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags); - ibdev_err(&rdev->ibdev, "Failed to get chip context\n"); - return -EINVAL; - } diff --git a/queue-5.15/series b/queue-5.15/series index 579a5665996..c897dd71adf 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -56,4 +56,3 @@ ib-hfi1-fix-possible-panic-during-hotplug-remove.patch drm-rockchip-don-t-spam-logs-in-atomic-check.patch wifi-cfg80211-fix-sband-iftype-data-lookup-for-ap_vlan.patch rdma-umem-set-iova-in-odp-flow.patch -rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch diff --git a/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch b/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch index a11d30ebcb8..284ac104386 100644 --- a/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch +++ b/queue-6.1/net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch @@ -109,14 +109,12 @@ Link: https://lore.kernel.org/r/20230804101220.247515-1-jonas.gorski@bisdn.de Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- - .../ethernet/marvell/prestera/prestera_router.c | 14 +++++++------- + drivers/net/ethernet/marvell/prestera/prestera_router.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router.c b/drivers/net/ethernet/marvell/prestera/prestera_router.c -index a9a1028cb17b..de317179a7dc 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_router.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_router.c -@@ -166,11 +166,11 @@ prestera_util_neigh2nc_key(struct prestera_switch *sw, struct neighbour *n, +@@ -166,11 +166,11 @@ prestera_util_neigh2nc_key(struct preste static bool __prestera_fi_is_direct(struct fib_info *fi) { @@ -140,7 +138,7 @@ index a9a1028cb17b..de317179a7dc 100644 struct fib_result res; bool reachable; -@@ -269,8 +269,8 @@ __prestera_util_kern_n_is_reachable_v4(u32 tb_id, __be32 *addr, +@@ -269,8 +269,8 @@ __prestera_util_kern_n_is_reachable_v4(u if (!prestera_util_kern_get_route(&res, tb_id, addr)) if (prestera_fi_is_direct(res.fi)) { @@ -151,7 +149,7 @@ index a9a1028cb17b..de317179a7dc 100644 reachable = true; } -@@ -324,7 +324,7 @@ prestera_kern_fib_info_nhc(struct fib_notifier_info *info, int n) +@@ -324,7 +324,7 @@ prestera_kern_fib_info_nhc(struct fib_no if (info->family == AF_INET) { fen4_info = container_of(info, struct fib_entry_notifier_info, info); @@ -160,6 +158,3 @@ index a9a1028cb17b..de317179a7dc 100644 } else if (info->family == AF_INET6) { fen6_info = container_of(info, struct fib6_entry_notifier_info, info); --- -2.41.0 - diff --git a/queue-6.1/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch b/queue-6.1/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch deleted file mode 100644 index 78c738026a0..00000000000 --- a/queue-6.1/rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5ac8480ae4d01f0ca5dfd561884424046df2478a Mon Sep 17 00:00:00 2001 -From: Kalesh AP -Date: Wed, 9 Aug 2023 21:44:36 -0700 -Subject: RDMA/bnxt_re: Fix error handling in probe failure path - -From: Kalesh AP - -commit 5ac8480ae4d01f0ca5dfd561884424046df2478a upstream. - -During bnxt_re_dev_init(), when bnxt_re_setup_chip_ctx() fails unregister -with L2 first before bailing out probe. - -Fixes: ae8637e13185 ("RDMA/bnxt_re: Add chip context to identify 57500 series") -Link: https://lore.kernel.org/r/1691642677-21369-3-git-send-email-selvin.xavier@broadcom.com -Signed-off-by: Kalesh AP -Signed-off-by: Selvin Xavier -Signed-off-by: Jason Gunthorpe -Signed-off-by: Greg Kroah-Hartman ---- - drivers/infiniband/hw/bnxt_re/main.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/infiniband/hw/bnxt_re/main.c -+++ b/drivers/infiniband/hw/bnxt_re/main.c -@@ -1409,6 +1409,8 @@ static int bnxt_re_dev_init(struct bnxt_ - - rc = bnxt_re_setup_chip_ctx(rdev, wqe_mode); - if (rc) { -+ bnxt_unregister_dev(rdev->en_dev); -+ clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags); - ibdev_err(&rdev->ibdev, "Failed to get chip context\n"); - return -EINVAL; - } diff --git a/queue-6.1/series b/queue-6.1/series index 295b3450390..2e9a8fd587d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -101,6 +101,5 @@ ib-hfi1-fix-possible-panic-during-hotplug-remove.patch drm-rockchip-don-t-spam-logs-in-atomic-check.patch wifi-cfg80211-fix-sband-iftype-data-lookup-for-ap_vlan.patch rdma-umem-set-iova-in-odp-flow.patch -rdma-bnxt_re-fix-error-handling-in-probe-failure-path.patch net-tls-avoid-discarding-data-on-record-close.patch net-marvell-prestera-fix-handling-ipv4-routes-with-nhid.patch -- 2.47.3