drop some not-needed 5.15 ice driver patches

diff --git a/queue-5.15/ice-open-devlink-when-device-is-ready.patch b/queue-5.15/ice-open-devlink-when-device-is-ready.patch
deleted file mode 100644 (file)
index 6724d73..0000000
--- a/queue-5.15/ice-open-devlink-when-device-is-ready.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From b30dc7ff580d179562951f1b1510fdde6462292c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 25 Sep 2021 14:22:46 +0300
-Subject: ice: Open devlink when device is ready
-
-From: Leon Romanovsky <leonro@nvidia.com>
-
-[ Upstream commit 838cefd5e52c4a3bfbc50e6a0194809ce27c759d ]
-
-Move devlink_registration routine to be the last command, when the
-device is fully initialized.
-
-Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Stable-dep-of: 0288c3e709e5 ("ice: reset first in crash dump kernels")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index b742afafd90bb..691c4320b6b1d 100644
---- a/drivers/net/ethernet/intel/ice/ice_main.c
-+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -4324,8 +4324,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
- 
-       pf->msg_enable = netif_msg_init(debug, ICE_DFLT_NETIF_M);
- 
--      ice_devlink_register(pf);
--
- #ifndef CONFIG_DYNAMIC_DEBUG
-       if (debug < -1)
-               hw->debug_mask = debug;
-@@ -4559,6 +4557,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
-               dev_warn(dev, "RDMA is not supported on this device\n");
-       }
- 
-+      ice_devlink_register(pf);
-       return 0;
- 
- err_init_aux_unroll:
-@@ -4582,7 +4581,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
-       ice_devlink_destroy_regions(pf);
-       ice_deinit_hw(hw);
- err_exit_unroll:
--      ice_devlink_unregister(pf);
-       pci_disable_pcie_error_reporting(pdev);
-       pci_disable_device(pdev);
-       return err;
-@@ -4659,6 +4657,7 @@ static void ice_remove(struct pci_dev *pdev)
-       struct ice_pf *pf = pci_get_drvdata(pdev);
-       int i;
- 
-+      ice_devlink_unregister(pf);
-       for (i = 0; i < ICE_MAX_RESET_WAIT; i++) {
-               if (!ice_is_reset_in_progress(pf->state))
-                       break;
-@@ -4696,7 +4695,6 @@ static void ice_remove(struct pci_dev *pdev)
-       ice_deinit_pf(pf);
-       ice_devlink_destroy_regions(pf);
-       ice_deinit_hw(&pf->hw);
--      ice_devlink_unregister(pf);
- 
-       /* Issue a PFR as part of the prescribed driver unload flow.  Do not
-        * do it via ice_schedule_reset() since there is no need to rebuild
--- 
-2.40.1
-

diff --git a/queue-5.15/ice-remove-redundant-pci_enable_pcie_error_reporting.patch b/queue-5.15/ice-remove-redundant-pci_enable_pcie_error_reporting.patch
deleted file mode 100644 (file)
index f2346a1..0000000
--- a/queue-5.15/ice-remove-redundant-pci_enable_pcie_error_reporting.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 17dc13c7587cc4f20d5cd4c8e957eb6089c13239 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 18 Jan 2023 17:46:09 -0600
-Subject: ice: Remove redundant pci_enable_pcie_error_reporting()
-
-From: Bjorn Helgaas <bhelgaas@google.com>
-
-[ Upstream commit ba153552c18d7eb839ec0bad7d7484e29ba4719c ]
-
-pci_enable_pcie_error_reporting() enables the device to send ERR_*
-Messages.  Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
-native"), the PCI core does this for all devices during enumeration.
-
-Remove the redundant pci_enable_pcie_error_reporting() call from the
-driver.  Also remove the corresponding pci_disable_pcie_error_reporting()
-from the driver .remove() path.
-
-Note that this doesn't control interrupt generation by the Root Port; that
-is controlled by the AER Root Error Command register, which is managed by
-the AER service driver.
-
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
-Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
-Cc: intel-wired-lan@lists.osuosl.org
-Cc: netdev@vger.kernel.org
-Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
-Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
-Stable-dep-of: 0288c3e709e5 ("ice: reset first in crash dump kernels")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/intel/ice/ice_main.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index 4aad089ea1f5d..61aaa6b98e199 100644
---- a/drivers/net/ethernet/intel/ice/ice_main.c
-+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -4297,7 +4297,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
-               return err;
-       }
- 
--      pci_enable_pcie_error_reporting(pdev);
-       pci_set_master(pdev);
- 
-       pf->pdev = pdev;
-@@ -4579,7 +4578,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
-       ice_devlink_destroy_regions(pf);
-       ice_deinit_hw(hw);
- err_exit_unroll:
--      pci_disable_pcie_error_reporting(pdev);
-       pci_disable_device(pdev);
-       return err;
- }
-@@ -4701,7 +4699,6 @@ static void ice_remove(struct pci_dev *pdev)
-       ice_reset(&pf->hw, ICE_RESET_PFR);
-       pci_wait_for_pending_transaction(pdev);
-       ice_clear_interrupt_scheme(pf);
--      pci_disable_pcie_error_reporting(pdev);
-       pci_disable_device(pdev);
- }
- 
--- 
-2.40.1
-

diff --git a/queue-5.15/ice-remove-useless-dma-32-fallback-configuration.patch b/queue-5.15/ice-remove-useless-dma-32-fallback-configuration.patch
deleted file mode 100644 (file)
index 5810d7a..0000000
--- a/queue-5.15/ice-remove-useless-dma-32-fallback-configuration.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6f77725babf0559f90f19df76ff71f7807dff67f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 9 Jan 2022 19:25:05 +0100
-Subject: ice: Remove useless DMA-32 fallback configuration
-
-From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-
-[ Upstream commit 9c3e54a632637f27d98fb0ec0c44f7039925809d ]
-
-As stated in [1], dma_set_mask() with a 64-bit mask never fails if
-dev->dma_mask is non-NULL.
-So, if it fails, the 32 bits case will also fail for the same reason.
-
-Simplify code and remove some dead code accordingly.
-
-[1]: https://lkml.org/lkml/2021/6/7/398
-
-Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Alexander Lobakin <alexandr.lobakin@intel.com>
-Tested-by: Gurucharan G <gurucharanx.g@intel.com>
-Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
-Stable-dep-of: 0288c3e709e5 ("ice: reset first in crash dump kernels")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/intel/ice/ice_main.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index 691c4320b6b1d..4aad089ea1f5d 100644
---- a/drivers/net/ethernet/intel/ice/ice_main.c
-+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -4292,8 +4292,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
- 
-       /* set up for high or low DMA */
-       err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
--      if (err)
--              err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
-       if (err) {
-               dev_err(dev, "DMA configuration failed: 0x%x\n", err);
-               return err;
--- 
-2.40.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 08c8a17dc8113a6203672fc45cc549e764c15790..9b4680e25559e8028729da0ac1d666a903c77c11 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -101,9 +101,6 @@ platform-x86-touchscreen_dmi-add-info-for-the-positi.patch
 netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
 net-mlx5-handle-fw-tracer-change-ownership-event-bas.patch
 devlink-make-devlink_register-to-be-void.patch
-ice-open-devlink-when-device-is-ready.patch
-ice-remove-useless-dma-32-fallback-configuration.patch
-ice-remove-redundant-pci_enable_pcie_error_reporting.patch
 bluetooth-hci_event-fix-using-memcmp-when-comparing-.patch
 netfilter-nf_tables-revert-do-not-remove-elements-if.patch
 net-introduce-a-function-to-check-if-a-netdev-name-i.patch