interconnect: imx: configure NoC mode/prioriry/ext_control
Introduce imx_icc_noc_setting structure to describe a master port setting Pass imx_icc_noc_setting as a parameter from specific driver Set priority level, mode, ext control in imx_icc_node_set Signed-off-by: Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/20220703091132.1412063-8-peng.fan@oss.nxp.com Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
parent
12db59e8e0
commit
7980d85a94
@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/interconnect-provider.h>
|
#include <linux/interconnect-provider.h>
|
||||||
|
#include <linux/io.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
@ -21,8 +22,10 @@
|
|||||||
/* private icc_node data */
|
/* private icc_node data */
|
||||||
struct imx_icc_node {
|
struct imx_icc_node {
|
||||||
const struct imx_icc_node_desc *desc;
|
const struct imx_icc_node_desc *desc;
|
||||||
|
const struct imx_icc_noc_setting *setting;
|
||||||
struct device *qos_dev;
|
struct device *qos_dev;
|
||||||
struct dev_pm_qos_request qos_req;
|
struct dev_pm_qos_request qos_req;
|
||||||
|
struct imx_icc_provider *imx_provider;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int imx_icc_get_bw(struct icc_node *node, u32 *avg, u32 *peak)
|
static int imx_icc_get_bw(struct icc_node *node, u32 *avg, u32 *peak)
|
||||||
@ -37,8 +40,30 @@ static int imx_icc_node_set(struct icc_node *node)
|
|||||||
{
|
{
|
||||||
struct device *dev = node->provider->dev;
|
struct device *dev = node->provider->dev;
|
||||||
struct imx_icc_node *node_data = node->data;
|
struct imx_icc_node *node_data = node->data;
|
||||||
|
void __iomem *base;
|
||||||
|
u32 prio;
|
||||||
u64 freq;
|
u64 freq;
|
||||||
|
|
||||||
|
if (node_data->setting && node->peak_bw) {
|
||||||
|
base = node_data->setting->reg + node_data->imx_provider->noc_base;
|
||||||
|
if (node_data->setting->mode == IMX_NOC_MODE_FIXED) {
|
||||||
|
prio = node_data->setting->prio_level;
|
||||||
|
prio = PRIORITY_COMP_MARK | (prio << 8) | prio;
|
||||||
|
writel(prio, base + IMX_NOC_PRIO_REG);
|
||||||
|
writel(node_data->setting->mode, base + IMX_NOC_MODE_REG);
|
||||||
|
writel(node_data->setting->ext_control, base + IMX_NOC_EXT_CTL_REG);
|
||||||
|
dev_dbg(dev, "%s: mode: 0x%x, prio: 0x%x, ext_control: 0x%x\n",
|
||||||
|
node_data->desc->name, node_data->setting->mode, prio,
|
||||||
|
node_data->setting->ext_control);
|
||||||
|
} else if (node_data->setting->mode == IMX_NOC_MODE_UNCONFIGURED) {
|
||||||
|
dev_dbg(dev, "%s: mode not unconfigured\n", node_data->desc->name);
|
||||||
|
} else {
|
||||||
|
dev_info(dev, "%s: mode: %d not supported\n",
|
||||||
|
node_data->desc->name, node_data->setting->mode);
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!node_data->qos_dev)
|
if (!node_data->qos_dev)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -135,7 +160,8 @@ static int imx_icc_node_init_qos(struct icc_provider *provider,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct icc_node *imx_icc_node_add(struct imx_icc_provider *imx_provider,
|
static struct icc_node *imx_icc_node_add(struct imx_icc_provider *imx_provider,
|
||||||
const struct imx_icc_node_desc *node_desc)
|
const struct imx_icc_node_desc *node_desc,
|
||||||
|
const struct imx_icc_noc_setting *setting)
|
||||||
{
|
{
|
||||||
struct icc_provider *provider = &imx_provider->provider;
|
struct icc_provider *provider = &imx_provider->provider;
|
||||||
struct device *dev = provider->dev;
|
struct device *dev = provider->dev;
|
||||||
@ -164,6 +190,8 @@ static struct icc_node *imx_icc_node_add(struct imx_icc_provider *imx_provider,
|
|||||||
node->name = node_desc->name;
|
node->name = node_desc->name;
|
||||||
node->data = node_data;
|
node->data = node_data;
|
||||||
node_data->desc = node_desc;
|
node_data->desc = node_desc;
|
||||||
|
node_data->setting = setting;
|
||||||
|
node_data->imx_provider = imx_provider;
|
||||||
icc_node_add(node, provider);
|
icc_node_add(node, provider);
|
||||||
|
|
||||||
if (node_desc->adj) {
|
if (node_desc->adj) {
|
||||||
@ -187,7 +215,8 @@ static void imx_icc_unregister_nodes(struct icc_provider *provider)
|
|||||||
|
|
||||||
static int imx_icc_register_nodes(struct imx_icc_provider *imx_provider,
|
static int imx_icc_register_nodes(struct imx_icc_provider *imx_provider,
|
||||||
const struct imx_icc_node_desc *descs,
|
const struct imx_icc_node_desc *descs,
|
||||||
int count)
|
int count,
|
||||||
|
const struct imx_icc_noc_setting *settings)
|
||||||
{
|
{
|
||||||
struct icc_provider *provider = &imx_provider->provider;
|
struct icc_provider *provider = &imx_provider->provider;
|
||||||
struct icc_onecell_data *provider_data = provider->data;
|
struct icc_onecell_data *provider_data = provider->data;
|
||||||
@ -199,7 +228,8 @@ static int imx_icc_register_nodes(struct imx_icc_provider *imx_provider,
|
|||||||
const struct imx_icc_node_desc *node_desc = &descs[i];
|
const struct imx_icc_node_desc *node_desc = &descs[i];
|
||||||
size_t j;
|
size_t j;
|
||||||
|
|
||||||
node = imx_icc_node_add(imx_provider, node_desc);
|
node = imx_icc_node_add(imx_provider, node_desc,
|
||||||
|
settings ? &settings[node_desc->id] : NULL);
|
||||||
if (IS_ERR(node)) {
|
if (IS_ERR(node)) {
|
||||||
ret = dev_err_probe(provider->dev, PTR_ERR(node),
|
ret = dev_err_probe(provider->dev, PTR_ERR(node),
|
||||||
"failed to add %s\n", node_desc->name);
|
"failed to add %s\n", node_desc->name);
|
||||||
@ -237,7 +267,8 @@ static int get_max_node_id(struct imx_icc_node_desc *nodes, int nodes_count)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int imx_icc_register(struct platform_device *pdev,
|
int imx_icc_register(struct platform_device *pdev,
|
||||||
struct imx_icc_node_desc *nodes, int nodes_count)
|
struct imx_icc_node_desc *nodes, int nodes_count,
|
||||||
|
struct imx_icc_noc_setting *settings)
|
||||||
{
|
{
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct icc_onecell_data *data;
|
struct icc_onecell_data *data;
|
||||||
@ -266,13 +297,22 @@ int imx_icc_register(struct platform_device *pdev,
|
|||||||
provider->dev = dev->parent;
|
provider->dev = dev->parent;
|
||||||
platform_set_drvdata(pdev, imx_provider);
|
platform_set_drvdata(pdev, imx_provider);
|
||||||
|
|
||||||
|
if (settings) {
|
||||||
|
imx_provider->noc_base = devm_of_iomap(dev, provider->dev->of_node, 0, NULL);
|
||||||
|
if (IS_ERR(imx_provider->noc_base)) {
|
||||||
|
ret = PTR_ERR(imx_provider->noc_base);
|
||||||
|
dev_err(dev, "Error mapping NoC: %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ret = icc_provider_add(provider);
|
ret = icc_provider_add(provider);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "error adding interconnect provider: %d\n", ret);
|
dev_err(dev, "error adding interconnect provider: %d\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = imx_icc_register_nodes(imx_provider, nodes, nodes_count);
|
ret = imx_icc_register_nodes(imx_provider, nodes, nodes_count, settings);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto provider_del;
|
goto provider_del;
|
||||||
|
|
||||||
|
@ -15,6 +15,32 @@
|
|||||||
|
|
||||||
#define IMX_ICC_MAX_LINKS 4
|
#define IMX_ICC_MAX_LINKS 4
|
||||||
|
|
||||||
|
/*
|
||||||
|
* High throughput priority level in Regulator mode
|
||||||
|
* Read Priority in Fixed/Limiter mode
|
||||||
|
*/
|
||||||
|
#define PRIORITY0_SHIFT 0
|
||||||
|
/*
|
||||||
|
* Low throughput priority level in Regulator mode
|
||||||
|
* Write Priority in Fixed/Limiter mode
|
||||||
|
*/
|
||||||
|
#define PRIORITY1_SHIFT 8
|
||||||
|
#define PRIORITY_MASK 0x7
|
||||||
|
|
||||||
|
#define PRIORITY_COMP_MARK BIT(31) /* Must set */
|
||||||
|
|
||||||
|
#define IMX_NOC_MODE_FIXED 0
|
||||||
|
#define IMX_NOC_MODE_LIMITER 1
|
||||||
|
#define IMX_NOC_MODE_BYPASS 2
|
||||||
|
#define IMX_NOC_MODE_REGULATOR 3
|
||||||
|
#define IMX_NOC_MODE_UNCONFIGURED 0xFF
|
||||||
|
|
||||||
|
#define IMX_NOC_PRIO_REG 0x8
|
||||||
|
#define IMX_NOC_MODE_REG 0xC
|
||||||
|
#define IMX_NOC_BANDWIDTH_REG 0x10
|
||||||
|
#define IMX_NOC_SATURATION 0x14
|
||||||
|
#define IMX_NOC_EXT_CTL_REG 0x18
|
||||||
|
|
||||||
struct imx_icc_provider {
|
struct imx_icc_provider {
|
||||||
void __iomem *noc_base;
|
void __iomem *noc_base;
|
||||||
struct icc_provider provider;
|
struct icc_provider provider;
|
||||||
@ -44,6 +70,20 @@ struct imx_icc_node_desc {
|
|||||||
const struct imx_icc_node_adj_desc *adj;
|
const struct imx_icc_node_adj_desc *adj;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* struct imx_icc_noc_setting - Describe an interconnect node setting
|
||||||
|
* @reg: register offset inside the NoC
|
||||||
|
* @prio_level: priority level
|
||||||
|
* @mode: functional mode
|
||||||
|
* @ext_control: external input control
|
||||||
|
*/
|
||||||
|
struct imx_icc_noc_setting {
|
||||||
|
u32 reg;
|
||||||
|
u32 prio_level;
|
||||||
|
u32 mode;
|
||||||
|
u32 ext_control;
|
||||||
|
};
|
||||||
|
|
||||||
#define DEFINE_BUS_INTERCONNECT(_name, _id, _adj, ...) \
|
#define DEFINE_BUS_INTERCONNECT(_name, _id, _adj, ...) \
|
||||||
{ \
|
{ \
|
||||||
.id = _id, \
|
.id = _id, \
|
||||||
@ -61,7 +101,8 @@ struct imx_icc_node_desc {
|
|||||||
|
|
||||||
int imx_icc_register(struct platform_device *pdev,
|
int imx_icc_register(struct platform_device *pdev,
|
||||||
struct imx_icc_node_desc *nodes,
|
struct imx_icc_node_desc *nodes,
|
||||||
int nodes_count);
|
int nodes_count,
|
||||||
|
struct imx_icc_noc_setting *noc_settings);
|
||||||
int imx_icc_unregister(struct platform_device *pdev);
|
int imx_icc_unregister(struct platform_device *pdev);
|
||||||
|
|
||||||
#endif /* __DRIVERS_INTERCONNECT_IMX_H */
|
#endif /* __DRIVERS_INTERCONNECT_IMX_H */
|
||||||
|
@ -83,7 +83,7 @@ static struct imx_icc_node_desc nodes[] = {
|
|||||||
|
|
||||||
static int imx8mm_icc_probe(struct platform_device *pdev)
|
static int imx8mm_icc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
return imx_icc_register(pdev, nodes, ARRAY_SIZE(nodes));
|
return imx_icc_register(pdev, nodes, ARRAY_SIZE(nodes), NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imx8mm_icc_remove(struct platform_device *pdev)
|
static int imx8mm_icc_remove(struct platform_device *pdev)
|
||||||
|
@ -72,7 +72,7 @@ static struct imx_icc_node_desc nodes[] = {
|
|||||||
|
|
||||||
static int imx8mn_icc_probe(struct platform_device *pdev)
|
static int imx8mn_icc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
return imx_icc_register(pdev, nodes, ARRAY_SIZE(nodes));
|
return imx_icc_register(pdev, nodes, ARRAY_SIZE(nodes), NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imx8mn_icc_remove(struct platform_device *pdev)
|
static int imx8mn_icc_remove(struct platform_device *pdev)
|
||||||
|
@ -82,7 +82,7 @@ static struct imx_icc_node_desc nodes[] = {
|
|||||||
|
|
||||||
static int imx8mq_icc_probe(struct platform_device *pdev)
|
static int imx8mq_icc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
return imx_icc_register(pdev, nodes, ARRAY_SIZE(nodes));
|
return imx_icc_register(pdev, nodes, ARRAY_SIZE(nodes), NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imx8mq_icc_remove(struct platform_device *pdev)
|
static int imx8mq_icc_remove(struct platform_device *pdev)
|
||||||
|
Loading…
Reference in New Issue
Block a user