397717c578
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>
38 lines
1.2 KiB
C
38 lines
1.2 KiB
C
#ifndef _ASM_POWERPC_ISERIES_IOMMU_H
|
|
#define _ASM_POWERPC_ISERIES_IOMMU_H
|
|
|
|
/*
|
|
* Copyright (C) 2005 Stephen Rothwell, IBM Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the:
|
|
* Free Software Foundation, Inc.,
|
|
* 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
struct pci_dev;
|
|
struct vio_dev;
|
|
struct device_node;
|
|
struct iommu_table;
|
|
|
|
/* Get table parameters from HV */
|
|
extern void iommu_table_getparms_iSeries(unsigned long busno,
|
|
unsigned char slotno, unsigned char virtbus,
|
|
struct iommu_table *tbl);
|
|
|
|
extern struct iommu_table *vio_build_iommu_table_iseries(struct vio_dev *dev);
|
|
extern void iommu_vio_init(void);
|
|
|
|
#endif /* _ASM_POWERPC_ISERIES_IOMMU_H */
|