mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
powerpc/iseries: Fix pci breakage due to bad dma_data initialization
Commit4fc665b88a
"powerpc: Merge 32 and 64-bit dma code" made changes to the PCI initialisation code that added an assignment to archdata.dma_data but only for 32 bit code. Commit7eef440a54
"powerpc/pci: Cosmetic cleanups of pci-common.c" removed the conditional compilation. Unfortunately, the iSeries code setup the archdata.dma_data before that assignment was done - effectively overwriting the dma_data with NULL. Fix this up by moving the iSeries setup of dma_data into a pci_dma_dev_setup callback. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
93f1cc609c
commit
397717c578
3 changed files with 5 additions and 6 deletions
|
@ -26,10 +26,6 @@ struct vio_dev;
|
|||
struct device_node;
|
||||
struct iommu_table;
|
||||
|
||||
/* Creates table for an individual device node */
|
||||
extern void iommu_devnode_init_iSeries(struct pci_dev *pdev,
|
||||
struct device_node *dn);
|
||||
|
||||
/* Get table parameters from HV */
|
||||
extern void iommu_table_getparms_iSeries(unsigned long busno,
|
||||
unsigned char slotno, unsigned char virtbus,
|
||||
|
|
|
@ -174,9 +174,10 @@ static struct iommu_table *iommu_table_find(struct iommu_table * tbl)
|
|||
}
|
||||
|
||||
|
||||
void iommu_devnode_init_iSeries(struct pci_dev *pdev, struct device_node *dn)
|
||||
static void pci_dma_dev_setup_iseries(struct pci_dev *pdev)
|
||||
{
|
||||
struct iommu_table *tbl;
|
||||
struct device_node *dn = pdev->sysdata;
|
||||
struct pci_dn *pdn = PCI_DN(dn);
|
||||
const u32 *lsn = of_get_property(dn, "linux,logical-slot-number", NULL);
|
||||
|
||||
|
@ -194,6 +195,8 @@ void iommu_devnode_init_iSeries(struct pci_dev *pdev, struct device_node *dn)
|
|||
kfree(tbl);
|
||||
pdev->dev.archdata.dma_data = pdn->iommu_table;
|
||||
}
|
||||
#else
|
||||
#define pci_dma_dev_setup_iseries NULL
|
||||
#endif
|
||||
|
||||
static struct iommu_table veth_iommu_table;
|
||||
|
@ -251,5 +254,6 @@ void iommu_init_early_iSeries(void)
|
|||
ppc_md.tce_build = tce_build_iSeries;
|
||||
ppc_md.tce_free = tce_free_iSeries;
|
||||
|
||||
ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_iseries;
|
||||
set_pci_dma_ops(&dma_iommu_ops);
|
||||
}
|
||||
|
|
|
@ -444,7 +444,6 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev)
|
|||
pdev->sysdata = node;
|
||||
allocate_device_bars(pdev);
|
||||
iseries_device_information(pdev, bus, *sub_bus);
|
||||
iommu_devnode_init_iSeries(pdev, node);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue