[v1,09/13] PCI/AER: Move aer_irq() declaration to portdrv.h

Commit Message

Bjorn Helgaas June 8, 2018, 8:05 p.m. UTC

From: Bjorn Helgaas <[e-mail]>

The aer_irq() declaration is the only thing needed by aer_inject.c.  Move
it to portdrv.h so we eventually get rid of aerdrv.h completely.  No
functional change intended.

Signed-off-by: Bjorn Helgaas <[e-mail]>
---
 drivers/pci/pcie/aer/aer_inject.c |    3 ++-
 drivers/pci/pcie/aer/aerdrv.h     |    2 --
 drivers/pci/pcie/portdrv.h        |    4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

Comments

Keith Busch June 8, 2018, 8:17 p.m. UTC | #1

On Fri, Jun 08, 2018 at 03:05:41PM -0500, Bjorn Helgaas wrote:
> The aer_irq() declaration is the only thing needed by aer_inject.c.  Move
> it to portdrv.h so we eventually get rid of aerdrv.h completely.  No
> functional change intended.

Nothing against what you're doing here, but it does seem odd that aer_irq
is required to be exported just for the error injection to directly call
it. I feel like aer-inject should route it through the irq subsystem,
like with generic_handle_irq. ?

Bjorn Helgaas June 8, 2018, 8:34 p.m. UTC | #2

On Fri, Jun 08, 2018 at 02:17:13PM -0600, Keith Busch wrote:
> On Fri, Jun 08, 2018 at 03:05:41PM -0500, Bjorn Helgaas wrote:
> > The aer_irq() declaration is the only thing needed by aer_inject.c.  Move
> > it to portdrv.h so we eventually get rid of aerdrv.h completely.  No
> > functional change intended.
> 
> Nothing against what you're doing here, but it does seem odd that aer_irq
> is required to be exported just for the error injection to directly call
> it. I feel like aer-inject should route it through the irq subsystem,
> like with generic_handle_irq. ?

I totally agree, that's ugly, but I don't have a good idea for how to
fix it yet.

(And I don't want to do anything more than the simplest possible code
moves at this stage, since I think restructuring like this would have
to be done at the end of the merge window to avoid major disruption to
people working on this code.)

Thanks for taking a look over it!

Bjorn

Patch

diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index a49090935303..6c5fda96778a 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -21,7 +21,8 @@ 
 #include <linux/uaccess.h>
 #include <linux/stddef.h>
 #include <linux/device.h>
-#include "aerdrv.h"
+
+#include "../portdrv.h"
 
 /* Override the existing corrected and uncorrected error masks */
 static bool aer_mask_override;
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index b0c4aaa79d9c..9867950635df 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -76,6 +76,4 @@  struct aer_rpc {
 					 */
 };
 
-irqreturn_t aer_irq(int irq, void *context);
-
 #endif /* _AERDRV_H_ */
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 6a261dc7cd4c..6ffc797a0dc1 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -121,6 +121,10 @@  static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
 }
 #endif
 
+#ifdef CONFIG_PCIEAER
+irqreturn_t aer_irq(int irq, void *context);
+#endif
+
 struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev,
 							u32 service);
 struct device *pcie_port_find_device(struct pci_dev *dev, u32 service);