Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c26d3c01 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Stop creating dummy root PCI host controller devices. 



It just creates confusion, errors, and bugs.

For one thing, this can cause dup sysfs or procfs nodes to get
created:

[    1.198015] proc_dir_entry '00.0' already registered
[    1.198036] Call Trace:
[    1.198052]  [00000000004f2534] create_proc_entry+0x7c/0x98
[    1.198092]  [00000000005719e4] pci_proc_attach_device+0xa4/0xd4
[    1.198126]  [00000000007d991c] pci_proc_init+0x64/0x88
[    1.198158]  [00000000007c62a4] kernel_init+0x190/0x330
[    1.198183]  [0000000000426cf8] kernel_thread+0x38/0x48
[    1.198210]  [00000000006a0d90] rest_init+0x18/0x5c

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 886c35fb

arch/sparc64/kernel/pci.c

+33 −97
Original line number Diff line number Diff line
@@ -350,8 +350,7 @@ static void pci_parse_of_addrs(struct of_device *op, 


struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,

				  struct device_node *node,

				  struct pci_bus *bus, int devfn,

				  int host_controller)

				  struct pci_bus *bus, int devfn)

{

	struct dev_archdata *sd;

	struct pci_dev *dev;
@@ -390,21 +389,6 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
	dev->devfn = devfn;

	dev->multifunction = 0;		/* maybe a lie? */



	if (host_controller) {

		if (tlb_type != hypervisor) {

			pci_read_config_word(dev, PCI_VENDOR_ID,

					     &dev->vendor);

			pci_read_config_word(dev, PCI_DEVICE_ID,

					     &dev->device);

		} else {

			dev->vendor = PCI_VENDOR_ID_SUN;

			dev->device = 0x80f0;

		}

		dev->cfg_size = 256;

		dev->class = PCI_CLASS_BRIDGE_HOST << 8;

		sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),

			0x00, PCI_SLOT(devfn), PCI_FUNC(devfn));

	} else {

	dev->vendor = of_getintprop_default(node, "vendor-id", 0xffff);

	dev->device = of_getintprop_default(node, "device-id", 0xffff);

	dev->subsystem_vendor =
@@ -426,7 +410,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 


	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),

		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));

	}



	if (ofpci_verbose)

		printk("    class: 0x%x device name: %s\n",

		       dev->class, pci_name(dev));
@@ -441,11 +425,6 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
	dev->current_state = 4;		/* unknown power state */

	dev->error_state = pci_channel_io_normal;



	if (host_controller) {

		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;

		dev->rom_base_reg = PCI_ROM_ADDRESS1;

		dev->irq = PCI_IRQ_NONE;

	} else {

	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {

		/* a PCI-PCI bridge */

		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
@@ -460,7 +439,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
		if (dev->irq == 0xffffffff)

			dev->irq = PCI_IRQ_NONE;

	}

	}



	pci_parse_of_addrs(sd->op, node, dev);



	if (ofpci_verbose)
@@ -749,7 +728,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm, 
		prev_devfn = devfn;



		/* create a new pci_dev for this device */

		dev = of_create_pci_dev(pbm, child, bus, devfn, 0);

		dev = of_create_pci_dev(pbm, child, bus, devfn);

		if (!dev)

			continue;

		if (ofpci_verbose)
@@ -796,48 +775,9 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus) 
		pci_bus_register_of_sysfs(child_bus);

}



int pci_host_bridge_read_pci_cfg(struct pci_bus *bus_dev,

				 unsigned int devfn,

				 int where, int size,

				 u32 *value)

{

	static u8 fake_pci_config[] = {

		0x8e, 0x10, /* Vendor: 0x108e (Sun) */

		0xf0, 0x80, /* Device: 0x80f0 (Fire) */

		0x46, 0x01, /* Command: 0x0146 (SERR, PARITY, MASTER, MEM) */

		0xa0, 0x22, /* Status: 0x02a0 (DEVSEL_MED, FB2B, 66MHZ) */

		0x00, 0x00, 0x00, 0x06, /* Class: 0x06000000 host bridge */

		0x00, /* Cacheline: 0x00 */

		0x40, /* Latency: 0x40 */

		0x00, /* Header-Type: 0x00 normal */

	};



	*value = 0;

	if (where >= 0 && where < sizeof(fake_pci_config) &&

	    (where + size) >= 0 &&

	    (where + size) < sizeof(fake_pci_config) &&

	    size <= sizeof(u32)) {

		while (size--) {

			*value <<= 8;

			*value |= fake_pci_config[where + size];

		}

	}



	return PCIBIOS_SUCCESSFUL;

}



int pci_host_bridge_write_pci_cfg(struct pci_bus *bus_dev,

				  unsigned int devfn,

				  int where, int size,

				  u32 value)

{

	return PCIBIOS_SUCCESSFUL;

}



struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)

{

	struct device_node *node = pbm->prom_node;

	struct pci_dev *host_pdev;

	struct pci_bus *bus;



	printk("PCI: Scanning PBM %s\n", node->full_name);
@@ -855,10 +795,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm) 
	bus->resource[0] = &pbm->io_space;

	bus->resource[1] = &pbm->mem_space;



	/* Create the dummy host bridge and link it in.  */

	host_pdev = of_create_pci_dev(pbm, node, bus, 0x00, 1);

	bus->self = host_pdev;



	pci_of_scan_bus(pbm, node, bus);

	pci_bus_add_devices(bus);

	pci_bus_register_of_sysfs(bus);

arch/sparc64/kernel/pci_common.c

+0 −6
Original line number Diff line number Diff line
@@ -264,9 +264,6 @@ static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn, 
	unsigned int func = PCI_FUNC(devfn);

	unsigned long ret;



	if (!bus && devfn == 0x00)

		return pci_host_bridge_read_pci_cfg(bus_dev, devfn, where,

						    size, value);

	if (config_out_of_range(pbm, bus, devfn, where)) {

		ret = ~0UL;

	} else {
@@ -300,9 +297,6 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn, 
	unsigned int func = PCI_FUNC(devfn);

	unsigned long ret;



	if (!bus && devfn == 0x00)

		return pci_host_bridge_write_pci_cfg(bus_dev, devfn, where,

						     size, value);

	if (config_out_of_range(pbm, bus, devfn, where)) {

		/* Do nothing. */

	} else {

arch/sparc64/kernel/pci_impl.h

+0 −9
Original line number Diff line number Diff line
@@ -167,15 +167,6 @@ extern void pci_get_pbm_props(struct pci_pbm_info *pbm); 
extern struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm);

extern void pci_determine_mem_io_space(struct pci_pbm_info *pbm);



extern int pci_host_bridge_read_pci_cfg(struct pci_bus *bus_dev,

					unsigned int devfn,

					int where, int size,

					u32 *value);

extern int pci_host_bridge_write_pci_cfg(struct pci_bus *bus_dev,

					 unsigned int devfn,

					 int where, int size,

					 u32 value);



/* Error reporting support. */

extern void pci_scan_for_target_abort(struct pci_pbm_info *, struct pci_bus *);

extern void pci_scan_for_master_abort(struct pci_pbm_info *, struct pci_bus *);