From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 572913E3161 for ; Fri, 13 Mar 2026 20:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773432779; cv=none; b=PV+RTIZBNGFfLnpsE17jVWI1HAUcP7hDvdHLoxGtnINFkkXcwx3HOab94sGl1IuyP8hGW3MTt/lj2vDZv4bplfAHk+H7m6ZqQ17/A6V3SNuFNIj5OQQI7nUc61cx84ZLBVK6y1aQCjRzBNcdFw6nfXcFSPcZomyM0Gd3vwH3BFc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773432779; c=relaxed/simple; bh=upK6uBmdFj3L01J2+uso9YhOoCCeQIlN/0kiddAlHQU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sXXSL4T3DynRT6gtLq1EktIbwoDOsP3lHXK+uZ0h84q8iSaPL8mqSVbaRwm7/Zyor+NTzMMsGWcaFewj+FcUYWzxbyHlwmjrCrg18M7kE5gzJKspNoZLc2qmuV6PT21HgygAKYASbw1yDdTb30JQnCx4MUaS1/frWnH2VaNAT3A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=A2Nx2nTv; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=XrQ5OLhk; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="A2Nx2nTv"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="XrQ5OLhk" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62DC9Ymw3229787 for ; Fri, 13 Mar 2026 20:12:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= z4EIReUVZDLLFKrNuhEc4keZuSe+ZzG9lS8i32XVEH8=; b=A2Nx2nTvIrC4BPA8 ymftmL8lysfgYoKg4EWiGnHKmR5nbIbR5l4WPmGBvYGCzbPK6u9Ptu04ydpxPsi1 xxbHEesDdLkdLj0JSU8S9o9fvXYyoScxW5R7vm9rTw7Y4f+GhC3zHI8pSyd9ZHnX 9Qb81x99M1g/ySyR2UKkVJF5Rfvit2ueC8ce9tkgtMaAJ2eeg2fzpKi0lIEjJGDI j2V7YrzOdM0ZXgiBl4Y3kZAlchDKVr65cr53K95VXCKdWKyDikCqQu4zUrMUF4FP IN28kKbj7Fb4Fb4tnzGosE9oVlGmRqJG+XIS4BAebBFokYB++e7lWhmm2r7hi6Bn kOFVlQ== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cv8n7kpej-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 13 Mar 2026 20:12:57 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd81c571a5so1493130485a.0 for ; Fri, 13 Mar 2026 13:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773432777; x=1774037577; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=z4EIReUVZDLLFKrNuhEc4keZuSe+ZzG9lS8i32XVEH8=; b=XrQ5OLhk12MVWb9cxFeuvTmFH8lgluEx4ZMEhBH04J10ViCWZmKU4FaRGqP5dPpqvR t/sTRlpBBvpDehBy+dt5vFGHuVp339duve9L4UcNUJ7lGUIh2IsvFyWPIUhkKLRs0dtQ IWVuGHN4voRGgHqcwHkgihA0FCCDMm6YKZlAEmUdACa39N/Y871iI85kQbGobWBLaxlU UQ0Hu4X7YruVL97/ooD1hSDWUxXFvzM+97uzCM1x44O99+iQuk9E+3GE2oAcmMhi0eOE q/w/YxSN1DVhpDmRDmFV6bC97FZDFVR2m+1Rt24799TCh8dXRnpSnA6DgN8rkBJhoQkD cLzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773432777; x=1774037577; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=z4EIReUVZDLLFKrNuhEc4keZuSe+ZzG9lS8i32XVEH8=; b=DlkDqceERZO1WJrJVHQmtj7QmFvd3LzI8inLVw8SeQBy3Gh5xQxIY9e0adGuBR4L2c WWVJi1N0S5FM+K+G1jodBsTDHBnfqY/3/PeDXp0CqE29EQxPeWP9ME4ZLKTxc9ptQCdH /rMZ+qynGhcrsrym1T9d4f0sxCYgQeyQDVcy9AYPQkyn77vjXYx/ar2NwkoRI8nEPZ1D B8Y+r3nkNhKdMyDdpHIwi20OXO+WiAlHsUxb5gG1Oiey/Ek8uYILJecVDxRRzxxuM9VZ TlxenZ9b+W+BjjJIpyzUb5+48OH8g3dXMWuUlMC0I6ZQXVk9aZmgdmJy4S4WNw8En3Aa BLMw== X-Forwarded-Encrypted: i=1; AJvYcCW9EcV6yYL0EDMQfE0nnVpD/oSxzFQPpBChwfeZ1XzpylhBOd6k0TtLtCijHi6u30t0GcZYVeU33C0Gr+ae@vger.kernel.org X-Gm-Message-State: AOJu0Yx+NO4cpg0+rn2ujqM5iIi0Porfqv7kakJWAOBbEcRrYTcPLQCy aEgc+lz4rAcAOfSTEOj+W3mN2rzEAQxE2g9kYCd/YuLwB2rsbSW9SbF60UuonfwGLa8sFiH85YX dJaiHp7JlsztphdaTLkSGGxqs2iNCIhdSAi5gFc89CiawB0G2k0xosc5WwLcIF2cka/+N X-Gm-Gg: ATEYQzzk5TqooMGzd0a1laguua3qfpw44WreY+i4yDzN5gha7HQhorRIR3FOkOaJi4t 5rY3f/STnFatqoIPgQTyKtsWrWnKT8WN1c9nL39Oc0d0mBLgYMPHOi0BekCqX7mnCOKPhWKK+QA zNuI0Mg8GyUDFo0zml6HPdYgYFYoRCIX/Im95DtWd6eZRX8vMNkms0IR7Dd9qr5T2EoNAMaf9yV 1UILJl14K97a8JssJsLrdu11aoL2taLu9BmDBUddRpb2lsSE49zb3kKksu4sIlimyKH38zAD0JL AMZ8kiMqvWVy26bxwpq1dpSBGFC3DFdvF5MAOAlOrffJ97dkkETexFgNHnFpGnM6j/vFoo3lqPx /GYAaEymcrGatvdKK27vzZjP+zLZG/4dzVZ1SW7NcniGj16xI403uoqx1oUuAG1CWDSpD+WwOFO zHhX77qH6u8qV6HKFL6wAgN5jqPlGV7Qp4N7s= X-Received: by 2002:a05:620a:1a0f:b0:8c7:1b3f:5eab with SMTP id af79cd13be357-8cdb5ba0c36mr632866585a.60.1773432776511; Fri, 13 Mar 2026 13:12:56 -0700 (PDT) X-Received: by 2002:a05:620a:1a0f:b0:8c7:1b3f:5eab with SMTP id af79cd13be357-8cdb5ba0c36mr632860685a.60.1773432775937; Fri, 13 Mar 2026 13:12:55 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a155f33c15sm1681259e87.17.2026.03.13.13.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 13:12:54 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 13 Mar 2026 22:12:49 +0200 Subject: [PATCH v6 1/8] media: qcom: iris: drop pas_id from the iris_platform_data struct Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260313-iris-platform-data-v6-1-1763bb837fd2@oss.qualcomm.com> References: <20260313-iris-platform-data-v6-0-1763bb837fd2@oss.qualcomm.com> In-Reply-To: <20260313-iris-platform-data-v6-0-1763bb837fd2@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6161; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=upK6uBmdFj3L01J2+uso9YhOoCCeQIlN/0kiddAlHQU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBptG/DfCk+BYOoeNXo/8BXAjER6PCimGAQhcfqC N4E3pZzGN2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabRvwwAKCRCLPIo+Aiko 1e/mB/0X7OL/t+OMtFzK341lhuFkgtmQjgOssx0x9PE3Bv+fSrX+VwpOzZax6YSGmsuK+0Q9PYN xuL0EHfwcjpqydni2yEUtsHUZw7EhwCBH9Rn56lMfjfiQ/fo26z5cFwKpS+vE9ugL5o30YM4EtP 166koAVGxhIHnie/qIua24/cmw4mW3OYmM8ULFithBcDUw9q7xO9fcvhAZHDZx7D5PVOcwsVexJ PAXbO+ocwd6kNupizRR6JDb6utkCQZmMNm786QEHoxyBIrL+9zzC5cDlNlqEyfPIrvZpp26EhRT m69Z46DhNBSQ7bV1FpOvGVappNIA7crpBB7G6EfVCsF8h+CD X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: kzuaCl2QRcreaqa7-wReLFyzzy7HogkB X-Proofpoint-GUID: kzuaCl2QRcreaqa7-wReLFyzzy7HogkB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEzMDE2MSBTYWx0ZWRfX2Fdll1WzTnEC 6qsx7cBQpLOVyRR0uzp6cGg5ynvZKpTd0NCX0NOge/uhh5dg32GwfHPi3smYFk6nfCiJQioQgcM ruAuaCf/Fxhylni97LHUG9PGx8qluJjxSRZ6pK4qHWtCCKM2Kgty/qgFwUU1/yUc66beru0fGOc qzQMmNEBPEGDidtSQFJzSY8NObFXJOQcnj6nKHqtTGSO1tlG527405d6jW4I9rRh7ugKsSBXo5J 604UuEShYpfdQBuejvXRxNjs/ZkQ5FS5kdZoI/6jIkHoAKUQbkg25uEEGPfiLkRPKz0uvxEpPXd Hom+q0SK0b5P1uF2wmFCO31hSjfoxfydS270pye1MCEM/qArzHWnjnM8232sNpzragx6Xz5AJPQ OyIOWTz1KSXLSFV/5/4ySBSBZv5V0+TcRr6bNwtJ+ngdEZqTqqM74NqybRMZ/f9rv83iV30MRpP rDTLNWADgLqFj64lcag== X-Authority-Analysis: v=2.4 cv=CpCys34D c=1 sm=1 tr=0 ts=69b46fc9 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=hYMYe-gnznq9qBW6PAEA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-13_04,2026-03-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 priorityscore=1501 adultscore=0 suspectscore=0 bulkscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603130161 The PAS ID, the authentication service ID, used by the Iris is a constant and it is not expected to change anytime. Drop it from the platform data and use the constant instead. Reviewed-by: Dikshita Agarwal Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/iris_firmware.c | 11 ++++++----- drivers/media/platform/qcom/iris/iris_platform_common.h | 2 -- drivers/media/platform/qcom/iris/iris_platform_gen1.c | 2 -- drivers/media/platform/qcom/iris/iris_platform_gen2.c | 4 ---- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c index 5f408024e967..bc6c5c3e00c3 100644 --- a/drivers/media/platform/qcom/iris/iris_firmware.c +++ b/drivers/media/platform/qcom/iris/iris_firmware.c @@ -12,11 +12,12 @@ #include "iris_core.h" #include "iris_firmware.h" +#define IRIS_PAS_ID 9 + #define MAX_FIRMWARE_NAME_SIZE 128 static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name) { - u32 pas_id = core->iris_platform_data->pas_id; const struct firmware *firmware = NULL; struct device *dev = core->dev; struct resource res; @@ -53,7 +54,7 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name) } ret = qcom_mdt_load(dev, firmware, fw_name, - pas_id, mem_virt, mem_phys, res_size, NULL); + IRIS_PAS_ID, mem_virt, mem_phys, res_size, NULL); memunmap(mem_virt); err_release_fw: @@ -79,7 +80,7 @@ int iris_fw_load(struct iris_core *core) return -ENOMEM; } - ret = qcom_scm_pas_auth_and_reset(core->iris_platform_data->pas_id); + ret = qcom_scm_pas_auth_and_reset(IRIS_PAS_ID); if (ret) { dev_err(core->dev, "auth and reset failed: %d\n", ret); return ret; @@ -93,7 +94,7 @@ int iris_fw_load(struct iris_core *core) cp_config->cp_nonpixel_size); if (ret) { dev_err(core->dev, "qcom_scm_mem_protect_video_var failed: %d\n", ret); - qcom_scm_pas_shutdown(core->iris_platform_data->pas_id); + qcom_scm_pas_shutdown(IRIS_PAS_ID); return ret; } } @@ -103,7 +104,7 @@ int iris_fw_load(struct iris_core *core) int iris_fw_unload(struct iris_core *core) { - return qcom_scm_pas_shutdown(core->iris_platform_data->pas_id); + return qcom_scm_pas_shutdown(IRIS_PAS_ID); } int iris_set_hw_state(struct iris_core *core, bool resume) diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index f42e1798747c..e4eefc646c7f 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -12,7 +12,6 @@ struct iris_core; struct iris_inst; -#define IRIS_PAS_ID 9 #define HW_RESPONSE_TIMEOUT_VALUE (1000) /* milliseconds */ #define AUTOSUSPEND_DELAY_VALUE (HW_RESPONSE_TIMEOUT_VALUE + 500) /* milliseconds */ @@ -226,7 +225,6 @@ struct iris_platform_data { unsigned int controller_rst_tbl_size; u64 dma_mask; const char *fwname; - u32 pas_id; struct iris_fmt *inst_iris_fmts; u32 inst_iris_fmts_size; struct platform_inst_caps *inst_caps; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c index aa71f7f53ee3..07ed572e895b 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c @@ -360,7 +360,6 @@ const struct iris_platform_data sm8250_data = { /* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu-1.0/venus.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8250_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8250_dec), .inst_caps = &platform_inst_cap_sm8250, @@ -413,7 +412,6 @@ const struct iris_platform_data sc7280_data = { /* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu20_p1.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8250_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8250_dec), .inst_caps = &platform_inst_cap_sm8250, diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c index a526b50a1cd3..1f23ddb972f0 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -934,7 +934,6 @@ const struct iris_platform_data sm8550_data = { /* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu30_p4.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550, @@ -1038,7 +1037,6 @@ const struct iris_platform_data sm8650_data = { /* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu33_p4.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550, @@ -1133,7 +1131,6 @@ const struct iris_platform_data sm8750_data = { /* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu35_p4.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550, @@ -1232,7 +1229,6 @@ const struct iris_platform_data qcs8300_data = { /* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu30_p4_s6.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_qcs8300, -- 2.47.3