omap iommu: Introduce iopgd_is_table MACRO (a1a54456) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm/plat-omap/iommu.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -653,7 +653,7 @@ void iopgtable_lookup_entry(struct iommu obj, u32 da, u32 ppgd, u32 *ppte)
	if (!*iopgd)		if (!*iopgd)
	goto out;		goto out;

	if (*iopgd & IOPGD_TABLE)		if (iopgd_is_table(*iopgd))
	iopte = iopte_offset(iopgd, da);		iopte = iopte_offset(iopgd, da);
	out:		out:
	*ppgd = iopgd;		*ppgd = iopgd;
	@@ -670,7 +670,7 @@ static size_t iopgtable_clear_entry_core(struct iommu *obj, u32 da)
	if (!*iopgd)		if (!*iopgd)
	return 0;		return 0;

	if (*iopgd & IOPGD_TABLE) {		if (iopgd_is_table(*iopgd)) {
	int i;		int i;
	u32 *iopte = iopte_offset(iopgd, da);		u32 *iopte = iopte_offset(iopgd, da);

	@@ -745,7 +745,7 @@ static void iopgtable_clear_entry_all(struct iommu *obj)
	if (!*iopgd)		if (!*iopgd)
	continue;		continue;

	if (*iopgd & IOPGD_TABLE)		if (iopgd_is_table(*iopgd))
	iopte_free(iopte_offset(iopgd, 0));		iopte_free(iopte_offset(iopgd, 0));

	*iopgd = 0;		*iopgd = 0;
	@@ -785,7 +785,7 @@ static irqreturn_t iommu_fault_handler(int irq, void *data)

	iopgd = iopgd_offset(obj, da);		iopgd = iopgd_offset(obj, da);

	if (!(*iopgd & IOPGD_TABLE)) {		if (!iopgd_is_table(*iopgd)) {
	dev_err(obj->dev, "%s: da:%08x pgd:%p *pgd:%08x\n", __func__,		dev_err(obj->dev, "%s: da:%08x pgd:%p *pgd:%08x\n", __func__,
	da, iopgd, *iopgd);		da, iopgd, *iopgd);
	return IRQ_NONE;		return IRQ_NONE;

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,8 @@
	#define IOPGD_SECTION (2 << 0)		#define IOPGD_SECTION (2 << 0)
	#define IOPGD_SUPER (1 << 18 \| 2 << 0)		#define IOPGD_SUPER (1 << 18 \| 2 << 0)

			#define iopgd_is_table(x) (((x) & 3) == IOPGD_TABLE)

	#define IOPTE_SMALL (2 << 0)		#define IOPTE_SMALL (2 << 0)
	#define IOPTE_LARGE (1 << 0)		#define IOPTE_LARGE (1 << 0)