Merge branch 'pci/misc'

- Warn only once about invalid ACS kernel parameter format (Richard Cheng)

- Suppress FW_BUG warning when writing sysfs 'numa_node' with the current
  value (Li RongQing)

- Drop redundant 'depends on PCI' from Kconfig (Julian Braha)

* pci/misc:
  PCI: Clean up dead code in Kconfig
  PCI/sysfs: Suppress FW_BUG warning when NUMA node already matches
  PCI: Use pr_warn_once() for ACS parameter parse failure
  PCI: of: Reduce severity of missing of_root error message

4 files changed, 8 insertions, 11 deletions

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index e3f848ffb52a..33c88432b728 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -31,7 +31,6 @@ if PCI
 
 config PCI_DOMAINS
 	bool
-	depends on PCI
 
 config PCI_DOMAINS_GENERIC
 	bool
@@ -255,7 +254,7 @@ config PCI_DYNAMIC_OF_NODES
 choice
 	prompt "PCI Express hierarchy optimization setting"
 	default PCIE_BUS_DEFAULT
-	depends on PCI && EXPERT
+	depends on EXPERT
 	help
 	  MPS (Max Payload Size) and MRRS (Max Read Request Size) are PCIe
 	  device parameters that affect performance and the ability to
@@ -272,20 +271,17 @@ choice
 
 config PCIE_BUS_TUNE_OFF
 	bool "Tune Off"
-	depends on PCI
 	help
 	  Use the BIOS defaults; don't touch MPS at all.  This is the same
 	  as booting with 'pci=pcie_bus_tune_off'.
 
 config PCIE_BUS_DEFAULT
 	bool "Default"
-	depends on PCI
 	help
 	  Default choice; ensure that the MPS matches upstream bridge.
 
 config PCIE_BUS_SAFE
 	bool "Safe"
-	depends on PCI
 	help
 	  Use largest MPS that boot-time devices support.  If you have a
 	  closed system with no possibility of adding new devices, this
@@ -294,7 +290,6 @@ config PCIE_BUS_SAFE
 
 config PCIE_BUS_PERFORMANCE
 	bool "Performance"
-	depends on PCI
 	help
 	  Use MPS and MRRS for best performance.  Ensure that a given
 	  device's MPS is no larger than its parent MPS, which allows us to
@@ -303,7 +298,6 @@ config PCIE_BUS_PERFORMANCE
 
 config PCIE_BUS_PEER2PEER
 	bool "Peer2peer"
-	depends on PCI
 	help
 	  Set MPS = 128 for all devices.  MPS configuration effected by the
 	  other options could cause the MPS on one root port to be
@@ -317,7 +311,7 @@ endchoice
 config VGA_ARB
 	bool "VGA Arbitration" if EXPERT
 	default y
-	depends on (PCI && !S390)
+	depends on !S390
 	select SCREEN_INFO if X86
 	help
 	  Some "legacy" VGA devices implemented on PCI typically have the same
@@ -340,4 +334,4 @@ source "drivers/pci/endpoint/Kconfig"
 source "drivers/pci/switch/Kconfig"
 source "drivers/pci/pwrctrl/Kconfig"
 
-endif
+endif # PCI
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index c216701c75dd..6da569fd3b8f 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -775,7 +775,7 @@ void of_pci_make_host_bridge_node(struct pci_host_bridge *bridge)
 
 	/* Check if there is a DT root node to attach the created node */
 	if (!of_root) {
-		pr_err("of_root node is NULL, cannot create PCI host bridge node\n");
+		pr_debug("of_root node is NULL, cannot create PCI host bridge node\n");
 		return;
 	}
 
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index a2f8a5d6190f..c7780adf564e 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -378,6 +378,9 @@ static ssize_t numa_node_store(struct device *dev,
 	if (node != NUMA_NO_NODE && !node_online(node))
 		return -EINVAL;
 
+	if (node == dev->numa_node)
+		return count;
+
 	add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
 	pci_alert(pdev, FW_BUG "Overriding NUMA node to %d.  Contact your vendor for updates.",
 		  node);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e601564709c6..8f7cfcc00090 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -949,7 +949,7 @@ static void __pci_config_acs(struct pci_dev *dev, struct pci_acs *caps,
 
 		ret = pci_dev_str_match(dev, p, &p);
 		if (ret < 0) {
-			pr_info_once("PCI: Can't parse ACS command line parameter\n");
+			pr_warn_once("PCI: Can't parse ACS command line parameter\n");
 			break;
 		} else if (ret == 1) {
 			/* Found a match */