tile PCI RC: support pci=off boot arg for tilepro

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

tile PCI RC: support pci=off boot arg for tilepro
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Chris Metcalf
1 parent 523c178edf
Showing 1 changed file with 17 additions and 0 deletions Side-by-side Diff
arch/tile/kernel/pci.c
@@ -51,6 +51,8 @@
  *
  */
  
+static int pci_probe = 1;
+
 /*
  * This flag tells if the platform is TILEmpower that needs
  * special configuration for the PLX switch chip.
@@ -143,6 +145,11 @@
 {
 	int i;
  
+	if (!pci_probe) {
+		pr_info("PCI: disabled by boot argument\n");
+		return 0;
+	}
+
 	pr_info("PCI: Searching for controllers...\n");
  
 	/* Re-init number of PCIe controllers to support hot-plug feature. */
@@ -376,6 +383,16 @@
 void pcibios_set_master(struct pci_dev *dev)
 {
 	/* No special bus mastering setup handling. */
+}
+
+/* Process any "pci=" kernel boot arguments. */
+char * __init pcibios_setup(char *str)
+{
+	if (!strcmp(str, "off")) {
+		pci_probe = 0;
+		return NULL;
+	}
+	return str;
 }
  
 /*
...	...	@@ -51,6 +51,8 @@
51	51	*
52	52	*/
53	53
	54	+static int pci_probe = 1;
	55	+
54	56	/*
55	57	* This flag tells if the platform is TILEmpower that needs
56	58	* special configuration for the PLX switch chip.
...	...	@@ -143,6 +145,11 @@
143	145	{
144	146	int i;
145	147
	148	+ if (!pci_probe) {
	149	+ pr_info("PCI: disabled by boot argument\n");
	150	+ return 0;
	151	+ }
	152	+
146	153	pr_info("PCI: Searching for controllers...\n");
147	154
148	155	/* Re-init number of PCIe controllers to support hot-plug feature. */
...	...	@@ -376,6 +383,16 @@
376	383	void pcibios_set_master(struct pci_dev *dev)
377	384	{
378	385	/* No special bus mastering setup handling. */
	386	+}
	387	+
	388	+/* Process any "pci=" kernel boot arguments. */
	389	+char * __init pcibios_setup(char *str)
	390	+{
	391	+ if (!strcmp(str, "off")) {
	392	+ pci_probe = 0;
	393	+ return NULL;
	394	+ }
	395	+ return str;
379	396	}
380	397
381	398	/*