lkml.org 
[lkml]   [2021]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/6] interconnect: icc-rpm: Define ICC device type
    Date
    The driver currently uses .is_bimc_node to distinguish device type BIMC
    from NOC. Define type for bus/noc devices like what downstream[1] does
    to make support for more types easier.

    [1] https://source.codeaurora.org/quic/la/kernel/msm-4.19/tree/drivers/soc/qcom/msm_bus/msm_bus_core.h?h=kernel.lnx.4.19.r22-rel#n46

    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    ---
    drivers/interconnect/qcom/icc-rpm.c | 4 ++--
    drivers/interconnect/qcom/icc-rpm.h | 11 ++++++++---
    drivers/interconnect/qcom/msm8916.c | 4 +++-
    drivers/interconnect/qcom/msm8939.c | 5 ++++-
    drivers/interconnect/qcom/sdm660.c | 7 ++++++-
    5 files changed, 23 insertions(+), 8 deletions(-)

    diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
    index 35888721a690..264a9399fb28 100644
    --- a/drivers/interconnect/qcom/icc-rpm.c
    +++ b/drivers/interconnect/qcom/icc-rpm.c
    @@ -163,7 +163,7 @@ static int qcom_icc_qos_set(struct icc_node *node, u64 sum_bw)

    dev_dbg(node->provider->dev, "Setting QoS for %s\n", qn->name);

    - if (qp->is_bimc_node)
    + if (qp->type == QCOM_ICC_BIMC)
    return qcom_icc_set_bimc_qos(node, sum_bw);

    return qcom_icc_set_noc_qos(node, sum_bw);
    @@ -307,7 +307,7 @@ int qnoc_probe(struct platform_device *pdev)
    qp->bus_clks[i].id = cds[i];
    qp->num_clks = cd_num;

    - qp->is_bimc_node = desc->is_bimc_node;
    + qp->type = desc->type;
    qp->qos_offset = desc->qos_offset;

    if (desc->regmap_cfg) {
    diff --git a/drivers/interconnect/qcom/icc-rpm.h b/drivers/interconnect/qcom/icc-rpm.h
    index f5744de4da19..d8e77ce7fe06 100644
    --- a/drivers/interconnect/qcom/icc-rpm.h
    +++ b/drivers/interconnect/qcom/icc-rpm.h
    @@ -12,19 +12,24 @@
    #define to_qcom_provider(_provider) \
    container_of(_provider, struct qcom_icc_provider, provider)

    +enum qcom_icc_type {
    + QCOM_ICC_NOC,
    + QCOM_ICC_BIMC,
    +};
    +
    /**
    * struct qcom_icc_provider - Qualcomm specific interconnect provider
    * @provider: generic interconnect provider
    * @bus_clks: the clk_bulk_data table of bus clocks
    * @num_clks: the total number of clk_bulk_data entries
    - * @is_bimc_node: indicates whether to use bimc specific setting
    + * @type: the ICC provider type
    * @qos_offset: offset to QoS registers
    * @regmap: regmap for QoS registers read/write access
    */
    struct qcom_icc_provider {
    struct icc_provider provider;
    int num_clks;
    - bool is_bimc_node;
    + enum qcom_icc_type type;
    struct regmap *regmap;
    unsigned int qos_offset;
    struct clk_bulk_data bus_clks[];
    @@ -77,7 +82,7 @@ struct qcom_icc_desc {
    size_t num_nodes;
    const char * const *clocks;
    size_t num_clocks;
    - bool is_bimc_node;
    + enum qcom_icc_type type;
    const struct regmap_config *regmap_cfg;
    unsigned int qos_offset;
    };
    diff --git a/drivers/interconnect/qcom/msm8916.c b/drivers/interconnect/qcom/msm8916.c
    index e3c995b11357..2f397a7c3322 100644
    --- a/drivers/interconnect/qcom/msm8916.c
    +++ b/drivers/interconnect/qcom/msm8916.c
    @@ -1229,6 +1229,7 @@ static const struct regmap_config msm8916_snoc_regmap_config = {
    };

    static struct qcom_icc_desc msm8916_snoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = msm8916_snoc_nodes,
    .num_nodes = ARRAY_SIZE(msm8916_snoc_nodes),
    .regmap_cfg = &msm8916_snoc_regmap_config,
    @@ -1256,9 +1257,9 @@ static const struct regmap_config msm8916_bimc_regmap_config = {
    };

    static struct qcom_icc_desc msm8916_bimc = {
    + .type = QCOM_ICC_BIMC,
    .nodes = msm8916_bimc_nodes,
    .num_nodes = ARRAY_SIZE(msm8916_bimc_nodes),
    - .is_bimc_node = true,
    .regmap_cfg = &msm8916_bimc_regmap_config,
    .qos_offset = 0x8000,
    };
    @@ -1325,6 +1326,7 @@ static const struct regmap_config msm8916_pcnoc_regmap_config = {
    };

    static struct qcom_icc_desc msm8916_pcnoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = msm8916_pcnoc_nodes,
    .num_nodes = ARRAY_SIZE(msm8916_pcnoc_nodes),
    .regmap_cfg = &msm8916_pcnoc_regmap_config,
    diff --git a/drivers/interconnect/qcom/msm8939.c b/drivers/interconnect/qcom/msm8939.c
    index 16272a477bd8..d188f3636e4c 100644
    --- a/drivers/interconnect/qcom/msm8939.c
    +++ b/drivers/interconnect/qcom/msm8939.c
    @@ -1282,6 +1282,7 @@ static const struct regmap_config msm8939_snoc_regmap_config = {
    };

    static struct qcom_icc_desc msm8939_snoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = msm8939_snoc_nodes,
    .num_nodes = ARRAY_SIZE(msm8939_snoc_nodes),
    .regmap_cfg = &msm8939_snoc_regmap_config,
    @@ -1309,6 +1310,7 @@ static const struct regmap_config msm8939_snoc_mm_regmap_config = {
    };

    static struct qcom_icc_desc msm8939_snoc_mm = {
    + .type = QCOM_ICC_NOC,
    .nodes = msm8939_snoc_mm_nodes,
    .num_nodes = ARRAY_SIZE(msm8939_snoc_mm_nodes),
    .regmap_cfg = &msm8939_snoc_mm_regmap_config,
    @@ -1336,9 +1338,9 @@ static const struct regmap_config msm8939_bimc_regmap_config = {
    };

    static struct qcom_icc_desc msm8939_bimc = {
    + .type = QCOM_ICC_BIMC,
    .nodes = msm8939_bimc_nodes,
    .num_nodes = ARRAY_SIZE(msm8939_bimc_nodes),
    - .is_bimc_node = true,
    .regmap_cfg = &msm8939_bimc_regmap_config,
    .qos_offset = 0x8000,
    };
    @@ -1407,6 +1409,7 @@ static const struct regmap_config msm8939_pcnoc_regmap_config = {
    };

    static struct qcom_icc_desc msm8939_pcnoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = msm8939_pcnoc_nodes,
    .num_nodes = ARRAY_SIZE(msm8939_pcnoc_nodes),
    .regmap_cfg = &msm8939_pcnoc_regmap_config,
    diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c
    index 471bb88f8828..274a7139fe1a 100644
    --- a/drivers/interconnect/qcom/sdm660.c
    +++ b/drivers/interconnect/qcom/sdm660.c
    @@ -1513,6 +1513,7 @@ static const struct regmap_config sdm660_a2noc_regmap_config = {
    };

    static struct qcom_icc_desc sdm660_a2noc = {
    + .type = QCOM_ICC_NOC,
    .nodes = sdm660_a2noc_nodes,
    .num_nodes = ARRAY_SIZE(sdm660_a2noc_nodes),
    .clocks = bus_a2noc_clocks,
    @@ -1540,9 +1541,9 @@ static const struct regmap_config sdm660_bimc_regmap_config = {
    };

    static struct qcom_icc_desc sdm660_bimc = {
    + .type = QCOM_ICC_BIMC,
    .nodes = sdm660_bimc_nodes,
    .num_nodes = ARRAY_SIZE(sdm660_bimc_nodes),
    - .is_bimc_node = true,
    .regmap_cfg = &sdm660_bimc_regmap_config,
    };

    @@ -1594,6 +1595,7 @@ static const struct regmap_config sdm660_cnoc_regmap_config = {
    };

    static struct qcom_icc_desc sdm660_cnoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = sdm660_cnoc_nodes,
    .num_nodes = ARRAY_SIZE(sdm660_cnoc_nodes),
    .regmap_cfg = &sdm660_cnoc_regmap_config,
    @@ -1614,6 +1616,7 @@ static const struct regmap_config sdm660_gnoc_regmap_config = {
    };

    static struct qcom_icc_desc sdm660_gnoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = sdm660_gnoc_nodes,
    .num_nodes = ARRAY_SIZE(sdm660_gnoc_nodes),
    .regmap_cfg = &sdm660_gnoc_regmap_config,
    @@ -1653,6 +1656,7 @@ static const struct regmap_config sdm660_mnoc_regmap_config = {
    };

    static struct qcom_icc_desc sdm660_mnoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = sdm660_mnoc_nodes,
    .num_nodes = ARRAY_SIZE(sdm660_mnoc_nodes),
    .clocks = bus_mm_clocks,
    @@ -1689,6 +1693,7 @@ static const struct regmap_config sdm660_snoc_regmap_config = {
    };

    static struct qcom_icc_desc sdm660_snoc = {
    + .type = QCOM_ICC_NOC,
    .nodes = sdm660_snoc_nodes,
    .num_nodes = ARRAY_SIZE(sdm660_snoc_nodes),
    .regmap_cfg = &sdm660_snoc_regmap_config,
    --
    2.17.1
    \
     
     \ /
      Last update: 2021-11-22 09:52    [W:3.194 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site