From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: nikolai.burov@jolla.com, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Ulf Hansson <ulfh@kernel.org>
Cc: Matthias Brugger <mbrugger@suse.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org,
Nikolai Burov <nikolai.burov+review@abscue.de>
Subject: Re: [PATCH 2/3] pmdomain: mediatek: Add support for secure modem power domain control
Date: Wed, 15 Jul 2026 11:56:58 +0200 [thread overview]
Message-ID: <0040e5e9-d219-4758-b402-c5e5b90ff667@collabora.com> (raw)
In-Reply-To: <20260714-mt6858-pmdomain-v1-2-4f09bbb822e0@jolla.com>
On 7/14/26 15:43, Nikolai Burov via B4 Relay wrote:
> From: Nikolai Burov <nikolai.burov@jolla.com>
>
> On recent MediaTek SoCs such as MT6858, the kernel is required to use
> a secure monitor call (SMC) to enable or disable the modem power domain.
> The power domain control register can be read, but firmware prevents it
> from being modified directly. Other parts of the power sequence, such as
> setting the ext_buck_iso register, still need to be performed on the
> kernel side.
>
> In preparation for modem support, add a flag to enable this new power
> sequence for SoCs that need it.
>
> Signed-off-by: Nikolai Burov <nikolai.burov@jolla.com>
> ---
> drivers/pmdomain/mediatek/mtk-pm-domains.c | 54 +++++++++++++++++++++++++++---
> drivers/pmdomain/mediatek/mtk-pm-domains.h | 1 +
> include/linux/soc/mediatek/mtk_sip_svc.h | 3 ++
> 3 files changed, 53 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pmdomain/mediatek/mtk-pm-domains.c b/drivers/pmdomain/mediatek/mtk-pm-domains.c
> index e1cfd4223473..56437b32b252 100644
> --- a/drivers/pmdomain/mediatek/mtk-pm-domains.c
> +++ b/drivers/pmdomain/mediatek/mtk-pm-domains.c
> @@ -57,6 +57,12 @@
>
> #define MTK_SIP_KERNEL_HWCCF_CONTROL MTK_SIP_SMC_CMD(0x540)
>
> +/* Power domain commands for MTK_SIP_KERNEL_CCCI_CONTROL */
> +enum {
> + MTK_MD_MTCMOS_ENABLE = 18,
> + MTK_MD_MTCMOS_DISABLE = 19,
> +};
I know in TZ firmware this is an enumeration, but makes little sense here, unless
it's put in some place which only purpose is to do all CCCI communication.... but
that's not a good idea for now. I can see that coming later though.
For now, just do:
/* Secure MTCMOS for modem subsystem */
#define MTK_CCCI_MD_MTCMOS_ENABLE 18
#define MTK_CCCI_MD_MTCMOS_ENABLE 19
> +
> struct scpsys_domain {
> struct generic_pm_domain genpd;
> const struct scpsys_domain_data *data;
> @@ -615,6 +621,34 @@ static void scpsys_modem_pwrseq_off(struct scpsys_domain *pd)
> regmap_clear_bits(scpsys->base, pd->data->ctl_offs, PWR_RST_B_BIT);
> }
>
> +static bool scpsys_modem_sec_poll(unsigned long cmd)
> +{
> + struct arm_smccc_res res;
> +
> + arm_smccc_smc(MTK_SIP_KERNEL_CCCI_CONTROL, cmd, 1, 0, 0, 0, 0, 0, &res);
> +
> + return res.a0 == 0;
> +}
> +
> +static int scpsys_modem_sec_power_on(bool on)
> +{
> + struct arm_smccc_res res;
> + unsigned long cmd = on ? MTK_MD_MTCMOS_ENABLE : MTK_MD_MTCMOS_DISABLE;
> + bool tmp;
> + int ret;
> +
> + arm_smccc_smc(MTK_SIP_KERNEL_CCCI_CONTROL, cmd, 0, 0, 0, 0, 0, 0, &res);
> + if (res.a0 == 0)
> + return 0;
> +
> + ret = readx_poll_timeout(scpsys_modem_sec_poll, cmd, tmp, tmp,
> + MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> static int scpsys_power_on(struct generic_pm_domain *genpd)
> {
> struct scpsys_domain *pd = container_of(genpd, struct scpsys_domain, genpd);
> @@ -633,7 +667,9 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
> regmap_clear_bits(scpsys->base, pd->data->ext_buck_iso_offs,
> pd->data->ext_buck_iso_mask);
>
> - if (MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_PWRSEQ))
> + if (MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_SECURE))
> + ret = scpsys_modem_sec_power_on(true);
> + else if (MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_PWRSEQ))
> ret = scpsys_modem_pwrseq_on(pd);
> else
> ret = scpsys_ctl_pwrseq_on(pd);
> @@ -709,6 +745,12 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
> if (ret < 0)
> return ret;
>
> + if (MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_SECURE)) {
> + ret = scpsys_modem_sec_power_on(false);
> + if (ret)
> + return ret;
> + }
> +
> if (pd->data->ext_buck_iso_offs && MTK_SCPD_CAPS(pd, MTK_SCPD_EXT_BUCK_ISO))
> regmap_set_bits(scpsys->base, pd->data->ext_buck_iso_offs,
> pd->data->ext_buck_iso_mask);
> @@ -719,10 +761,12 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
> if (ret < 0)
> return ret;
>
> - if (MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_PWRSEQ))
> - scpsys_modem_pwrseq_off(pd);
> - else
> - scpsys_ctl_pwrseq_off(pd);
> + if (!MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_SECURE)) {
> + if (MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_PWRSEQ))
> + scpsys_modem_pwrseq_off(pd);
> + else
> + scpsys_ctl_pwrseq_off(pd);
> + }
if (MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_PWRSEQ))
scpsys_modem_pwrseq_off(pd);
else if (!MTK_SCPD_CAPS(pd, MTK_SCPD_MODEM_SECURE_PWRSEQ))
scpsys_ctl_pwrseq_off(pd);
Less indent, looks a bit less messy... I still don't like it but I don't think that
there's any other solution that doesn't imply adding one more power domain type, as
in SCPSYS_MTCMOS_TYPE_SECURE.
I think more will come, so perhaps let's wait for that to happen as to understand
how to actually define the new type.
>
> /* wait until PWR_ACK = 0 */
> ret = readx_poll_timeout(scpsys_domain_is_on, pd, tmp, !tmp, MTK_POLL_DELAY_US,
> diff --git a/drivers/pmdomain/mediatek/mtk-pm-domains.h b/drivers/pmdomain/mediatek/mtk-pm-domains.h
> index a5dca24cbc2f..b1a3d54a7b01 100644
> --- a/drivers/pmdomain/mediatek/mtk-pm-domains.h
> +++ b/drivers/pmdomain/mediatek/mtk-pm-domains.h
> @@ -17,6 +17,7 @@
> #define MTK_SCPD_MODEM_PWRSEQ BIT(10)
> #define MTK_SCPD_SKIP_RESET_B BIT(11)
> #define MTK_SCPD_INFRA_PWR_CTL BIT(12)
> +#define MTK_SCPD_MODEM_SECURE BIT(13)
MTK_SCPD_MODEM_SECURE_PWRSEQ
Cheers,
Angelo
next prev parent reply other threads:[~2026-07-15 9:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-14 13:43 [PATCH 0/3] pmdomain: mediatek: Add MT6858 support Nikolai Burov via B4 Relay
2026-07-14 13:43 ` [PATCH 1/3] dt-bindings: power: Add MediaTek MT6858 power domain controller Nikolai Burov via B4 Relay
2026-07-15 9:58 ` AngeloGioacchino Del Regno
2026-07-14 13:43 ` [PATCH 2/3] pmdomain: mediatek: Add support for secure modem power domain control Nikolai Burov via B4 Relay
2026-07-14 15:28 ` Matthias Brugger
2026-07-15 9:56 ` AngeloGioacchino Del Regno [this message]
2026-07-14 13:43 ` [PATCH 3/3] pmdomain: mediatek: Add support for MT6858 SoC Nikolai Burov via B4 Relay
2026-07-15 9:56 ` AngeloGioacchino Del Regno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0040e5e9-d219-4758-b402-c5e5b90ff667@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=mbrugger@suse.com \
--cc=nikolai.burov+review@abscue.de \
--cc=nikolai.burov@jolla.com \
--cc=robh@kernel.org \
--cc=ulfh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®