Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 843f4697 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Jesse Barnes
Browse files

PCI: aerdrv: make aer_{en,dis}able_rootport static 



These functions are only called from init/remove path of aerdrv,
so move them from aerdrv_core.c to aerdrv.c, to make them static.

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 460d298d

drivers/pci/pcie/aer/aerdrv.c

+107 −0
Original line number Diff line number Diff line
@@ -72,6 +72,113 @@ void pci_no_aer(void) 
	pcie_aer_disable = 1;	/* has priority over 'forceload' */

}



static int set_device_error_reporting(struct pci_dev *dev, void *data)

{

	bool enable = *((bool *)data);



	if ((dev->pcie_type == PCI_EXP_TYPE_ROOT_PORT) ||

	    (dev->pcie_type == PCI_EXP_TYPE_UPSTREAM) ||

	    (dev->pcie_type == PCI_EXP_TYPE_DOWNSTREAM)) {

		if (enable)

			pci_enable_pcie_error_reporting(dev);

		else

			pci_disable_pcie_error_reporting(dev);

	}



	if (enable)

		pcie_set_ecrc_checking(dev);



	return 0;

}



/**

 * set_downstream_devices_error_reporting - enable/disable the error reporting  bits on the root port and its downstream ports.

 * @dev: pointer to root port's pci_dev data structure

 * @enable: true = enable error reporting, false = disable error reporting.

 */

static void set_downstream_devices_error_reporting(struct pci_dev *dev,

						   bool enable)

{

	set_device_error_reporting(dev, &enable);



	if (!dev->subordinate)

		return;

	pci_walk_bus(dev->subordinate, set_device_error_reporting, &enable);

}



/**

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

 * @rpc: pointer to a Root Port data structure

 *

 * Invoked when PCIe bus loads AER service driver.

 */

static void aer_enable_rootport(struct aer_rpc *rpc)

{

	struct pci_dev *pdev = rpc->rpd->port;

	int pos, aer_pos;

	u16 reg16;

	u32 reg32;



	pos = pci_pcie_cap(pdev);

	/* Clear PCIe Capability's Device Status */

	pci_read_config_word(pdev, pos+PCI_EXP_DEVSTA, &reg16);

	pci_write_config_word(pdev, pos+PCI_EXP_DEVSTA, reg16);



	/* Disable system error generation in response to error messages */

	pci_read_config_word(pdev, pos + PCI_EXP_RTCTL, &reg16);

	reg16 &= ~(SYSTEM_ERROR_INTR_ON_MESG_MASK);

	pci_write_config_word(pdev, pos + PCI_EXP_RTCTL, reg16);



	aer_pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);

	/* Clear error status */

	pci_read_config_dword(pdev, aer_pos + PCI_ERR_ROOT_STATUS, &reg32);

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_ROOT_STATUS, reg32);

	pci_read_config_dword(pdev, aer_pos + PCI_ERR_COR_STATUS, &reg32);

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_COR_STATUS, reg32);

	pci_read_config_dword(pdev, aer_pos + PCI_ERR_UNCOR_STATUS, &reg32);

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_UNCOR_STATUS, reg32);



	/*

	 * Enable error reporting for the root port device and downstream port

	 * devices.

	 */

	set_downstream_devices_error_reporting(pdev, true);



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

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

	reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_ROOT_COMMAND, reg32);

}



/**

 * aer_disable_rootport - disable Root Port's interrupts when receiving messages

 * @rpc: pointer to a Root Port data structure

 *

 * Invoked when PCIe bus unloads AER service driver.

 */

static void aer_disable_rootport(struct aer_rpc *rpc)

{

	struct pci_dev *pdev = rpc->rpd->port;

	u32 reg32;

	int pos;



	/*

	 * Disable error reporting for the root port device and downstream port

	 * devices.

	 */

	set_downstream_devices_error_reporting(pdev, false);



	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);

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

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

	reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, pos + PCI_ERR_ROOT_COMMAND, reg32);



	/* Clear Root's error status reg */

	pci_read_config_dword(pdev, pos + PCI_ERR_ROOT_STATUS, &reg32);

	pci_write_config_dword(pdev, pos + PCI_ERR_ROOT_STATUS, reg32);

}



/**

 * aer_irq - Root Port's ISR

 * @irq: IRQ assigned to Root Port

drivers/pci/pcie/aer/aerdrv.h

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ static inline pci_ers_result_t merge_result(enum pci_ers_result orig, 
}



extern struct bus_type pcie_port_bus_type;

extern void aer_enable_rootport(struct aer_rpc *rpc);

extern void aer_disable_rootport(struct aer_rpc *rpc);

extern int aer_init(struct pcie_device *dev);

extern void aer_isr(struct work_struct *work);

extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);

drivers/pci/pcie/aer/aerdrv_core.c

+0 −107
Original line number Diff line number Diff line
@@ -99,40 +99,6 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) 
}

EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);



static int set_device_error_reporting(struct pci_dev *dev, void *data)

{

	bool enable = *((bool *)data);



	if ((dev->pcie_type == PCI_EXP_TYPE_ROOT_PORT) ||

	    (dev->pcie_type == PCI_EXP_TYPE_UPSTREAM) ||

	    (dev->pcie_type == PCI_EXP_TYPE_DOWNSTREAM)) {

		if (enable)

			pci_enable_pcie_error_reporting(dev);

		else

			pci_disable_pcie_error_reporting(dev);

	}



	if (enable)

		pcie_set_ecrc_checking(dev);



	return 0;

}



/**

 * set_downstream_devices_error_reporting - enable/disable the error reporting  bits on the root port and its downstream ports.

 * @dev: pointer to root port's pci_dev data structure

 * @enable: true = enable error reporting, false = disable error reporting.

 */

static void set_downstream_devices_error_reporting(struct pci_dev *dev,

						   bool enable)

{

	set_device_error_reporting(dev, &enable);



	if (!dev->subordinate)

		return;

	pci_walk_bus(dev->subordinate, set_device_error_reporting, &enable);

}



static inline int compare_device_id(struct pci_dev *dev,

			struct aer_err_info *e_info)

{
@@ -584,79 +550,6 @@ static void handle_error_source(struct pcie_device *aerdev, 
	}

}



/**

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

 * @rpc: pointer to a Root Port data structure

 *

 * Invoked when PCIe bus loads AER service driver.

 */

void aer_enable_rootport(struct aer_rpc *rpc)

{

	struct pci_dev *pdev = rpc->rpd->port;

	int pos, aer_pos;

	u16 reg16;

	u32 reg32;



	pos = pci_pcie_cap(pdev);

	/* Clear PCIe Capability's Device Status */

	pci_read_config_word(pdev, pos+PCI_EXP_DEVSTA, &reg16);

	pci_write_config_word(pdev, pos+PCI_EXP_DEVSTA, reg16);



	/* Disable system error generation in response to error messages */

	pci_read_config_word(pdev, pos + PCI_EXP_RTCTL, &reg16);

	reg16 &= ~(SYSTEM_ERROR_INTR_ON_MESG_MASK);

	pci_write_config_word(pdev, pos + PCI_EXP_RTCTL, reg16);



	aer_pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);

	/* Clear error status */

	pci_read_config_dword(pdev, aer_pos + PCI_ERR_ROOT_STATUS, &reg32);

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_ROOT_STATUS, reg32);

	pci_read_config_dword(pdev, aer_pos + PCI_ERR_COR_STATUS, &reg32);

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_COR_STATUS, reg32);

	pci_read_config_dword(pdev, aer_pos + PCI_ERR_UNCOR_STATUS, &reg32);

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_UNCOR_STATUS, reg32);



	/*

	 * Enable error reporting for the root port device and downstream port

	 * devices.

	 */

	set_downstream_devices_error_reporting(pdev, true);



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

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

	reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, aer_pos + PCI_ERR_ROOT_COMMAND, reg32);

}



/**

 * aer_disable_rootport - disable Root Port's interrupts when receiving messages

 * @rpc: pointer to a Root Port data structure

 *

 * Invoked when PCIe bus unloads AER service driver.

 */

void aer_disable_rootport(struct aer_rpc *rpc)

{

	struct pci_dev *pdev = rpc->rpd->port;

	u32 reg32;

	int pos;



	/*

	 * Disable error reporting for the root port device and downstream port

	 * devices.

	 */

	set_downstream_devices_error_reporting(pdev, false);



	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);

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

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

	reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(pdev, pos + PCI_ERR_ROOT_COMMAND, reg32);



	/* Clear Root's error status reg */

	pci_read_config_dword(pdev, pos + PCI_ERR_ROOT_STATUS, &reg32);

	pci_write_config_dword(pdev, pos + PCI_ERR_ROOT_STATUS, reg32);

}



/**

 * get_e_source - retrieve an error source

 * @rpc: pointer to the root port which holds an error