Commit 13cf36c6 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Bjorn Helgaas
Browse files

PCI/AER: Factor out interrupt toggling into helpers 

There are many places that enable and disable AER interrupt, so move
them into helpers.

Link: https://lore.kernel.org/r/20230512000014.118942-1-kai.heng.feng@canonical.com


Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 0bb80ecc

drivers/pci/pcie/aer.c

+27 −18
Original line number Diff line number Diff line
@@ -1213,6 +1213,28 @@ static irqreturn_t aer_irq(int irq, void *context) 
	return IRQ_WAKE_THREAD;

}



static void aer_enable_irq(struct pci_dev *pdev)

{

	int aer = pdev->aer_cap;

	u32 reg32;



	/* Enable Root Port's interrupt in response to error messages */

	pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);

	reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);

}



static void aer_disable_irq(struct pci_dev *pdev)

{

	int aer = pdev->aer_cap;

	u32 reg32;



	/* Disable Root's interrupt in response to error messages */

	pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);

	reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);

}



/**

 * aer_enable_rootport - enable Root Port's interrupts when receiving messages

 * @rpc: pointer to a Root Port data structure
@@ -1242,10 +1264,7 @@ static void aer_enable_rootport(struct aer_rpc *rpc) 
	pci_read_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS, &reg32);

	pci_write_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS, reg32);



	/* Enable Root Port's interrupt in response to error messages */

	pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);

	reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);

	aer_enable_irq(pdev);

}



/**
@@ -1260,10 +1279,7 @@ static void aer_disable_rootport(struct aer_rpc *rpc) 
	int aer = pdev->aer_cap;

	u32 reg32;



	/* Disable Root's interrupt in response to error messages */

	pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);

	reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);

	aer_disable_irq(pdev);



	/* Clear Root's error status reg */

	pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_STATUS, &reg32);
@@ -1358,12 +1374,8 @@ 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) {

		/* Disable Root's interrupt in response to error messages */

		pci_read_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, &reg32);

		reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;

		pci_write_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, reg32);

	}

	if ((host->native_aer || pcie_ports_native) && aer)

		aer_disable_irq(root);



	if (type == PCI_EXP_TYPE_RC_EC || type == PCI_EXP_TYPE_RC_END) {

		rc = pcie_reset_flr(dev, PCI_RESET_DO_RESET);
@@ -1382,10 +1394,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) 
		pci_read_config_dword(root, aer + PCI_ERR_ROOT_STATUS, &reg32);

		pci_write_config_dword(root, aer + PCI_ERR_ROOT_STATUS, reg32);



		/* Enable Root Port's interrupt in response to error messages */

		pci_read_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, &reg32);

		reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;

		pci_write_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, reg32);

		aer_enable_irq(root);

	}



	return rc ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;