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 253393E7155 for ; Wed, 20 May 2026 14:05:42 +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=1779285943; cv=none; b=bQtdYKKMx9qcJzne11kmOSqsaE833l+hCzgwSsbr0SafazLTbMmegFaOPS1rUrqL+eflb6mB/q/2n88Llqm32Y9lp7HTbnz0tvU1dGXEJFbr25B0lWCeQdOun4pwV9FqiaI+eeYjHMJS3igv1kpoM8HfQ5XEPiUkG4zXRVmrSXY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779285943; c=relaxed/simple; bh=bxhg2HxFmld3fYJF433QWvJMN+XCIp0MPqLoIN6K3y0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=VLoag99oCp9Io3FOxTAOE5Uqo1iTLjc7uJaMhkLp18SuXTdIylYzSVa/UzfIIp/cm9gCNr+DLLPZj4j3HEWGtNyvqZJeRTSc28IriHDBjsmvtybq/c/UzRLbHFd+Fc1iPQekvK1Ha5Tm6mcemwT0vL/CzW6dWmDEOpE0kVQQsf4= 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=EdGVqRzj; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IgnDfypb; 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="EdGVqRzj"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IgnDfypb" 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 64KDuTo73680300 for ; Wed, 20 May 2026 14:05:41 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= NYuYOeuKLU/F1YE+q0QbOg5zwMu3UJcu2pfEYYYE19A=; b=EdGVqRzjucFwT49w wSuOYqa1DcEBhIYGmSAP5UaGSI+FBYEwoK4K2nOR5LuSTZ+PysT3pQw1lppIYVNN uDm81WUXn9T/i0nDVwT/Ysf6bkzjZmrgg0fzR1O7IY2NAY4ATQp/iCIHqHJsv43K shMwAIM8uWKebr8wnQB4e8bgco59u2Qkfido66ov98H4AN73ZhyJYbI5C1tyCHlc zCn7OD8fXKxsWM5TTEhLfbGid6MzBY17YF/9dwJODR7geqqq4wTTGV7o5UKRbvbo KFvfkkKGba6+CjQ88Uq25Gh5UgZJJ34Nr8xoendBKPdd4ZrujEiw+uZwhNkNwemW +O5Pjg== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9e9j019w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:05:41 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2ba838d3fa4so47400595ad.3 for ; Wed, 20 May 2026 07:05:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779285941; x=1779890741; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=NYuYOeuKLU/F1YE+q0QbOg5zwMu3UJcu2pfEYYYE19A=; b=IgnDfypb0lTPGpsRl845AmnD/sIJxmNxtr2TCMBo7rBqjW+5YXwBF4srDdFdIT7KyX XcS5vpQAahY+uAMsIeIO235iTFjsRBIDgdA0UMy5fKrOEPU3tY3gLK7hUroY3hTZ+bD4 g9tkfAhNP7+0uJd0VXuDyaZz2+TyiabpUbiTCwl0jDGczQqgeus/umg+toIVVbrROOG8 8fg1XzG9CqhDyl1u2HBJKxu6LR+gyCPavwuFZpFDm3DUKqjLryDG0r3R01q8qkuJpFSI kUqx/iPS6sM3yyGiLZ3i9Pwx6GjlwPwx3JKhT/e8wIIpGY78u9IemXoFZT84DErvOO24 KJMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779285941; x=1779890741; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NYuYOeuKLU/F1YE+q0QbOg5zwMu3UJcu2pfEYYYE19A=; b=seSMjTNDND2g6gl9CGh6OPPwC+KnJDhEoHgXc4b6qdOWZbFI+2uG/SoU6kV0K+nMn7 +i6pNW2bRFQY41mcoO6zLgEPwKC8By+/sBcOduWlCL0vS1IhRMHht6FRQbPMdMz7hoMb AwLTUliDtG25Si9/sYb/Gz3l1EMDJqsBvN1Bv4tY2CUoMl2UDPM01TWfudnuNcV3PTCW CgThH3ak212JdmJYm6mEz0c6rWV9TfnMXZF7UWgisXnBbKPCxRTiv2V0P+bVzf948UVa 00b67G6DQxrnFpQCo4eiepOHNKEyecHknSOzp72D0n+G9RoBmWlP2MXIKjAvoRYhi52d WLhA== X-Forwarded-Encrypted: i=1; AFNElJ8LtQYPqEo9UGhMP8dFO87bbSkl7R4yaPyEflneNtODXnGuQgUxBuRM0K7ImjCUFzh3+vLPP6NMUGPf/Ss=@vger.kernel.org X-Gm-Message-State: AOJu0YzFfc8x5HQZGDsBneAaYUgHmC9dtf1fZgqb8ZBVDbJ5PzlzHt12 T4ER8k9m4eqWQd2cc3O7i33qFzlWX+Q4pYsL8tQuQBMo8sTad3mOz5Mx83YkiTBAOMtaaqa9MEG Q1PEBF/i/il2cvrcY+Ki1FvS4qwTeR6F7RO0BAFFxgok3DFLo/f1QmGoRHQ9tTV+n1jw= X-Gm-Gg: Acq92OF/HQi8Z4hlYUz2MlPWmKMumcUe3//YUomx0xxAv5+ZVAJ21AOo3muvxbRRoTP vcTiBr6sbtlx9HtrFWXC2aFOZCZt16Hilk6qkt4rpsdjGOmEofqFBZusT7Obl0W6NInR8gCdgjH xcPdX78l80MD8v8uje+aH7SsZ06CuE1C3MV9HVzlktdQB/7LXczYSXeOxFyCCG5GpTawoQFFynM RInC4lYVK1VMckgVwcqm+e00TRTXnwMK+y6d87zBURojoPTODa5u2QH90yFWnYOsqIZ44WKxluk 3JEXs5mIhyo1j+GMvzHumD3OomLssZawxQ7FirA5iJLAu7VDVPvgqDMsc2XpWWFqU8WhkysH9IQ mMQO/+mrFFkY08FRaIjBYoiR7R4RgO62Ak92s0Jv4AVSO0o3hm4I0OFY= X-Received: by 2002:a17:903:2284:b0:2bc:9f51:2922 with SMTP id d9443c01a7336-2bd7e9db7cfmr238085805ad.41.1779285940619; Wed, 20 May 2026 07:05:40 -0700 (PDT) X-Received: by 2002:a17:903:2284:b0:2bc:9f51:2922 with SMTP id d9443c01a7336-2bd7e9db7cfmr238085155ad.41.1779285940030; Wed, 20 May 2026 07:05:40 -0700 (PDT) Received: from [10.204.101.125] ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5d0fc2bdsm292402795ad.63.2026.05.20.07.05.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 May 2026 07:05:39 -0700 (PDT) Message-ID: <12650883-177e-4e92-bf34-370249cf6994@oss.qualcomm.com> Date: Wed, 20 May 2026 19:35:34 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 2/2] media: iris: Add Gen2 firmware autodetect and fallback To: Dmitry Baryshkov , 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, Dikshita Agarwal References: <20260512-kodiak-gen2-support-v4-v5-0-a98968423d24@oss.qualcomm.com> <20260512-kodiak-gen2-support-v4-v5-2-a98968423d24@oss.qualcomm.com> Content-Language: en-US From: Vikash Garodia In-Reply-To: <20260512-kodiak-gen2-support-v4-v5-2-a98968423d24@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=bfhbluPB c=1 sm=1 tr=0 ts=6a0dbfb5 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=SlpFFaZawDAKOkDku34A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: mxgVXZqzNThkBiV8PBAwY5r0hfdQ-J7Q X-Proofpoint-ORIG-GUID: mxgVXZqzNThkBiV8PBAwY5r0hfdQ-J7Q X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDEzNSBTYWx0ZWRfX+Xx2Ktlh+v+6 Bb+HAHdYNFPMol+UPk1No51HrR2XFV/8MQML7jwcdYMTyYGaOyCqx+wB7Sv8ev3a0vscQSEakoU 8wJqOARLUz1AHxPnhCaKshvVkeuqh/KMTAQknifj4HVld+XpTZxS0csRUmLP0wDUgHkytDiaaOa /MkE28MYefak7xWTc7itWaGCLh9wxDXCSTK9sOyVllGy8FrSznBRD2MLEBZ7BNXjlHaRg4CHDQo ve61QNxv5qbHFcRTU+VJJsGH7Rdoxw4KSfZYsP82Bawk924BkXPlqCF23oT6eBWxAWSTANB2oBc Lnc32DTR0LxvTmJqnyQL1hsOry0aJTPhwVwXfpSoGlP2lWqm2D5gX2rw73+uPWXBC75kIQP8FyW i+/J0WHY0YF7lbZxb72zWxeAZ2Ha77dDEtllcvz/BwFgVcBz9y6uyOTQaeHzP5CowuieTngOwxB U6Uu3d1swt2NNxoLV+A== 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 adultscore=0 spamscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200135 On 5/12/2026 8:51 PM, Dmitry Baryshkov wrote: > From: Dikshita Agarwal > > Some Iris platforms support both Gen1 and Gen2 HFI firmware images. > Update the firmware loading logic to handle this generically by > preferring Gen2 when available, while safely falling back to Gen1 > when required. > > The firmware loading logic is updated with the following priority: > 1. Device Tree (`firmware-name`): If specified, load unconditionally. > 2. Gen2 default : If no DT override exists, select the Gen2 firmware > descriptor when present and attempt to load the corresponding > firmware image. > 3. Gen1 Fallback: If loading the Gen2 firmware fails and a Gen1 > descriptor is available, retry with the Gen1 firmware image. > > When a platform provides both Gen1 and Gen2 firmware descriptors and the > firmware is loaded via a DT override, the driver detects the > firmware generation at runtime before authentication by inspecting > the firmware data. The firmware is classified as Gen2 if the > QC_IMAGE_VERSION_STRING starts with "vfw" or matches the > "video-firmware.N.M" format with N >= 2. > > If a Gen1 firmware image is detected in this case, the driver switches > to the Gen1 firmware descriptor and associated platform data so that > the correct HFI implementation is used. > > This change makes firmware generation detection platform‑agnostic, > preserves DT overrides, prefers newer Gen2 firmware when available, > and maintains compatibility with platforms that only support Gen1. > > Signed-off-by: Dikshita Agarwal > Co-developed-by: Dmitry Baryshkov > Signed-off-by: Dmitry Baryshkov > --- > drivers/media/platform/qcom/iris/iris_firmware.c | 105 +++++++++++++++++---- > .../platform/qcom/iris/iris_platform_common.h | 6 +- > .../media/platform/qcom/iris/iris_platform_vpu2.c | 11 ++- > .../media/platform/qcom/iris/iris_platform_vpu3x.c | 8 +- > drivers/media/platform/qcom/iris/iris_probe.c | 4 - > drivers/media/platform/qcom/iris/iris_vidc.c | 3 + > 6 files changed, 105 insertions(+), 32 deletions(-) Reviewed-by: Vikash Garodia