Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci (09521577) · Commits · 戴 / test

drivers/pci/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ config PCI_IOV

		config PCI_PRI
		bool "PCI PRI support"
		depends on PCI
		select PCI_ATS
		help
		PRI is the PCI Page Request Interface. It allows PCI devices that are

drivers/pci/hotplug/acpiphp_glue.c

+24 −5

Original line number	Diff line number	Diff line
		@@ -459,8 +459,17 @@ static int add_bridge(acpi_handle handle)
		{
		acpi_status status;
		unsigned long long tmp;
		struct acpi_pci_root *root;
		acpi_handle dummy_handle;

		/*
		* We shouldn't use this bridge if PCIe native hotplug control has been
		* granted by the BIOS for it.
		*/
		root = acpi_pci_find_root(handle);
		if (root && (root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
		return -ENODEV;

		/* if the bridge doesn't have _STA, we assume it is always there */
		status = acpi_get_handle(handle, "_STA", &dummy_handle);
		if (ACPI_SUCCESS(status)) {
		@@ -1376,13 +1385,23 @@ static void handle_hotplug_event_func(acpi_handle handle, u32 type,
		static acpi_status
		find_root_bridges(acpi_handle handle, u32 lvl, void context, void *rv)
		{
		struct acpi_pci_root *root;
		int count = (int )context;

		if (acpi_is_root_bridge(handle)) {
		if (!acpi_is_root_bridge(handle))
		return AE_OK;

		root = acpi_pci_find_root(handle);
		if (!root)
		return AE_OK;

		if (root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)
		return AE_OK;

		(*count)++;
		acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
		handle_hotplug_event_bridge, NULL);
		(*count)++;
		}

		return AE_OK ;
		}

drivers/pci/hotplug/pciehp_ctrl.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -213,9 +213,6 @@ static int board_added(struct slot *p_slot)
		goto err_exit;
		}

		/* Wait for 1 second after checking link training status */
		msleep(1000);

		/* Check for a power fault */
		if (ctrl->power_fault_detected \|\| pciehp_query_power_fault(p_slot)) {
		ctrl_err(ctrl, "Power fault on slot %s\n", slot_name(p_slot));

drivers/pci/hotplug/pciehp_hpc.c

+18 −9

Original line number	Diff line number	Diff line
		@@ -280,6 +280,14 @@ int pciehp_check_link_status(struct controller *ctrl)
		else
		msleep(1000);

		/*
		* Need to wait for 1000 ms after Data Link Layer Link Active
		* (DLLLA) bit reads 1b before sending configuration request.
		* We need it before checking Link Training (LT) bit becuase
		* LT is still set even after DLLLA bit is set on some platform.
		*/
		msleep(1000);

		retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status);
		if (retval) {
		ctrl_err(ctrl, "Cannot read LNKSTATUS register\n");
		@@ -294,6 +302,16 @@ int pciehp_check_link_status(struct controller *ctrl)
		return retval;
		}

		/*
		* If the port supports Link speeds greater than 5.0 GT/s, we
		* must wait for 100 ms after Link training completes before
		* sending configuration request.
		*/
		if (ctrl->pcie->port->subordinate->max_bus_speed > PCIE_SPEED_5_0GT)
		msleep(100);

		pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);

		return retval;
		}

		@@ -484,7 +502,6 @@ int pciehp_power_on_slot(struct slot * slot)
		u16 slot_cmd;
		u16 cmd_mask;
		u16 slot_status;
		u16 lnk_status;
		int retval = 0;

		/* Clear sticky power-fault bit from previous power failures */
		@@ -516,14 +533,6 @@ int pciehp_power_on_slot(struct slot * slot)
		ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
		pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_cmd);

		retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status);
		if (retval) {
		ctrl_err(ctrl, "%s: Cannot read LNKSTA register\n",
		__func__);
		return retval;
		}
		pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);

		return retval;
		}

drivers/pci/hotplug/shpchp_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -278,8 +278,8 @@ static int get_adapter_status (struct hotplug_slot hotplug_slot, u8 value)

		static int is_shpc_capable(struct pci_dev *dev)
		{
		if ((dev->vendor == PCI_VENDOR_ID_AMD) \|\| (dev->device ==
		PCI_DEVICE_ID_AMD_GOLAM_7450))
		if (dev->vendor == PCI_VENDOR_ID_AMD &&
		dev->device == PCI_DEVICE_ID_AMD_GOLAM_7450)
		return 1;
		if (!pci_find_capability(dev, PCI_CAP_ID_SHPC))
		return 0;

Admin message