From nobody Sat Feb 7 08:27:56 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 559251C3030 for ; Thu, 28 Nov 2024 21:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828383; cv=pass; b=rXpWA6UmDwebjvINeDCOnIZ/5LAt8oeSid7OgFaen7KkWuLJHF74jZpUBEyrjBj+UP0G95imxUe2vGJeMHdzPo1bzDab9BSVGbEYl/SRSuUcuqBkodXa8EB+XHtO7V7H+ucV5ng5xW/UpB8/M6vktZYAE8LAOvrOZbcq17hfpxw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732828383; c=relaxed/simple; bh=NbuwBBBxILqVg0MpU2AoR/F3g9jHD90SURdiEOS8Tms=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GvKg7qrlqHcYKyU0QDAjuLtcs3cnjs1kEzZ8WyeJj4pFe/EWHv1eJdsyXObu2XQK4GmL8YWoZeMM0pYVgGutI/MGj3UI7JInI+gdlt5x8wBzyQjzIo/8+y+09UGe5rrWdjvCbh3Wmdj44wXyl/3qmS0/EifDcacHhFB0MZgn1gg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=KMbNT9Au; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="KMbNT9Au" ARC-Seal: i=1; a=rsa-sha256; t=1732828366; cv=none; d=zohomail.com; s=zohoarc; b=HG41YBfhRINc8HLm+FUETI/VPXlnra1ojIcjBskQW3mL0pir95PyEDWl2aJCrCiZvmoN9AGwY3yaFoDkj+dpzowFPjyc6PNvBXTJiHl3gKZ3PEYSmFL8KpRq1v0tGRZMCrAH+vIbsKKJVXadfRAGf0vm3B1kl8ZiyWObtXksXug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732828366; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=4KMeDqmO6/kMqWAURl+BuWqqDuQXnOAKVcXkzDnRlbQ=; b=EoKfNHUuLE+qKj+LLLeKUqlmkdxwt0k1Pw6TBVeVBsDARE6xJuLc7LK3q0x7tiUK2Brr3ji2udDzKg/IDHQ8s9bhQfGi5p2C/IYHSwo8NQw990qCdB3mhNEQD2CIEMZLdYqh1nTKMvFwBH2c4Mpy1NDVCZJOmr0EEGGqUZF8NqI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732828366; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=4KMeDqmO6/kMqWAURl+BuWqqDuQXnOAKVcXkzDnRlbQ=; b=KMbNT9AuRvt7iwGH9LliiiOVNzebKw0yCw5ReyxGamwV4HsqDwGLh195+zmzXjV/ uCx4WY2t4cXCRBHctYFDTVmvvmt5K9+ejplVzatrTixi2XWr/YDKjToeL25uHBLyybx cb31nWrGUNuTQ2Wwf9nKJPotgwJfCC2/STrmbQMc= Received: by mx.zohomail.com with SMTPS id 1732828366344785.3465141422423; Thu, 28 Nov 2024 13:12:46 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/8] drm/panfrost: Handle error when allocating AS number Date: Thu, 28 Nov 2024 21:06:19 +0000 Message-ID: <20241128211223.1805830-5-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241128211223.1805830-1-adrian.larumbe@collabora.com> References: <20241128211223.1805830-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable If we reach the beginning of the LRU AS list, then return an error. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +++-- drivers/gpu/drm/panfrost/panfrost_mmu.h | 2 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 9 ++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panf= rost/panfrost_job.c index 3f4f0682d69d..fba1a376f593 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -214,7 +214,11 @@ static int panfrost_job_hw_submit(struct panfrost_job = *job, int js) goto err_hwsubmit; } =20 - cfg =3D panfrost_mmu_as_get(pfdev, job->mmu); + ret =3D panfrost_mmu_as_get(pfdev, job->mmu); + if (ret < 0) + goto err_hwsubmit; + + cfg =3D (u32)ret; =20 job_write(pfdev, JS_HEAD_NEXT_LO(js), lower_32_bits(jc_head)); job_write(pfdev, JS_HEAD_NEXT_HI(js), upper_32_bits(jc_head)); diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index 2189e42d2bfa..03ac527b35e7 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -155,7 +155,7 @@ static void panfrost_mmu_disable(struct panfrost_device= *pfdev, u32 as_nr) write_cmd(pfdev, as_nr, AS_COMMAND_UPDATE); } =20 -u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu) +int panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu) { int as; =20 @@ -197,7 +197,8 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, = struct panfrost_mmu *mmu) if (!atomic_read(&lru_mmu->as_count)) break; } - WARN_ON(&lru_mmu->list =3D=3D &pfdev->as_lru_list); + if (WARN_ON(&lru_mmu->list =3D=3D &pfdev->as_lru_list)) + return -EBUSY; =20 list_del_init(&lru_mmu->list); as =3D lru_mmu->as; diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.h b/drivers/gpu/drm/panf= rost/panfrost_mmu.h index 022a9a74a114..e6e6966a0cca 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.h +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.h @@ -16,7 +16,7 @@ void panfrost_mmu_fini(struct panfrost_device *pfdev); void panfrost_mmu_reset(struct panfrost_device *pfdev); void panfrost_mmu_suspend_irq(struct panfrost_device *pfdev); =20 -u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu); +int panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu); void panfrost_mmu_as_put(struct panfrost_device *pfdev, struct panfrost_mm= u *mmu); =20 struct panfrost_mmu *panfrost_mmu_ctx_get(struct panfrost_mmu *mmu); diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/= panfrost/panfrost_perfcnt.c index f30817bcf8ba..2145f9707dde 100644 --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c @@ -130,7 +130,12 @@ static int panfrost_perfcnt_enable_locked(struct panfr= ost_device *pfdev, =20 perfcnt->user =3D user; =20 - as =3D panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu); + ret =3D panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu); + if (ret) + goto err_unsetuser; + + as =3D (u32)ret; + cfg =3D GPU_PERFCNT_CFG_AS(as) | GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_MANUAL); =20 @@ -164,6 +169,8 @@ static int panfrost_perfcnt_enable_locked(struct panfro= st_device *pfdev, =20 return 0; =20 +err_unsetuser: + perfcnt->user =3D NULL; err_vunmap: drm_gem_vunmap_unlocked(&bo->base, &map); err_put_mapping: --=20 2.47.0