From nobody Mon Feb 9 03:13:55 2026 Received: from mx07-00376f01.pphosted.com (mx07-00376f01.pphosted.com [185.132.180.163]) (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 3C36438A9C2 for ; Tue, 13 Jan 2026 10:17:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.132.180.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768299446; cv=none; b=KhxUNCmQ/v0FmPHWHgrcNEBDAO6EKl/AVmVSs6mQpfPlYvqyZORmUVoudSuVG7utE3cvvNNBnxoFnZ0sOCNNZT4KzJ3XVjuqkl0DdJmPPJvqVdnlrKWLRW9NauwsdMRp9xIrGfogOVx/y0YKtGh0I2IPA5LQUc9YFes2sHU8FAc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768299446; c=relaxed/simple; bh=QaYdkwqzhfz6F415XvNobyn5CdpW5o8qGTOpWNts8MI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Xpl9aj0CCkqcy4sNTbr/7XxB7WsFH9K7lWeeb2H55DS5SbjSwB9ID/v+gkAwi/ac3Gk+uZM0GJkzXxZeVAELi6McYNjq7L7vIy3AygUXFyWS3BY6gFJhWHEAma0GpD82jPXXyUlER98jYfe7cIMW+dwJxyhEWquB4gInVFfTvME= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com; spf=pass smtp.mailfrom=imgtec.com; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b=Y1MajCw0; arc=none smtp.client-ip=185.132.180.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=imgtec.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b="Y1MajCw0" Received: from pps.filterd (m0168889.ppops.net [127.0.0.1]) by mx07-00376f01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60D6s9BD3231942; Tue, 13 Jan 2026 10:16:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=imgtec.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=dk201812; bh=y 7KbZH7pJe4OUK8l8BTzMgqTxGTSurHYwOj4kGCSNcY=; b=Y1MajCw0ympEARzwL sOhbjrbTPb5HSX36VVoCzZXWPBDXPRZ64QhMPWSv/7NhMQxM97cC9OC1SN1m8mWw 9fbgfv7YdIdtspGc/S47SPcoU3jUcTgWR/T0/btNPdWJXWqilgGFDdl0SeS4bFC8 Bh/nrZw2uJRRM+nytGZY9OUomWhYL4pzu8+d0/cQzEzYrWfA58gjdLuXaq78ihQ6 etZ0KQwDwn4e4RrOPfZhXX8qjFbc0Hk6Tgb7jI33qR/yXY9t+fveJptv2G1b/2ni bEh9umTRitCmkzKqn399MEZ8Rh2Y424BUU2hmhriiJIeESBaU5hb87F13vnYUk8O 4m93A== Received: from hhmail01.hh.imgtec.org (83-244-153-141.cust-83.exponential-e.net [83.244.153.141]) by mx07-00376f01.pphosted.com (PPS) with ESMTPS id 4bkfqua1rv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Jan 2026 10:16:59 +0000 (GMT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa (172.25.4.58) by HHMAIL01.hh.imgtec.org (10.100.10.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Tue, 13 Jan 2026 10:16:58 +0000 From: Matt Coster Date: Tue, 13 Jan 2026 10:16:42 +0000 Subject: [PATCH 4/6] drm/imagination: Add gpuid module parameter 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: <20260113-device-support-info-v1-4-91e5db7f7294@imgtec.com> References: <20260113-device-support-info-v1-0-91e5db7f7294@imgtec.com> In-Reply-To: <20260113-device-support-info-v1-0-91e5db7f7294@imgtec.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Frank Binns , Brajesh Gupta , Alessio Belle , Alexandru Dadu , Matt Coster , , X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6114; i=matt.coster@imgtec.com; h=from:subject:message-id; bh=+y/dBA+BeRbuqFYzY1p34KWE4SaglYANlS150uP+4/A=; b=owGbwMvMwCFWuUfy8817WRsYT6slMWSmSU+bL2wptvDc0lsmMXx7/a+8W8Nqlbl1n6fO4cpXB y/PWn5bsqOUhUGMg0FWTJFlxwrLFWp/1LQkbvwqhpnDygQyhIGLUwAmkijByDBR7XRMeu007uoF xhfOGUUfu/7bLtzvDtOF9g/bBE385M4yMmxeEvjhSNTNu4dWFc7/nRTQJhqsESPxcN2ciMQvv/Z zP2IEAA== X-Developer-Key: i=matt.coster@imgtec.com; a=openpgp; fpr=05A40CFCE7269D61D97100A1747F0A9036F90DFA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTEzMDA4NiBTYWx0ZWRfXy/Bt3WDvRCSa LTZzt25+ldDnAjhMBi/HAgBvLY9Ixy9tG54UVD0RcnoaDvp6FP6bk/bAZZQV+DD4q+o6tsYVL2U aW94uOJKPwXdy/0C4WEjTN9pB1aTBD4LAmEfUrhTvuEeX664AYvRXBXubHX/hkcNWgdsqTRgNpk VNMvvyRqlyOH6tdznWwpzoENt9mycR5XDQz5La/mbaB2frCJvWNsSSMQ4614W1t95ZgAy9eL3xJ iGv8DgjhO0sXT9rhtf+LJNHU2jB60ABcwh5aFNTA2K6VCX0fUAL7l3Qxcjd17HudsFp2tQnTVg/ NyLJB3O4xGmc2ZeuMXUmGX2PuFPhNwKCwFLz513lrk3pkXhNVayOP9NpM1kzVs4S7GHcQiw7aT7 spws2E1WvsIR+/prm8u+AUSfJIfaNk4GPG9l8owO+cu4B7UnGWK07murhhRLzw7SPtJ1CtPmESS PsLSKIm61IpuMOYONHQ== X-Proofpoint-GUID: VHxVPakON5Yq925irH0h015hDOFaYbws X-Proofpoint-ORIG-GUID: VHxVPakON5Yq925irH0h015hDOFaYbws X-Authority-Analysis: v=2.4 cv=aexsXBot c=1 sm=1 tr=0 ts=69661b9b cx=c_pps a=AKOq//PuzOIrVTIF9yBwbA==:117 a=AKOq//PuzOIrVTIF9yBwbA==:17 a=jNdnsKvOq7QA:10 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=r_1tXGB3AAAA:8 a=4Q53omCfAPGnJu_YSsAA:9 a=QEXdDO2ut3YA:10 a=t8nPyN_e6usw4ciXM-Pk:22 From: Alexandru Dadu The "gpuid" module parameter is used to override the gpuid read from a hardware register and is useful for testing the loading of different firmware (including processing of the firmware header) without having the hardware to hand. Signed-off-by: Alexandru Dadu Signed-off-by: Matt Coster --- drivers/gpu/drm/imagination/pvr_device.c | 117 +++++++++++++++++++++++++++= +--- drivers/gpu/drm/imagination/pvr_device.h | 7 +- 2 files changed, 114 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/ima= gination/pvr_device.c index abe8ad1d447ac..db844e4e2e945 100644 --- a/drivers/gpu/drm/imagination/pvr_device.c +++ b/drivers/gpu/drm/imagination/pvr_device.c @@ -421,23 +421,21 @@ pvr_request_firmware(struct pvr_device *pvr_dev) } =20 /** - * pvr_load_gpu_id() - Load a PowerVR device's GPU ID (BVNC) from control = registers. + * pvr_gpuid_decode_reg() - Decode the GPU ID from GPU register * - * Sets struct pvr_dev.gpu_id. + * Sets the b, v, n, c fields of struct pvr_dev.gpu_id. * * @pvr_dev: Target PowerVR device. + * @gpu_id: Output to be updated with the GPU ID. */ static void -pvr_load_gpu_id(struct pvr_device *pvr_dev) +pvr_gpuid_decode_reg(const struct pvr_device *pvr_dev, struct pvr_gpu_id *= gpu_id) { - struct pvr_gpu_id *gpu_id =3D &pvr_dev->gpu_id; - u64 bvnc; - /* * Try reading the BVNC using the newer (cleaner) method first. If the * B value is zero, fall back to the older method. */ - bvnc =3D pvr_cr_read64(pvr_dev, ROGUE_CR_CORE_ID__PBVNC); + u64 bvnc =3D pvr_cr_read64(pvr_dev, ROGUE_CR_CORE_ID__PBVNC); =20 gpu_id->b =3D PVR_CR_FIELD_GET(bvnc, CORE_ID__PBVNC__BRANCH_ID); if (gpu_id->b !=3D 0) { @@ -456,6 +454,107 @@ pvr_load_gpu_id(struct pvr_device *pvr_dev) } } =20 +/** + * pvr_gpuid_decode_string() - Decode the GPU ID from a module input string + * + * Sets the b, v, n, c fields of struct pvr_dev.gpu_id. + * + * @pvr_dev: Target PowerVR device. + * @param_bvnc: GPU ID (BVNC) module parameter. + * @gpu_id: Output to be updated with the GPU ID. + */ +static int +pvr_gpuid_decode_string(const struct pvr_device *pvr_dev, + const char *param_bvnc, struct pvr_gpu_id *gpu_id) +{ + const struct drm_device *drm_dev =3D &pvr_dev->base; + char str_cpy[PVR_GPUID_STRING_MAX_LENGTH]; + char *pos, *tkn; + int ret, idx =3D 0; + u16 user_bvnc_u16[4]; + u8 dot_cnt =3D 0; + + ret =3D strscpy(str_cpy, param_bvnc); + + /* + * strscpy() should return at least a size 7 for the input to be valid. + * Returns -E2BIG for the case when the string is empty or too long. + */ + if (ret < PVR_GPUID_STRING_MIN_LENGTH) { + drm_info(drm_dev, + "Invalid size of the input GPU ID (BVNC): %s", + str_cpy); + return -EINVAL; + } + + while (*param_bvnc) { + if (*param_bvnc =3D=3D '.') + dot_cnt++; + param_bvnc++; + } + + if (dot_cnt !=3D 3) { + drm_info(drm_dev, + "Invalid format of the input GPU ID (BVNC): %s", + str_cpy); + return -EINVAL; + } + + pos =3D str_cpy; + + while ((tkn =3D strsep(&pos, ".")) !=3D NULL && idx < 4) { + /* kstrtou16() will also handle the case of consecutive dots */ + ret =3D kstrtou16(tkn, 10, &user_bvnc_u16[idx]); + if (ret) { + drm_info(drm_dev, + "Invalid format of the input GPU ID (BVNC): %s", + str_cpy); + return -EINVAL; + } + idx++; + } + + gpu_id->b =3D user_bvnc_u16[0]; + gpu_id->v =3D user_bvnc_u16[1]; + gpu_id->n =3D user_bvnc_u16[2]; + gpu_id->c =3D user_bvnc_u16[3]; + + return 0; +} + +static char *pvr_gpuid_override; +module_param_named(gpuid, pvr_gpuid_override, charp, 0400); +MODULE_PARM_DESC(gpuid, "GPU ID (BVNC) to be used instead of the value rea= d from hardware."); + +/** + * pvr_load_gpu_id() - Load a PowerVR device's GPU ID (BVNC) from control + * registers or input parameter. The input parameter is processed instead + * of the GPU register if provided. + * + * Sets the arch field of struct pvr_dev.gpu_id. + * + * @pvr_dev: Target PowerVR device. + */ +static int +pvr_load_gpu_id(struct pvr_device *pvr_dev) +{ + struct pvr_gpu_id *gpu_id =3D &pvr_dev->gpu_id; + + if (!pvr_gpuid_override || !pvr_gpuid_override[0]) { + pvr_gpuid_decode_reg(pvr_dev, gpu_id); + } else { + drm_warn(from_pvr_device(pvr_dev), + "Using custom GPU ID (BVNC) provided by the user!"); + + int err =3D pvr_gpuid_decode_string(pvr_dev, pvr_gpuid_override, + gpu_id); + if (err) + return err; + } + + return 0; +} + /** * pvr_set_dma_info() - Set PowerVR device DMA information * @pvr_dev: Target PowerVR device. @@ -516,7 +615,9 @@ pvr_device_gpu_init(struct pvr_device *pvr_dev) { int err; =20 - pvr_load_gpu_id(pvr_dev); + err =3D pvr_load_gpu_id(pvr_dev); + if (err) + return err; =20 err =3D pvr_request_firmware(pvr_dev); if (err) diff --git a/drivers/gpu/drm/imagination/pvr_device.h b/drivers/gpu/drm/ima= gination/pvr_device.h index d0e61923fd9b4..5608a977f6d21 100644 --- a/drivers/gpu/drm/imagination/pvr_device.h +++ b/drivers/gpu/drm/imagination/pvr_device.h @@ -39,6 +39,9 @@ struct firmware; /* Forward declaration from */ struct pwrseq_desc; =20 +#define PVR_GPUID_STRING_MIN_LENGTH 7U +#define PVR_GPUID_STRING_MAX_LENGTH 32U + /** * struct pvr_gpu_id - Hardware GPU ID information for a PowerVR device * @b: Branch ID. @@ -558,7 +561,7 @@ pvr_device_has_feature(struct pvr_device *pvr_dev, u32 = feature); * Return: The value of the requested register. */ static __always_inline u32 -pvr_cr_read32(struct pvr_device *pvr_dev, u32 reg) +pvr_cr_read32(const struct pvr_device *pvr_dev, u32 reg) { return ioread32(pvr_dev->regs + reg); } @@ -571,7 +574,7 @@ pvr_cr_read32(struct pvr_device *pvr_dev, u32 reg) * Return: The value of the requested register. */ static __always_inline u64 -pvr_cr_read64(struct pvr_device *pvr_dev, u32 reg) +pvr_cr_read64(const struct pvr_device *pvr_dev, u32 reg) { return ioread64(pvr_dev->regs + reg); } --=20 2.52.0