Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8daac8a authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: iommu cleanup 



No need to initialize per-cpu pointer to NULL, it is the default.

Direct dma ops and no setup are the defaults, no need to set for
iommu-off.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Reviewed-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 34c4d012

arch/powerpc/platforms/pseries/iommu.c

+2 −7
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum, 
	return ret;

}



static DEFINE_PER_CPU(u64 *, tce_page) = NULL;

static DEFINE_PER_CPU(u64 *, tce_page);



static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,

				     long npages, unsigned long uaddr,
@@ -589,13 +589,8 @@ static struct notifier_block iommu_reconfig_nb = { 
/* These are called very early. */

void iommu_init_early_pSeries(void)

{

	if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL)) {

		/* Direct I/O, IOMMU off */

		ppc_md.pci_dma_dev_setup = NULL;

		ppc_md.pci_dma_bus_setup = NULL;

		set_pci_dma_ops(&dma_direct_ops);

	if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL))

		return;

	}



	if (firmware_has_feature(FW_FEATURE_LPAR)) {

		if (firmware_has_feature(FW_FEATURE_MULTITCE)) {