From: Peng Fan <[email protected]>
i.MX93 mediamix blk ctrl has registers to set QoS(priority) value.
It support default QoS value and cfg QoS value. Set an initial
value from i.MX design team. If LCDIF/ISI/PXP wanna a different QoS
value in future, they could use interconnect to request bandwidth.
Signed-off-by: Peng Fan <[email protected]>
---
V1:
This patch is based on
https://lore.kernel.org/all/[email protected]/
drivers/soc/imx/imx93-blk-ctrl.c | 113 +++++++++++++++++++++++++++++--
1 file changed, 109 insertions(+), 4 deletions(-)
diff --git a/drivers/soc/imx/imx93-blk-ctrl.c b/drivers/soc/imx/imx93-blk-ctrl.c
index 42be09688cf1..614de7396680 100644
--- a/drivers/soc/imx/imx93-blk-ctrl.c
+++ b/drivers/soc/imx/imx93-blk-ctrl.c
@@ -20,6 +20,30 @@
#define BLK_MAX_CLKS 4
+#define LCDIF_QOS_REG 0xC
+#define LCDIF_DEFAULT_QOS_OFF 12
+#define LCDIF_CFG_QOS_OFF 8
+
+#define PXP_QOS_REG 0x10
+#define PXP_R_DEFAULT_QOS_OFF 28
+#define PXP_R_CFG_QOS_OFF 24
+#define PXP_W_DEFAULT_QOS_OFF 20
+#define PXP_W_CFG_QOS_OFF 16
+
+#define ISI_QOS_REG 0x1C
+#define ISI_V_DEFAULT_QOS_OFF 28
+#define ISI_V_CFG_QOS_OFF 24
+#define ISI_U_DEFAULT_QOS_OFF 20
+#define ISI_U_CFG_QOS_OFF 16
+#define ISI_Y_R_DEFAULT_QOS_OFF 12
+#define ISI_Y_R_CFG_QOS_OFF 8
+#define ISI_Y_W_DEFAULT_QOS_OFF 4
+#define ISI_Y_W_CFG_QOS_OFF 0
+
+#define PRIO_MASK 0xF
+
+#define PRIO(X) (X)
+
struct imx93_blk_ctrl_domain;
struct imx93_blk_ctrl {
@@ -31,13 +55,23 @@ struct imx93_blk_ctrl {
struct genpd_onecell_data onecell_data;
};
+#define DOMAIN_MAX_QOS 4
+
+struct imx93_blk_ctrl_qos {
+ u32 reg;
+ u32 cfg_off;
+ u32 default_prio;
+ u32 cfg_prio;
+};
+
struct imx93_blk_ctrl_domain_data {
const char *name;
const char * const *clk_names;
int num_clks;
u32 rst_mask;
u32 clk_mask;
-
+ u32 num_qos;
+ struct imx93_blk_ctrl_qos qos[DOMAIN_MAX_QOS];
};
#define DOMAIN_MAX_CLKS 4
@@ -67,6 +101,30 @@ to_imx93_blk_ctrl_domain(struct generic_pm_domain *genpd)
return container_of(genpd, struct imx93_blk_ctrl_domain, genpd);
}
+static int imx93_blk_ctrl_set_qos(struct imx93_blk_ctrl_domain *domain)
+{
+ const struct imx93_blk_ctrl_domain_data *data = domain->data;
+ struct imx93_blk_ctrl *bc = domain->bc;
+ const struct imx93_blk_ctrl_qos *qos;
+ u32 val, mask;
+ int i;
+
+ for (i = 0; i < data->num_qos; i++) {
+ qos = &data->qos[i];
+
+ mask = PRIO_MASK << qos->cfg_off;
+ mask |= PRIO_MASK << (qos->cfg_off + 4);
+ val = qos->cfg_prio << qos->cfg_off;
+ val |= qos->default_prio << (qos->cfg_off + 4);
+
+ regmap_write_bits(bc->regmap, qos->reg, mask, val);
+
+ dev_dbg(bc->dev, "data->qos[i].reg 0x%x 0x%x\n", qos->reg, val);
+ }
+
+ return 0;
+}
+
static int imx93_blk_ctrl_power_on(struct generic_pm_domain *genpd)
{
struct imx93_blk_ctrl_domain *domain = to_imx93_blk_ctrl_domain(genpd);
@@ -99,9 +157,9 @@ static int imx93_blk_ctrl_power_on(struct generic_pm_domain *genpd)
/* release reset */
regmap_set_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);
- dev_info(bc->dev, "pd_on: name: %s\n", genpd->name);
+ dev_dbg(bc->dev, "pd_on: name: %s\n", genpd->name);
- return 0;
+ return imx93_blk_ctrl_set_qos(domain);
disable_clk:
clk_bulk_disable_unprepare(data->num_clks, domain->clks);
@@ -115,7 +173,7 @@ static int imx93_blk_ctrl_power_off(struct generic_pm_domain *genpd)
const struct imx93_blk_ctrl_domain_data *data = domain->data;
struct imx93_blk_ctrl *bc = domain->bc;
- dev_info(bc->dev, "pd_off: name: %s\n", genpd->name);
+ dev_dbg(bc->dev, "pd_off: name: %s\n", genpd->name);
regmap_clear_bits(bc->regmap, BLK_SFT_RSTN, data->rst_mask);
regmap_set_bits(bc->regmap, BLK_CLK_EN, data->clk_mask);
@@ -288,6 +346,20 @@ static const struct imx93_blk_ctrl_domain_data imx93_media_blk_ctl_domain_data[]
.num_clks = 1,
.rst_mask = BIT(7) | BIT(8),
.clk_mask = BIT(7) | BIT(8),
+ .num_qos = 2,
+ .qos = {
+ {
+ .reg = PXP_QOS_REG,
+ .cfg_off = PXP_R_CFG_QOS_OFF,
+ .default_prio = PRIO(1),
+ .cfg_prio = PRIO(7),
+ }, {
+ .reg = PXP_QOS_REG,
+ .cfg_off = PXP_W_CFG_QOS_OFF,
+ .default_prio = PRIO(1),
+ .cfg_prio = PRIO(7),
+ }
+ }
},
[IMX93_MEDIABLK_PD_LCDIF] = {
.name = "mediablk-lcdif",
@@ -295,6 +367,15 @@ static const struct imx93_blk_ctrl_domain_data imx93_media_blk_ctl_domain_data[]
.num_clks = 2,
.rst_mask = BIT(4) | BIT(5) | BIT(6),
.clk_mask = BIT(4) | BIT(5) | BIT(6),
+ .num_qos = 1,
+ .qos = {
+ {
+ .reg = LCDIF_QOS_REG,
+ .cfg_off = LCDIF_CFG_QOS_OFF,
+ .default_prio = PRIO(1),
+ .cfg_prio = PRIO(7),
+ }
+ }
},
[IMX93_MEDIABLK_PD_ISI] = {
.name = "mediablk-isi",
@@ -302,6 +383,30 @@ static const struct imx93_blk_ctrl_domain_data imx93_media_blk_ctl_domain_data[]
.num_clks = 1,
.rst_mask = BIT(2) | BIT(3),
.clk_mask = BIT(2) | BIT(3),
+ .num_qos = 4,
+ .qos = {
+ {
+ .reg = ISI_QOS_REG,
+ .cfg_off = ISI_Y_W_CFG_QOS_OFF,
+ .default_prio = PRIO(1),
+ .cfg_prio = PRIO(7),
+ }, {
+ .reg = ISI_QOS_REG,
+ .cfg_off = ISI_Y_R_CFG_QOS_OFF,
+ .default_prio = PRIO(1),
+ .cfg_prio = PRIO(7),
+ }, {
+ .reg = ISI_QOS_REG,
+ .cfg_off = ISI_U_CFG_QOS_OFF,
+ .default_prio = PRIO(1),
+ .cfg_prio = PRIO(7),
+ }, {
+ .reg = ISI_QOS_REG,
+ .cfg_off = ISI_V_CFG_QOS_OFF,
+ .default_prio = PRIO(1),
+ .cfg_prio = PRIO(7),
+ }
+ }
},
};
--
2.25.1
Hi Peng,
thanks for the patch.
On 22-07-25, Peng Fan (OSS) wrote:
> From: Peng Fan <[email protected]>
>
> i.MX93 mediamix blk ctrl has registers to set QoS(priority) value.
> It support default QoS value and cfg QoS value. Set an initial
> value from i.MX design team. If LCDIF/ISI/PXP wanna a different QoS
> value in future, they could use interconnect to request bandwidth.
I need to ask here. Does the iMX93 use the same interconnect as the
iMX8M* does?
Regards,
Marco
Hi Marco,
> Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
>
> Hi Peng,
>
> thanks for the patch.
>
> On 22-07-25, Peng Fan (OSS) wrote:
> > From: Peng Fan <[email protected]>
> >
> > i.MX93 mediamix blk ctrl has registers to set QoS(priority) value.
> > It support default QoS value and cfg QoS value. Set an initial value
> > from i.MX design team. If LCDIF/ISI/PXP wanna a different QoS value in
> > future, they could use interconnect to request bandwidth.
>
> I need to ask here. Does the iMX93 use the same interconnect as the
> iMX8M* does?
No. i.MX93 use different interconnect, it has different design,
the QoS priority register are distributed in blk ctrl.
The reference manual would be public soon I think, then you could
have more information.
Regards,
Peng.
>
> Regards,
> Marco
On 22-07-25, Peng Fan wrote:
> Hi Marco,
>
> > Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
> >
> > Hi Peng,
> >
> > thanks for the patch.
> >
> > On 22-07-25, Peng Fan (OSS) wrote:
> > > From: Peng Fan <[email protected]>
> > >
> > > i.MX93 mediamix blk ctrl has registers to set QoS(priority) value.
> > > It support default QoS value and cfg QoS value. Set an initial value
> > > from i.MX design team. If LCDIF/ISI/PXP wanna a different QoS value in
> > > future, they could use interconnect to request bandwidth.
> >
> > I need to ask here. Does the iMX93 use the same interconnect as the
> > iMX8M* does?
>
> No. i.MX93 use different interconnect, it has different design,
> the QoS priority register are distributed in blk ctrl.
Did just the interface change e.g. how you configure the interconnect or
is it a complete new interconnect?
> The reference manual would be public soon I think, then you could
> have more information.
Looking forward to it :)
Regards,
Marco
> Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
>
> On 22-07-25, Peng Fan wrote:
> > Hi Marco,
> >
> > > Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
> > >
> > > Hi Peng,
> > >
> > > thanks for the patch.
> > >
> > > On 22-07-25, Peng Fan (OSS) wrote:
> > > > From: Peng Fan <[email protected]>
> > > >
> > > > i.MX93 mediamix blk ctrl has registers to set QoS(priority) value.
> > > > It support default QoS value and cfg QoS value. Set an initial
> > > > value from i.MX design team. If LCDIF/ISI/PXP wanna a different
> > > > QoS value in future, they could use interconnect to request bandwidth.
> > >
> > > I need to ask here. Does the iMX93 use the same interconnect as the
> > > iMX8M* does?
> >
> > No. i.MX93 use different interconnect, it has different design, the
> > QoS priority register are distributed in blk ctrl.
>
> Did just the interface change e.g. how you configure the interconnect or is it
> a complete new interconnect?
It is different interconnect IP. The QoS(priority) register is not in a central
place, they are spread in the mix blk ctrl register space, most blk ctrl
has QoS. By configure the register in BLK CTRL, the QoS value will flow
into the interconnect IP.
But compared with i.MX8M, it is simpler.
Regards,
Peng.
>
> > The reference manual would be public soon I think, then you could have
> > more information.
>
> Looking forward to it :)
>
> Regards,
> Marco
Hi Peng,
On 22-07-25, Peng Fan wrote:
> > Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
> >
> > On 22-07-25, Peng Fan wrote:
> > > Hi Marco,
> > >
> > > > Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
> > > >
> > > > Hi Peng,
> > > >
> > > > thanks for the patch.
> > > >
> > > > On 22-07-25, Peng Fan (OSS) wrote:
> > > > > From: Peng Fan <[email protected]>
> > > > >
> > > > > i.MX93 mediamix blk ctrl has registers to set QoS(priority) value.
> > > > > It support default QoS value and cfg QoS value. Set an initial
> > > > > value from i.MX design team. If LCDIF/ISI/PXP wanna a different
> > > > > QoS value in future, they could use interconnect to request bandwidth.
> > > >
> > > > I need to ask here. Does the iMX93 use the same interconnect as the
> > > > iMX8M* does?
> > >
> > > No. i.MX93 use different interconnect, it has different design, the
> > > QoS priority register are distributed in blk ctrl.
> >
> > Did just the interface change e.g. how you configure the interconnect or is it
> > a complete new interconnect?
>
> It is different interconnect IP. The QoS(priority) register is not in a central
> place, they are spread in the mix blk ctrl register space, most blk ctrl
> has QoS. By configure the register in BLK CTRL, the QoS value will flow
> into the interconnect IP.
>
> But compared with i.MX8M, it is simpler.
Okay, I got both points. Just to be clear (and sorry for my persistency
here) it is not just a different IP interface for the NOC?
So to be on the same page with you: On the i.MX93 we now have the
BLKCTRL settting the interconnect priority and a interconnect setting
for advanced traffic shaping like bandwidth reservation?
Regards,
Marco
> Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
>
> Hi Peng,
>
> On 22-07-25, Peng Fan wrote:
> > > Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority level
> > >
> > > On 22-07-25, Peng Fan wrote:
> > > > Hi Marco,
> > > >
> > > > > Subject: Re: [PATCH] soc: imx: imx93-blk-ctrl: set priority
> > > > > level
> > > > >
> > > > > Hi Peng,
> > > > >
> > > > > thanks for the patch.
> > > > >
> > > > > On 22-07-25, Peng Fan (OSS) wrote:
> > > > > > From: Peng Fan <[email protected]>
> > > > > >
> > > > > > i.MX93 mediamix blk ctrl has registers to set QoS(priority) value.
> > > > > > It support default QoS value and cfg QoS value. Set an initial
> > > > > > value from i.MX design team. If LCDIF/ISI/PXP wanna a
> > > > > > different QoS value in future, they could use interconnect to
> request bandwidth.
> > > > >
> > > > > I need to ask here. Does the iMX93 use the same interconnect as
> > > > > the
> > > > > iMX8M* does?
> > > >
> > > > No. i.MX93 use different interconnect, it has different design,
> > > > the QoS priority register are distributed in blk ctrl.
> > >
> > > Did just the interface change e.g. how you configure the
> > > interconnect or is it a complete new interconnect?
> >
> > It is different interconnect IP. The QoS(priority) register is not in
> > a central place, they are spread in the mix blk ctrl register space,
> > most blk ctrl has QoS. By configure the register in BLK CTRL, the QoS
> > value will flow into the interconnect IP.
> >
> > But compared with i.MX8M, it is simpler.
>
> Okay, I got both points. Just to be clear (and sorry for my persistency
> here) it is not just a different IP interface for the NOC?
The interconnect IP is a different IP, not NOC. Before RM public,
I could not say what it is.
>
> So to be on the same page with you: On the i.MX93 we now have the
> BLKCTRL settting the interconnect priority and a interconnect setting for
> advanced traffic shaping like bandwidth reservation?
For mediamix, the programming registers is in mediamix blk ctrl.
Regards,
Peng.
>
> Regards,
> Marco