From nobody Sat Oct 4 03:17:13 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47584322A2D for ; Wed, 20 Aug 2025 15:16:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755703014; cv=none; b=Db55oGTwPI/MZiTHf7VJ9K3VsWz0pUExv6QS2FGK6tuMUtR2nf8I7XehmijWMHgrj/qNz2a3IMIXOOiWx/pY1RUNboaqs99L5Wbwn8lxFhhvu2T1FGDf5+dX49ej7gqKT2XEFYO/oD3fxea9kw9khuMpZH2USaJZKT786K0NBdQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755703014; c=relaxed/simple; bh=VjOmDxlM9r0Y6X4IU3of2mGjZhM94NUpcZEcYyk0u4M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=cezLksNCgs+6rv9aTn5EE3VZe+4h4LrMVwUczcgxMO92XZD7gvxOyzdfFyVL5IFb+W7PWEXoa2SQh7afJaL3dGLHZGbL62VaOd4H9kImI3xym8tScUQHqK4rgDno/wLgccIOT4GSESzgnDPYapjTfsmYKhbVDtMZVC/NXsO5q50= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=rAmeFBig; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rAmeFBig" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-45a1b0b2d21so34851885e9.2 for ; Wed, 20 Aug 2025 08:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755703009; x=1756307809; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=IxdnfGgNmB1UdOb/2h1cFQtiPBBv3GhVp3aMiI+P4k8=; b=rAmeFBigGkL8vHCofymweGuvT+NNel7pnE5dkar0TGQnVg4C2dsX5lewogMAOPvjB1 1XeZucGiJEVSbMpYWdhKFUNgENwmvJtELmxebTMmeq52NUd1GCuzow++U9A12gjVS8GI RiVberpFdcm3PO020bxXTrX5wYVYN0deLVaWIhK0QG/nD7g3w5Cc3MB6TR8bK6rpP89g ulVWXaqh3BzFnU0K2amQuav09SE5k+sbDTBxfH/dT6Ud6coknXQL91Dt6+0sBtAocgeM qTdn/mWqluLUXerFCUVBWF4CdyMA1T/HTrnoEC/NW4KdQlbegHlC39poulPTrdpR6Nq5 uUUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755703009; x=1756307809; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IxdnfGgNmB1UdOb/2h1cFQtiPBBv3GhVp3aMiI+P4k8=; b=QseYWlxbIcX6DGtdwy0ltDCJ6iB1A+dEgVInPeHRVMB9T/swBkeZfeYZ4SAbbOEAxQ iSfPq5SyKTfGo4askMHSbet8YZfk0UFhaqOGtqTHjeloJq5zamnHCjvb0ifGhmsI+ZF2 9+30yY6BYDQD60yI+i1fNijxkkLCZc7fdbVDXBMd+ERsPnf7EKkj+5q7UrcRad6Bzckc 76zs8grYLrIQyz0Cp0NXD0QYsPLFClQheFsD2LtmgxO54Psu1fa3qT2QKMhKu3fQVMId vTvKT1tQXvqvOA5seop8gUqShzsoqgtO5yUbvzfUMm930ue9I2HO8+PydpJDblm7GAmY 4DiA== X-Forwarded-Encrypted: i=1; AJvYcCXn5fvAtR4By0ABIIlHyUpqhCl0LseFCN89x7SAuw92NkKZSt7zWQ74sjY0/V/OefuuT+mnUxvbt5Y6o4g=@vger.kernel.org X-Gm-Message-State: AOJu0YyRDCsx2qsyUFoc77lN/XBBXzcN2gApZW5GE9cEvOPuuNiVuQws yTZFPFmn+vuDMtCH/bjYnsdgItiHn96V1HspUrMumuwoPJFaRItRYf+guuRoVGhrePM= X-Gm-Gg: ASbGnctJlVdhcrLqII0kujllkieaymUNGn+7+2Cf6pK+riDJgq5pHSQ1vu8FIqYhkas iphrHD23vZuEyOg4Pomn50X+OaKY4/eVfeFJy3mvZNrj/KlWsT5sV9yWOIGxzSkvwze9FOAUlgn AxMyu/zpaC5wXzm95f0hmTEcUBkRhhOgSCF/5rVqbuwnwnSA43A8Uhuxjckuw55YaQW6i2cOifS lam7P9aMtnBuVPvOgYKVlJ7VkdRg+VhZrWgxTFhRAG4tjNKVkcnw4A2L1nkVEn53WVaI5BeA0X3 UkWX1EoTEAvS56iGoTYGN+GEMzh6Ou7wTGODkSeI525gOz/0J9+KqstKjk6vn87PV8FPB/z9Lkn PBO3LsvhPCDwS0+CTmo5wLM7rj8yGXDsRSB03 X-Google-Smtp-Source: AGHT+IHdC6Kupzga2JlY9sSe8Fe3nGx/liiHMx6CxPwughaFpp+PojchSdWmF9yi6UA4bt62PUy9/g== X-Received: by 2002:a05:600c:4705:b0:43c:ea1a:720a with SMTP id 5b1f17b1804b1-45b47d90d97mr19274705e9.1.1755703009449; Wed, 20 Aug 2025 08:16:49 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:f5f2:96b:fcb7:af4b]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b47c310efsm39758195e9.7.2025.08.20.08.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 08:16:49 -0700 (PDT) From: Stephan Gerhold Date: Wed, 20 Aug 2025 17:16:39 +0200 Subject: [PATCH] media: venus: firmware: Use correct reset sequence for IRIS2 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: <20250820-venus-iris2-no-tz-v1-1-9ebcc343195a@linaro.org> X-B4-Tracking: v=1; b=H4sIANbmpWgC/x3MQQ5AMBBA0avIrE1SpQmuIhbUlNmUdGhE4+4ay 7f4P4FQYBLoiwSBIgvvPqMqC7Db5FdCXrJBK21UWxmM5C9BDiwa/Y7ng66bjXZ1bZtFQe6OQI7 v/zmM7/sBQwLpWWMAAAA= X-Change-ID: 20250815-venus-iris2-no-tz-f9b52f33c4d0 To: Bryan O'Donoghue Cc: Vikash Garodia , Dikshita Agarwal , Mauro Carvalho Chehab , Konrad Dybcio , Hans Verkuil , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 When starting venus with the "no_tz" code path, IRIS2 needs the same boot/reset sequence as IRIS2_1. This is because most of the registers were moved to the "wrapper_tz_base", which is already defined for both IRIS2 and IRIS2_1 inside core.c. Add IRIS2 to the checks inside firmware.c as well to make sure that it uses the correct reset sequence. Both IRIS and IRIS2_1 are HFI v6 variants, so the correct sequence was used before commit c38610f8981e ("media: venus: firmware: Sanitize per-VPU-version"). Fixes: c38610f8981e ("media: venus: firmware: Sanitize per-VPU-version") Signed-off-by: Stephan Gerhold Reviewed-by: Bryan O'Donoghue Reviewed-by: Dikshita Agarwal Reviewed-by: Dmitry Baryshkov Reviewed-by: Vikash Garodia --- drivers/media/platform/qcom/venus/firmware.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/p= latform/qcom/venus/firmware.c index 66a18830e66dac2acbe11751a8c250876e20d795..4e2636b0536693a86dc51503d01= dc2bca40b532a 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -30,7 +30,7 @@ static void venus_reset_cpu(struct venus_core *core) u32 fw_size =3D core->fw.mapped_mem_size; void __iomem *wrapper_base; =20 - if (IS_IRIS2_1(core)) + if (IS_IRIS2(core) || IS_IRIS2_1(core)) wrapper_base =3D core->wrapper_tz_base; else wrapper_base =3D core->wrapper_base; @@ -42,7 +42,7 @@ static void venus_reset_cpu(struct venus_core *core) writel(fw_size, wrapper_base + WRAPPER_NONPIX_START_ADDR); writel(fw_size, wrapper_base + WRAPPER_NONPIX_END_ADDR); =20 - if (IS_IRIS2_1(core)) { + if (IS_IRIS2(core) || IS_IRIS2_1(core)) { /* Bring XTSS out of reset */ writel(0, wrapper_base + WRAPPER_TZ_XTSS_SW_RESET); } else { @@ -68,7 +68,7 @@ int venus_set_hw_state(struct venus_core *core, bool resu= me) if (resume) { venus_reset_cpu(core); } else { - if (IS_IRIS2_1(core)) + if (IS_IRIS2(core) || IS_IRIS2_1(core)) writel(WRAPPER_XTSS_SW_RESET_BIT, core->wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET); else @@ -181,7 +181,7 @@ static int venus_shutdown_no_tz(struct venus_core *core) void __iomem *wrapper_base =3D core->wrapper_base; void __iomem *wrapper_tz_base =3D core->wrapper_tz_base; =20 - if (IS_IRIS2_1(core)) { + if (IS_IRIS2(core) || IS_IRIS2_1(core)) { /* Assert the reset to XTSS */ reg =3D readl(wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET); reg |=3D WRAPPER_XTSS_SW_RESET_BIT; --- base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585 change-id: 20250815-venus-iris2-no-tz-f9b52f33c4d0 Best regards, --=20 Stephan Gerhold