Skip to content

Commit

Permalink
[POWERPC] iommu_free_table doesn't need the device_node
Browse files Browse the repository at this point in the history
It only needs the iommu_table address.  It also makes use of the node
name to print error messages.  So just pass it the things it needs.
This reduces the places that know about the pci_dn by one.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Dec 11, 2007
1 parent 0d9dc4b commit 68d315f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
8 changes: 3 additions & 5 deletions arch/powerpc/kernel/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,16 +526,14 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid)
return tbl;
}

void iommu_free_table(struct device_node *dn)
void iommu_free_table(struct iommu_table *tbl, const char *node_name)
{
struct pci_dn *pdn = dn->data;
struct iommu_table *tbl = pdn->iommu_table;
unsigned long bitmap_sz, i;
unsigned int order;

if (!tbl || !tbl->it_map) {
printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__,
dn->full_name);
node_name);
return;
}

Expand All @@ -544,7 +542,7 @@ void iommu_free_table(struct device_node *dn)
for (i = 0; i < (tbl->it_size/64); i++) {
if (tbl->it_map[i] != 0) {
printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
__FUNCTION__, dn->full_name);
__FUNCTION__, node_name);
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/pseries/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti
case PSERIES_RECONFIG_REMOVE:
if (pci && pci->iommu_table &&
of_get_property(np, "ibm,dma-window", NULL))
iommu_free_table(np);
iommu_free_table(pci->iommu_table, np->full_name);
break;
default:
err = NOTIFY_DONE;
Expand Down
3 changes: 1 addition & 2 deletions include/asm-powerpc/iommu.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ struct iommu_table {
};

struct scatterlist;
struct device_node;

/* Frees table for an individual device node */
extern void iommu_free_table(struct device_node *dn);
extern void iommu_free_table(struct iommu_table *tbl, const char *node_name);

/* Initializes an iommu_table based in values set in the passed-in
* structure
Expand Down

0 comments on commit 68d315f

Please sign in to comment.