From: Yong Wu <yong.wu@mediatek.com>
To: Chengci.Xu <chengci.xu@mediatek.com>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: <linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
<yi.kuo@mediatek.com>, <anthony.huang@mediatek.com>,
<wendy-st.lin@mediatek.com>
Subject: Re: [PATCH v4 2/4] memory: mtk-smi: Add return value for configure port function
Date: Tue, 9 Aug 2022 13:58:39 +0800 [thread overview]
Message-ID: <302677f4420e7e76728fdabce92fb275b985b21c.camel@mediatek.com> (raw)
In-Reply-To: <20220801021851.7169-3-chengci.xu@mediatek.com>
On Mon, 2022-08-01 at 10:18 +0800, Chengci.Xu wrote:
> In MT8188, the register to enable/disable IOMMU can only be
> configured
> in secure world by SMC call. We should add a return value for
> configure
> port function for preparation because SMC call may return an error
> result.
>
> Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com>
> ---
> drivers/memory/mtk-smi.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
> index d7cb7ead2ac7..08c1668d47bf 100644
> --- a/drivers/memory/mtk-smi.c
> +++ b/drivers/memory/mtk-smi.c
> @@ -127,7 +127,7 @@ struct mtk_smi_common_plat {
>
> struct mtk_smi_larb_gen {
> int port_in_larb[MTK_LARB_NR_MAX + 1];
> - void (*config_port)(struct device *dev);
> + int (*config_port)(struct device
> *dev);
> unsigned int larb_direct_to_common_mask;
> unsigned int flags_general;
> const u8 (*ostd)[SMI_LARB_PORT_NR_MAX];
> @@ -185,7 +185,7 @@ static const struct component_ops
> mtk_smi_larb_component_ops = {
> .unbind = mtk_smi_larb_unbind,
> };
>
> -static void mtk_smi_larb_config_port_gen1(struct device *dev)
> +static int mtk_smi_larb_config_port_gen1(struct device *dev)
> {
> struct mtk_smi_larb *larb = dev_get_drvdata(dev);
> const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen;
> @@ -214,23 +214,26 @@ static void
> mtk_smi_larb_config_port_gen1(struct device *dev)
> common->smi_ao_base
> + REG_SMI_SECUR_CON_ADDR(m4u_port_id));
> }
> + return 0;
> }
>
> -static void mtk_smi_larb_config_port_mt8167(struct device *dev)
> +static int mtk_smi_larb_config_port_mt8167(struct device *dev)
> {
> struct mtk_smi_larb *larb = dev_get_drvdata(dev);
>
> writel(*larb->mmu, larb->base + MT8167_SMI_LARB_MMU_EN);
> + return 0;
> }
>
> -static void mtk_smi_larb_config_port_mt8173(struct device *dev)
> +static int mtk_smi_larb_config_port_mt8173(struct device *dev)
> {
> struct mtk_smi_larb *larb = dev_get_drvdata(dev);
>
> writel(*larb->mmu, larb->base + MT8173_SMI_LARB_MMU_EN);
> + return 0;
> }
>
> -static void mtk_smi_larb_config_port_gen2_general(struct device
> *dev)
> +static int mtk_smi_larb_config_port_gen2_general(struct device *dev)
> {
> struct mtk_smi_larb *larb = dev_get_drvdata(dev);
> u32 reg, flags_general = larb->larb_gen->flags_general;
> @@ -238,7 +241,7 @@ static void
> mtk_smi_larb_config_port_gen2_general(struct device *dev)
> int i;
>
> if (BIT(larb->larbid) & larb->larb_gen-
> >larb_direct_to_common_mask)
> - return;
> + return 0;
>
> if (MTK_SMI_CAPS(flags_general, MTK_SMI_FLAG_THRT_UPDATE)) {
> reg = readl_relaxed(larb->base +
> SMI_LARB_CMD_THRT_CON);
> @@ -259,6 +262,7 @@ static void
> mtk_smi_larb_config_port_gen2_general(struct device *dev)
> reg |= BANK_SEL(larb->bank[i]);
> writel(reg, larb->base + SMI_LARB_NONSEC_CON(i));
> }
> + return 0;
> }
>
> static const u8 mtk_smi_larb_mt8195_ostd[][SMI_LARB_PORT_NR_MAX] = {
> @@ -511,7 +515,9 @@ static int __maybe_unused
> mtk_smi_larb_resume(struct device *dev)
> mtk_smi_larb_sleep_ctrl_disable(larb);
>
> /* Configure the basic setting for this larb */
> - larb_gen->config_port(dev);
> + ret = larb_gen->config_port(dev);
> + if (ret)
> + return ret;
return larb_gen->config_port(dev);
After this,
Reviewed-by: Yong Wu <yong.wu@mediatek.com>
>
> return 0;
> }
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-08-09 8:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-01 2:18 [PATCH v4 0/4] MT8188 SMI SUPPORT Chengci.Xu
2022-08-01 2:18 ` [PATCH v4 1/4] dt-bindings: memory: mediatek: Add mt8188 smi binding Chengci.Xu
2022-08-01 2:18 ` [PATCH v4 2/4] memory: mtk-smi: Add return value for configure port function Chengci.Xu
2022-08-09 5:58 ` Yong Wu [this message]
2022-08-01 2:18 ` [PATCH v4 3/4] memory: mtk-smi: Add enable IOMMU SMC command for MM master Chengci.Xu
2022-08-09 5:58 ` Yong Wu
2022-08-17 12:43 ` Chengci.Xu
2022-08-01 2:18 ` [PATCH v4 4/4] memory: mtk-smi: mt8188: Add SMI Support Chengci.Xu
2022-08-09 5:58 ` Yong Wu
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=302677f4420e7e76728fdabce92fb275b985b21c.camel@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=anthony.huang@mediatek.com \
--cc=chengci.xu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=wendy-st.lin@mediatek.com \
--cc=yi.kuo@mediatek.com \
/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;
as well as URLs for NNTP newsgroup(s).