Re: [PATCH] drm/panfrost: Don't try to map on error faults

From: Robin Murphy
Date: Wed Feb 05 2020 - 08:25:53 EST


On 05/02/2020 10:07 am, Tomeu Vizoso wrote:
If the exception type isn't one of the normal faults, don't try to map
and instead go straight to a terminal fault.

"One of the the normal faults" seems a rather vague way of saying "a translation fault", which is what we're specifically handling here, and logically the only fault reflecting something not yet mapped rather than mapped inappropriately ;)

(Who knows how the level ended up as 1-4 rather than 0-3 as it really should be - another Mali Mystery(TM)...)

Otherwise, we can get flooded by kernel warnings and further faults.

Either way,

Reviewed-by: Robin Murphy <robin.murphy@xxxxxxx>

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@xxxxxxxxxxxxx>
---
drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index 763cfca886a7..80abddb4544c 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -596,8 +596,9 @@ static irqreturn_t panfrost_mmu_irq_handler_thread(int irq, void *data)
source_id = (fault_status >> 16);
/* Page fault only */
- if ((status & mask) == BIT(i)) {
- WARN_ON(exception_type < 0xC1 || exception_type > 0xC4);
+ if ((status & mask) == BIT(i) &&
+ exception_type >= 0xC1 &&
+ exception_type <= 0xC4) {
ret = panfrost_mmu_map_fault_addr(pfdev, i, addr);
if (!ret) {