powerpc/pseries: fix software invalidate TCE

PATCH New Michael Neuling 1 participant 1 message Jun 27, 2012 PowerPC

lore

Share & tools

lore

Michael Neuling

author

2012-06-27 07:26 UTC #0 lore raw

PATCH 1/1 powerpc/pseries: fix software invalidate TCE

The following added support for powernv but broke pseries/BML:
1f1616e powerpc/powernv: Add TCE SW invalidation support

TCE_PCI_SW_INVAL was split into FREE and CREATE flags but the tests in the pseries code were not updated to reflect this.

Signed-off-by Michael Neuling <[email protected]>

cc [email protected] (v3.3-v3.4)

---

arch/powerpc/platforms/pseries/iommu.c +2 -2

index 0915b1a..2d311c0 100644
@@ -106,7 +106,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index,
 		tcep++;
 	}
 
-	if (tbl->it_type == TCE_PCI_SWINV_CREATE)
+	if (tbl->it_type & TCE_PCI_SWINV_CREATE)
 		tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);
 	return 0;
 }

@@ -121,7 +121,7 @@ static void tce_free_pSeries(struct iommu_table *tbl, long index, long npages)
 	while (npages--)
 		*(tcep++) = 0;
 
-	if (tbl->it_type == TCE_PCI_SWINV_FREE)
+	if (tbl->it_type & TCE_PCI_SWINV_FREE)
 		tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);
 }