Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 08:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] powerpc: pseries: Use generic dma-window parsing function

Browse Source 
Change the pseries iommu init code to use the new of_parse_dma_window()
to parse the ibm,dma-window and ibm,my-dma-window properties of pci and
virtual device nodes.

Also, clean up vio_build_iommu_table() a little.

Tested on pseries, with both vio and pci devices.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Jeremy Kerr 2006-05-18 18:06:37 +10:00 committed by Paul Mackerras
parent d4ad66faec
commit 4c76e0bcde
2 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/powerpc/kernel/vio.c
View File

@ -77,36 +77,28 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
} else } else
#endif #endif
{ {
unsigned int *dma_window; unsigned char *dma_window;
struct iommu_table *newTceTable; struct iommu_table *tbl;
unsigned long offset; unsigned long offset, size;
int dma_window_property_size;
dma_window = (unsigned int *)get_property( dma_window = get_property(dev->dev.platform_data,
dev->dev.platform_data, "ibm,my-dma-window", "ibm,my-dma-window", NULL);
&dma_window_property_size);
if (!dma_window) if (!dma_window)
return NULL; return NULL;
newTceTable = kmalloc(sizeof(struct iommu_table), GFP_KERNEL); tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
/* of_parse_dma_window(dev->dev.platform_data, dma_window,
* There should be some code to extract the phys-encoded &tbl->it_index, &offset, &size);
* offset using prom_n_addr_cells(). However, according to
* a comment on earlier versions, it's always zero, so we
* don't bother
*/
offset = dma_window[1] >> PAGE_SHIFT;
/* TCE table size - measured in tce entries */ /* TCE table size - measured in tce entries */
newTceTable->it_size = dma_window[4] >> PAGE_SHIFT; tbl->it_size = size >> PAGE_SHIFT;
/* offset for VIO should always be 0 */ /* offset for VIO should always be 0 */
newTceTable->it_offset = offset; tbl->it_offset = offset >> PAGE_SHIFT;
newTceTable->it_busno = 0; tbl->it_busno = 0;
newTceTable->it_index = (unsigned long)dma_window[0]; tbl->it_type = TCE_VB;
newTceTable->it_type = TCE_VB;
return iommu_init_table(newTceTable); return iommu_init_table(tbl);
} }
} }

31
arch/powerpc/platforms/pseries/iommu.c
View File

@ -281,30 +281,22 @@ static void iommu_table_setparms(struct pci_controller *phb,
* iommu_table_setparms_lpar * iommu_table_setparms_lpar
* *
* Function: On pSeries LPAR systems, return TCE table info, given a pci bus. * Function: On pSeries LPAR systems, return TCE table info, given a pci bus.
*
* ToDo: properly interpret the ibm,dma-window property. The definition is:
* logical-bus-number (1 word)
* phys-address (#address-cells words)
* size (#cell-size words)
*
* Currently we hard code these sizes (more or less).
*/ */
static void iommu_table_setparms_lpar(struct pci_controller *phb, static void iommu_table_setparms_lpar(struct pci_controller *phb,
struct device_node *dn, struct device_node *dn,
struct iommu_table *tbl, struct iommu_table *tbl,
unsigned int *dma_window) unsigned char *dma_window)
{ {
tbl->it_busno = PCI_DN(dn)->bussubno; unsigned long offset, size;
tbl->it_busno = PCI_DN(dn)->bussubno;
of_parse_dma_window(dn, dma_window, &tbl->it_index, &offset, &size);
/* TODO: Parse field size properties properly. */
tbl->it_size = (((unsigned long)dma_window[4] << 32) |
(unsigned long)dma_window[5]) >> PAGE_SHIFT;
tbl->it_offset = (((unsigned long)dma_window[2] << 32) |
(unsigned long)dma_window[3]) >> PAGE_SHIFT;
tbl->it_base = 0; tbl->it_base = 0;
tbl->it_index = dma_window[0];
tbl->it_blocksize = 16; tbl->it_blocksize = 16;
tbl->it_type = TCE_PCI; tbl->it_type = TCE_PCI;
tbl->it_offset = offset >> PAGE_SHIFT;
tbl->it_size = size >> PAGE_SHIFT;
} }
static void iommu_bus_setup_pSeries(struct pci_bus *bus) static void iommu_bus_setup_pSeries(struct pci_bus *bus)
@ -396,7 +388,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
struct iommu_table *tbl; struct iommu_table *tbl;
struct device_node *dn, *pdn; struct device_node *dn, *pdn;
struct pci_dn *ppci; struct pci_dn *ppci;
unsigned int *dma_window = NULL; unsigned char *dma_window = NULL;
DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self); DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self);
@ -404,7 +396,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
/* Find nearest ibm,dma-window, walking up the device tree */ /* Find nearest ibm,dma-window, walking up the device tree */
for (pdn = dn; pdn != NULL; pdn = pdn->parent) { for (pdn = dn; pdn != NULL; pdn = pdn->parent) {
dma_window = (unsigned int *)get_property(pdn, "ibm,dma-window", NULL); dma_window = get_property(pdn, "ibm,dma-window", NULL);
if (dma_window != NULL) if (dma_window != NULL)
break; break;
} }
@ -498,7 +490,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
{ {
struct device_node *pdn, *dn; struct device_node *pdn, *dn;
struct iommu_table *tbl; struct iommu_table *tbl;
int *dma_window = NULL; unsigned char *dma_window = NULL;
struct pci_dn *pci; struct pci_dn *pci;
DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev)); DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev));
@ -513,8 +505,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
for (pdn = dn; pdn && PCI_DN(pdn) && !PCI_DN(pdn)->iommu_table; for (pdn = dn; pdn && PCI_DN(pdn) && !PCI_DN(pdn)->iommu_table;
pdn = pdn->parent) { pdn = pdn->parent) {
dma_window = (unsigned int *) dma_window = get_property(pdn, "ibm,dma-window", NULL);
get_property(pdn, "ibm,dma-window", NULL);
if (dma_window) if (dma_window)
break; break;
} }