lkml.org 
[lkml]   [2019]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 08/14] soc: mediatek: Refactor bus protection control
    Date
    Put bus protection enable and disable control in separate functions.

    Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
    ---
    drivers/soc/mediatek/mtk-scpsys.c | 48 ++++++++++++++++++++++---------
    1 file changed, 34 insertions(+), 14 deletions(-)

    diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
    index 65b734b40098..6bf846cb1893 100644
    --- a/drivers/soc/mediatek/mtk-scpsys.c
    +++ b/drivers/soc/mediatek/mtk-scpsys.c
    @@ -279,6 +279,34 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr)
    MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);
    }

    +static int scpsys_bus_protect_enable(struct scp_domain *scpd)
    +{
    + struct scp *scp = scpd->scp;
    + int ret = 0;
    +
    + if (scpd->data->bus_prot_mask) {
    + ret = mtk_infracfg_set_bus_protection(scp->infracfg,
    + scpd->data->bus_prot_mask,
    + scp->bus_prot_reg_update);
    + }
    +
    + return ret;
    +}
    +
    +static int scpsys_bus_protect_disable(struct scp_domain *scpd)
    +{
    + struct scp *scp = scpd->scp;
    + int ret = 0;
    +
    + if (scpd->data->bus_prot_mask) {
    + ret = mtk_infracfg_clear_bus_protection(scp->infracfg,
    + scpd->data->bus_prot_mask,
    + scp->bus_prot_reg_update);
    + }
    +
    + return ret;
    +}
    +
    static int scpsys_power_on(struct generic_pm_domain *genpd)
    {
    struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd);
    @@ -321,13 +349,9 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
    if (ret < 0)
    goto err_pwr_ack;

    - if (scpd->data->bus_prot_mask) {
    - ret = mtk_infracfg_clear_bus_protection(scp->infracfg,
    - scpd->data->bus_prot_mask,
    - scp->bus_prot_reg_update);
    - if (ret)
    - goto err_pwr_ack;
    - }
    + ret = scpsys_bus_protect_disable(scpd);
    + if (ret < 0)
    + goto err_pwr_ack;

    return 0;

    @@ -349,13 +373,9 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
    u32 val;
    int ret, tmp;

    - if (scpd->data->bus_prot_mask) {
    - ret = mtk_infracfg_set_bus_protection(scp->infracfg,
    - scpd->data->bus_prot_mask,
    - scp->bus_prot_reg_update);
    - if (ret)
    - goto out;
    - }
    + ret = scpsys_bus_protect_enable(scpd);
    + if (ret < 0)
    + goto out;

    ret = scpsys_sram_disable(scpd, ctl_addr);
    if (ret < 0)
    --
    2.18.0
    \
     
     \ /
      Last update: 2019-03-19 09:03    [W:4.107 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site