From: Matthias Brugger <mbrugger@suse.com>
To: Nicolas Boichat <drinkcat@chromium.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: Enric Balletbo i Serra <enric.balletbo@collabora.com>,
lkml <linux-kernel@vger.kernel.org>,
Collabora Kernel ML <kernel@collabora.com>,
Fabien Parent <fparent@baylibre.com>,
Hsin-Yi Wang <hsinyi@chromium.org>,
Weiyi Lu <weiyi.lu@mediatek.com>,
linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>
Subject: Re: [PATCH v2 06/12] soc: mediatek: pm-domains: Add SMI block as bus protection block
Date: Mon, 5 Oct 2020 12:28:12 +0200 [thread overview]
Message-ID: <8b007805-5fd5-aebe-2ac3-014514173263@suse.com> (raw)
In-Reply-To: <CANMq1KDNKsE5oWxsg-zPS1L07dZySjoQc-fRWsXc5ngdi98Kgg@mail.gmail.com>
On 05/10/2020 03:48, Nicolas Boichat wrote:
> On Fri, Oct 2, 2020 at 4:56 PM Matthias Brugger <matthias.bgg@gmail.com> wrote:
>>
>>
>>
>> On 01/10/2020 18:01, Enric Balletbo i Serra wrote:
>>> From: Matthias Brugger <mbrugger@suse.com>
>>>
>>> Apart from the infracfg block, the SMI block is used to enable the bus
>>> protection for some power domains. Add support for this block.
>>>
>>> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
>>> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>> drivers/soc/mediatek/mtk-pm-domains.c | 64 ++++++++++++++++++++-------
>>> include/linux/soc/mediatek/infracfg.h | 6 +++
>>> 2 files changed, 53 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c
>>> index b5e7c9846c34..38f2630bdd0a 100644
>>> --- a/drivers/soc/mediatek/mtk-pm-domains.c
>>> +++ b/drivers/soc/mediatek/mtk-pm-domains.c
>>> @@ -56,8 +56,25 @@
>>>
>>> #define SPM_MAX_BUS_PROT_DATA 3
>>>
>>> +#define _BUS_PROT(_mask, _set, _clr, _sta, _update) { \
>>> + .bus_prot_mask = (_mask), \
>>> + .bus_prot_set = _set, \
>>> + .bus_prot_clr = _clr, \
>>> + .bus_prot_sta = _sta, \
>>> + .bus_prot_reg_update = _update, \
>>> + }
>>> +
>>> +#define BUS_PROT_WR(_mask, _set, _clr, _sta) \
>>> + _BUS_PROT(_mask, _set, _clr, _sta, false)
>>> +
>>> +#define BUS_PROT_UPDATE(_mask, _set, _clr, _sta) \
>>> + _BUS_PROT(_mask, _set, _clr, _sta, true)
>>> +
>>> struct scpsys_bus_prot_data {
>>> u32 bus_prot_mask;
>>> + u32 bus_prot_set;
>>> + u32 bus_prot_clr;
>>> + u32 bus_prot_sta;
>>> bool bus_prot_reg_update;
>>> };
>>>
>>> @@ -69,6 +86,7 @@ struct scpsys_bus_prot_data {
>>> * @sram_pdn_ack_bits: The mask for sram power control acked bits.
>>> * @caps: The flag for active wake-up action.
>>> * @bp_infracfg: bus protection for infracfg subsystem
>>> + * @bp_smi: bus protection for smi subsystem
>>> */
>>> struct scpsys_domain_data {
>>> u32 sta_mask;
>>> @@ -77,6 +95,7 @@ struct scpsys_domain_data {
>>> u32 sram_pdn_ack_bits;
>>> u8 caps;
>>> const struct scpsys_bus_prot_data bp_infracfg[SPM_MAX_BUS_PROT_DATA];
>>> + const struct scpsys_bus_prot_data bp_smi[SPM_MAX_BUS_PROT_DATA];
>>> };
>>>
>>> struct scpsys_domain {
>>> @@ -86,6 +105,7 @@ struct scpsys_domain {
>>> int num_clks;
>>> struct clk_bulk_data *clks;
>>> struct regmap *infracfg;
>>> + struct regmap *smi;
>>> };
>>>
>>> struct scpsys_soc_data {
>>> @@ -175,9 +195,9 @@ static int _scpsys_bus_protect_enable(const struct scpsys_bus_prot_data *bpd, st
>>> if (bpd[i].bus_prot_reg_update)
>>> regmap_update_bits(regmap, INFRA_TOPAXI_PROTECTEN, mask, mask);
>>> else
>>> - regmap_write(regmap, INFRA_TOPAXI_PROTECTEN_SET, mask);
>>> + regmap_write(regmap, bpd[i].bus_prot_set, mask);
>>>
>>> - ret = regmap_read_poll_timeout(regmap, INFRA_TOPAXI_PROTECTSTA1,
>>> + ret = regmap_read_poll_timeout(regmap, bpd[i].bus_prot_sta,
>>> val, (val & mask) == mask,
>>> MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);
>>> if (ret)
>>> @@ -193,7 +213,11 @@ static int scpsys_bus_protect_enable(struct scpsys_domain *pd)
>>> int ret;
>>>
>>> ret = _scpsys_bus_protect_enable(bpd, pd->infracfg);
>>> - return ret;
>>> + if (ret)
>>> + return ret;
>>> +
>>> + bpd = pd->data->bp_smi;
>>> + return _scpsys_bus_protect_enable(bpd, pd->smi);
>
> Not a huge fan or reusing bpd for 2 different things.
>
> I think this is easier to follow:
>
> _scpsys_bus_protect_enable(pd->data->bp_infracfg, pd->infracfg);
> ...
> _scpsys_bus_protect_enable(pd->data->bp_smi, pd->smi);
>
Sounds reasonable, yes :)
next prev parent reply other threads:[~2020-10-05 10:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 16:01 [PATCH v2 00/12] soc: mediatek: pm-domains: Add new driver for SCPSYS power domains controller Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 01/12] dt-bindings: power: Add bindings for the Mediatek " Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 02/12] soc: mediatek: Add MediaTek SCPSYS power domains Enric Balletbo i Serra
2020-10-05 1:39 ` Nicolas Boichat
2020-10-26 15:17 ` Enric Balletbo i Serra
2020-10-27 0:19 ` Nicolas Boichat
2020-10-27 16:25 ` Enric Balletbo i Serra
2020-10-28 1:13 ` Nicolas Boichat
2020-10-30 10:29 ` Enric Balletbo i Serra
2020-10-30 12:44 ` Nicolas Boichat
2020-10-01 16:01 ` [PATCH v2 03/12] arm64: dts: mediatek: Add mt8173 power domain controller Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 04/12] soc: mediatek: pm-domains: Add bus protection protocol Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 05/12] soc: mediatek: pm_domains: Make bus protection generic Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 06/12] soc: mediatek: pm-domains: Add SMI block as bus protection block Enric Balletbo i Serra
2020-10-02 8:56 ` Matthias Brugger
2020-10-05 1:48 ` Nicolas Boichat
2020-10-05 10:28 ` Matthias Brugger [this message]
2020-10-26 15:18 ` Enric Balletbo i Serra
2020-10-26 15:18 ` Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 07/12] soc: mediatek: pm-domains: Add extra sram control Enric Balletbo i Serra
2020-10-02 9:24 ` Matthias Brugger
2020-10-01 16:01 ` [PATCH v2 08/12] soc: mediatek: pm-domains: Add subsystem clocks Enric Balletbo i Serra
2020-10-02 9:04 ` Matthias Brugger
2020-10-26 15:17 ` Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 09/12] soc: mediatek: pm-domains: Allow bus protection to ignore clear ack Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 10/12] dt-bindings: power: Add MT8183 power domains Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 11/12] soc: mediatek: pm-domains: Add support for mt8183 Enric Balletbo i Serra
2020-10-01 16:01 ` [PATCH v2 12/12] arm64: dts: mediatek: Add mt8183 power domains controller Enric Balletbo i Serra
2020-10-02 9:11 ` Matthias Brugger
2020-10-11 14:55 ` kernel test robot
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=8b007805-5fd5-aebe-2ac3-014514173263@suse.com \
--to=mbrugger@suse.com \
--cc=drinkcat@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=fparent@baylibre.com \
--cc=hsinyi@chromium.org \
--cc=kernel@collabora.com \
--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=weiyi.lu@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).