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

Commit 4bdc1b96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: AMD 813x B2 devices do not need boot interrupt quirk
  PCI: Enable PCIe AER only after checking firmware support
  PCI: pciehp: Handle interrupts that happen during initialization.
  PCI: don't enable too many HT MSI mappings
  PCI: add some sysfs ABI docs
  PCI quirk: enable MSI on 8132
parents 64e71303 bbe19443

Documentation/ABI/testing/sysfs-bus-pci

+43 −0
Original line number Diff line number Diff line 
What:		/sys/bus/pci/drivers/.../bind

Date:		December 2003

Contact:	linux-pci@vger.kernel.org

Description:

		Writing a device location to this file will cause

		the driver to attempt to bind to the device found at

		this location.	This is useful for overriding default

		bindings.  The format for the location is: DDDD:BB:DD.F.

		That is Domain:Bus:Device.Function and is the same as

		found in /sys/bus/pci/devices/.  For example:

		# echo 0000:00:19.0 > /sys/bus/pci/drivers/foo/bind

		(Note: kernels before 2.6.28 may require echo -n).



What:		/sys/bus/pci/drivers/.../unbind

Date:		December 2003

Contact:	linux-pci@vger.kernel.org

Description:

		Writing a device location to this file will cause the

		driver to attempt to unbind from the device found at

		this location.	This may be useful when overriding default

		bindings.  The format for the location is: DDDD:BB:DD.F.

		That is Domain:Bus:Device.Function and is the same as

		found in /sys/bus/pci/devices/. For example:

		# echo 0000:00:19.0 > /sys/bus/pci/drivers/foo/unbind

		(Note: kernels before 2.6.28 may require echo -n).



What:		/sys/bus/pci/drivers/.../new_id

Date:		December 2003

Contact:	linux-pci@vger.kernel.org

Description:

		Writing a device ID to this file will attempt to

		dynamically add a new device ID to a PCI device driver.

		This may allow the driver to support more hardware than

		was included in the driver's static device ID support

		table at compile time.  The format for the device ID is:

		VVVV DDDD SVVV SDDD CCCC MMMM PPPP.  That is Vendor ID,

		Device ID, Subsystem Vendor ID, Subsystem Device ID,

		Class, Class Mask, and Private Driver Data.  The Vendor ID

		and Device ID fields are required, the rest are optional.

		Upon successfully adding an ID, the driver will probe

		for the device and attempt to bind to it.  For example:

		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/new_id



What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

drivers/pci/hotplug/pciehp.h

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ struct controller { 
	int cmd_busy;

	unsigned int no_cmd_complete:1;

	unsigned int link_active_reporting:1;

	unsigned int notification_enabled:1;

};



#define INT_BUTTON_IGNORE		0
@@ -170,6 +171,7 @@ extern int pciehp_configure_device(struct slot *p_slot); 
extern int pciehp_unconfigure_device(struct slot *p_slot);

extern void pciehp_queue_pushbutton_work(struct work_struct *work);

struct controller *pcie_init(struct pcie_device *dev);

int pcie_init_notification(struct controller *ctrl);

int pciehp_enable_slot(struct slot *p_slot);

int pciehp_disable_slot(struct slot *p_slot);

int pcie_enable_notification(struct controller *ctrl);

drivers/pci/hotplug/pciehp_core.c

+7 −0
Original line number Diff line number Diff line
@@ -434,6 +434,13 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 
		goto err_out_release_ctlr;

	}



	/* Enable events after we have setup the data structures */

	rc = pcie_init_notification(ctrl);

	if (rc) {

		ctrl_err(ctrl, "Notification initialization failed\n");

		goto err_out_release_ctlr;

	}



	/* Check if slot is occupied */

	t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);

	t_slot->hpc_ops->get_adapter_status(t_slot, &value);

drivers/pci/hotplug/pciehp_hpc.c

+7 −8
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static void pcie_disable_notification(struct controller *ctrl) 
		ctrl_warn(ctrl, "Cannot disable software notification\n");

}



static int pcie_init_notification(struct controller *ctrl)

int pcie_init_notification(struct controller *ctrl)

{

	if (pciehp_request_irq(ctrl))

		return -1;
@@ -942,13 +942,17 @@ static int pcie_init_notification(struct controller *ctrl) 
		pciehp_free_irq(ctrl);

		return -1;

	}

	ctrl->notification_enabled = 1;

	return 0;

}



static void pcie_shutdown_notification(struct controller *ctrl)

{

	if (ctrl->notification_enabled) {

		pcie_disable_notification(ctrl);

		pciehp_free_irq(ctrl);

		ctrl->notification_enabled = 0;

	}

}



static int pcie_init_slot(struct controller *ctrl)
@@ -1110,13 +1114,8 @@ struct controller *pcie_init(struct pcie_device *dev) 
	if (pcie_init_slot(ctrl))

		goto abort_ctrl;



	if (pcie_init_notification(ctrl))

		goto abort_slot;



	return ctrl;



abort_slot:

	pcie_cleanup_slot(ctrl);

abort_ctrl:

	kfree(ctrl);

abort:

drivers/pci/pcie/aer/aerdrv_core.c

+39 −9
Original line number Diff line number Diff line
@@ -108,6 +108,34 @@ int pci_cleanup_aer_correct_error_status(struct pci_dev *dev) 
}

#endif  /*  0  */





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

{

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



	if (dev->pcie_type != PCIE_RC_PORT &&

	    dev->pcie_type != PCIE_SW_UPSTREAM_PORT &&

	    dev->pcie_type != PCIE_SW_DOWNSTREAM_PORT)

		return;



	if (enable)

		pci_enable_pcie_error_reporting(dev);

	else

		pci_disable_pcie_error_reporting(dev);

}



/**

 * 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);

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

}



static int find_device_iter(struct device *device, void *data)

{

	struct pci_dev *dev;
@@ -525,15 +553,11 @@ void aer_enable_rootport(struct aer_rpc *rpc) 
	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 Root Port device reporting error itself */

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

	reg16 = reg16 |

		PCI_EXP_DEVCTL_CERE |

		PCI_EXP_DEVCTL_NFERE |

		PCI_EXP_DEVCTL_FERE |

		PCI_EXP_DEVCTL_URRE;

	pci_write_config_word(pdev, pos+PCI_EXP_DEVCTL,

		reg16);

	/*

	 * 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_write_config_dword(pdev,
@@ -553,6 +577,12 @@ static void disable_root_aer(struct aer_rpc *rpc) 
	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_write_config_dword(pdev, pos + PCI_ERR_ROOT_COMMAND, 0);