From nobody Fri Dec 19 21:46:58 2025 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 03D00345CD3; Wed, 17 Dec 2025 17:04:36 +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=1765991078; cv=pass; b=Q6yP7dYTLl/FSGx+bwVl5STxchNmceqfe5KD2kJbp8XhXW4eDmlJZVuz4ZGRhwdl7Nb2C+FGHGJKXLIL7zjE54aIiKZekSnj0FQPcHQKDyog1oUfl7dMLg4FOhvMyhjEa57wvIk1UsT/Cq9Rjrof86px9OL3Dm6vUKWOpWdMNUA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765991078; c=relaxed/simple; bh=pr9UW7Dl3TNeqzUHp9ga7zw64c+YpNGATOHAHO2v818=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BHdqaW7XiQwtk3v5t2HYhD73kAD8Zjuli5OZfivyFFAaH6DxO7dNFlQDausucZK0M0zOYvDtDniB4zeoIKtjI9wyRRyDo7F7Gn0/dJx7BvWquDDqNWZgK8fOsvH0QYTJ9cK258s5FF6uqvmEtE5p/09rv4hxDFN5ZIOKxR1cGQU= 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=nicolas.frattaroli@collabora.com header.b=fwCPkhnW; 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=nicolas.frattaroli@collabora.com header.b="fwCPkhnW" ARC-Seal: i=1; a=rsa-sha256; t=1765991056; cv=none; d=zohomail.com; s=zohoarc; b=Jzgx6lqJR14JQih6FJdnyOcRHLbOCDxbzeEjWYAWViyh9xuYdhx+6eJ7m9CD1HnK7gIcPn6skUNUJnhgpayNQS3MXvvwIjRd1hSnqq+S34IKtxBhLuwh/4RcPNmtMcb9neImJGDaIsLB8LW+mJldjHTZVhmELWZHlYsSZDxF37Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765991056; 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=oGj1Iz8fP7j1sriJri6rEXbeQOcxivFvgqwECO6b/Kk=; b=GZk50L67nxhR6wmRUtdZgQxTTZgbwDj31hMO4JOzoI2zbJn/jRHpzz5J5stsekUTjgDoMxaPZIKzwGx0g2hbC7NANOEsQBRxgjif1QrIzTBTPbTxExp/JMKvtbluuxzYJK4RNRkluYtvTWHtk10MxAVNe3pAfgQ1HdPybbA4l5Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1765991056; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=oGj1Iz8fP7j1sriJri6rEXbeQOcxivFvgqwECO6b/Kk=; b=fwCPkhnWAV8gqlC/LquoK+DfvZ/wQtXxFvtqHlAbDwH0bf/CWTYXExm+HrUbp+Ss X53RpplfSNh8v2XOX9aJiHn83p2Afd859SDtaFHtT8VHpMTeSQkjwgcvB4FidLAWkwu Hdgw2e8kGGFbobsnKMq9YnQ5zARpGO6a/XBLWClk= Received: by mx.zohomail.com with SMTPS id 1765991055390303.7583910605715; Wed, 17 Dec 2025 09:04:15 -0800 (PST) From: Nicolas Frattaroli Date: Wed, 17 Dec 2025 18:03:29 +0100 Subject: [PATCH 3/4] drm/panthor: Implement reading shader_present from nvmem 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 Message-Id: <20251217-mt8196-shader-present-v1-3-f6f8f3aa1e93@collabora.com> References: <20251217-mt8196-shader-present-v1-0-f6f8f3aa1e93@collabora.com> In-Reply-To: <20251217-mt8196-shader-present-v1-0-f6f8f3aa1e93@collabora.com> To: Boris Brezillon , Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Ulf Hansson Cc: Chen-Yu Tsai , Chia-I Wu , kernel@collabora.com, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 On some platforms, notably MediaTek MT8196, the shader_present bitmask in the Mali GPU register for it has cores enabled that may be faulty. The true shader_present bitmask is found in an efuse instead. Implement reading shader_present from an nvmem cell if one is present, falling back to the Mali register if it's absent. The error codes are trickled up through to the probe function so that probe deferral works. Signed-off-by: Nicolas Frattaroli Reviewed-by: Boris Brezillon Reviewed-by: Steven Price --- drivers/gpu/drm/panthor/panthor_hw.c | 63 ++++++++++++++++++++++++++++++++= ---- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_hw.c b/drivers/gpu/drm/panthor= /panthor_hw.c index 87ebb7ae42c4..eb44c8b108aa 100644 --- a/drivers/gpu/drm/panthor/panthor_hw.c +++ b/drivers/gpu/drm/panthor/panthor_hw.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2025 ARM Limited. All rights reserved. */ =20 +#include #include =20 #include "panthor_device.h" @@ -109,7 +110,52 @@ static char *get_gpu_model_name(struct panthor_device = *ptdev) return "(Unknown Mali GPU)"; } =20 -static void panthor_gpu_info_init(struct panthor_device *ptdev) +static int overload_shader_present(struct panthor_device *ptdev) +{ + struct device *dev =3D ptdev->base.dev; + struct nvmem_cell *cell =3D nvmem_cell_get(dev, "shader-present"); + ssize_t len; + void *buf; + int ret; + + if (IS_ERR(cell)) { + /* On platforms without this cell, use the Mali register */ + if (PTR_ERR(cell) =3D=3D -ENOENT) + return 0; + + return dev_err_probe(dev, PTR_ERR(cell), + "Failed to get shader-present nvmem cell\n"); + } + + buf =3D nvmem_cell_read(cell, &len); + if (IS_ERR(buf)) { + ret =3D dev_err_probe(dev, PTR_ERR(buf), + "Failed to read shader-present nvmem cell\n"); + goto err_put_cell; + } + + if (!len || len > 8) { + ret =3D dev_err_probe(dev, -EINVAL, "shader-present cell can't be length= %ld\n", + len); + goto err_free; + } + + memcpy(&ptdev->gpu_info.shader_present, buf, len); + + kfree(buf); + nvmem_cell_put(cell); + + return 0; + +err_free: + kfree(buf); +err_put_cell: + nvmem_cell_put(cell); + + return ret; +} + +static int panthor_gpu_info_init(struct panthor_device *ptdev) { unsigned int i; =20 @@ -143,13 +189,18 @@ static void panthor_gpu_info_init(struct panthor_devi= ce *ptdev) ptdev->gpu_info.tiler_present =3D gpu_read64(ptdev, GPU_TILER_PRESENT); ptdev->gpu_info.l2_present =3D gpu_read64(ptdev, GPU_L2_PRESENT); } + + return overload_shader_present(ptdev); } =20 -static void panthor_hw_info_init(struct panthor_device *ptdev) +static int panthor_hw_info_init(struct panthor_device *ptdev) { u32 major, minor, status; + int ret; =20 - panthor_gpu_info_init(ptdev); + ret =3D panthor_gpu_info_init(ptdev); + if (ret) + return ret; =20 major =3D GPU_VER_MAJOR(ptdev->gpu_info.gpu_id); minor =3D GPU_VER_MINOR(ptdev->gpu_info.gpu_id); @@ -172,6 +223,8 @@ static void panthor_hw_info_init(struct panthor_device = *ptdev) "shader_present=3D0x%0llx l2_present=3D0x%0llx tiler_present=3D0x%0llx", ptdev->gpu_info.shader_present, ptdev->gpu_info.l2_present, ptdev->gpu_info.tiler_present); + + return 0; } =20 static int panthor_hw_bind_device(struct panthor_device *ptdev) @@ -218,7 +271,5 @@ int panthor_hw_init(struct panthor_device *ptdev) if (ret) return ret; =20 - panthor_hw_info_init(ptdev); - - return 0; + return panthor_hw_info_init(ptdev); } --=20 2.52.0