From patchwork Wed Mar 5 19:05:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 14003236 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 D142E2459FC for ; Wed, 5 Mar 2025 19:05:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201532; cv=none; b=iwiMCdERtkhnh6YWS3ja7FrO9JoXQU/EoylEhk5uYQKopl1/5Wks4OVr5gLazGXo33LFvSaxQtCMLHq659CzuhsqYL0bxw05p3nZolWGI5VuJ20nuwRODmnRhkZ1D1WbLl7iQR1qD0xePrQlnG3wEeZolmo41tCHVZe1Yxc6X5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201532; c=relaxed/simple; bh=rZobr5wcTlhEiVAtYQB5i/HT1qKxwHEGG9fjtMu74sg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P8xXv36vsCcARf3G02DhHhmTlQFJ1teSDBZiDb/536sB1OElkKqDL9nRuowJ/GW95PH9YfVfdGMQGIoXs9HSyAliwPm7ZqbeMurDSB6Z4rJCrrJi+B0FBh6fgQAL2kqRUFMzRJYGdHUuEXiZKYjsqiJwJl8Hd+9xvch6Fu00m2o= 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=gvZoe0c8; arc=none smtp.client-ip=209.85.221.42 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="gvZoe0c8" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-38f403edb4eso4337540f8f.3 for ; Wed, 05 Mar 2025 11:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741201528; x=1741806328; 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=Kaj59JWv8fpvZKdwQhX3eEQ/lEkOt31+9Jk/t/r3z4Q=; b=gvZoe0c8RsT7zOofhJWQvqVUw5TFZVqW40QZ5gZiWfJoLrVuAOYYj78oaGLBbB7vEA 2Qkuv1EjmcY9k3DjrBXFBNzt03W7J3x9RZOywUFdA4sIuyaY4c6RDDQI30S0mhXPye2T LTNVR8kJNvt2t+zybah8M4ovr4iyGpSeR+kbnuPyWiFZmp+M/ZAjN89dUSIv598Ny7Mw ICZWclpySgpc0TIIpfpRaA0OUCKm35GbbnHpkCafWCKXknHPNN+zW3znh/NWreTZn/tr SK96x4YdLTy9MU+x+YTlnclh/r/WjXvZrm/tdpe7CXYU5BWzdxTr5BXFpcrFWqytmYxR gCzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741201528; x=1741806328; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kaj59JWv8fpvZKdwQhX3eEQ/lEkOt31+9Jk/t/r3z4Q=; b=U4UiIjxDHmipwXzUlwIjH6t+dxDAZKfFqJf8p7d2ZHLS7XGC8y/hSr8DmxItjm7akv bF0/RSmSHw7O/5dKl34Px+2tKFXLyw5AGjaIUrLIUQSXYaQKyAM77Z0IwUaZ/ez2TUnn lYbOj9B4nbWqRL7dIDPogr/AX8IIS9Tgky8379v0Xwlp7ODIb2xCDLcbr/MzaqeZcLMg xt2p5iExrGFoKG2gYEPZMkvVHeg+L6nk6w19a57768LySWDD/Lvp506kN0jbFE2suiyh ZvdAtrNxxfnlgJO5CIvqytN0h09zLU4AEZXE5l9IzbjEs0pxhCehzinBUUK6CyUrkKQQ tGYw== X-Gm-Message-State: AOJu0Yziznru+rn7ciuRB7L7hRc755fsSnd+/ikaolSlsQ1zTSY4FyK6 gphpcEB9yYozovwQawUEY/nuJb3LpyFzPdwrDu2tJtcUV+MUfY4jvjtWJk26dgA= X-Gm-Gg: ASbGncvYqgOkaT29E/nQhsC9bPDWlUkofFgVt4Gfsc2TOS3+ZV5LdGHgqwR4DaxOgzi CbBS/OuAvMYHqemOkGP1omDSjJKSEXrAiACAoPnfmD5VblyEakCCT1vmQMA5MR0V0RoMsyVvdQm YD4IMhql0LP2cJu4oZ1QcZm6MOfzPNtAdbTgAkBpClQyndnmDzmvqW0oKuO3D5+/LVDBqWzb6fZ eGzWdcG76o0E8ghvBeC18JzKk73FPWqeWzww/hcuQZJBtwJM5sbOnszynohqlX1DEpBObKCJmYL b99xb6jPEzr6StbDE42Rmc8t7oF/s2Ee0sAOLlq4R2cfDIa3b6yZxfrt96etbe/FfA== X-Google-Smtp-Source: AGHT+IGYzLJwg7FBqRTXK9nhI85AB7AnaQrWmA3XgEVM55LrF/Z0j81U0P3KALYF+4LnaMMQwwwR/w== X-Received: by 2002:a05:6000:1a8f:b0:390:e7c1:59d3 with SMTP id ffacd0b85a97d-3911f72620bmr3691438f8f.2.1741201528087; Wed, 05 Mar 2025 11:05:28 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391241bd151sm2045218f8f.21.2025.03.05.11.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 11:05:27 -0800 (PST) From: Neil Armstrong Date: Wed, 05 Mar 2025 20:05:19 +0100 Subject: [PATCH v2 1/7] dt-bindings: media: qcom,sm8550-iris: document SM8650 IRIS accelerator Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250305-topic-sm8x50-iris-v10-v2-1-bd65a3fc099e@linaro.org> References: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> In-Reply-To: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1966; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=rZobr5wcTlhEiVAtYQB5i/HT1qKxwHEGG9fjtMu74sg=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBnyKBzX2B8GunSD/h8MttPoHNqZCC8beKHLKN6H4g+ /9k4IX6JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZ8igcwAKCRB33NvayMhJ0dm2D/ 9l1E6q5hnNYFNeNDJkFPsawIuLbkj8YEq7esKn2iKvhTk8M/b5stZ3fzE+OktKI55B1UUij98yEdbb YJ66Fa8FLBam+o32FZ2x3gVeYRGnbdadhl+cgO50mQ5+qA35n1bNC6B89vZZ83aB2ZBg5dhVZ0kFHx lw+7LptRZcRqq3RzW0MBeTK1Y2nBPqquSj/Wrpq6XxRlu1Fz8e+SDgPBh/tjxm8WoWK8jf8K0Ffg1f VLvEXF6VaKdePLD4Q2H4A4bcwM1L4U5UMkHYxzGZHVCmawCNfiYCF9O3PV/0ke8E05vwJxQFjl8Vjh VlTgeGnTc1EyuGqr3yT3ILchssu7xkqxJ7UBZZs+61GVErLZCXYhRFzg95YjHWykDHtEBukY3EJFC6 Mq3XGOqJ/8sS4bTHr5x5kZVtvDolyN1vCHaCGaDPM1Z5oP8tWKZNfX28JgaU8axuDHsPOqaECevPWm nIK0H8W7PXizIJSEOGHmLKtbP6wH9fTF1mEpT8r7rcIGUN5Vkpo17BmbB2vcuC4LiqwXyjt0FSJWDi e228qbMnIF8L4tLt65C3Sjt1KPx208Ef8Tmx57uSn4t64yfU7sADJCUOnJmttwzNBqYEmufLo+DV83 MVOwYuaB6TMr4h4bMFDN6NTdImmTtRJzJrUc23EKBET4Gtd60OvrEwsWDccA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Document the IRIS video decoder and encoder accelerator found in the SM8650 platform, it requires 2 more reset lines in addition to the properties required for the SM8550 platform. Reviewed-by: Rob Herring (Arm) Signed-off-by: Neil Armstrong --- .../bindings/media/qcom,sm8550-iris.yaml | 33 ++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/media/qcom,sm8550-iris.yaml b/Documentation/devicetree/bindings/media/qcom,sm8550-iris.yaml index e424ea84c211f473a799481fd5463a16580187ed..536cf458dcb08141e5a1ec8c3df964196e599a57 100644 --- a/Documentation/devicetree/bindings/media/qcom,sm8550-iris.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sm8550-iris.yaml @@ -14,12 +14,11 @@ description: The iris video processing unit is a video encode and decode accelerator present on Qualcomm platforms. -allOf: - - $ref: qcom,venus-common.yaml# - properties: compatible: - const: qcom,sm8550-iris + enum: + - qcom,sm8550-iris + - qcom,sm8650-iris power-domains: maxItems: 4 @@ -49,11 +48,15 @@ properties: - const: video-mem resets: - maxItems: 1 + minItems: 1 + maxItems: 3 reset-names: + minItems: 1 items: - const: bus + - const: xo + - const: core iommus: maxItems: 2 @@ -75,6 +78,26 @@ required: - iommus - dma-coherent +allOf: + - $ref: qcom,venus-common.yaml# + - if: + properties: + compatible: + enum: + - qcom,sm8650-iris + then: + properties: + resets: + minItems: 3 + reset-names: + minItems: 3 + else: + properties: + resets: + maxItems: 1 + reset-names: + maxItems: 1 + unevaluatedProperties: false examples: From patchwork Wed Mar 5 19:05:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 14003237 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 D77A8254871 for ; Wed, 5 Mar 2025 19:05:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201533; cv=none; b=b9kVbznypWpRPkxPARa6fd69E8oLtoVTAU71xb0WrqoVNrDMetDM0KQP0a3BNaOgejbs9oyDCyWjBWpgzD5vBsLqlaOUKIVOcvyvR4z76uTSDAVM36v/gKjOameZ1ZZPzBBdCZedHYVKXtWeZIOmIO5SyBFTaddUA0TqymXSH2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201533; c=relaxed/simple; bh=7F/lb3BQ+xLsa7QmxRPtTN99nPEu5DGTE3fdAaA9TPs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XMg44/wc++BTxYOknD9DIeaR9Wp14mKBzoWJ8tY01WoBgI2Fnm0zX0lBX7AHugIWAoVp9ozuK2sOGx9hcITJ9bPePDxQJdyGBba0XzjmdK1YC3O8PTbdYCcQ83sSmkRz9A3Im1hbRTwmg0JGkl/TClFVy7NHP94VtASL8iQ3WgY= 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=v94w2NeB; arc=none smtp.client-ip=209.85.128.54 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="v94w2NeB" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43bd45e4d91so6522085e9.1 for ; Wed, 05 Mar 2025 11:05:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741201529; x=1741806329; 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=1xLGSJADXNR/hr66tyqCVZu5qyHAPdvLKX+cD2MnHAo=; b=v94w2NeByaEeRLYWeCG3Bp+IvrOwUctH4B3MePEMIJqLxKrkNT+JjIKUwfuMeCRw/9 9GfUwdjphrJgsd4fm3YMfeWOonOvG5Y2oqCVxLvgtqTxMnUvDnLB7CBZzLlY/sFjUGNo dR2oZ2Vwc+0Rqqxlz+sPo6YyMzHSxm4zV9StVCVABKlwV/YvcEvBD7O3xzCGD3zJsQWd 56cOUWiBXiuguSnsRaWjVarwXCwlkuCbAWTQySRgJKTJYn7pwd9PARDR8QIlLtu/aFzS 1OAR7tL+PdoZDdpyfcbbQB2mby+zx8V8gp9i8H1oP4hvDVXVm4gvrMM1mgliFZa5Z89N +jgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741201529; x=1741806329; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1xLGSJADXNR/hr66tyqCVZu5qyHAPdvLKX+cD2MnHAo=; b=du2OoTzbBjA/IodTEdHYO8pCYHWunWVtHKP8+WiaSgurQKwRynUiuH0YvI2EWpMb3N oOZC7+42DSK/sSOtA5PChU90SDwuVLQDjuLeryZheEm41YKKaU3czXUtwbOOKh2xeyi7 QSn0V5p02k2fgL9xTzWD1UJcf8UJJsJXHcPorp/TjYQ7qksYBTD87lRJObwb//LXMVxb ccySZZUOLQCH78gnp47ol+dG38nsngzbgVOOQLM8GsjY/nwGiLkAIRw5MQ8YWO7PaJdX PDQn5AlneSgmNVqDSjUYGRLKEwkzEnc70QfoP3wcRugP0Kteb7nMfRUeSQZAHsmdPIKE W3YQ== X-Gm-Message-State: AOJu0YynsijKgQksIZv/yeb3CokrGRgizozNlFBt/siB59iMcqohbj4B AebGPp35N9L+ObeJVkcjbs8XGVm4OgBIUuQnYgd/h+ZMJV/aY/pHgoZc3LiHa5o= X-Gm-Gg: ASbGnctilXlGNNTo672WczacA0bF0X84gNh7/SnGC6El05Ris0BV7T3sJoJ8YRFE3I9 PiKUDVVRU37UOwW8TdSnQr//i8N+3rOHM1BRhTRrJ/L/neOiXw/4gEk2pBIgKRHOk37ZnszZLZy m/jUV7yjrPZ6NdI/+pNxuXoT9pTlEVdbG+e3Y+vTvUkRxyyYJq3d110wDS3KoP+I06OdKgtnqVg IeASwXOgUsdoKjBzgVcxnhjwN1Le3zFRYbXsTPNfRkjK8XahLaF+s9WYOHgs9EMoTD5L18ZLzpM 4AOl5oWOdYjRlmM5ofgotgrwGuGPNWN6iWT/0g3Mahm9L+vlbLDogY8/oFUEUdj2PA== X-Google-Smtp-Source: AGHT+IEganXlxH2+lP5ulNTLUOZSaTwD7x12KEFoCNpyrwi9IRfkdbIGT+3gRGv8DcNHkPZn8e/2Qg== X-Received: by 2002:a05:600c:1d19:b0:43b:c857:e9d7 with SMTP id 5b1f17b1804b1-43bdb38dbedmr3651495e9.5.1741201529035; Wed, 05 Mar 2025 11:05:29 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391241bd151sm2045218f8f.21.2025.03.05.11.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 11:05:28 -0800 (PST) From: Neil Armstrong Date: Wed, 05 Mar 2025 20:05:20 +0100 Subject: [PATCH v2 2/7] media: platform: qcom/iris: split iris_vpu_power_off_controller in multiple steps Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250305-topic-sm8x50-iris-v10-v2-2-bd65a3fc099e@linaro.org> References: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> In-Reply-To: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3391; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=7F/lb3BQ+xLsa7QmxRPtTN99nPEu5DGTE3fdAaA9TPs=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBnyKBz3rxLuaIEhEfq2rgeTP6X2+5DC3zVrY/XRhQl IrG7rg+JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZ8igcwAKCRB33NvayMhJ0R/lD/ 0VxNIG+yrJFnR2xQm2zZnFm+7bUGOT9bNf7wLyZciiolSlurtyVL+/8+WiPnskNpXaAM0B9m9SHc89 76Eg2cWy0hbwp0KNUnIfB74B3bzpuddWB1KDx+w3TjMbIJbjoYpnyzNeDLKvpGvf8bWA/L/Eqg2ZxN fALR2F79Em1nDtZfz0poEX848fVpMQq5mFrYjMx7TeS4jrYb+uPpukcjn6NUkP9orh1obD54s0/gcE GLGPTTbzfRdDjlPFT4A/391j7vCIR5RW1wshNwtQrgnwl9TKGDn7k1A5dphYhOyV5gyMy3Y/TpmHIK OYCXs8oYcXj3WumQsIHJsISqV2gC2ACof4yUQpOAcGTP0BzathGGjfpO519rQlt6EvAvLtA6YV5jYM szqJ9FVZyPx6Bx7VyPaZbJXXzsyzYkxrNpMqoodknCD4+OLUz1R4UrRle5KqP9apAGRA2TGMLWDDak /hR9ujSYtvDN8J+O2x6DBMvw0pacQuuxKE3Ws8DemAuO9G5sV1MQoSsHYl7LR754jdc/eQI5r+0Jb5 Nbs6MtNFA68bY3FgsypjSqMZRwB/huDLNxjWPG0Q6sFW79zqEBP5T/xgEgjnslzDr/Ke+5X7x6PTKD 5vUrCr8pkFO7zNzsdVTkBh8tLAqn2zoYT1QRwoKQDsHYw1s2xhYpIO1fWzFA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE In order to support vpu33, the iris_vpu_power_off_controller needs to be reused and extended, but the AON_WRAPPER_MVP_NOC_LPI_CONTROL cannot be set from the power_off_controller sequence like vpu2 and vpu3 so split the power_off_controller into 3 steps: - iris_vpu_power_off_controller_begin - iris_vpu_power_off_controller_end - iris_vpu_power_off_controller_disable And use them in a common iris_vpu_power_off_controller() for vpu2 and vpu3 based platforms. Signed-off-by: Neil Armstrong --- drivers/media/platform/qcom/iris/iris_vpu_common.c | 46 ++++++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c index fe9896d66848cdcd8c67bd45bbf3b6ce4a01ab10..d6ce92f3c7544e44dccca26bf6a4c95a720f9229 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c @@ -211,33 +211,29 @@ int iris_vpu_prepare_pc(struct iris_core *core) return -EAGAIN; } -static int iris_vpu_power_off_controller(struct iris_core *core) +static void iris_vpu_power_off_controller_begin(struct iris_core *core) { - u32 val = 0; - int ret; - writel(MSK_SIGNAL_FROM_TENSILICA | MSK_CORE_POWER_ON, core->reg_base + CPU_CS_X2RPMH); +} - writel(REQ_POWER_DOWN_PREP, core->reg_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); - - ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_LPI_STATUS, - val, val & BIT(0), 200, 2000); - if (ret) - goto disable_power; +static int iris_vpu_power_off_controller_end(struct iris_core *core) +{ + u32 val = 0; + int ret; writel(REQ_POWER_DOWN_PREP, core->reg_base + WRAPPER_IRIS_CPU_NOC_LPI_CONTROL); ret = readl_poll_timeout(core->reg_base + WRAPPER_IRIS_CPU_NOC_LPI_STATUS, val, val & BIT(0), 200, 2000); if (ret) - goto disable_power; + return ret; writel(0x0, core->reg_base + WRAPPER_DEBUG_BRIDGE_LPI_CONTROL); ret = readl_poll_timeout(core->reg_base + WRAPPER_DEBUG_BRIDGE_LPI_STATUS, val, val == 0, 200, 2000); if (ret) - goto disable_power; + return ret; writel(CTL_AXI_CLK_HALT | CTL_CLK_HALT, core->reg_base + WRAPPER_TZ_CTL_AXI_CLOCK_CONFIG); @@ -245,10 +241,34 @@ static int iris_vpu_power_off_controller(struct iris_core *core) writel(0x0, core->reg_base + WRAPPER_TZ_QNS4PDXFIFO_RESET); writel(0x0, core->reg_base + WRAPPER_TZ_CTL_AXI_CLOCK_CONFIG); -disable_power: + return 0; +} + +static void iris_vpu_power_off_controller_disable(struct iris_core *core) +{ iris_disable_unprepare_clock(core, IRIS_CTRL_CLK); iris_disable_unprepare_clock(core, IRIS_AXI_CLK); iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]); +} + +static int iris_vpu_power_off_controller(struct iris_core *core) +{ + u32 val = 0; + int ret; + + iris_vpu_power_off_controller_begin(core); + + writel(REQ_POWER_DOWN_PREP, core->reg_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); + + ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_LPI_STATUS, + val, val & BIT(0), 200, 2000); + if (ret) + goto disable_power; + + iris_vpu_power_off_controller_end(core); + +disable_power: + iris_vpu_power_off_controller_disable(core); return 0; } From patchwork Wed Mar 5 19:05:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 14003239 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 D787D254B10 for ; Wed, 5 Mar 2025 19:05:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201534; cv=none; b=ZpscnNFFiJfHDfb7KxJyplbiyyaKnzptRSJBucKKwvR+p3MUld3Ph/coR4u5x/5DmF0iqgVssdQCBIIWemNinVJh7SQugxJYAxIFYwHdAl/aMbHxv+D3N/URrkWF8p9mBAiIDDC1yojn1uUGgvaT7v1dh7qCKimARog2hAo+40w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201534; c=relaxed/simple; bh=0NeaNRcSK7UDoUfhdeNVtRUD9cUv0qEzjzihXO0mJMs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KGbC3fzYo9ECJKVYPbD2Gjjy7TIS2TzBcECPzpIKm4yKbcisg3ffhjWu0S+c/PbMYC1AkSBUhejcYQlWhSqWsX4ymjYNg1KffefqFxtpGdPkAsfT8Er3Hr34f7fHzPvlnKQ403FO6+Q+Fj6Q5R35ycJTFa3Nw4pGbQJJTLv+kC0= 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=Bu6Vzyqg; arc=none smtp.client-ip=209.85.128.53 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="Bu6Vzyqg" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4393dc02b78so47392215e9.3 for ; Wed, 05 Mar 2025 11:05:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741201530; x=1741806330; 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=dVZEqtiI2RLBc3sKmrfhb+KtkmKXF4cx5FQMA7ydIuM=; b=Bu6Vzyqg55sJKz20yNv0GBu4CC2e4SJQuDG3aYr563J5OoVWRoOgaUgi0FPXGgFsBR Dug5Pn7BxWM8Ga+V5fJZcv9iy1a2werdQMvRXoi/sh6DGr7YbsEmGkRI2eh8EXc+OBEw H2CVRKsI/yaXXMXshZspycvdkNd9DfBA33MVGEsoiOLfwBuPnBHhWehsC/Ennh9WoqKY 8JcZt1fRgEDwAc52BMi2yDvOYQJf7ta2IlFWppnyo0CYlYR/WoI0nR/XY+IVLkykZJiN upDtFchep79A8QhF1Uhiz2baox3t8/VwrJs2/kKn6tzUj84HT5n5RQTUAEn+vTsmIOpv uVIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741201530; x=1741806330; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dVZEqtiI2RLBc3sKmrfhb+KtkmKXF4cx5FQMA7ydIuM=; b=P//d2jE010JUOT7kpPKbvlrKDOax/u0qbbPErwzQPF1omAA3xq+Ev2WYEADYXwz2Fa 5hyLlFF9lKV68gi2k8n+WMdHg8Dsty7vPi9zCFtyxLn/pxmNWTBjCTU5ZvfpFcOp0eQ0 c0i+ZzekPhYe4MoGcgVM/8ESauyc0LooKeO4pl5Or05peCqMN4zehYF60KpCe1yyLAts J8EHzdOQ4V7a+vbmRAfoQMsEazLFdmT+Yl5QSHaLH8Ur4dvU1OvGhXwberUUcK1rM0hO us9BEXthJC3X9t5JtPbv95EHNQDj4s9zSiiJ8CuhZj5p+eYGqvKYFVcEbfRlJx86A/+Z ACkQ== X-Gm-Message-State: AOJu0Yz2CRSXDiFk9RafCfj82ZfFwOWsnDj8peRa3hzBZtS4ttCHl5Cx ZKWqani1TBJx8iWAXzBweTXsf5I7o17sd637y6Tz6PU2mCyx+LoCVkQYEMRbuZQ= X-Gm-Gg: ASbGncsq/L3f2gLNcFjhhmhw07AhV4eYg09cR6+keh3SNTZEsULIu4ckiMZNHg8Pf9j AzEPnV+ONRwby3CRLyzqUmNm6OhQ4LXzJYXoXo1FKT1Sy6rLDXfTjzO8IbA6mPp/2VnxVSc7mL8 mDZ6at4trdMhoIlEkVUl6b/0wOfbIdJ2ibBT5BD7YQbVZqnZTvSCC4u5l3QCI2Vzf4QIpiVoRId mJUZxnJAyBdo1JokICBuxyzwOjJgzLstoy1JTEKUM9n3fQ/RRwofkXKPMDMHARXH2B5YUgftX4B DJaf9u9pvjbdt6wnOUy1qgSovOyBo5H4e0YNLqfotHgcUhLJsMW0/DEQmcrFOrOd3A== X-Google-Smtp-Source: AGHT+IFzRIskFsKc+hza8dNCDs6WL2V0amuCJwB6HmCuXQQQjxKyv0wR37y6HmCD3BopW0zqWdYIgw== X-Received: by 2002:a05:600c:4f87:b0:439:9d75:9e7d with SMTP id 5b1f17b1804b1-43bd29c4593mr28407075e9.22.1741201530057; Wed, 05 Mar 2025 11:05:30 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391241bd151sm2045218f8f.21.2025.03.05.11.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 11:05:29 -0800 (PST) From: Neil Armstrong Date: Wed, 05 Mar 2025 20:05:21 +0100 Subject: [PATCH v2 3/7] media: platform: qcom/iris: add power_off_controller to vpu_ops Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250305-topic-sm8x50-iris-v10-v2-3-bd65a3fc099e@linaro.org> References: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> In-Reply-To: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4579; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=0NeaNRcSK7UDoUfhdeNVtRUD9cUv0qEzjzihXO0mJMs=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBnyKB0ioFERG5p8hkTpF4LR4U4q4zIzMg4nHr0lS+m qlav25eJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZ8igdAAKCRB33NvayMhJ0Xf2D/ 4stwZ91WXybax6cmCvoEr1csv9LMhjo+wdMjJ430DaUkhkufJGnUiLqKEu2iQ8NV7Pn+4V1Lu8KoXo KrOi3Zq95vpojWYRv655+uhyc9OnSHj3tSzJv/w+TWDsbq/gPKXBJFFkrB69pzEho/9IODcyb2pDFs r5tQs0h+rjS/nqSw1tcgSw84S/GCdgg7rNXxFUI/Oiw31JzhVE7oQCRGryP2DK9uVsyJq/Q68ZLDcD WeC5iGrVeCJFzOliwSZL4YXLxslaS9J8Uc1KtMZMq4wbNsRrp3ESjKjrF9WL8HN8KU6fGfELjLVsrR RNoiMIkF2wWTjHCU9ULx16mg113l+yh5mZfZbiF8RlcsKrs76dMU6ibSpUuPk42ybTjyBVMKwMzy/x CKnd58DOw+x8DDGg/zoQ8Vv+232VYO7B/0da6J7ybxyRH+zhv7Sj8fuSEN2qAknJrUsuqJ6UnTvfDv qtVyg5nXx3jDL1GGFVayW2r1An4iN1r9cYxNPjcTDyFSDreMg7GajLwns/ntYcq3Idht2Q+O7IZlk1 vRiMqwsnDKGAcwItUOPoJHH4aJB58qINjAFx0p/2jpB0QT53+bk3NfTB2iq7/briSV0Pmv5lj3qpxb dcjheQlzRA94NYHokLrnQ8jPZS31zELUJyenra6bBDUPkWYQ6RRWPRbnc+Bg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE In order to support the SM8650 iris33 hardware, we need to provide a specific constoller power off sequences via the vpu_ops callbacks. Add the callback, and use the current helper for currently supported platforms. Signed-off-by: Neil Armstrong --- drivers/media/platform/qcom/iris/iris_vpu2.c | 1 + drivers/media/platform/qcom/iris/iris_vpu3.c | 2 ++ drivers/media/platform/qcom/iris/iris_vpu_common.c | 14 ++++++++++---- drivers/media/platform/qcom/iris/iris_vpu_common.h | 2 ++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_vpu2.c b/drivers/media/platform/qcom/iris/iris_vpu2.c index 8f502aed43ce2fa6a272a2ce14ff1ca54d3e63a2..7cf1bfc352d34b897451061b5c14fbe90276433d 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu2.c +++ b/drivers/media/platform/qcom/iris/iris_vpu2.c @@ -34,5 +34,6 @@ static u64 iris_vpu2_calc_freq(struct iris_inst *inst, size_t data_size) const struct vpu_ops iris_vpu2_ops = { .power_off_hw = iris_vpu_power_off_hw, + .power_off_controller = iris_vpu_power_off_controller, .calc_freq = iris_vpu2_calc_freq, }; diff --git a/drivers/media/platform/qcom/iris/iris_vpu3.c b/drivers/media/platform/qcom/iris/iris_vpu3.c index b484638e6105a69319232f667ee7ae95e3853698..95f362633c95b101ecfda6480c4c0b73416bd00c 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu3.c +++ b/drivers/media/platform/qcom/iris/iris_vpu3.c @@ -117,6 +117,8 @@ static u64 iris_vpu3_calculate_frequency(struct iris_inst *inst, size_t data_siz } const struct vpu_ops iris_vpu3_ops = { + .reset_controller = iris_vpu_reset_controller, .power_off_hw = iris_vpu3_power_off_hardware, + .power_off_controller = iris_vpu_power_off_controller, .calc_freq = iris_vpu3_calculate_frequency, }; diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c index d6ce92f3c7544e44dccca26bf6a4c95a720f9229..3b3e1ca1e42183561ee78c89f50946fd0cc3c3ab 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c @@ -251,7 +251,7 @@ static void iris_vpu_power_off_controller_disable(struct iris_core *core) iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]); } -static int iris_vpu_power_off_controller(struct iris_core *core) +int iris_vpu_power_off_controller(struct iris_core *core) { u32 val = 0; int ret; @@ -284,23 +284,29 @@ void iris_vpu_power_off(struct iris_core *core) { dev_pm_opp_set_rate(core->dev, 0); core->iris_platform_data->vpu_ops->power_off_hw(core); - iris_vpu_power_off_controller(core); + core->iris_platform_data->vpu_ops->power_off_controller(core); iris_unset_icc_bw(core); if (!iris_vpu_watchdog(core, core->intr_status)) disable_irq_nosync(core->irq); } -static int iris_vpu_power_on_controller(struct iris_core *core) +static int iris_vpu_reset_controller(struct iris_core *core) { u32 rst_tbl_size = core->iris_platform_data->clk_rst_tbl_size; + + return reset_control_bulk_reset(rst_tbl_size, core->resets); +} + +static int iris_vpu_power_on_controller(struct iris_core *core) +{ int ret; ret = iris_enable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]); if (ret) return ret; - ret = reset_control_bulk_reset(rst_tbl_size, core->resets); + ret = iris_vpu_reset_controller(core); if (ret) goto err_disable_power; diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h index 63fa1fa5a4989e48aebdb6c7619c140000c0b44c..f8965661c602f990d5a7057565f79df4112d097e 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h @@ -13,6 +13,7 @@ extern const struct vpu_ops iris_vpu3_ops; struct vpu_ops { void (*power_off_hw)(struct iris_core *core); + int (*power_off_controller)(struct iris_core *core); u64 (*calc_freq)(struct iris_inst *inst, size_t data_size); }; @@ -22,6 +23,7 @@ void iris_vpu_clear_interrupt(struct iris_core *core); int iris_vpu_watchdog(struct iris_core *core, u32 intr_status); int iris_vpu_prepare_pc(struct iris_core *core); int iris_vpu_power_on(struct iris_core *core); +int iris_vpu_power_off_controller(struct iris_core *core); void iris_vpu_power_off_hw(struct iris_core *core); void iris_vpu_power_off(struct iris_core *core); From patchwork Wed Mar 5 19:05:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 14003238 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 A27E725524A for ; Wed, 5 Mar 2025 19:05:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201535; cv=none; b=cw2Fs7VUACVUvBUDiUAJ6nFM8DalIZ/drYapVBEGgXBpvnOGzcHekeqGSpyLeD8P6eMz2qx1QNqLkhK1zF8ALgfneYMJ5Jmiw+UwpIAVFuuNO4x7Pot4TdsLOk//CX5KbhYWXTHkSZ+OBr+mKBnDrCO287B8Bp7xAZxXdz3ApOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201535; c=relaxed/simple; bh=4xWvpAYXHrZie7L5gQZo6NAa+M3VJwRo6H+qV6FZMQY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GB8gOxkj19qb88OY7G0umBgrZEyUaugEspWuEJY77fCOQ6yLZQagY5IWCLTWGqT4H3pv8jztleKrI4PRDLcEU8v4i8LnhPmfZE2U/DdK4o4uYMk0BcRjJe/BAJ+d3cGO56wsiOBxL34NKq/MEwgFe4sL8/JMVGAnQBfZyuPIIqI= 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=XY6CwFrF; arc=none smtp.client-ip=209.85.221.41 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="XY6CwFrF" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-390ec7c2cd8so3972183f8f.1 for ; Wed, 05 Mar 2025 11:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741201531; x=1741806331; 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=yDhNJvj51yq2wkwFl3xSWV0D5qLVQYcb+snJSu2m7UQ=; b=XY6CwFrFRIFAleQsQ/iPQ5Im/y6iGx71MRARJoUXucmH6ELNyCG6fNkU7d8JwtIe2a YQhcZU1sx+gFaGgEyLkkwfZ/56y9gVCxfPZH1B6zZg83eAhLirPXOltGXFJJKeDs34UB xCJxHm/B7W7BtjT5m1dOSt2GsshgQPMRZYCN21MfooFz/6Qp0tk6u/7gMHfrGeXfz08h 45rUr7bjDJG/kdCSY0pbcOZoVBLcj3Okm9890dK1Q1a36y57FzZ+Y1KVbs8dpL4iMN4V dsW+dWV1UkiiBkkU4tDElNk2xx+PT8XLfigknPLd0Inc6L+YScWIX3tvqAeUw9SRdWXT Xo1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741201531; x=1741806331; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yDhNJvj51yq2wkwFl3xSWV0D5qLVQYcb+snJSu2m7UQ=; b=s3WM4RkmyTxhBchI9Mxa04z9Itzf1rWtC+tnMWEDvg3PdOhUJ3+7IQ4Kx+I6hhA3Ud cPDzOyOrfDuDDHA6HKXDlGxzE7DKI81hlXtY8YJ/ZN4Y+e970K4FcW4hs+9mZ/xT1Xz/ RtZo61IabWH/GfIqro5jw6SgpGbwISm+w/7dVWUH+dUz2qwce3M/26egf7BtbGb5rE+6 P80R3w2mGsRC3MEuj+/Bidzv4yBEHrHnJ4GLCwit5J7mSNlSgQqo0cSNvENJuEqHNhUr nGmMy1wJX5ZvHEW0yb98kzqDzETzEsx4cUBfcqi0ZZohWH1lUfda0rfSV2aPEw1tsrpA Cl+g== X-Gm-Message-State: AOJu0YzHVe5rIHsdOyJCLWxxlwa6xX4D88B1b/99BRo3s5Hj7WQ/uIzj jtqT1yWe+um1Vk9RGT1cEjGiJyivCc+aS1McL4n48fkgKZMl4/OcDsToYmw1DSQ= X-Gm-Gg: ASbGncstOYpdEneaxJDAF7GfL4GbCcGquZpBNnU2pPSvc6caM34x7X1Naesh/fWFsZw zToxQiF2gDJpVhDYHWEa15HhrHCAOTVFBqWXHAurQsKhEO59hgtHTXvy78zWWllCRdWvbv6KAA9 uChvEBPLafOKv09J+gfyMnra8p8pHHiIbgK+TJzX327TmbEled5v1t3GDeoZ+/zJNGg7PzHMhjx Ow3lPLsBfk/h8YaKDNEvcC4IJGpj783vfWhvv1dQkCy0j6yMBCm8ptnulWDgZtdtkSE0Tdex3ug 7XFvjwLNzM0nG4UHWL6E4032BeZm7ZOFiqwt8QZXdfDLnxEtXJL2up4Ix6YBYIrztw== X-Google-Smtp-Source: AGHT+IGUjPRq97ZEQw0P71WjSTjxhDc1f6XEctcdOEfq5TgTNg740OiVfh8udZC30JYLEybJGm2hMw== X-Received: by 2002:a5d:6c62:0:b0:38f:503a:d93f with SMTP id ffacd0b85a97d-3911f7b349cmr3595082f8f.40.1741201530786; Wed, 05 Mar 2025 11:05:30 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391241bd151sm2045218f8f.21.2025.03.05.11.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 11:05:30 -0800 (PST) From: Neil Armstrong Date: Wed, 05 Mar 2025 20:05:22 +0100 Subject: [PATCH v2 4/7] media: platform: qcom/iris: introduce optional controller_rst_tbl Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250305-topic-sm8x50-iris-v10-v2-4-bd65a3fc099e@linaro.org> References: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> In-Reply-To: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3932; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=4xWvpAYXHrZie7L5gQZo6NAa+M3VJwRo6H+qV6FZMQY=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBnyKB0m/WE6TYaeFRoljQU8b2IKjy2fW5a9kc1f1ka v4wnS1yJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZ8igdAAKCRB33NvayMhJ0VXDEA CDcLgAdkWsboNxrgj2j41rVTAtkMKvrZLXL1ZcbByAkpsLMoVt61VV5/wvllnTPAVveSDoGkiLLJZz 0DvSQGDJzwO9B0mr+2V88ibUWUt4cWsMlMtEsTzT+A3vCUGR3cj4gmfItY63rXawDHdOiwHfuzv34Y IZK+NJKUdNdszDG/lO6lZTYD3WpcJOXzX3o1sTHCo6sankyjnm2kAwp12ou/UM7mTSLYZPj4NLaBx8 wj+UQ92A4MDMZWgDGsTfbVGZSgHAZMGaISC5SLWjrdCoiXVY0jnM1Qlylvbr96o4vpKoiFUAMl2vhv RB5ZtpXQzXBX7dzK/bijVQGiKnKpDQn3ur89n/5cgAHh2volpPyeVopgoG3kpPE1qF57jm7lzNhJD2 5Wu72MbLuQTuRb5JAnkQbho2mBSddUvh5plXSMQ9xkcwxkKb0Ok8YqqblYieTNGRass0F246Cf2/PM koX9XvKKTO3lZwxFE2Z17SNbTJkZ+sd5WtIVpAsP57xJINzm2fOHZe34wARN1RXmPaFid9X00/xXGl bBSD768gWPv4U5ATbQG3FPcG7uHD3zZgy5zTY3x7tXAsw0VFYQpQyNwlCCXPSB178jPb6Qq5dt2IKh tm83SfgOA3iwXOvdPfyGIZWZpyyGxwojo8Xs7Xnzu40jC9aOSmJfeGADC28g== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Introduce an optional controller_rst_tbl use to store reset lines used to reset part of the controller. This is necessary for the vpu3 support, when the xo reset line must be asserted separately from the other reset line on power off operation. Factor the iris_init_resets() logic to allow requesting multiple reset tables. Signed-off-by: Neil Armstrong --- drivers/media/platform/qcom/iris/iris_core.h | 1 + .../platform/qcom/iris/iris_platform_common.h | 2 ++ drivers/media/platform/qcom/iris/iris_probe.c | 39 +++++++++++++++------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_core.h b/drivers/media/platform/qcom/iris/iris_core.h index 37fb4919fecc62182784b4dca90fcab47dd38a80..78143855b277cd3ebdc7a1e7f35f6df284aa364c 100644 --- a/drivers/media/platform/qcom/iris/iris_core.h +++ b/drivers/media/platform/qcom/iris/iris_core.h @@ -82,6 +82,7 @@ struct iris_core { struct clk_bulk_data *clock_tbl; u32 clk_count; struct reset_control_bulk_data *resets; + struct reset_control_bulk_data *controller_resets; const struct iris_platform_data *iris_platform_data; enum iris_core_state state; dma_addr_t iface_q_table_daddr; diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index f6b15d2805fb2004699709bb12cd7ce9b052180c..fdd40fd80178c4c66b37e392d07a0a62f492f108 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -156,6 +156,8 @@ struct iris_platform_data { unsigned int clk_tbl_size; const char * const *clk_rst_tbl; unsigned int clk_rst_tbl_size; + const char * const *controller_rst_tbl; + unsigned int controller_rst_tbl_size; u64 dma_mask; const char *fwname; u32 pas_id; diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c index aca442dcc153830e6252d1dca87afb38c0b9eb8f..4f8bce6e2002bffee4c93dcaaf6e52bf4e40992e 100644 --- a/drivers/media/platform/qcom/iris/iris_probe.c +++ b/drivers/media/platform/qcom/iris/iris_probe.c @@ -91,25 +91,40 @@ static int iris_init_clocks(struct iris_core *core) return 0; } -static int iris_init_resets(struct iris_core *core) +static int iris_init_reset_table(struct iris_core *core, + struct reset_control_bulk_data **resets, + const char * const *rst_tbl, u32 rst_tbl_size) { - const char * const *rst_tbl; - u32 rst_tbl_size; u32 i = 0; - rst_tbl = core->iris_platform_data->clk_rst_tbl; - rst_tbl_size = core->iris_platform_data->clk_rst_tbl_size; - - core->resets = devm_kzalloc(core->dev, - sizeof(*core->resets) * rst_tbl_size, - GFP_KERNEL); - if (!core->resets) + *resets = devm_kzalloc(core->dev, + sizeof(struct reset_control_bulk_data) * rst_tbl_size, + GFP_KERNEL); + if (!*resets) return -ENOMEM; for (i = 0; i < rst_tbl_size; i++) - core->resets[i].id = rst_tbl[i]; + (*resets)[i].id = rst_tbl[i]; + + return devm_reset_control_bulk_get_exclusive(core->dev, rst_tbl_size, *resets); +} + +static int iris_init_resets(struct iris_core *core) +{ + int ret; + + ret = iris_init_reset_table(core, &core->resets, + core->iris_platform_data->clk_rst_tbl, + core->iris_platform_data->clk_rst_tbl_size); + if (ret) + return ret; + + if (!core->iris_platform_data->controller_rst_tbl_size) + return 0; - return devm_reset_control_bulk_get_exclusive(core->dev, rst_tbl_size, core->resets); + return iris_init_reset_table(core, &core->controller_resets, + core->iris_platform_data->controller_rst_tbl, + core->iris_platform_data->controller_rst_tbl_size); } static int iris_init_resources(struct iris_core *core) From patchwork Wed Mar 5 19:05:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 14003240 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 850B5255E58 for ; Wed, 5 Mar 2025 19:05:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201536; cv=none; b=WVu8xbpTRpl0zkNbvc2jm5frWgjJD6PeAZm3+EKCevfJGQn+Ek4tODOXa9MmvIJcTF4HarpM7b8fVxtAV7ePmU1ZZo7y9tO3vTDlfVjmZOClFKKIH+kOBizV+J2PtJxTnjKYDfy8BZbvI1/NaHsDQkwMRUucSPzkfJY1zVCqUDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201536; c=relaxed/simple; bh=264GKvxijvAwIqYax4UBh8DSRsYH08FMQDF93sAtJoc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M0W2aQnJLfvSiR3QXiFxaA5cQwFWw4XG15bTMfrb0L4MMKIWvWa4sHAWdL5m9rFqNIZFG8ADShjd4lbLRTQAu8NxO5bYWi83lm9lf3DnwamJAsXCWura15lp8Lvnv+nvD0QTnBfTLItzSIlozA7riq3sZ30VTyu95joMc2K8lEI= 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=nPiK1R4y; arc=none smtp.client-ip=209.85.128.48 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="nPiK1R4y" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43bccfa7b89so17665485e9.2 for ; Wed, 05 Mar 2025 11:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741201531; x=1741806331; 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=kX7FgUQGF0NZIl0sosO/eVP71r2DfvUSXcsohdDKCcI=; b=nPiK1R4yyg78ybLEyuq4GALPbhA9jki8yKArSHZIkewSrYzZIJX6FyMi6yj4fQUBj+ YuRo3PIF+T0ipieMAu830bWbJdDbRQtg6GucmQ7wybnvIvNF2mUEQNClgbmJwAAYe4VM EFI/khiDw/48hDBF6u0IgOy/5jfc6HlY1DWuGr2gbNdzxsSqiMS5TZ6PBto/F5Ayf7Ck KIiR/Maa1SQWcZ45VB1HJyIelSmWAlUEWiddrI8B1R1h6TyIkTkTlUh3UEmLjIk3ZhYk 3anAKACcxs4eYoegLu2CMwBjpPDA/hTu3dwi6a5iX2yff3syrvoCSaZZJOY7bMhVjMkw ECwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741201531; x=1741806331; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kX7FgUQGF0NZIl0sosO/eVP71r2DfvUSXcsohdDKCcI=; b=TSNv2l0vq0X+Dg8IeUJrHeTV7Nte531dnb9Im3HLfMxqIuxTLLg0lgqUBorr4LVzjs +IorCcYVfwEzV0dc0HjKEMytzSDLK3pFDMp4pjP+rTqTIVoAZZZ5rOf/K+6V7eKvhx66 MNMBrNIlj3CjsZEjG/0JF9zLZfiwGCa8lFzSlCF2YdkEpwZvGmu70Lz4RmnEnfE5lcLH iatqcRNQ9auy8r3qKe0TndJ1Kq3AvHWO3T/GMGfkxLoqTsQrLwkwArBurufIJEPGG6Cn L4YgvFzamA2KZHob7xj8+ucAiDCeK/+3kZQ6tiWZAoARvsOal1dYWn+qZStzL8oDH/dJ VLDQ== X-Gm-Message-State: AOJu0YzFv+7VR10cPm3vGzmB5GeHlYjodxd3IvmPx7arNr/ZKz42/AZq wPtf37ukIWTPcffMf2DDf6TRkZaUsjAuMFhIOE/dKwTe8jbKOsXisG7ueL99MHE= X-Gm-Gg: ASbGncuvF7Oyho7Cmlia6vswZ1RFBz13RQxEncJXWNhVvMhX7JmWYGkjVyM2UcHWchh rjXlPCfie/ap6mhg32JLlvxPtRR0xUc0Dn1k+kRqQk5baG0C3aJ0SRwH2D4ove23TOG/z//JFbU jYeqdRcO5t4FUDCsLtCwONTmE9mz4nIfaMLHp0fkdH/Unw3vrup6+rJM/Ohd06rY8LVyKjfDyVe FIOC9eWUmHjcPryUTod6sU7gTVeZmZiMzEM1RmEyGpZOJaxLU2GuroKkzkute5YiLm67JSaUZkm NqMRUD7F+oyxnB/cd7IrgEkEFNiTIWvXMTczS/wQkHp9vPBS6+bNFSdufqtr2cDNeg== X-Google-Smtp-Source: AGHT+IGrXTL0QZpUv/OFT6PtkL4D65bAF4/8a4VWTnUwODQTv9dBIsvSLw9ZMmHrNsOqNKHU5YHAoA== X-Received: by 2002:a05:600c:3547:b0:43b:cc3c:60c8 with SMTP id 5b1f17b1804b1-43bd29a12d1mr40217925e9.11.1741201531494; Wed, 05 Mar 2025 11:05:31 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391241bd151sm2045218f8f.21.2025.03.05.11.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 11:05:31 -0800 (PST) From: Neil Armstrong Date: Wed, 05 Mar 2025 20:05:23 +0100 Subject: [PATCH v2 5/7] media: platform: qcom/iris: rename iris_vpu3 to iris_vpu3x Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250305-topic-sm8x50-iris-v10-v2-5-bd65a3fc099e@linaro.org> References: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> In-Reply-To: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1212; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=264GKvxijvAwIqYax4UBh8DSRsYH08FMQDF93sAtJoc=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBnyKB1daGuRDKRkyGyhSF97HB1D3WOwTay9MYnbz1Z ynuo3N+JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZ8igdQAKCRB33NvayMhJ0Rf/EA C9D3Slw0jkfoM/+nQaG7xAHEcTNcRc93mzCYIT30TvnAW7z0LbzsCGN/V8x4O3YVYXGZzvE3zIt3p5 +Kho1ZyUTVJmlpuFtx1zk4dPp4FYiPy5etJGloctZ42SERFYtaS0DxNkGOaOryFSo/+dzo1AdfwmA4 BG2IUlXWxUd6KRS/nbqMktPqN6AFFTuo+YFKosf/qqN93iVDq2Mh5gW+Cuc17fv/mRXzk4VsoDYXtD qn9PXnXC0B6A4IwVx8Yc7ce/PNT5kniyA2R2wx8a6DtWuHAimAbXpgr/abafDrGMgaA9ct5Gatadfe 13+mPITIxGxH2aqU4yxfH1Fs0rPVMrzEK3LAJYQDfVcZz8WL8NOsnQVpaC/NbR0VCSjRif4lIZubC4 nTi0Rrqwl4hHuYbfHVGbKmZLKPEqazyJYALMhWDzMhH82bJwrdxBZCUVraOnRLNmhMdSqYZiXVKuDD HBIkTCmgYiHGe1YmlTVceQ9OgYcwGLsXbE6n1/cGMmehX08WH1vf6ntYIQ6JLGZ16p7t7YqV+iMbps Ml7FmwXHQPD2QRS0OrEnaHgw3N41zIeISj49UYBVmPSKdjPbO81gu5wSUS8dJ84V+5ZG36ZEZE0hw/ lyKLzRBvlysNbqiP2VsphQBNHNOXACfIKcMg89wJ7xvfH5RdhMlNvP3HiYDA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE The vpu33 HW is very close to vpu3, and shares most of the operations, so rename file to vpu3x since we'll handle all vpu3 variants in it. Signed-off-by: Neil Armstrong Reviewed-by: Dikshita Agarwal --- drivers/media/platform/qcom/iris/Makefile | 2 +- drivers/media/platform/qcom/iris/{iris_vpu3.c => iris_vpu3x.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile index 35390534534e93f4617c1036a05ca0921567ba1d..473aaf655448180ade917e642289677fc1277f99 100644 --- a/drivers/media/platform/qcom/iris/Makefile +++ b/drivers/media/platform/qcom/iris/Makefile @@ -20,7 +20,7 @@ qcom-iris-objs += \ iris_vb2.o \ iris_vdec.o \ iris_vpu2.o \ - iris_vpu3.o \ + iris_vpu3x.o \ iris_vpu_buffer.o \ iris_vpu_common.o \ diff --git a/drivers/media/platform/qcom/iris/iris_vpu3.c b/drivers/media/platform/qcom/iris/iris_vpu3x.c similarity index 100% rename from drivers/media/platform/qcom/iris/iris_vpu3.c rename to drivers/media/platform/qcom/iris/iris_vpu3x.c From patchwork Wed Mar 5 19:05:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 14003241 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 85FE62561DE for ; Wed, 5 Mar 2025 19:05:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201538; cv=none; b=kc0HURh7Ue4USK+pj3EK3MO1Wjh7cv3qmaYipXQS4prgFG9ToCxGw70hZyy7UbmxwScYaAVJYWt7Gc78j8gBIoZwlIUDvQ7nzWx1PF7oa33y2Tb9AaPwJi0aFpBWRjbt6CY+VbpXVFdv1w67wMj1Gud/rVfEwnsVK7BearT0rKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201538; c=relaxed/simple; bh=osmHa0U8qJR0SUJVlvd2QBRzZ2ejiQTx8cmQSpLjVkA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gJYRdD6X+JqtI6FRjBBNQtvM9z/vF28cWezJsJhyjyKiiiJVt2Dc2YCs4bW/g99Z+a8fohdIIXfgDAeqh9Ex5Do82cC+ZtUknVmyO+u43VQt2YALAz/QdZe1hYtF4/rRTRMaxoZWS08gV2gWVcx1kCaDC72h4A+MtH0yoyjb9+Q= 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=WT+mj5TC; arc=none smtp.client-ip=209.85.221.51 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="WT+mj5TC" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-390eebcc371so3447142f8f.0 for ; Wed, 05 Mar 2025 11:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741201532; x=1741806332; 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=GVIZMJHYSN6AUW9boWlMKVGyFBqi/YaM1bOAURkXiWA=; b=WT+mj5TCUEhA4/30KZgMBoFwyyyvKdWErrbTAtV8yhbGUGjQgbTXlVCZjQZQa3ciwy GCmTKBKpgHuuauQcSoiDIw5AB7EStzY77avLCztsepU47R8k9ab2qF9nluWQF98zVeYx +GA/PyDQbq4lLiUn7TIe8U2FRIEjlo0djFdsebo8Ivvu9u5KmmABOj9HZNOWYBir8jT+ ehJ3OJCAvm9Wr/4iFPhoPKOllKI5cTgWHynFq0e4Av1gcwZ235N5beZ5YuvSLbXOuA5S qROKnr4pFFEsU1xZYn6YNgWSbjRtPpQzSW14V2yhLYlQDK0dEsQOIkt1hKwqUX24eUtW b2pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741201532; x=1741806332; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GVIZMJHYSN6AUW9boWlMKVGyFBqi/YaM1bOAURkXiWA=; b=HhoyYuOp05TiKzlOg0dnRNXW0BjMQNpVxkGI7gT0tpe3LdYmGKwjIEIZrVuJNbp5BM L3jLQSIudnY0MqW+hDmO022Va8tSIBvQ0Nv+AEW1oFx/6QygGMzmr3XshWQRBrN99eo6 5dZ5rR47SfhQGSGU4xe+cnvDD7zkgFF/F2pBjcDamCXQyH6v4/AO/cP1J6Yln1PPqqGz x2DTE6AaivoMa5MeMnNQOGV4fdr4evJ//qBU76yll870t7AQojI8RKagIK6CXoJxQAHW WSXZFSAxl5tc+Ae5vK0y1pAE0Z2lELN4CeYGQKFTL8aO3EAVQ7hT8XTVIuziwBYsCBRe eHSw== X-Gm-Message-State: AOJu0YwnUHxxRH8lM7+uJXzMccvKMW3y1joeJdpy5Kz7XcMk86eXnjxi XQgp+u61v8nOzfElA2pGA+imnJLSwzUEXQJ2O5wn8tMBjwtk4AfGuV3wcRuUUPo= X-Gm-Gg: ASbGncsmHKqWo8c0Q9+bbzRNqIPVms2VgHNfMX5B/SCqEN2JIrJEDi1xn+KGwT5vTmz U2iz3xU77hjV2CU/9R+zabD6LntfwLlCPxxi5jbys3S0UecUUKLYiRnuFW/LgPtpwt8xuiCgESK kznPdsRVaSzyoCyfYKTKSblHT+6DMCHZ096VmvE5yO8mh3/nU6M1Hh8rWcJQW9eqoSCMcD8HmvJ +hCsTOYcK0tV46V7SBXi7lOPArcZUKWbY5BUJrEyPM75ofQzwIptBH+m+qm6ttwCiRsiJV20D8f EYez9T/SS8/byHMrX2OwUn9yF6egwt6bSzhP1DfuPF76L8ifGHwY4OHWH3KVZN3rkA== X-Google-Smtp-Source: AGHT+IELPSrbgMh2UU+Qp8RbEVE/itcXNeZyQs0vgLia7pKY35/7EgOZThZMmHNZAm4T9RlwrmEvKg== X-Received: by 2002:a5d:5850:0:b0:391:4f9:a039 with SMTP id ffacd0b85a97d-3911f7400aamr4618282f8f.16.1741201532253; Wed, 05 Mar 2025 11:05:32 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391241bd151sm2045218f8f.21.2025.03.05.11.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 11:05:31 -0800 (PST) From: Neil Armstrong Date: Wed, 05 Mar 2025 20:05:24 +0100 Subject: [PATCH v2 6/7] media: platform: qcom/iris: add support for vpu33 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250305-topic-sm8x50-iris-v10-v2-6-bd65a3fc099e@linaro.org> References: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> In-Reply-To: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9418; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=osmHa0U8qJR0SUJVlvd2QBRzZ2ejiQTx8cmQSpLjVkA=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBnyKB1bagc7WUxbvm5SLikOidB1dxAnMzp85NZkbmU QGJ8XTGJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZ8igdQAKCRB33NvayMhJ0Rz8D/ 0cK0cr/La3kg97nFK7TDuRkul6qCceATHRenZ4elhv/d3UIq3GrvFLgiP0WuiQ6URQcOAAU/zaC99o g490ZSJEypb8/CvmkkOe7LebD/sIPzQaHlKfRL55Y5b6R4zQXHL5XcGXycQzZVkeYBsDNXYvsB3ILI NfnwODlxs5BibdVClDDO9NIhR1i40PM2+MQRZ0OwQlhh8CqbWFVCuq4L8Ajqd0bRn3UeFhC0g214iV PyPbWQiDzhDSGtNxCSWvbUOJSdWYtrp9shzcyPRssTQruMxHH7JYi++QDD3OpS/KnszavdJZnPEpvW 3jxL9AoGfPMUEEL4vEopjHZRCqtdEJ8sOryIcWVQRLDULhmLMoMENKqrqQDBuR83/xIg3ES40pHUoQ NUP1eX3pFA21iUtANWklglYGgNO5CtVU+BtkhydEI6hLn/YI6JXpnJ+kCdEtnFQnk+u8SQX+RRY/WA +z5txsxwsBK16CdrPS9RDyI7jaE82LX2GKvgHHtodMeLnl2zVAD7hDHVj4VPgQ8HfBpTps/rDluZAt lLSsXNCPA3DwBYb32sQEHyL/swHbLgAtiVLnNrmK4wcas1pPgmBiNAd0O8hj+rfK/PNd9Pj0WHc7g6 YHvEL6Zpr1urfNTlmlpklYVp4iz8HH17lkB+ts2LzvZJYJU4qgU0qYFJw26g== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE The IRIS acceleration found in the SM8650 platforms uses the vpu33 hardware version, and requires a slighly different reset and power off sequences in order to properly get out of runtime suspend. Signed-off-by: Neil Armstrong --- drivers/media/platform/qcom/iris/iris_vpu3x.c | 144 +++++++++++++++++++-- drivers/media/platform/qcom/iris/iris_vpu_common.c | 4 +- drivers/media/platform/qcom/iris/iris_vpu_common.h | 3 + 3 files changed, 137 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_vpu3x.c b/drivers/media/platform/qcom/iris/iris_vpu3x.c index 95f362633c95b101ecfda6480c4c0b73416bd00c..109f663d031ab5f5ee8b58eb2a781eb27d2675aa 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu3x.c +++ b/drivers/media/platform/qcom/iris/iris_vpu3x.c @@ -4,11 +4,13 @@ */ #include +#include #include "iris_instance.h" #include "iris_vpu_common.h" #include "iris_vpu_register_defines.h" +#define AON_BASE_OFFS 0x000E0000 #define AON_MVP_NOC_RESET 0x0001F000 #define WRAPPER_CORE_CLOCK_CONFIG (WRAPPER_BASE_OFFS + 0x88) @@ -25,7 +27,16 @@ #define VCODEC_SS_IDLE_STATUSN (VCODEC_BASE_OFFS + 0x70) -static bool iris_vpu3_hw_power_collapsed(struct iris_core *core) +#define AON_WRAPPER_MVP_NOC_LPI_CONTROL (AON_BASE_OFFS) +#define AON_WRAPPER_MVP_NOC_LPI_STATUS (AON_BASE_OFFS + 0x4) + +#define AON_WRAPPER_MVP_NOC_CORE_SW_RESET (AON_BASE_OFFS + 0x18) +#define SW_RESET BIT(0) +#define AON_WRAPPER_MVP_NOC_CORE_CLK_CONTROL (AON_BASE_OFFS + 0x20) +#define NOC_HALT BIT(0) +#define AON_WRAPPER_SPARE (AON_BASE_OFFS + 0x28) + +static bool iris_vpu3x_hw_power_collapsed(struct iris_core *core) { u32 value, pwr_status; @@ -35,13 +46,13 @@ static bool iris_vpu3_hw_power_collapsed(struct iris_core *core) return pwr_status ? false : true; } -static void iris_vpu3_power_off_hardware(struct iris_core *core) +static int iris_vpu3x_power_off_hardware_begin(struct iris_core *core) { u32 reg_val = 0, value, i; int ret; - if (iris_vpu3_hw_power_collapsed(core)) - goto disable_power; + if (iris_vpu3x_hw_power_collapsed(core)) + return 1; dev_err(core->dev, "video hw is power on\n"); @@ -53,9 +64,29 @@ static void iris_vpu3_power_off_hardware(struct iris_core *core) ret = readl_poll_timeout(core->reg_base + VCODEC_SS_IDLE_STATUSN + 4 * i, reg_val, reg_val & 0x400000, 2000, 20000); if (ret) - goto disable_power; + return ret; } + return 0; +} + +static void iris_vpu3x_power_off_hardware_end(struct iris_core *core) +{ + writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, + core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); + writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); + writel(0x0, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); +} + +static void iris_vpu3_power_off_hardware(struct iris_core *core) +{ + u32 reg_val = 0; + int ret; + + ret = iris_vpu3x_power_off_hardware_begin(core); + if (ret) + goto disable_power; + writel(VIDEO_NOC_RESET_REQ, core->reg_base + AON_WRAPPER_MVP_NOC_RESET_REQ); ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_RESET_ACK, @@ -70,16 +101,100 @@ static void iris_vpu3_power_off_hardware(struct iris_core *core) if (ret) goto disable_power; - writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, - core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); - writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); - writel(0x0, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); + iris_vpu3x_power_off_hardware_end(core); + +disable_power: + iris_vpu_power_off_hw(core); +} + +static void iris_vpu33_power_off_hardware(struct iris_core *core) +{ + u32 reg_val = 0; + int ret; + + ret = iris_vpu3x_power_off_hardware_begin(core); + if (ret) + goto disable_power; + + ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_LPI_STATUS, + reg_val, reg_val & BIT(0), 200, 2000); + if (ret) + goto disable_power; + + /* set MNoC to low power, set PD_NOC_QREQ (bit 0) */ + writel(BIT(0), core->reg_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); + + iris_vpu3x_power_off_hardware_end(core); disable_power: iris_vpu_power_off_hw(core); } -static u64 iris_vpu3_calculate_frequency(struct iris_inst *inst, size_t data_size) +static int iris_vpu33_power_off_controller(struct iris_core *core) +{ + u32 xo_rst_tbl_size = core->iris_platform_data->controller_rst_tbl_size; + u32 clk_rst_tbl_size = core->iris_platform_data->clk_rst_tbl_size; + u32 val = 0; + int ret; + + iris_vpu_power_off_controller_begin(core); + + ret = iris_vpu_power_off_controller_end(core); + if (ret) + goto disable_power; + + reset_control_bulk_reset(clk_rst_tbl_size, core->resets); + + /* Disable MVP NoC clock */ + val = readl(core->reg_base + AON_WRAPPER_MVP_NOC_CORE_CLK_CONTROL); + val |= NOC_HALT; + writel(val, core->reg_base + AON_WRAPPER_MVP_NOC_CORE_CLK_CONTROL); + + /* enable MVP NoC reset */ + val = readl(core->reg_base + AON_WRAPPER_MVP_NOC_CORE_SW_RESET); + val |= SW_RESET; + writel(val, core->reg_base + AON_WRAPPER_MVP_NOC_CORE_SW_RESET); + + /* poll AON spare register bit0 to become zero with 50ms timeout */ + ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_SPARE, + val, (val & BIT(0)) == 0, 1000, 50000); + if (ret) + goto disable_power; + + /* enable bit(1) to avoid cvp noc xo reset */ + val = readl(core->reg_base + AON_WRAPPER_SPARE); + val |= BIT(1); + writel(val, core->reg_base + AON_WRAPPER_SPARE); + + reset_control_bulk_assert(xo_rst_tbl_size, core->controller_resets); + + /* De-assert MVP NoC reset */ + val = readl(core->reg_base + AON_WRAPPER_MVP_NOC_CORE_SW_RESET); + val &= ~SW_RESET; + writel(val, core->reg_base + AON_WRAPPER_MVP_NOC_CORE_SW_RESET); + + usleep_range(80, 100); + + reset_control_bulk_deassert(xo_rst_tbl_size, core->controller_resets); + + /* reset AON spare register */ + writel(0, core->reg_base + AON_WRAPPER_SPARE); + + /* Enable MVP NoC clock */ + val = readl(core->reg_base + AON_WRAPPER_MVP_NOC_CORE_CLK_CONTROL); + val &= ~NOC_HALT; + writel(val, core->reg_base + AON_WRAPPER_MVP_NOC_CORE_CLK_CONTROL); + + iris_disable_unprepare_clock(core, IRIS_CTRL_CLK); + +disable_power: + iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]); + iris_disable_unprepare_clock(core, IRIS_AXI_CLK); + + return 0; +} + +static u64 iris_vpu3x_calculate_frequency(struct iris_inst *inst, size_t data_size) { struct platform_inst_caps *caps = inst->core->iris_platform_data->inst_caps; struct v4l2_format *inp_f = inst->fmt_src; @@ -117,8 +232,13 @@ static u64 iris_vpu3_calculate_frequency(struct iris_inst *inst, size_t data_siz } const struct vpu_ops iris_vpu3_ops = { - .reset_controller = iris_vpu_reset_controller, .power_off_hw = iris_vpu3_power_off_hardware, .power_off_controller = iris_vpu_power_off_controller, - .calc_freq = iris_vpu3_calculate_frequency, + .calc_freq = iris_vpu3x_calculate_frequency, +}; + +const struct vpu_ops iris_vpu33_ops = { + .power_off_hw = iris_vpu33_power_off_hardware, + .power_off_controller = iris_vpu33_power_off_controller, + .calc_freq = iris_vpu3x_calculate_frequency, }; diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c index 3b3e1ca1e42183561ee78c89f50946fd0cc3c3ab..43c62e2ee593146b8e3448e8c7cab44ef1a15bf2 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c @@ -211,12 +211,12 @@ int iris_vpu_prepare_pc(struct iris_core *core) return -EAGAIN; } -static void iris_vpu_power_off_controller_begin(struct iris_core *core) +void iris_vpu_power_off_controller_begin(struct iris_core *core) { writel(MSK_SIGNAL_FROM_TENSILICA | MSK_CORE_POWER_ON, core->reg_base + CPU_CS_X2RPMH); } -static int iris_vpu_power_off_controller_end(struct iris_core *core) +int iris_vpu_power_off_controller_end(struct iris_core *core) { u32 val = 0; int ret; diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h index f8965661c602f990d5a7057565f79df4112d097e..4af3cb0d44e00be498fc7ba648c68f1ef2cb0f20 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h @@ -10,6 +10,7 @@ struct iris_core; extern const struct vpu_ops iris_vpu2_ops; extern const struct vpu_ops iris_vpu3_ops; +extern const struct vpu_ops iris_vpu33_ops; struct vpu_ops { void (*power_off_hw)(struct iris_core *core); @@ -23,6 +24,8 @@ void iris_vpu_clear_interrupt(struct iris_core *core); int iris_vpu_watchdog(struct iris_core *core, u32 intr_status); int iris_vpu_prepare_pc(struct iris_core *core); int iris_vpu_power_on(struct iris_core *core); +void iris_vpu_power_off_controller_begin(struct iris_core *core); +int iris_vpu_power_off_controller_end(struct iris_core *core); int iris_vpu_power_off_controller(struct iris_core *core); void iris_vpu_power_off_hw(struct iris_core *core); void iris_vpu_power_off(struct iris_core *core); From patchwork Wed Mar 5 19:05:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 14003242 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 71BD7256C7C for ; Wed, 5 Mar 2025 19:05:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201538; cv=none; b=nz5A5e+PKwQFCoWRxazJ18IxZ3XnzLLh37zD/kTWuD7MA8LGvQuByzzMu2DV+A1buOtlTrVWfgtOb69OwVXjlRc/A9oR25P9VoxThV8BFXfuEHAjnRPKBPOEeZ8YOhhfnmhJJak13pE1wsf8SJ4/Z08CeuAHOg2eAqoWc/ShNy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741201538; c=relaxed/simple; bh=neXImAtQA6tzq28UA2f7Fc6YFrL/8512jm9dsPst4Uw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cz4fJdvRP+j4JdPuqccK6S3qobUrPGc+q7fiStT6N+VsonbQ9wziX/28Ci3Ib1QE0ZiHZs5pX5wJ3bjPnPHQTP7lPqWRQgcP9Tmk+jS7GAEoEOePgNcH/oqKSwVYKaRp6fFpJV/2j+dTGyBLjFjqursKvdS+GO8LlZ9TCQnhdyM= 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=sGCJTLM5; arc=none smtp.client-ip=209.85.128.50 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="sGCJTLM5" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-439ac3216dcso49315695e9.1 for ; Wed, 05 Mar 2025 11:05:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741201533; x=1741806333; 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=GvVRJL05EetY3b5wXnazV4Utq3Bno8ucEIV3aAjgwZI=; b=sGCJTLM5akhjtpBw2rOqKdzH1v5/sNTJ8XuwjgZiiwYYYdpbozEUMTdo82pP0rAQ+6 pCN880LOAO3K0JKIdEkuTdERbCn+O+V3JYV3VBdfopjLzghr/M5k/VRb3gCYptP3s+Vc eXBfEFO4M889JegPAYacxm4OgFE2MssEvIStp7UHSveGhaqUIhKRNLfrnZZxS70GJlR/ UWTuL91IvOwEkwvN9wsU+hrwkKjC80HM2ZYR55CvzsuglUq0ZdZUaM4ptd4/GcUAXckY 7atWsVkjhqf/pDD1tnRp4mVLNw0yKvjwO6gtmoV93q0qBUOs6eE7MMMFsFkFUk01/F1J T7FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741201533; x=1741806333; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GvVRJL05EetY3b5wXnazV4Utq3Bno8ucEIV3aAjgwZI=; b=aUMiJ/nEzcHdg6nQ0mwNNmULw9kcap6Lne5RSKXeeIrn1J+MgrkNQ/M+ereKdTfpvc X5GyBhn81r6bnaXpiAXLfBLvIRRNwiob+0QwrYUj76o7B4T/10yAWyddaMvNU8Rcu4hc Ak+PTLyi6dahiUGKB3DzvkuMb4gpbhW4nPjXesFaqcUV4suTjlDDPTXJS06qXrKUaME8 cLvmgJjEfYhNEx9qOUVyovWSGT4+WdU8IzoBrKYvo9k/An4vDJQN8TDNZPsxm3QY05C9 l64cc974VoNuJmISEOF9zKQDv4B2zWmH88QvqPGu4QObQm9aZHZWzfVghfK2B9e5AY5D tsYg== X-Gm-Message-State: AOJu0YzWrdYN4CkAVByAQ4WYWrQvN6OR1lvYadCjMawUxVc+3IhH+9Cc i2CMWNTl8VyMIQJF/ERmOnvyhizt4nFhNK5/MEMm0cXV5tVmbyxzt0wYP7l6dVM= X-Gm-Gg: ASbGncvef0uFSAkLb52WTlj+wNPTT+YRniAV4rPSAbL8Z/2sLJmNrh+YwIQCsgQa9cw zMeKwad4iOh6SVARkwadA2h0VPSNgV5Bbx2c77oOCTHCMzK6uZGP/kwlfciIxauLpE97h9af37Q IKcRqUYsTB6gVAD8Pk1CDfWu330PPUpn9RnAMf2eiUaDbzjoyArzGN2Z87HjWEYtqiQPNq/uAfb 8g1jJjXtILo5sTlwqAeeRpaYXFlwhtWkuADinLDbMaioE7JJ3h1O5DA9w63ocAxhELwqUJ1t6CT 4c2LmXDUA4uIn1U66lrQQqUNbYkf4TEYMSR1wEAs3WDF7K7BZ+Uav5AUmQj24sC0JQ== X-Google-Smtp-Source: AGHT+IFYKLnbBRjUoClSNfoh1wWUEkoomndMQiw1Y73Ybrnmb822oEVcCwKZmOMKtP8MBlDxn2Meqg== X-Received: by 2002:a05:6000:1f8c:b0:390:f116:d230 with SMTP id ffacd0b85a97d-3911f74bc14mr4769589f8f.16.1741201532944; Wed, 05 Mar 2025 11:05:32 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-391241bd151sm2045218f8f.21.2025.03.05.11.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 11:05:32 -0800 (PST) From: Neil Armstrong Date: Wed, 05 Mar 2025 20:05:25 +0100 Subject: [PATCH v2 7/7] media: platform: qcom/iris: add sm8650 support Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250305-topic-sm8x50-iris-v10-v2-7-bd65a3fc099e@linaro.org> References: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> In-Reply-To: <20250305-topic-sm8x50-iris-v10-v2-0-bd65a3fc099e@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5217; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=neXImAtQA6tzq28UA2f7Fc6YFrL/8512jm9dsPst4Uw=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBnyKB1HLO9Z9d394GsUYIIHIi6x+YViVfgPszprcEs 3N73EoWJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZ8igdQAKCRB33NvayMhJ0fSOEA CXRdQdRV1ZYZOurILMyVtf3HyF/wL0JbBB3ktMurqv7RarFp8KAcdq9CcXOVjpTq575rTJMwF3j1p9 Ug9CCZ8lAOuDkpxyW/tQx3bwOeZEf7HZ91nRwWd0ZJsL0ZuH/H4PhM44RlzgGxvJcDixEmnmdQte25 t04c8VcLrooeMi5rkGRn0f5d7uW1GlEmQey7Hfq64ND1/w73pO7iPc2AjykO7D/IRLMiuxDzwEgcAy CHz0w4Sz2CxkTGkXhVeLFCs+I73Dazhgrdjq062pZPUqS6eWzPXSJm/wPI2jkl+7hAXf6z+W2/d0fv KrqhEDUjBLJcwYE4wvvesrPLffBdNt4xhU2sAMesrc2G6BXQWQv33Y9kguT4x+nQYJB4OJdyVDbIfr 3G1VdvAWsWBO4oFppgMpQeEW12/7bq3tq8BwCPUp4NqSW3JQ9FxadAVShQ+XlxTGraGRIUoSPR/b7I NXAf/hARIMF2LAx9uYUhncKpeLL3EeBqX7e6rSl8kHDKyUVwTu/fHjgb8kWWr4+rUqPqs7BdR1XyKr OwRjlo0PweXOzVt7TSz+TdP+P9o+cUXiO0MmaKQUB0dHXMgW3BJjWTpQnnM1KPnEM31Oku35y0Vx6R UUWXaRBR+p2MLIArCI3GE3KdxQFR55ASP6+r5rg2jXu9XZD3L+08w/026ncg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Add support for the SM8650 platform by re-using the SM8550 definitions and using the vpu33 ops. The SM8650/vpu33 requires more reset lines, but the H.284 decoder capabilities are identical. Signed-off-by: Neil Armstrong --- .../platform/qcom/iris/iris_platform_common.h | 1 + .../platform/qcom/iris/iris_platform_sm8550.c | 64 ++++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_probe.c | 4 ++ 3 files changed, 69 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index fdd40fd80178c4c66b37e392d07a0a62f492f108..6bc3a7975b04d612f6c89206eae95dac678695fc 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -35,6 +35,7 @@ enum pipe_type { extern struct iris_platform_data sm8250_data; extern struct iris_platform_data sm8550_data; +extern struct iris_platform_data sm8650_data; enum platform_clk_type { IRIS_AXI_CLK, diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c index 35d278996c430f2856d0fe59586930061a271c3e..d0f8fa960d53367023e41bc5807ba3f8beae2efc 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c @@ -144,6 +144,10 @@ static const struct icc_info sm8550_icc_table[] = { static const char * const sm8550_clk_reset_table[] = { "bus" }; +static const char * const sm8650_clk_reset_table[] = { "bus", "core" }; + +static const char * const sm8650_controller_reset_table[] = { "xo" }; + static const struct bw_info sm8550_bw_table_dec[] = { { ((4096 * 2160) / 256) * 60, 1608000 }, { ((4096 * 2160) / 256) * 30, 826000 }, @@ -264,3 +268,63 @@ struct iris_platform_data sm8550_data = { .dec_op_int_buf_tbl = sm8550_dec_op_int_buf_tbl, .dec_op_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_op_int_buf_tbl), }; + +/* + * Shares most of SM8550 data except: + * - vpu_ops to iris_vpu33_ops + * - clk_rst_tbl to sm8650_clk_reset_table + * - controller_rst_tbl to sm8650_controller_reset_table + * - fwname to "qcom/vpu/vpu33_p4.mbn" + */ +struct iris_platform_data sm8650_data = { + .get_instance = iris_hfi_gen2_get_instance, + .init_hfi_command_ops = iris_hfi_gen2_command_ops_init, + .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, + .vpu_ops = &iris_vpu33_ops, + .set_preset_registers = iris_set_sm8550_preset_registers, + .icc_tbl = sm8550_icc_table, + .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), + .clk_rst_tbl = sm8650_clk_reset_table, + .clk_rst_tbl_size = ARRAY_SIZE(sm8650_clk_reset_table), + .controller_rst_tbl = sm8650_controller_reset_table, + .controller_rst_tbl_size = ARRAY_SIZE(sm8650_controller_reset_table), + .bw_tbl_dec = sm8550_bw_table_dec, + .bw_tbl_dec_size = ARRAY_SIZE(sm8550_bw_table_dec), + .pmdomain_tbl = sm8550_pmdomain_table, + .pmdomain_tbl_size = ARRAY_SIZE(sm8550_pmdomain_table), + .opp_pd_tbl = sm8550_opp_pd_table, + .opp_pd_tbl_size = ARRAY_SIZE(sm8550_opp_pd_table), + .clk_tbl = sm8550_clk_table, + .clk_tbl_size = ARRAY_SIZE(sm8550_clk_table), + /* Upper bound of DMA address range */ + .dma_mask = 0xe0000000 - 1, + .fwname = "qcom/vpu/vpu33_p4.mbn", + .pas_id = IRIS_PAS_ID, + .inst_caps = &platform_inst_cap_sm8550, + .inst_fw_caps = inst_fw_cap_sm8550, + .inst_fw_caps_size = ARRAY_SIZE(inst_fw_cap_sm8550), + .tz_cp_config_data = &tz_cp_config_sm8550, + .core_arch = VIDEO_ARCH_LX, + .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, + .ubwc_config = &ubwc_config_sm8550, + .num_vpp_pipe = 4, + .max_session_count = 16, + .max_core_mbpf = ((8192 * 4352) / 256) * 2, + .input_config_params = + sm8550_vdec_input_config_params, + .input_config_params_size = + ARRAY_SIZE(sm8550_vdec_input_config_params), + .output_config_params = + sm8550_vdec_output_config_params, + .output_config_params_size = + ARRAY_SIZE(sm8550_vdec_output_config_params), + .dec_input_prop = sm8550_vdec_subscribe_input_properties, + .dec_input_prop_size = ARRAY_SIZE(sm8550_vdec_subscribe_input_properties), + .dec_output_prop = sm8550_vdec_subscribe_output_properties, + .dec_output_prop_size = ARRAY_SIZE(sm8550_vdec_subscribe_output_properties), + + .dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl, + .dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl), + .dec_op_int_buf_tbl = sm8550_dec_op_int_buf_tbl, + .dec_op_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_op_int_buf_tbl), +}; diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c index 4f8bce6e2002bffee4c93dcaaf6e52bf4e40992e..7cd8650fbe9c09598670530103e3d5edf32953e7 100644 --- a/drivers/media/platform/qcom/iris/iris_probe.c +++ b/drivers/media/platform/qcom/iris/iris_probe.c @@ -345,6 +345,10 @@ static const struct of_device_id iris_dt_match[] = { .data = &sm8250_data, }, #endif + { + .compatible = "qcom,sm8650-iris", + .data = &sm8650_data, + }, { }, }; MODULE_DEVICE_TABLE(of, iris_dt_match);