Commit 863ed40e authored by Georgi Djakov's avatar Georgi Djakov
Browse files

Merge branch 'icc-ip0-migration' into icc-next 

Commits 2f372493 ("interconnect: qcom: sc7180: Drop IP0
interconnects") and 2fb251c2 ("interconnect: qcom: sdx55: Drop IP0
interconnects") removed IP0 interconnects (and ipa-virt devices support)
in favour of the RPMH clocks. Follow this example for other platforms
defining IP0 RPMH resource. While we are at it, remove several leftover
from the mentioned patches.

* icc-ip0-migration:
  interconnect: qcom: sdx55: drop IP0 remnants
  interconnect: qcom: sc7180: drop IP0 remnants
  interconnect: move ignore_list out of of_count_icc_providers()
  interconnect: qcom: sm8150: Drop IP0 interconnects
  interconnect: qcom: sm8250: Drop IP0 interconnects
  interconnect: qcom: sc8180x: Drop IP0 interconnects
  interconnect: qcom: sc8280xp: Drop IP0 interconnects
  dt-bindings: interconnect: qcom: Remove ipa-virt compatibles
  dt-bindings: interconnect: qcom: drop IPA_CORE related defines

Link: https://lore.kernel.org/r/20230109002935.244320-1-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parents 163ea204 e51c94dd

Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml

+0 −3
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ properties: 
      - qcom,sc8180x-config-noc

      - qcom,sc8180x-dc-noc

      - qcom,sc8180x-gem-noc

      - qcom,sc8180x-ipa-virt

      - qcom,sc8180x-mc-virt

      - qcom,sc8180x-mmss-noc

      - qcom,sc8180x-qup-virt
@@ -96,7 +95,6 @@ properties: 
      - qcom,sm8150-config-noc

      - qcom,sm8150-dc-noc

      - qcom,sm8150-gem-noc

      - qcom,sm8150-ipa-virt

      - qcom,sm8150-mc-virt

      - qcom,sm8150-mmss-noc

      - qcom,sm8150-system-noc
@@ -106,7 +104,6 @@ properties: 
      - qcom,sm8250-config-noc

      - qcom,sm8250-dc-noc

      - qcom,sm8250-gem-noc

      - qcom,sm8250-ipa-virt

      - qcom,sm8250-mc-virt

      - qcom,sm8250-mmss-noc

      - qcom,sm8250-npu-noc

drivers/interconnect/core.c

+9 −5
Original line number Diff line number Diff line
@@ -1079,16 +1079,20 @@ void icc_provider_del(struct icc_provider *provider) 
}

EXPORT_SYMBOL_GPL(icc_provider_del);



static int of_count_icc_providers(struct device_node *np)

{

	struct device_node *child;

	int count = 0;

	const struct of_device_id __maybe_unused ignore_list[] = {

static const struct of_device_id __maybe_unused ignore_list[] = {

	{ .compatible = "qcom,sc7180-ipa-virt" },

	{ .compatible = "qcom,sc8180x-ipa-virt" },

	{ .compatible = "qcom,sdx55-ipa-virt" },

	{ .compatible = "qcom,sm8150-ipa-virt" },

	{ .compatible = "qcom,sm8250-ipa-virt" },

	{}

};



static int of_count_icc_providers(struct device_node *np)

{

	struct device_node *child;

	int count = 0;



	for_each_available_child_of_node(np, child) {

		if (of_property_read_bool(child, "#interconnect-cells") &&

		    likely(!of_match_node(ignore_list, child)))

drivers/interconnect/qcom/sc7180.h

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#define SC7180_MASTER_APPSS_PROC			0

#define SC7180_MASTER_SYS_TCU				1

#define SC7180_MASTER_NPU_SYS				2

#define SC7180_MASTER_IPA_CORE				3

/* 3 was used by MASTER_IPA_CORE, now represented as RPMh clock */

#define SC7180_MASTER_LLCC				4

#define SC7180_MASTER_A1NOC_CFG				5

#define SC7180_MASTER_A2NOC_CFG				6
@@ -58,7 +58,7 @@ 
#define SC7180_MASTER_USB3				47

#define SC7180_MASTER_EMMC				48

#define SC7180_SLAVE_EBI1				49

#define SC7180_SLAVE_IPA_CORE				50

/* 50 was used by SLAVE_IPA_CORE, now represented as RPMh clock */

#define SC7180_SLAVE_A1NOC_CFG				51

#define SC7180_SLAVE_A2NOC_CFG				52

#define SC7180_SLAVE_AHB2PHY_SOUTH			53

drivers/interconnect/qcom/sc8180x.c

+0 −38
Original line number Diff line number Diff line
@@ -469,15 +469,6 @@ static struct qcom_icc_node mas_qxm_ecc = { 
	.links = { SC8180X_SLAVE_LLCC }

};



static struct qcom_icc_node mas_ipa_core_master = {

	.name = "mas_ipa_core_master",

	.id = SC8180X_MASTER_IPA_CORE,

	.channels = 1,

	.buswidth = 8,

	.num_links = 1,

	.links = { SC8180X_SLAVE_IPA_CORE }

};



static struct qcom_icc_node mas_llcc_mc = {

	.name = "mas_llcc_mc",

	.id = SC8180X_MASTER_LLCC,
@@ -1201,13 +1192,6 @@ static struct qcom_icc_node slv_srvc_gemnoc1 = { 
	.buswidth = 4

};



static struct qcom_icc_node slv_ipa_core_slave = {

	.name = "slv_ipa_core_slave",

	.id = SC8180X_SLAVE_IPA_CORE,

	.channels = 1,

	.buswidth = 8

};



static struct qcom_icc_node slv_ebi = {

	.name = "slv_ebi",

	.id = SC8180X_SLAVE_EBI_CH0,
@@ -1524,11 +1508,6 @@ static struct qcom_icc_bcm bcm_co2 = { 
	.nodes = { &mas_qnm_npu }

};



static struct qcom_icc_bcm bcm_ip0 = {

	.name = "IP0",

	.nodes = { &slv_ipa_core_slave }

};



static struct qcom_icc_bcm bcm_sn3 = {

	.name = "SN3",

	.keepalive = true,
@@ -1604,10 +1583,6 @@ static struct qcom_icc_bcm * const gem_noc_bcms[] = { 
	&bcm_sh3,

};



static struct qcom_icc_bcm * const ipa_virt_bcms[] = {

	&bcm_ip0,

};



static struct qcom_icc_bcm * const mc_virt_bcms[] = {

	&bcm_mc0,

	&bcm_acv,
@@ -1766,11 +1741,6 @@ static struct qcom_icc_node * const gem_noc_nodes[] = { 
	[SLAVE_SERVICE_GEM_NOC_1] = &slv_srvc_gemnoc1,

};



static struct qcom_icc_node * const ipa_virt_nodes[] = {

	[MASTER_IPA_CORE] = &mas_ipa_core_master,

	[SLAVE_IPA_CORE] = &slv_ipa_core_slave,

};



static struct qcom_icc_node * const mc_virt_nodes[] = {

	[MASTER_LLCC] = &mas_llcc_mc,

	[SLAVE_EBI_CH0] = &slv_ebi,
@@ -1857,13 +1827,6 @@ static const struct qcom_icc_desc sc8180x_gem_noc = { 
	.num_bcms = ARRAY_SIZE(gem_noc_bcms),

};



static const struct qcom_icc_desc sc8180x_ipa_virt  = {

	.nodes = ipa_virt_nodes,

	.num_nodes = ARRAY_SIZE(ipa_virt_nodes),

	.bcms = ipa_virt_bcms,

	.num_bcms = ARRAY_SIZE(ipa_virt_bcms),

};



static const struct qcom_icc_desc sc8180x_mc_virt  = {

	.nodes = mc_virt_nodes,

	.num_nodes = ARRAY_SIZE(mc_virt_nodes),
@@ -1913,7 +1876,6 @@ static const struct of_device_id qnoc_of_match[] = { 
	{ .compatible = "qcom,sc8180x-config-noc", .data = &sc8180x_config_noc },

	{ .compatible = "qcom,sc8180x-dc-noc", .data = &sc8180x_dc_noc },

	{ .compatible = "qcom,sc8180x-gem-noc", .data = &sc8180x_gem_noc },

	{ .compatible = "qcom,sc8180x-ipa-virt", .data = &sc8180x_ipa_virt },

	{ .compatible = "qcom,sc8180x-mc-virt", .data = &sc8180x_mc_virt },

	{ .compatible = "qcom,sc8180x-mmss-noc", .data = &sc8180x_mmss_noc },

	{ .compatible = "qcom,sc8180x-qup-virt", .data = &sc8180x_qup_virt },

drivers/interconnect/qcom/sc8180x.h

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#define SC8180X_MASTER_SNOC_GC_MEM_NOC		41

#define SC8180X_MASTER_SNOC_SF_MEM_NOC		42

#define SC8180X_MASTER_ECC			43

#define SC8180X_MASTER_IPA_CORE			44

/* 44 was used by MASTER_IPA_CORE, now represented as RPMh clock */

#define SC8180X_MASTER_LLCC			45

#define SC8180X_MASTER_CNOC_MNOC_CFG		46

#define SC8180X_MASTER_CAMNOC_HF0		47
@@ -146,7 +146,7 @@ 
#define SC8180X_SLAVE_LLCC			136

#define SC8180X_SLAVE_SERVICE_GEM_NOC		137

#define SC8180X_SLAVE_SERVICE_GEM_NOC_1		138

#define SC8180X_SLAVE_IPA_CORE			139

/* 139 was used by SLAVE_IPA_CORE, now represented as RPMh clock */

#define SC8180X_SLAVE_EBI_CH0			140

#define SC8180X_SLAVE_MNOC_SF_MEM_NOC		141

#define SC8180X_SLAVE_MNOC_HF_MEM_NOC		142