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

Commit b148d5fb authored by Suman Anna's avatar Suman Anna Committed by Joerg Roedel
Browse files

iommu/omap: Enable bus-error back on supported iommus 



The remoteproc MMUs in OMAP4+ SoCs have some additional debug
registers that can give out the PC value in addition to the
MMU fault address. The PC value can be extracted properly only
on the DSP cores, and is not available on the ARM processors
within the IPU sub-systems. Instead, the MMUs have been enhanced
to throw a bus-error response back to the IPU processors.

This functionality is programmable through the MMU_GP_REG register.
The cores are simply stalled if the MMU_GP_REG.BUS_ERR_BACK_EN bit
is not set. When set, a bus-error exception is raised allowing the
processor to handle it as a bus fault and provide additional debug
information. This feature is turned on by default by the driver on
iommus supporting it.

Signed-off-by: default avatarSubramaniam Chanderashekarapuram <subramaniam.ca@ti.com>
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
parent 3c92748d

drivers/iommu/omap-iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -961,6 +961,8 @@ static int omap_iommu_probe(struct platform_device *pdev) 
		 */

		obj->da_start = 0;

		obj->da_end = 0xfffff000;

		if (of_find_property(of, "ti,iommu-bus-err-back", NULL))

			obj->has_bus_err_back = MMU_GP_REG_BUS_ERR_BACK_EN;

	} else {

		obj->nr_tlb_entries = pdata->nr_tlb_entries;

		obj->name = pdata->name;

drivers/iommu/omap-iommu.h

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ struct omap_iommu { 
	void *ctx; /* iommu context: registres saved area */

	u32 da_start;

	u32 da_end;



	int has_bus_err_back;

};



struct cr_regs {
@@ -130,6 +132,7 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev) 
#define MMU_READ_CAM		0x68

#define MMU_READ_RAM		0x6c

#define MMU_EMU_FAULT_AD	0x70

#define MMU_GP_REG		0x88



#define MMU_REG_SIZE		256
@@ -163,6 +166,8 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev) 
#define MMU_RAM_MIXED_MASK	(1 << MMU_RAM_MIXED_SHIFT)

#define MMU_RAM_MIXED		MMU_RAM_MIXED_MASK



#define MMU_GP_REG_BUS_ERR_BACK_EN	0x1



/*

 * utilities for super page(16MB, 1MB, 64KB and 4KB)

 */

drivers/iommu/omap-iommu2.c

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ static int omap2_iommu_enable(struct omap_iommu *obj) 


	iommu_write_reg(obj, pa, MMU_TTB);



	if (obj->has_bus_err_back)

		iommu_write_reg(obj, MMU_GP_REG_BUS_ERR_BACK_EN, MMU_GP_REG);



	__iommu_set_twl(obj, true);



	return 0;