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

Commit 403fac4f authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[PATCH] powerpc: remove LogicalSlot from pci_dn 



As we now store enough information in the device_node.

Also the Flags field was not used either, do remove that.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b0252793

arch/powerpc/platforms/iseries/iommu.c

+4 −1
Original line number Diff line number Diff line
@@ -162,10 +162,13 @@ void iommu_devnode_init_iSeries(struct device_node *dn) 
{

	struct iommu_table *tbl;

	struct pci_dn *pdn = PCI_DN(dn);

	u32 *lsn = (u32 *)get_property(dn, "linux,logical-slot-number", NULL);



	BUG_ON(lsn == NULL);



	tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);



	iommu_table_getparms_iSeries(pdn->busno, pdn->LogicalSlot, 0, tbl);

	iommu_table_getparms_iSeries(pdn->busno, *lsn, 0, tbl);



	/* Look for existing tce table */

	pdn->iommu_table = iommu_table_find(tbl);

arch/powerpc/platforms/iseries/pci.c

+0 −8
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ void iSeries_pcibios_init(void) 
		for (dn = NULL; (dn = of_get_next_child(node, dn)) != NULL;) {

			struct pci_dn *pdn;

			u32 *reg;

			u32 *lsn;



			reg = (u32 *)get_property(dn, "reg", NULL);

			if (reg == NULL) {
@@ -203,12 +202,6 @@ void iSeries_pcibios_init(void) 
				printk(KERN_DEBUG "no subbus property!\n");

				continue;

			}

			lsn = (u32 *)get_property(dn,

					"linux,logical-slot-number", NULL);

			if (lsn == NULL) {

				printk(KERN_DEBUG "no logical-slot-number\n");

				continue;

			}



			pdn = kzalloc(sizeof(*pdn), GFP_KERNEL);

			if (pdn == NULL)
@@ -218,7 +211,6 @@ void iSeries_pcibios_init(void) 
			pdn->busno = bus;

			pdn->devfn = (reg[0] >> 8) & 0xff;

			pdn->bussubno = *busp;

			pdn->LogicalSlot = *lsn;

		}

	}

}

include/asm-powerpc/pci-bridge.h

+0 −4
Original line number Diff line number Diff line
@@ -78,10 +78,6 @@ struct pci_dn { 
	struct	iommu_table *iommu_table;	/* for phb's or bridges */

	struct	pci_dev *pcidev;	/* back-pointer to the pci device */

	struct	device_node *node;	/* back-pointer to the device_node */

#ifdef CONFIG_PPC_ISERIES

	int	Flags;			/* Possible flags(disable/bist)*/

	u8	LogicalSlot;		/* Hv Slot Index for Tces */

#endif

	u32	config_space[16];	/* saved PCI config space */

};