From nobody Tue Dec 30 09:52:53 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43DDFC2BB3F for ; Sat, 18 Nov 2023 12:12:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229868AbjKRMLz (ORCPT ); Sat, 18 Nov 2023 07:11:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229687AbjKRMLr (ORCPT ); Sat, 18 Nov 2023 07:11:47 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE882D6D for ; Sat, 18 Nov 2023 04:11:42 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4084095722aso3522845e9.1 for ; Sat, 18 Nov 2023 04:11:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700309501; x=1700914301; 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=FU64yB094w/k/dpqAQjQeJG192Ggsw7tuSAo8zmyjiE=; b=LOcaZouNczmMwFJPhAbrrYP8hWeDaop+eFo7kzbojaoLvb5LO+n6NG8wss1+fFQbOK rO6j2BDY4fmJ7LrbA+xiIgdeO7fQSVYu1N59AXxQk2HfnT5uxd6JzmAldV5MNsjdF3ie s5sDl2dqHgblU53bmAqlWb1K9WiM5e5UrsDjzVxwWVNLXom1L93K6mqDTbJEGs9Bgm/U Yk9VDu/3i9UyNPVq5lWwhtkBhOGnmDw3kzGngJpINS8uUCVf6BPDHWX6mDf3qGEMfHEF OyPl5/o0uDoMpkIfqMwJ1RUw5yADb7+BgaC32FlGwmNu4voomgvIotT9lTak2wIoDjBL lNxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700309501; x=1700914301; 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=FU64yB094w/k/dpqAQjQeJG192Ggsw7tuSAo8zmyjiE=; b=O+9KAyEyG07A4y+69PZ2+A/Nv5FypNncvjWg+OiRnX7kDuYpn2FGwAXQtvFeh5v27Q Vw5Zz2pP1xxu2RsUGwsOW/QWlWEOhlkF+s9/QOzdzN5ZcgipAFf+a/fsXJpu2LXfebV5 i2hFnBv0sA7Psbf6LwVE8A7mvPMv1eb/5I97B1cDarbN98fAXoxWXsm+XwFju2z5A2je FfE0GB0/bParFQ3DfSMSXz2OzsBfv+4KaQKVRjXKV1esI2Eo4XECE5+PnQRSrXXMfBAN cLnAQZQkHyzvb7iy7RQUJt4V64GGaJ4F+moW7XnxXM56C67w7fLFPUmVQRGvegL2Ax9H Mx0Q== X-Gm-Message-State: AOJu0Yy9cxoVfsacgK7CakPFnChfuj7vxBBUYeDzhH29ZhDVtk7PaIu5 FbItP7BlbrA+CNRY3U1BDPdDwQ== X-Google-Smtp-Source: AGHT+IG4n+HRR5k4EfHXB5ERl8ccwVAaKbWHk5TGG2hEIekCUOrxgIzGWE2v02kT+yqfN7/WtUwb3w== X-Received: by 2002:a05:600c:35c5:b0:3fb:feb0:6f40 with SMTP id r5-20020a05600c35c500b003fbfeb06f40mr1664447wmq.11.1700309501274; Sat, 18 Nov 2023 04:11:41 -0800 (PST) Received: from [127.0.0.1] ([37.228.218.3]) by smtp.gmail.com with ESMTPSA id n18-20020a05600c3b9200b00407efbc4361sm10955775wms.9.2023.11.18.04.11.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 04:11:40 -0800 (PST) From: Bryan O'Donoghue Date: Sat, 18 Nov 2023 12:11:36 +0000 Subject: [PATCH v5 2/7] media: qcom: camss: Convert to per-VFE pointer for power-domain linkages MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231118-b4-camss-named-power-domains-v5-2-55eb0f35a30a@linaro.org> References: <20231118-b4-camss-named-power-domains-v5-0-55eb0f35a30a@linaro.org> In-Reply-To: <20231118-b4-camss-named-power-domains-v5-0-55eb0f35a30a@linaro.org> To: hverkuil-cisco@xs4all.nl, laurent.pinchart@ideasonboard.com, Robert Foss , Todor Tomov , Bryan O'Donoghue , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mauro Carvalho Chehab , matti.lehtimaki@gmail.com, quic_grosikop@quicinc.com Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13-dev-26615 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Right now we use the top-level camss structure to provide pointers via VFE id index back to genpd linkages. In effect this hard-codes VFE indexes to power-domain indexes in the dtsi and mandates a very particular ordering of power domains in the dtsi, which bears no relationship to a real hardware dependency. As a first step to rationalising the VFE power-domain code and breaking the magic indexing in dtsi use per-VFE pointers to genpd linkages. The top-level index in msm_vfe_subdev_init is still used to attain the initial so no functional or logical change arises from this change. Reviewed-by: Konrad Dybcio Tested-by: Matti Lehtim=C3=A4ki Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/camss/camss-vfe-170.c | 15 +++++++-------- drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 15 +++++---------- drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 13 +++++-------- drivers/media/platform/qcom/camss/camss-vfe-480.c | 15 +++++++-------- drivers/media/platform/qcom/camss/camss-vfe.c | 3 +++ drivers/media/platform/qcom/camss/camss-vfe.h | 2 ++ 6 files changed, 29 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/me= dia/platform/qcom/camss/camss-vfe-170.c index 0b211fed12760..7451484317cc3 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c @@ -638,7 +638,7 @@ static void vfe_pm_domain_off(struct vfe_device *vfe) if (vfe->id >=3D camss->res->vfe_num) return; =20 - device_link_del(camss->genpd_link[vfe->id]); + device_link_del(vfe->genpd_link); } =20 /* @@ -648,16 +648,15 @@ static void vfe_pm_domain_off(struct vfe_device *vfe) static int vfe_pm_domain_on(struct vfe_device *vfe) { struct camss *camss =3D vfe->camss; - enum vfe_line_id id =3D vfe->id; =20 - if (id >=3D camss->res->vfe_num) + if (vfe->id >=3D camss->res->vfe_num) return 0; =20 - camss->genpd_link[id] =3D device_link_add(camss->dev, camss->genpd[id], - DL_FLAG_STATELESS | - DL_FLAG_PM_RUNTIME | - DL_FLAG_RPM_ACTIVE); - if (!camss->genpd_link[id]) + vfe->genpd_link =3D device_link_add(camss->dev, vfe->genpd, + DL_FLAG_STATELESS | + DL_FLAG_PM_RUNTIME | + DL_FLAG_RPM_ACTIVE); + if (!vfe->genpd_link) return -EINVAL; =20 return 0; diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/me= dia/platform/qcom/camss/camss-vfe-4-7.c index b65ed0fef595e..2b4e7e039407b 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c @@ -1109,14 +1109,10 @@ static void vfe_isr_read(struct vfe_device *vfe, u3= 2 *value0, u32 *value1) */ static void vfe_pm_domain_off(struct vfe_device *vfe) { - struct camss *camss; - if (!vfe) return; =20 - camss =3D vfe->camss; - - device_link_del(camss->genpd_link[vfe->id]); + device_link_del(vfe->genpd_link); } =20 /* @@ -1126,13 +1122,12 @@ static void vfe_pm_domain_off(struct vfe_device *vf= e) static int vfe_pm_domain_on(struct vfe_device *vfe) { struct camss *camss =3D vfe->camss; - enum vfe_line_id id =3D vfe->id; =20 - camss->genpd_link[id] =3D device_link_add(camss->dev, camss->genpd[id], D= L_FLAG_STATELESS | - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); + vfe->genpd_link =3D device_link_add(camss->dev, vfe->genpd, DL_FLAG_STATE= LESS | + DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); =20 - if (!camss->genpd_link[id]) { - dev_err(vfe->camss->dev, "Failed to add VFE#%d to power domain\n", id); + if (!vfe->genpd_link) { + dev_err(vfe->camss->dev, "Failed to add VFE#%d to power domain\n", vfe->= id); return -EINVAL; } =20 diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c b/drivers/me= dia/platform/qcom/camss/camss-vfe-4-8.c index 7b3805177f037..5e95343241304 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c @@ -1099,9 +1099,7 @@ static void vfe_isr_read(struct vfe_device *vfe, u32 = *value0, u32 *value1) */ static void vfe_pm_domain_off(struct vfe_device *vfe) { - struct camss *camss =3D vfe->camss; - - device_link_del(camss->genpd_link[vfe->id]); + device_link_del(vfe->genpd_link); } =20 /* @@ -1111,13 +1109,12 @@ static void vfe_pm_domain_off(struct vfe_device *vf= e) static int vfe_pm_domain_on(struct vfe_device *vfe) { struct camss *camss =3D vfe->camss; - enum vfe_line_id id =3D vfe->id; =20 - camss->genpd_link[id] =3D device_link_add(camss->dev, camss->genpd[id], D= L_FLAG_STATELESS | - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); + vfe->genpd_link =3D device_link_add(camss->dev, vfe->genpd, DL_FLAG_STATE= LESS | + DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); =20 - if (!camss->genpd_link[id]) { - dev_err(vfe->camss->dev, "Failed to add VFE#%d to power domain\n", id); + if (!vfe->genpd_link) { + dev_err(vfe->camss->dev, "Failed to add VFE#%d to power domain\n", vfe->= id); return -EINVAL; } =20 diff --git a/drivers/media/platform/qcom/camss/camss-vfe-480.c b/drivers/me= dia/platform/qcom/camss/camss-vfe-480.c index f2368b77fc6d6..a70b8633bb3eb 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-480.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-480.c @@ -463,7 +463,7 @@ static void vfe_pm_domain_off(struct vfe_device *vfe) if (vfe->id >=3D camss->res->vfe_num) return; =20 - device_link_del(camss->genpd_link[vfe->id]); + device_link_del(vfe->genpd_link); } =20 /* @@ -473,16 +473,15 @@ static void vfe_pm_domain_off(struct vfe_device *vfe) static int vfe_pm_domain_on(struct vfe_device *vfe) { struct camss *camss =3D vfe->camss; - enum vfe_line_id id =3D vfe->id; =20 - if (id >=3D camss->res->vfe_num) + if (vfe->id >=3D camss->res->vfe_num) return 0; =20 - camss->genpd_link[id] =3D device_link_add(camss->dev, camss->genpd[id], - DL_FLAG_STATELESS | - DL_FLAG_PM_RUNTIME | - DL_FLAG_RPM_ACTIVE); - if (!camss->genpd_link[id]) + vfe->genpd_link =3D device_link_add(camss->dev, vfe->genpd, + DL_FLAG_STATELESS | + DL_FLAG_PM_RUNTIME | + DL_FLAG_RPM_ACTIVE); + if (!vfe->genpd_link) return -EINVAL; =20 return 0; diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/= platform/qcom/camss/camss-vfe.c index 4839e2cedfe58..94267b9974554 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -1347,6 +1347,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct v= fe_device *vfe, if (!res->line_num) return -EINVAL; =20 + if (res->has_pd) + vfe->genpd =3D camss->genpd[id]; + vfe->line_num =3D res->line_num; vfe->ops->subdev_init(dev, vfe); =20 diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/= platform/qcom/camss/camss-vfe.h index 09baded0dcdd6..c1c50023d4876 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.h +++ b/drivers/media/platform/qcom/camss/camss-vfe.h @@ -150,6 +150,8 @@ struct vfe_device { const struct vfe_hw_ops_gen1 *ops_gen1; struct vfe_isr_ops isr_ops; struct camss_video_ops video_ops; + struct device *genpd; + struct device_link *genpd_link; }; =20 struct camss_subdev_resources; --=20 2.42.0