From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Dec 2014 04:58:52 +0000 (-0800)
Subject: Merge tag 'pci-v3.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c75059c46293adf1560162c17148ab94624f5ed2;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'pci-v3.19-changes' of git://git./linux/kernel/git/helgaas/pci

Pull PCI changes from Bjorn Helgaas:
 "Here are the PCI changes intended for v3.19.  I don't think there's
  anything very exciting here, but there was a lot of MSI-related stuff
  coming via Thomas.

  Details:

  NUMA
    - Allow numa_node override via sysfs (Prarit Bhargava)

  Resource management
    - Restore detection of read-only BARs (Myron Stowe)
    - Shrink decoding-disabled window while sizing BARs (Myron Stowe)
    - Add informational printk for invalid BARs (Myron Stowe)
    - Remove fixed parameter in pci_iov_resource_bar() (Myron Stowe)

  MSI
    - Add pci_msi_ignore_mask to prevent writes to MSI/MSI-X Mask Bits (Yijing Wang)
    - Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()" (Yijing Wang)
    - s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() (Yijing Wang)

  Virtualization
    - xen: Process failure for pcifront_(re)scan_root() (Chen Gang)
    - Make FLR and AF FLR reset warning messages different (Gavin Shan)

  Generic host bridge driver
    - Allocate config space windows after limiting bus number range (Lorenzo Pieralisi)
    - Convert to DT resource parsing API (Lorenzo Pieralisi)

  Freescale Layerscape
    - Add Freescale Layerscape PCIe driver (Minghuan Lian)

  NVIDIA Tegra
    - Do not build on 64-bit ARM (Thierry Reding)
    - Add Kconfig help text (Thierry Reding)

  Renesas R-Car
    - Make rcar_pci static (Jingoo Han)

  Samsung Exynos
    - Add exynos prefix to add_pcie_port(), pcie_init() (Jingoo Han)

  ST Microelectronics SPEAr13xx
    - Add spear prefix to add_pcie_port(), pcie_init() (Jingoo Han)
    - Make spear13xx_add_pcie_port() __init (Jingoo Han)
    - Remove unnecessary OOM message (Jingoo Han)

  TI DRA7xx
    - Add dra7xx prefix to add_pcie_port() (Jingoo Han)
    - Make dra7xx_add_pcie_port() __init (Jingoo Han)

  TI Keystone
    - Make ks_dw_pcie_msi_domain_ops static (Jingoo Han)
    - Remove unnecessary OOM message (Jingoo Han)

  Miscellaneous
    - Delete unnecessary NULL pointer checks (Markus Elfring)
    - Remove unused to_hotplug_slot() (Gavin Shan)
    - Whitespace cleanup (Jingoo Han)
    - Simplify if-return sequences (Quentin Lambert)"

* tag 'pci-v3.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (28 commits)
  PCI: Remove fixed parameter in pci_iov_resource_bar()
  PCI: Add informational printk for invalid BARs
  PCI: tegra: Add Kconfig help text
  PCI: tegra: Do not build on 64-bit ARM
  PCI: spear: Remove unnecessary OOM message
  PCI: mvebu: Add a blank line after declarations
  PCI: designware: Add a blank line after declarations
  PCI: exynos: Remove unnecessary return statement
  PCI: imx6: Use tabs for indentation
  PCI: keystone: Remove unnecessary OOM message
  PCI: Remove unused and broken to_hotplug_slot()
  PCI: Make FLR and AF FLR reset warning messages different
  PCI: dra7xx: Add __init annotation to dra7xx_add_pcie_port()
  PCI: spear: Add __init annotation to spear13xx_add_pcie_port()
  PCI: spear: Rename add_pcie_port(), pcie_init() to spear13xx_add_pcie_port(), etc.
  PCI: dra7xx: Rename add_pcie_port() to dra7xx_add_pcie_port()
  PCI: layerscape: Add Freescale Layerscape PCIe driver
  PCI: Simplify if-return sequences
  PCI: Delete unnecessary NULL pointer checks
  PCI: Shrink decoding-disabled window while sizing BARs
  ...
---

c75059c46293adf1560162c17148ab94624f5ed2
diff --cc drivers/pci/host/pcie-rcar.c
index d3053e53cf35,0df9b2941221..5519e939e412
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@@ -380,7 -380,16 +380,7 @@@ static int rcar_pcie_setup(int nr, stru
  	return 1;
  }
  
- struct hw_pci rcar_pci = {
 -static void rcar_pcie_add_bus(struct pci_bus *bus)
 -{
 -	if (IS_ENABLED(CONFIG_PCI_MSI)) {
 -		struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
 -
 -		bus->msi = &pcie->msi.chip;
 -	}
 -}
 -
+ static struct hw_pci rcar_pci = {
  	.setup          = rcar_pcie_setup,
  	.map_irq        = of_irq_parse_and_map_pci,
  	.ops            = &rcar_pcie_ops,
diff --cc drivers/pci/pci-sysfs.c
index 2c6643fdc0cf,91e760f9655b..a5addbc9c026
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@@ -218,9 -218,34 +218,34 @@@ static ssize_t enable_show(struct devic
  	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_store(struct device *dev,
+ 			       struct device_attribute *attr, const char *buf,
+ 			       size_t count)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(dev);
+ 	int node, ret;
+ 
+ 	if (!capable(CAP_SYS_ADMIN))
+ 		return -EPERM;
+ 
+ 	ret = kstrtoint(buf, 0, &node);
+ 	if (ret)
+ 		return ret;
+ 
+ 	if (!node_online(node))
+ 		return -EINVAL;
+ 
+ 	add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
+ 	dev_alert(&pdev->dev, FW_BUG "Overriding NUMA node to %d.  Contact your vendor for updates.",
+ 		  node);
+ 
+ 	dev->numa_node = node;
+ 	return count;
+ }
+ 
  static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr,
  			      char *buf)
  {