PCI/AER: Change to use helper pcie_aer_is_native() in some places
Subsystems (2)
PATCH 1/1 PCI/AER: Change to use helper pcie_aer_is_native() in some places
Use helper function pcie_aer_is_native() in some places to keep the code tidy. No function changes.
--- drivers/pci/pcie/aer.c | 4 ++-- drivers/pci/pcie/err.c | 2 +- drivers/pci/pcie/portdrv_core.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/pci/pcie/aer.c +2 -2
@@ -1397,7 +1397,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)*/ aer = root ? root->aer_cap :0 ; -if ((host->native_aer || pcie_ports_native) && aer) { +if (pcie_aer_is_native (dev) && aer) {/* Disable Root's interrupt in response to error messages */ pci_read_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , ®32); reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK ;
@@ -1417,7 +1417,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)pci_info (dev,"Root Port link has been reset (%d)\n" , rc); } -if ((host->native_aer || pcie_ports_native) && aer) { +if (pcie_aer_is_native (dev) && aer) {/* Clear Root Error Status */ pci_read_config_dword (root, aer +PCI_ERR_ROOT_STATUS , ®32);pci_write_config_dword (root, aer +PCI_ERR_ROOT_STATUS , reg32);
drivers/pci/pcie/err.c +1 -1
@@ -237,7 +237,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,* this status. In that case, the signaling device may not even be * visible to the OS. */ -if (host->native_aer || pcie_ports_native) { +if (pcie_aer_is_native (dev)) {pcie_clear_device_status (bridge);pci_aer_clear_nonfatal_status (bridge); }
drivers/pci/pcie/portdrv_core.c +1 -1
@@ -222,7 +222,7 @@ static int get_port_device_capability(struct pci_dev *dev)#ifdef CONFIG_PCIEAER if (dev->aer_cap &&pci_aer_available () && - (pcie_ports_native || host->native_aer)) { +pcie_aer_is_native (dev)) { services |=PCIE_PORT_SERVICE_AER ;/*
Signature · 1 line
2.8.1
Hi Tan,
This is very nice! Thank you for this.
[...]
drivers/pci/pcie/portdrv_core.c static int get_port_device_capability(struct pci_dev *dev) · line 226
Quoted 4 lines
drivers/pci/pcie/portdrv_core.c +1
-1if (dev->aer_cap &&pci_aer_available () && - (pcie_ports_native || host->native_aer)) { +pcie_aer_is_native (dev)) { services |=PCIE_PORT_SERVICE_AER ;
[...]
A suggestion. You could improve this even further, for example:
if (pci_aer_available() && pcie_aer_is_native(dev)) {This is because the pcie_aer_is_native() function performs the dev->aer_cap check internally, so we could rely on it, and avoid checking the same thing twice.
What do you think?
Krzysztof
Hi Krzysztof,
Quoted 13 lines · Krzysztof Wilczyński
Hi Tan,
This is very nice! Thank you for this.
[...]
drivers/pci/pcie/portdrv_core.c static int get_port_device_capability(struct pci_dev *dev) · line 226
Quoted 4 lines
drivers/pci/pcie/portdrv_core.c +1
-1if (dev->aer_cap &&pci_aer_available () && - (pcie_ports_native || host->native_aer)) { +pcie_aer_is_native (dev)) { services |=PCIE_PORT_SERVICE_AER ;[...]
A suggestion. You could improve this even further, for example:
Quoted 8 lines
if (pci_aer_available() && pcie_aer_is_native(dev)) {This is because the
pcie_aer_is_native()function performs thedev->aer_capcheck internally, so we could rely on it, and avoid checking the same thing twice.What do you think?
Yes, it's better, i will send v2 patch including this.thanks.
Quoted 6 lines
Reviewed-by Krzysztof Wilczyński <[email protected]>Krzysztof
.