leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc: mediatek: pm-domains: Add bus protection protocol

Browse Source 
Bus protection will need to update more then one register
in infracfg. Add support for several operations.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Link: https://lore.kernel.org/r/20201030113622.201188-5-enric.balletbo@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
This commit is contained in:
Matthias Brugger 2020-10-30 12:36:10 +01:00 committed by Matthias Brugger
parent 59b644b01c
commit 916d6d71ba
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/soc/mediatek/mt8173-pm-domains.h
View File

@ -34,7 +34,7 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = {
.ctl_offs = SPM_DIS_PWR_CON,
.sram_pdn_bits = GENMASK(11, 8),
.sram_pdn_ack_bits = GENMASK(12, 12),
.bp_infracfg = {
.bp_infracfg[0] = {
.bus_prot_reg_update = true,
.bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MM_M0 |
MT8173_TOP_AXI_PROT_EN_MM_M1,
@ -76,7 +76,7 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = {
.ctl_offs = SPM_MFG_PWR_CON,
.sram_pdn_bits = GENMASK(13, 8),
.sram_pdn_ack_bits = GENMASK(21, 16),
.bp_infracfg = {
.bp_infracfg[0] = {
.bus_prot_reg_update = true,
.bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MFG_S |
MT8173_TOP_AXI_PROT_EN_MFG_M0 |

36
drivers/soc/mediatek/mtk-pm-domains.c
View File

@ -88,24 +88,40 @@ static int scpsys_sram_disable(struct scpsys_domain *pd)
static int scpsys_bus_protect_enable(struct scpsys_domain *pd)
{
const struct scpsys_bus_prot_data *bp_data = &pd->data->bp_infracfg;
const struct scpsys_bus_prot_data *bpd = pd->data->bp_infracfg;
int i, ret;
if (!bp_data->bus_prot_mask)
return 0;
for (i = 0; i < SPM_MAX_BUS_PROT_DATA; i++) {
if (!bpd[i].bus_prot_mask)
break;
return mtk_infracfg_set_bus_protection(pd->infracfg, bp_data->bus_prot_mask,
bp_data->bus_prot_reg_update);
ret = mtk_infracfg_set_bus_protection(pd->infracfg,
bpd[i].bus_prot_mask,
bpd[i].bus_prot_reg_update);
if (ret)
return ret;
}
return 0;
}
static int scpsys_bus_protect_disable(struct scpsys_domain *pd)
{
const struct scpsys_bus_prot_data *bp_data = &pd->data->bp_infracfg;
const struct scpsys_bus_prot_data *bpd = pd->data->bp_infracfg;
int i, ret;
if (!bp_data->bus_prot_mask)
return 0;
for (i = SPM_MAX_BUS_PROT_DATA; i > 0; i--) {
if (!bpd[i].bus_prot_mask)
continue;
return mtk_infracfg_clear_bus_protection(pd->infracfg, bp_data->bus_prot_mask,
bp_data->bus_prot_reg_update);
ret = mtk_infracfg_clear_bus_protection(pd->infracfg,
bpd[i].bus_prot_mask,
bpd[i].bus_prot_reg_update);
if (ret)
return ret;
}
return 0;
}
static int scpsys_power_on(struct generic_pm_domain *genpd)

4
drivers/soc/mediatek/mtk-pm-domains.h
View File

@ -32,6 +32,8 @@
#define PWR_STATUS_AUDIO BIT(24)
#define PWR_STATUS_USB BIT(25)
#define SPM_MAX_BUS_PROT_DATA 5
struct scpsys_bus_prot_data {
u32 bus_prot_mask;
bool bus_prot_reg_update;
@ -52,7 +54,7 @@ struct scpsys_domain_data {
u32 sram_pdn_bits;
u32 sram_pdn_ack_bits;
u8 caps;
const struct scpsys_bus_prot_data bp_infracfg;
const struct scpsys_bus_prot_data bp_infracfg[SPM_MAX_BUS_PROT_DATA];
};
struct scpsys_soc_data {