From: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Georgi Djakov <djakov@kernel.org>
Cc: Shawn Guo <shawn.guo@linaro.org>,
Yassine Oudjana <y.oudjana@protonmail.com>,
linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH v2 05/11] interconnect: icc-rpm: add support for QoS reg offset
Date: Sat, 4 Sep 2021 12:59:40 +0200 [thread overview]
Message-ID: <1ed29d4b-e239-36d0-d98c-6a460fcb4566@somainline.org> (raw)
In-Reply-To: <20210903232421.1384199-6-dmitry.baryshkov@linaro.org>
Il 04/09/21 01:24, Dmitry Baryshkov ha scritto:
> SDM660 driver expects to have QoS registers at the beginning of NoC
> address space (sdm660 platform shifts NoC base address). Add support for
> using QoS register offset, so that other platforms do not have to change
> existing device trees.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested on Sony Xperia XA2 (sdm630-pioneer)
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
> ---
> drivers/interconnect/qcom/icc-rpm.c | 24 ++++++++++++++----------
> drivers/interconnect/qcom/icc-rpm.h | 3 +++
> 2 files changed, 17 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
> index b8bac738c64f..384b571fffec 100644
> --- a/drivers/interconnect/qcom/icc-rpm.c
> +++ b/drivers/interconnect/qcom/icc-rpm.c
> @@ -39,7 +39,7 @@
> #define NOC_QOS_MODEn_ADDR(n) (0xc + (n * 0x1000))
> #define NOC_QOS_MODEn_MASK 0x3
>
> -static int qcom_icc_bimc_set_qos_health(struct regmap *rmap,
> +static int qcom_icc_bimc_set_qos_health(struct qcom_icc_provider *qp,
> struct qcom_icc_qos *qos,
> int regnum)
> {
> @@ -58,8 +58,8 @@ static int qcom_icc_bimc_set_qos_health(struct regmap *rmap,
> mask |= M_BKE_HEALTH_CFG_LIMITCMDS_MASK;
> }
>
> - return regmap_update_bits(rmap,
> - M_BKE_HEALTH_CFG_ADDR(regnum, qos->qos_port),
> + return regmap_update_bits(qp->regmap,
> + qp->qos_offset + M_BKE_HEALTH_CFG_ADDR(regnum, qos->qos_port),
> mask, val);
> }
>
> @@ -84,7 +84,7 @@ static int qcom_icc_set_bimc_qos(struct icc_node *src, u64 max_bw)
> */
> if (mode != NOC_QOS_MODE_BYPASS) {
> for (i = 3; i >= 0; i--) {
> - rc = qcom_icc_bimc_set_qos_health(qp->regmap,
> + rc = qcom_icc_bimc_set_qos_health(qp,
> &qn->qos, i);
> if (rc)
> return rc;
> @@ -94,11 +94,12 @@ static int qcom_icc_set_bimc_qos(struct icc_node *src, u64 max_bw)
> val = 1;
> }
>
> - return regmap_update_bits(qp->regmap, M_BKE_EN_ADDR(qn->qos.qos_port),
> + return regmap_update_bits(qp->regmap,
> + qp->qos_offset + M_BKE_EN_ADDR(qn->qos.qos_port),
> M_BKE_EN_EN_BMASK, val);
> }
>
> -static int qcom_icc_noc_set_qos_priority(struct regmap *rmap,
> +static int qcom_icc_noc_set_qos_priority(struct qcom_icc_provider *qp,
> struct qcom_icc_qos *qos)
> {
> u32 val;
> @@ -106,12 +107,14 @@ static int qcom_icc_noc_set_qos_priority(struct regmap *rmap,
>
> /* Must be updated one at a time, P1 first, P0 last */
> val = qos->areq_prio << NOC_QOS_PRIORITY_P1_SHIFT;
> - rc = regmap_update_bits(rmap, NOC_QOS_PRIORITYn_ADDR(qos->qos_port),
> + rc = regmap_update_bits(qp->regmap,
> + qp->qos_offset + NOC_QOS_PRIORITYn_ADDR(qos->qos_port),
> NOC_QOS_PRIORITY_P1_MASK, val);
> if (rc)
> return rc;
>
> - return regmap_update_bits(rmap, NOC_QOS_PRIORITYn_ADDR(qos->qos_port),
> + return regmap_update_bits(qp->regmap,
> + qp->qos_offset + NOC_QOS_PRIORITYn_ADDR(qos->qos_port),
> NOC_QOS_PRIORITY_P0_MASK, qos->prio_level);
> }
>
> @@ -140,7 +143,7 @@ static int qcom_icc_set_noc_qos(struct icc_node *src, u64 max_bw)
> if (mode == NOC_QOS_MODE_FIXED) {
> dev_dbg(src->provider->dev, "NoC QoS: %s: Set Fixed mode\n",
> qn->name);
> - rc = qcom_icc_noc_set_qos_priority(qp->regmap, &qn->qos);
> + rc = qcom_icc_noc_set_qos_priority(qp, &qn->qos);
> if (rc)
> return rc;
> } else if (mode == NOC_QOS_MODE_BYPASS) {
> @@ -149,7 +152,7 @@ static int qcom_icc_set_noc_qos(struct icc_node *src, u64 max_bw)
> }
>
> return regmap_update_bits(qp->regmap,
> - NOC_QOS_MODEn_ADDR(qn->qos.qos_port),
> + qp->qos_offset + NOC_QOS_MODEn_ADDR(qn->qos.qos_port),
> NOC_QOS_MODEn_MASK, mode);
> }
>
> @@ -305,6 +308,7 @@ int qnoc_probe(struct platform_device *pdev)
> qp->num_clks = cd_num;
>
> qp->is_bimc_node = desc->is_bimc_node;
> + qp->qos_offset = desc->qos_offset;
>
> if (desc->regmap_cfg) {
> struct resource *res;
> diff --git a/drivers/interconnect/qcom/icc-rpm.h b/drivers/interconnect/qcom/icc-rpm.h
> index 868585c80f38..f6746dabdf28 100644
> --- a/drivers/interconnect/qcom/icc-rpm.h
> +++ b/drivers/interconnect/qcom/icc-rpm.h
> @@ -18,6 +18,7 @@
> * @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
> + * @qos_offset: offset to QoS registers
> * @regmap: regmap for QoS registers read/write access
> */
> struct qcom_icc_provider {
> @@ -25,6 +26,7 @@ struct qcom_icc_provider {
> int num_clks;
> bool is_bimc_node;
> struct regmap *regmap;
> + unsigned int qos_offset;
> struct clk_bulk_data bus_clks[];
> };
>
> @@ -77,6 +79,7 @@ struct qcom_icc_desc {
> size_t num_clocks;
> bool is_bimc_node;
> const struct regmap_config *regmap_cfg;
> + unsigned int qos_offset;
> };
>
> #define DEFINE_QNODE(_name, _id, _buswidth, _mas_rpm_id, _slv_rpm_id, \
>
next prev parent reply other threads:[~2021-09-04 10:59 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 23:24 [PATCH v2 0/11] interconnect: merge AP-owned support into icc-rpm Dmitry Baryshkov
2021-09-03 23:24 ` [PATCH v2 01/11] interconnect: icc-rpm: move bus clocks handling into qnoc_probe Dmitry Baryshkov
2021-09-04 10:58 ` AngeloGioacchino Del Regno
2021-09-04 11:04 ` Marijn Suijten
2021-10-04 11:49 ` Georgi Djakov
2021-09-03 23:24 ` [PATCH v2 02/11] interconnect: sdm660: expand DEFINE_QNODE macros Dmitry Baryshkov
2021-09-04 10:58 ` AngeloGioacchino Del Regno
2021-09-04 10:58 ` AngeloGioacchino Del Regno
2021-09-04 11:05 ` Marijn Suijten
2021-09-03 23:24 ` [PATCH v2 03/11] interconnect: sdm660: drop default/unused values Dmitry Baryshkov
2021-09-04 10:59 ` AngeloGioacchino Del Regno
2021-09-04 11:05 ` Marijn Suijten
2021-09-03 23:24 ` [PATCH v2 04/11] interconnect: sdm660: merge common code into icc-rpm Dmitry Baryshkov
2021-09-04 10:59 ` AngeloGioacchino Del Regno
2021-09-04 11:05 ` Marijn Suijten
2021-10-04 11:54 ` Georgi Djakov
2021-09-03 23:24 ` [PATCH v2 05/11] interconnect: icc-rpm: add support for QoS reg offset Dmitry Baryshkov
2021-09-04 10:59 ` AngeloGioacchino Del Regno [this message]
2021-09-03 23:24 ` [PATCH v2 06/11] interconnect: msm8916: expand DEFINE_QNODE macros Dmitry Baryshkov
2021-09-04 10:59 ` AngeloGioacchino Del Regno
2021-09-03 23:24 ` [PATCH v2 07/11] interconnect: msm8916: add support for AP-owned nodes Dmitry Baryshkov
2021-09-04 11:00 ` AngeloGioacchino Del Regno
2021-09-03 23:24 ` [PATCH v2 08/11] interconnect: msm8939: expand DEFINE_QNODE macros Dmitry Baryshkov
2021-09-04 11:00 ` AngeloGioacchino Del Regno
2021-09-03 23:24 ` [PATCH v2 09/11] interconnect: msm8939: add support for AP-owned nodes Dmitry Baryshkov
2021-09-04 11:00 ` AngeloGioacchino Del Regno
2021-09-03 23:24 ` [PATCH v2 10/11] interconnect: qcs404: expand DEFINE_QNODE macros Dmitry Baryshkov
2021-09-04 11:00 ` AngeloGioacchino Del Regno
2021-09-03 23:24 ` [PATCH v2 11/11] interconnect: qcom: drop DEFINE_QNODE macro Dmitry Baryshkov
2021-09-04 11:00 ` AngeloGioacchino Del Regno
2021-09-04 11:05 ` Marijn Suijten
2021-09-06 5:42 ` [PATCH v2 0/11] interconnect: merge AP-owned support into icc-rpm Shawn Guo
2021-09-25 19:40 ` Dmitry Baryshkov
2021-10-04 11:56 ` Georgi Djakov
2021-10-04 12:37 ` Dmitry Baryshkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1ed29d4b-e239-36d0-d98c-6a460fcb4566@somainline.org \
--to=angelogioacchino.delregno@somainline.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=djakov@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=shawn.guo@linaro.org \
--cc=y.oudjana@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox