| Message ID | 20230118234612.272916-1-helgaas@kernel.org |
|---|---|
| Headers | show |
| Series | PCI/AER: Remove redundant Device Control Error Reporting Enable | expand |
On 1/18/23 3:46 PM, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), > ths PCI core sets the Device Control bits that enable error reporting for > PCIe devices. > > This series removes redundant calls to pci_enable_pcie_error_reporting() > that do the same thing from the AER driver and several NIC drivers. > > There are several more drivers where this should be removed; I started with > just the Intel drivers here. > > Bjorn Helgaas (9): > PCI/AER: Remove redundant Device Control Error Reporting Enable > e1000e: Remove redundant pci_enable_pcie_error_reporting() > fm10k: Remove redundant pci_enable_pcie_error_reporting() > i40e: Remove redundant pci_enable_pcie_error_reporting() > iavf: Remove redundant pci_enable_pcie_error_reporting() > ice: Remove redundant pci_enable_pcie_error_reporting() > igb: Remove redundant pci_enable_pcie_error_reporting() > igc: Remove redundant pci_enable_pcie_error_reporting() > ixgbe: Remove redundant pci_enable_pcie_error_reporting() It should be simpler to do in one patch. Any reason to split it into multiple patches? > > drivers/net/ethernet/intel/e1000e/netdev.c | 7 --- > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -- > drivers/net/ethernet/intel/i40e/i40e_main.c | 4 -- > drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -- > drivers/net/ethernet/intel/ice/ice_main.c | 3 -- > drivers/net/ethernet/intel/igb/igb_main.c | 5 -- > drivers/net/ethernet/intel/igc/igc_main.c | 5 -- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -- > drivers/pci/pcie/aer.c | 48 ------------------- > 9 files changed, 87 deletions(-) >
On Wed, Jan 18, 2023 at 07:55:33PM -0800, Sathyanarayanan Kuppuswamy wrote: > On 1/18/23 3:46 PM, Bjorn Helgaas wrote: > > From: Bjorn Helgaas <bhelgaas@google.com> > > > > Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), > > ths PCI core sets the Device Control bits that enable error reporting for > > PCIe devices. > > > > This series removes redundant calls to pci_enable_pcie_error_reporting() > > that do the same thing from the AER driver and several NIC drivers. > > > > There are several more drivers where this should be removed; I started with > > just the Intel drivers here. > > > > Bjorn Helgaas (9): > > PCI/AER: Remove redundant Device Control Error Reporting Enable > > e1000e: Remove redundant pci_enable_pcie_error_reporting() > > fm10k: Remove redundant pci_enable_pcie_error_reporting() > > i40e: Remove redundant pci_enable_pcie_error_reporting() > > iavf: Remove redundant pci_enable_pcie_error_reporting() > > ice: Remove redundant pci_enable_pcie_error_reporting() > > igb: Remove redundant pci_enable_pcie_error_reporting() > > igc: Remove redundant pci_enable_pcie_error_reporting() > > ixgbe: Remove redundant pci_enable_pcie_error_reporting() > > It should be simpler to do in one patch. Any reason to split > it into multiple patches? Sure, the driver patches could easily be squashed, either by me or be the netdev folks if they prefer it that way. There are close to 50 callers, and I hesitate to do them all in a single patch because it becomes unwieldy to backport (probably pointless for this situation) or to revert if there's any issue. These are all trivial removals, but there are a few that are more complicated and will require closer review, so I didn't include those here. > > drivers/net/ethernet/intel/e1000e/netdev.c | 7 --- > > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -- > > drivers/net/ethernet/intel/i40e/i40e_main.c | 4 -- > > drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -- > > drivers/net/ethernet/intel/ice/ice_main.c | 3 -- > > drivers/net/ethernet/intel/igb/igb_main.c | 5 -- > > drivers/net/ethernet/intel/igc/igc_main.c | 5 -- > > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -- > > drivers/pci/pcie/aer.c | 48 ------------------- > > 9 files changed, 87 deletions(-) > > > > -- > Sathyanarayanan Kuppuswamy > Linux Kernel Developer
[+cc all the folks I forgot to cc when sending the original cover letter, sorry about that, plus the folks who very generously tested the driver patches] On Wed, Jan 18, 2023 at 05:46:03PM -0600, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), > ths PCI core sets the Device Control bits that enable error reporting for > PCIe devices. > > This series removes redundant calls to pci_enable_pcie_error_reporting() > that do the same thing from the AER driver and several NIC drivers. > > There are several more drivers where this should be removed; I started with > just the Intel drivers here. > > Bjorn Helgaas (9): > PCI/AER: Remove redundant Device Control Error Reporting Enable > e1000e: Remove redundant pci_enable_pcie_error_reporting() > fm10k: Remove redundant pci_enable_pcie_error_reporting() > i40e: Remove redundant pci_enable_pcie_error_reporting() > iavf: Remove redundant pci_enable_pcie_error_reporting() > ice: Remove redundant pci_enable_pcie_error_reporting() > igb: Remove redundant pci_enable_pcie_error_reporting() > igc: Remove redundant pci_enable_pcie_error_reporting() > ixgbe: Remove redundant pci_enable_pcie_error_reporting() Thank you very much for reviewing and testing these. I applied the first (PCI/AER) patch to the PCI tree. I think Jakub is planning to merge the rest via the netdev tree. There are no dependencies, so they can be squashed if desired. Let me know if you'd prefer me to merge them or squash them. > drivers/net/ethernet/intel/e1000e/netdev.c | 7 --- > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -- > drivers/net/ethernet/intel/i40e/i40e_main.c | 4 -- > drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -- > drivers/net/ethernet/intel/ice/ice_main.c | 3 -- > drivers/net/ethernet/intel/igb/igb_main.c | 5 -- > drivers/net/ethernet/intel/igc/igc_main.c | 5 -- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -- > drivers/pci/pcie/aer.c | 48 ------------------- > 9 files changed, 87 deletions(-) > > -- > 2.25.1 >
From: Bjorn Helgaas <bhelgaas@google.com> Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), ths PCI core sets the Device Control bits that enable error reporting for PCIe devices. This series removes redundant calls to pci_enable_pcie_error_reporting() that do the same thing from the AER driver and several NIC drivers. There are several more drivers where this should be removed; I started with just the Intel drivers here. Bjorn Helgaas (9): PCI/AER: Remove redundant Device Control Error Reporting Enable e1000e: Remove redundant pci_enable_pcie_error_reporting() fm10k: Remove redundant pci_enable_pcie_error_reporting() i40e: Remove redundant pci_enable_pcie_error_reporting() iavf: Remove redundant pci_enable_pcie_error_reporting() ice: Remove redundant pci_enable_pcie_error_reporting() igb: Remove redundant pci_enable_pcie_error_reporting() igc: Remove redundant pci_enable_pcie_error_reporting() ixgbe: Remove redundant pci_enable_pcie_error_reporting() drivers/net/ethernet/intel/e1000e/netdev.c | 7 --- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 -- drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -- drivers/net/ethernet/intel/ice/ice_main.c | 3 -- drivers/net/ethernet/intel/igb/igb_main.c | 5 -- drivers/net/ethernet/intel/igc/igc_main.c | 5 -- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -- drivers/pci/pcie/aer.c | 48 ------------------- 9 files changed, 87 deletions(-)