Commit 50b3ef14 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device so dwc3 can
  claim it instead (Vicki Pfau)

- Make pci_assign_unassigned_resources() non-init because sparc uses it
  after init-time (Randy Dunlap)

- Remove logic_outb(), _outw(), outl() duplicate declarations (John Sanpe)

- Remove unnecessary UTF-8 in Kconfig help text that confuses menuconfig
  (Liu Song)

- Fix double free in __pci_epc_create() (Dan Carpenter)

- Simplify pcie_capability_clear_and_set_word() cases that could be
  pcie_capability_clear_word() (Ilpo Järvinen)

* pci/misc:
  PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
  PCI: endpoint: Fix double free in __pci_epc_create()
  PCI: Replace unnecessary UTF-8 in Kconfig
  logic_pio: Remove logic_outb(), _outw(), outl() duplicate declarations
  PCI: Make pci_assign_unassigned_resources() non-init
  PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device
parents 5897c174 0fce6e5c

drivers/pci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ config PCI_P2PDMA 
	select GENERIC_ALLOCATOR

	select NEED_SG_DMA_FLAGS

	help

	  Enableѕ drivers to do PCI peer-to-peer transactions to and from

	  Enables drivers to do PCI peer-to-peer transactions to and from

	  BARs that are exposed in other devices that are the part of

	  the hierarchy where peer-to-peer DMA is guaranteed by the PCI

	  specification to work (ie. anything below a single PCI bridge).

drivers/pci/endpoint/pci-epc-core.c

+0 −1
Original line number Diff line number Diff line
@@ -869,7 +869,6 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops, 


put_dev:

	put_device(&epc->dev);

	kfree(epc);



err_ret:

	return ERR_PTR(ret);

drivers/pci/pcie/aspm.c

+4 −4
Original line number Diff line number Diff line
@@ -696,10 +696,10 @@ static void pcie_config_aspm_l1ss(struct pcie_link_state *link, u32 state) 
	 * in pcie_config_aspm_link().

	 */

	if (enable_req & (ASPM_STATE_L1_1 | ASPM_STATE_L1_2)) {

		pcie_capability_clear_and_set_word(child, PCI_EXP_LNKCTL,

						   PCI_EXP_LNKCTL_ASPM_L1, 0);

		pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,

						   PCI_EXP_LNKCTL_ASPM_L1, 0);

		pcie_capability_clear_word(child, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPM_L1);

		pcie_capability_clear_word(parent, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPM_L1);

	}



	val = 0;

drivers/pci/quirks.c

+8 −6
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, quirk_ati_ 
/*

 * In the AMD NL platform, this device ([1022:7912]) has a class code of

 * PCI_CLASS_SERIAL_USB_XHCI (0x0c0330), which means the xhci driver will

 * claim it.

 * claim it. The same applies on the VanGogh platform device ([1022:163a]).

 *

 * But the dwc3 driver is a more specific driver for this device, and we'd

 * prefer to use it instead of xhci. To prevent xhci from claiming the
@@ -698,7 +698,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, quirk_ati_ 
 * defines as "USB device (not host controller)". The dwc3 driver can then

 * claim it based on its Vendor and Device ID.

 */

static void quirk_amd_nl_class(struct pci_dev *pdev)

static void quirk_amd_dwc_class(struct pci_dev *pdev)

{

	u32 class = pdev->class;
@@ -708,7 +708,9 @@ static void quirk_amd_nl_class(struct pci_dev *pdev) 
		 class, pdev->class);

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB,

		quirk_amd_nl_class);

		quirk_amd_dwc_class);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VANGOGH_USB,

		quirk_amd_dwc_class);



/*

 * Synopsys USB 3.x host HAPS platform has a class code of
@@ -4553,9 +4555,9 @@ static void quirk_disable_root_port_attributes(struct pci_dev *pdev) 


	pci_info(root_port, "Disabling No Snoop/Relaxed Ordering Attributes to avoid PCIe Completion erratum in %s\n",

		 dev_name(&pdev->dev));

	pcie_capability_clear_and_set_word(root_port, PCI_EXP_DEVCTL,

	pcie_capability_clear_word(root_port, PCI_EXP_DEVCTL,

				   PCI_EXP_DEVCTL_RELAX_EN |

					   PCI_EXP_DEVCTL_NOSNOOP_EN, 0);

				   PCI_EXP_DEVCTL_NOSNOOP_EN);

}



/*

drivers/pci/setup-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -2129,7 +2129,7 @@ void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus) 
	pci_bus_dump_resources(bus);

}



void __init pci_assign_unassigned_resources(void)

void pci_assign_unassigned_resources(void)

{

	struct pci_bus *root_bus;