Skip to content

Commit 9ee5214

Browse files
author
Georgi Djakov
committed
Merge branch 'icc-acv-enable-mask' into icc-next
In the downstream kernel, ACV enable_mask has not been mentioned explicitly, rather being handled by a sneaky if-condition [1], [2]. Add it to all RPMh platforms to actually enable that BCM. [1] https://git.codelinaro.org/clo/la/kernel/msm-4.19/-/blob/LA.UM.10.2.1.c25/drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c#L556-567 [2] https://git.codelinaro.org/clo/la/kernel/msm-4.19/-/blob/LA.UM.10.2.1.c25/drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c#L475-495 * icc-acv-enable-mask interconnect: qcom: qdu1000: Set ACV enable_mask interconnect: qcom: sc7180: Set ACV enable_mask interconnect: qcom: sc7280: Set ACV enable_mask interconnect: qcom: sc8180x: Set ACV enable_mask interconnect: qcom: sc8280xp: Set ACV enable_mask interconnect: qcom: sdm670: Set ACV enable_mask interconnect: qcom: sdm845: Set ACV enable_mask interconnect: qcom: sm6350: Set ACV enable_mask interconnect: qcom: sm8150: Set ACV enable_mask interconnect: qcom: sm8250: Set ACV enable_mask interconnect: qcom: sm8350: Set ACV enable_mask Link: https://lore.kernel.org/r/20230811-topic-acv-v2-0-765ad70e539a@linaro.org Signed-off-by: Georgi Djakov <djakov@kernel.org>
2 parents 300e0fb + df1b835 commit 9ee5214

11 files changed

Lines changed: 11 additions & 0 deletions

File tree

drivers/interconnect/qcom/qdu1000.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,7 @@ static struct qcom_icc_node xs_sys_tcu_cfg = {
769769

770770
static struct qcom_icc_bcm bcm_acv = {
771771
.name = "ACV",
772+
.enable_mask = BIT(3),
772773
.num_nodes = 1,
773774
.nodes = { &ebi },
774775
};

drivers/interconnect/qcom/sc7180.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,6 +1238,7 @@ static struct qcom_icc_node xs_sys_tcu_cfg = {
12381238

12391239
static struct qcom_icc_bcm bcm_acv = {
12401240
.name = "ACV",
1241+
.enable_mask = BIT(3),
12411242
.keepalive = false,
12421243
.num_nodes = 1,
12431244
.nodes = { &ebi },

drivers/interconnect/qcom/sc7280.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,7 @@ static struct qcom_icc_node srvc_snoc = {
12851285

12861286
static struct qcom_icc_bcm bcm_acv = {
12871287
.name = "ACV",
1288+
.enable_mask = BIT(3),
12881289
.num_nodes = 1,
12891290
.nodes = { &ebi },
12901291
};

drivers/interconnect/qcom/sc8180x.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,6 +1345,7 @@ static struct qcom_icc_node slv_qup_core_2 = {
13451345

13461346
static struct qcom_icc_bcm bcm_acv = {
13471347
.name = "ACV",
1348+
.enable_mask = BIT(3),
13481349
.num_nodes = 1,
13491350
.nodes = { &slv_ebi }
13501351
};

drivers/interconnect/qcom/sc8280xp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,6 +1712,7 @@ static struct qcom_icc_node srvc_snoc = {
17121712

17131713
static struct qcom_icc_bcm bcm_acv = {
17141714
.name = "ACV",
1715+
.enable_mask = BIT(3),
17151716
.num_nodes = 1,
17161717
.nodes = { &ebi },
17171718
};

drivers/interconnect/qcom/sdm670.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,7 @@ static struct qcom_icc_node xs_sys_tcu_cfg = {
10471047

10481048
static struct qcom_icc_bcm bcm_acv = {
10491049
.name = "ACV",
1050+
.enable_mask = BIT(3),
10501051
.keepalive = false,
10511052
.num_nodes = 1,
10521053
.nodes = { &ebi },

drivers/interconnect/qcom/sdm845.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,7 @@ static struct qcom_icc_node xs_sys_tcu_cfg = {
12651265

12661266
static struct qcom_icc_bcm bcm_acv = {
12671267
.name = "ACV",
1268+
.enable_mask = BIT(3),
12681269
.keepalive = false,
12691270
.num_nodes = 1,
12701271
.nodes = { &ebi },

drivers/interconnect/qcom/sm6350.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,6 +1164,7 @@ static struct qcom_icc_node xs_sys_tcu_cfg = {
11641164

11651165
static struct qcom_icc_bcm bcm_acv = {
11661166
.name = "ACV",
1167+
.enable_mask = BIT(3),
11671168
.keepalive = false,
11681169
.num_nodes = 1,
11691170
.nodes = { &ebi },

drivers/interconnect/qcom/sm8150.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,6 +1282,7 @@ static struct qcom_icc_node xs_sys_tcu_cfg = {
12821282

12831283
static struct qcom_icc_bcm bcm_acv = {
12841284
.name = "ACV",
1285+
.enable_mask = BIT(3),
12851286
.keepalive = false,
12861287
.num_nodes = 1,
12871288
.nodes = { &ebi },

drivers/interconnect/qcom/sm8250.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,7 @@ static struct qcom_icc_node qup2_core_slave = {
13971397

13981398
static struct qcom_icc_bcm bcm_acv = {
13991399
.name = "ACV",
1400+
.enable_mask = BIT(3),
14001401
.keepalive = false,
14011402
.num_nodes = 1,
14021403
.nodes = { &ebi },

0 commit comments

Comments
 (0)