Commit 08da742e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "These changes, intended for v3.18, fix:

  Sysfs
    - Fix "enable" filename change (Greg Kroah-Hartman)

      An unintentional sysfs filename change in commit 5136b2da
      ("PCI: convert bus code to use dev_groups"), which appeared in
      v3.13, changed "enable" to "enabled", and this changes it back.

      Old users of "enable" are currently broken and will be helped by
      this change.  Anything that started to use "enabled" after v3.13
      will be broken by this change.  If necessary, we can add a symlink
      to make both work, but this patch doesn't do that.

  PCI device hotplug
    - Revert duplicate merge (Kamal Mostafa)

      A mistaken duplicate merge that added a check twice.  Nothing's
      broken; this just removes the unnecessary code.

  Freescale i.MX6
    - Wait for clocks to stabilize after ref_en (Richard Zhu)

      An i.MX6 clock problem that prevents mx6 nitrogen boards from booting"

* tag 'pci-v3.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Rename sysfs 'enabled' file back to 'enable'
  PCI: imx6: Wait for clocks to stabilize after ref_en
  Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe"
parents 653bc77a d8e7d53a

drivers/pci/host/pci-imx6.c

+10 −3
Original line number Diff line number Diff line
@@ -275,15 +275,22 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp) 
		goto err_pcie;

	}



	/* allow the clocks to stabilize */

	usleep_range(200, 500);



	/* power up core phy and enable ref clock */

	regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,

			IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);

	/*

	 * the async reset input need ref clock to sync internally,

	 * when the ref clock comes after reset, internal synced

	 * reset time is too short, cannot meet the requirement.

	 * add one ~10us delay here.

	 */

	udelay(10);

	regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,

			IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);



	/* allow the clocks to stabilize */

	usleep_range(200, 500);



	/* Some boards don't have PCIe reset GPIO. */

	if (gpio_is_valid(imx6_pcie->reset_gpio)) {

		gpio_set_value(imx6_pcie->reset_gpio, 0);

drivers/pci/hotplug/pciehp_core.c

+0 −7
Original line number Diff line number Diff line
@@ -262,13 +262,6 @@ static int pciehp_probe(struct pcie_device *dev) 
		goto err_out_none;

	}



	if (!dev->port->subordinate) {

		/* Can happen if we run out of bus numbers during probe */

		dev_err(&dev->device,

			"Hotplug bridge without secondary bus, ignoring\n");

		goto err_out_none;

	}



	ctrl = pcie_init(dev);

	if (!ctrl) {

		dev_err(&dev->device, "Controller initialization failed\n");

drivers/pci/pci-sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, 
}

static DEVICE_ATTR_RO(modalias);



static ssize_t enabled_store(struct device *dev, struct device_attribute *attr,

static ssize_t enable_store(struct device *dev, struct device_attribute *attr,

			     const char *buf, size_t count)

{

	struct pci_dev *pdev = to_pci_dev(dev);
@@ -210,7 +210,7 @@ static ssize_t enabled_store(struct device *dev, struct device_attribute *attr, 
	return result < 0 ? result : count;

}



static ssize_t enabled_show(struct device *dev, struct device_attribute *attr,

static ssize_t enable_show(struct device *dev, struct device_attribute *attr,

			    char *buf)

{

	struct pci_dev *pdev;
@@ -218,7 +218,7 @@ static ssize_t enabled_show(struct device *dev, struct device_attribute *attr, 
	pdev = to_pci_dev(dev);

	return sprintf(buf, "%u\n", atomic_read(&pdev->enable_cnt));

}

static DEVICE_ATTR_RW(enabled);

static DEVICE_ATTR_RW(enable);



#ifdef CONFIG_NUMA

static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr,
@@ -563,7 +563,7 @@ static struct attribute *pci_dev_attrs[] = { 
#endif

	&dev_attr_dma_mask_bits.attr,

	&dev_attr_consistent_dma_mask_bits.attr,

	&dev_attr_enabled.attr,

	&dev_attr_enable.attr,

	&dev_attr_broken_parity_status.attr,

	&dev_attr_msi_bus.attr,

#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)

CRA Git | Maintained and supported by SUSTech CRA and CCSE