Commit 68d315f5 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] iommu_free_table doesn't need the device_node 



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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0d9dc4b4

arch/powerpc/kernel/iommu.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

	}
@@ -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;

		}

	}

arch/powerpc/platforms/pseries/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/asm-powerpc/iommu.h

+1 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE