mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00

The 'icc_bw_lock' mutex is introduced in commitaf42269c35
("interconnect: Fix locking for runpm vs reclaim") in order to decouple serialization of bw aggregation from codepaths that require memory allocation. However commitd30f83d278
("interconnect: core: Add dynamic id allocation support") added a devm_kasprintf() call into a path protected by the 'icc_bw_lock' which causes the following lockdep warning on machines like the Lenovo ThinkPad X13s: ====================================================== WARNING: possible circular locking dependency detected 6.16.0-rc3 #15 Not tainted ------------------------------------------------------ (udev-worker)/342 is trying to acquire lock: ffffb973f7ec4638 (fs_reclaim){+.+.}-{0:0}, at: __kmalloc_node_track_caller_noprof+0xa0/0x3e0 but task is already holding lock: ffffb973f7f7f0e8 (icc_bw_lock){+.+.}-{4:4}, at: icc_node_add+0x44/0x154 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (icc_bw_lock){+.+.}-{4:4}: icc_init+0x48/0x108 do_one_initcall+0x64/0x30c kernel_init_freeable+0x27c/0x500 kernel_init+0x20/0x1d8 ret_from_fork+0x10/0x20 -> #0 (fs_reclaim){+.+.}-{0:0}: __lock_acquire+0x136c/0x2114 lock_acquire+0x1c8/0x354 fs_reclaim_acquire+0x74/0xa8 __kmalloc_node_track_caller_noprof+0xa0/0x3e0 devm_kmalloc+0x54/0x124 devm_kvasprintf+0x74/0xd4 devm_kasprintf+0x58/0x80 icc_node_add+0xb4/0x154 qcom_osm_l3_probe+0x20c/0x314 [icc_osm_l3] platform_probe+0x68/0xd8 really_probe+0xc0/0x38c __driver_probe_device+0x7c/0x160 driver_probe_device+0x40/0x110 __driver_attach+0xfc/0x208 bus_for_each_dev+0x74/0xd0 driver_attach+0x24/0x30 bus_add_driver+0x110/0x234 driver_register+0x60/0x128 __platform_driver_register+0x24/0x30 osm_l3_driver_init+0x20/0x1000 [icc_osm_l3] do_one_initcall+0x64/0x30c do_init_module+0x58/0x23c load_module+0x1df8/0x1f70 init_module_from_file+0x88/0xc4 idempotent_init_module+0x188/0x280 __arm64_sys_finit_module+0x6c/0xd8 invoke_syscall+0x48/0x110 el0_svc_common.constprop.0+0xc0/0xe0 do_el0_svc+0x1c/0x28 el0_svc+0x4c/0x158 el0t_64_sync_handler+0xc8/0xcc el0t_64_sync+0x198/0x19c other info that might help us debug this: Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(icc_bw_lock); lock(fs_reclaim); lock(icc_bw_lock); lock(fs_reclaim); *** DEADLOCK *** The icc_node_add() functions is not designed to fail, and as such it should not do any memory allocation. In order to avoid this, add a new helper function for the name generation to be called by drivers which are using the new dynamic id feature. Fixes:d30f83d278
("interconnect: core: Add dynamic id allocation support") Signed-off-by: Gabor Juhos <j4g8y7@gmail.com> Link: https://lore.kernel.org/r/20250625-icc-bw-lockdep-v3-1-2b8f8b8987c4@gmail.com Co-developed-by: Johan Hovold <johan+linaro@kernel.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20250627075854.26943-1-johan+linaro@kernel.org Signed-off-by: Georgi Djakov <djakov@kernel.org>
378 lines
8.9 KiB
C
378 lines
8.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
|
|
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
*/
|
|
|
|
#include <linux/bitfield.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/interconnect.h>
|
|
#include <linux/interconnect-provider.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "bcm-voter.h"
|
|
#include "icc-common.h"
|
|
#include "icc-rpmh.h"
|
|
|
|
/* QNOC QoS */
|
|
#define QOSGEN_MAINCTL_LO(p, qp) (0x8 + (p->port_offsets[qp]))
|
|
#define QOS_SLV_URG_MSG_EN_MASK GENMASK(3, 3)
|
|
#define QOS_DFLT_PRIO_MASK GENMASK(6, 4)
|
|
#define QOS_DISABLE_MASK GENMASK(24, 24)
|
|
|
|
/**
|
|
* qcom_icc_set_qos - initialize static QoS configurations
|
|
* @qp: qcom icc provider to which @node belongs
|
|
* @node: qcom icc node to operate on
|
|
*/
|
|
static void qcom_icc_set_qos(struct qcom_icc_provider *qp,
|
|
struct qcom_icc_node *node)
|
|
{
|
|
const struct qcom_icc_qosbox *qos = node->qosbox;
|
|
int port;
|
|
|
|
for (port = 0; port < qos->num_ports; port++) {
|
|
regmap_update_bits(qp->regmap, QOSGEN_MAINCTL_LO(qos, port),
|
|
QOS_DISABLE_MASK,
|
|
FIELD_PREP(QOS_DISABLE_MASK, qos->prio_fwd_disable));
|
|
|
|
regmap_update_bits(qp->regmap, QOSGEN_MAINCTL_LO(qos, port),
|
|
QOS_DFLT_PRIO_MASK,
|
|
FIELD_PREP(QOS_DFLT_PRIO_MASK, qos->prio));
|
|
|
|
regmap_update_bits(qp->regmap, QOSGEN_MAINCTL_LO(qos, port),
|
|
QOS_SLV_URG_MSG_EN_MASK,
|
|
FIELD_PREP(QOS_SLV_URG_MSG_EN_MASK, qos->urg_fwd));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* qcom_icc_pre_aggregate - cleans up stale values from prior icc_set
|
|
* @node: icc node to operate on
|
|
*/
|
|
void qcom_icc_pre_aggregate(struct icc_node *node)
|
|
{
|
|
size_t i;
|
|
struct qcom_icc_node *qn;
|
|
struct qcom_icc_provider *qp;
|
|
|
|
qn = node->data;
|
|
qp = to_qcom_provider(node->provider);
|
|
|
|
for (i = 0; i < QCOM_ICC_NUM_BUCKETS; i++) {
|
|
qn->sum_avg[i] = 0;
|
|
qn->max_peak[i] = 0;
|
|
}
|
|
|
|
for (i = 0; i < qn->num_bcms; i++)
|
|
qcom_icc_bcm_voter_add(qp->voter, qn->bcms[i]);
|
|
}
|
|
EXPORT_SYMBOL_GPL(qcom_icc_pre_aggregate);
|
|
|
|
/**
|
|
* qcom_icc_aggregate - aggregate bw for buckets indicated by tag
|
|
* @node: node to aggregate
|
|
* @tag: tag to indicate which buckets to aggregate
|
|
* @avg_bw: new bw to sum aggregate
|
|
* @peak_bw: new bw to max aggregate
|
|
* @agg_avg: existing aggregate avg bw val
|
|
* @agg_peak: existing aggregate peak bw val
|
|
*/
|
|
int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,
|
|
u32 peak_bw, u32 *agg_avg, u32 *agg_peak)
|
|
{
|
|
size_t i;
|
|
struct qcom_icc_node *qn;
|
|
|
|
qn = node->data;
|
|
|
|
if (!tag)
|
|
tag = QCOM_ICC_TAG_ALWAYS;
|
|
|
|
for (i = 0; i < QCOM_ICC_NUM_BUCKETS; i++) {
|
|
if (tag & BIT(i)) {
|
|
qn->sum_avg[i] += avg_bw;
|
|
qn->max_peak[i] = max_t(u32, qn->max_peak[i], peak_bw);
|
|
}
|
|
|
|
if (node->init_avg || node->init_peak) {
|
|
qn->sum_avg[i] = max_t(u64, qn->sum_avg[i], node->init_avg);
|
|
qn->max_peak[i] = max_t(u64, qn->max_peak[i], node->init_peak);
|
|
}
|
|
}
|
|
|
|
*agg_avg += avg_bw;
|
|
*agg_peak = max_t(u32, *agg_peak, peak_bw);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(qcom_icc_aggregate);
|
|
|
|
/**
|
|
* qcom_icc_set - set the constraints based on path
|
|
* @src: source node for the path to set constraints on
|
|
* @dst: destination node for the path to set constraints on
|
|
*
|
|
* Return: 0 on success, or an error code otherwise
|
|
*/
|
|
int qcom_icc_set(struct icc_node *src, struct icc_node *dst)
|
|
{
|
|
struct qcom_icc_provider *qp;
|
|
struct icc_node *node;
|
|
|
|
if (!src)
|
|
node = dst;
|
|
else
|
|
node = src;
|
|
|
|
qp = to_qcom_provider(node->provider);
|
|
|
|
qcom_icc_bcm_voter_commit(qp->voter);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(qcom_icc_set);
|
|
|
|
/**
|
|
* qcom_icc_bcm_init - populates bcm aux data and connect qnodes
|
|
* @bcm: bcm to be initialized
|
|
* @dev: associated provider device
|
|
*
|
|
* Return: 0 on success, or an error code otherwise
|
|
*/
|
|
int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev)
|
|
{
|
|
struct qcom_icc_node *qn;
|
|
const struct bcm_db *data;
|
|
size_t data_count;
|
|
int i;
|
|
|
|
/* BCM is already initialised*/
|
|
if (bcm->addr)
|
|
return 0;
|
|
|
|
bcm->addr = cmd_db_read_addr(bcm->name);
|
|
if (!bcm->addr) {
|
|
dev_err(dev, "%s could not find RPMh address\n",
|
|
bcm->name);
|
|
return -EINVAL;
|
|
}
|
|
|
|
data = cmd_db_read_aux_data(bcm->name, &data_count);
|
|
if (IS_ERR(data)) {
|
|
dev_err(dev, "%s command db read error (%ld)\n",
|
|
bcm->name, PTR_ERR(data));
|
|
return PTR_ERR(data);
|
|
}
|
|
if (!data_count) {
|
|
dev_err(dev, "%s command db missing or partial aux data\n",
|
|
bcm->name);
|
|
return -EINVAL;
|
|
}
|
|
|
|
bcm->aux_data.unit = le32_to_cpu(data->unit);
|
|
bcm->aux_data.width = le16_to_cpu(data->width);
|
|
bcm->aux_data.vcd = data->vcd;
|
|
bcm->aux_data.reserved = data->reserved;
|
|
INIT_LIST_HEAD(&bcm->list);
|
|
INIT_LIST_HEAD(&bcm->ws_list);
|
|
|
|
if (!bcm->vote_scale)
|
|
bcm->vote_scale = 1000;
|
|
|
|
/* Link Qnodes to their respective BCMs */
|
|
for (i = 0; i < bcm->num_nodes; i++) {
|
|
qn = bcm->nodes[i];
|
|
qn->bcms[qn->num_bcms] = bcm;
|
|
qn->num_bcms++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(qcom_icc_bcm_init);
|
|
|
|
/**
|
|
* qcom_icc_rpmh_configure_qos - configure QoS parameters
|
|
* @qp: qcom icc provider associated with QoS endpoint nodes
|
|
*
|
|
* Return: 0 on success, or an error code otherwise
|
|
*/
|
|
static int qcom_icc_rpmh_configure_qos(struct qcom_icc_provider *qp)
|
|
{
|
|
struct qcom_icc_node *qnode;
|
|
size_t i;
|
|
int ret;
|
|
|
|
ret = clk_bulk_prepare_enable(qp->num_clks, qp->clks);
|
|
if (ret)
|
|
return ret;
|
|
|
|
for (i = 0; i < qp->num_nodes; i++) {
|
|
qnode = qp->nodes[i];
|
|
if (!qnode)
|
|
continue;
|
|
|
|
if (qnode->qosbox)
|
|
qcom_icc_set_qos(qp, qnode);
|
|
}
|
|
|
|
clk_bulk_disable_unprepare(qp->num_clks, qp->clks);
|
|
|
|
return ret;
|
|
}
|
|
|
|
int qcom_icc_rpmh_probe(struct platform_device *pdev)
|
|
{
|
|
const struct qcom_icc_desc *desc;
|
|
struct device *dev = &pdev->dev;
|
|
struct icc_onecell_data *data;
|
|
struct icc_provider *provider;
|
|
struct qcom_icc_node * const *qnodes, *qn;
|
|
struct qcom_icc_provider *qp;
|
|
struct icc_node *node;
|
|
size_t num_nodes, i, j;
|
|
int ret;
|
|
|
|
desc = of_device_get_match_data(dev);
|
|
if (!desc)
|
|
return -EINVAL;
|
|
|
|
qnodes = desc->nodes;
|
|
num_nodes = desc->num_nodes;
|
|
|
|
qp = devm_kzalloc(dev, sizeof(*qp), GFP_KERNEL);
|
|
if (!qp)
|
|
return -ENOMEM;
|
|
|
|
data = devm_kzalloc(dev, struct_size(data, nodes, num_nodes), GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
data->num_nodes = num_nodes;
|
|
|
|
provider = &qp->provider;
|
|
provider->dev = dev;
|
|
provider->set = qcom_icc_set;
|
|
provider->pre_aggregate = qcom_icc_pre_aggregate;
|
|
provider->aggregate = qcom_icc_aggregate;
|
|
provider->xlate_extended = qcom_icc_xlate_extended;
|
|
provider->data = data;
|
|
|
|
icc_provider_init(provider);
|
|
|
|
qp->dev = dev;
|
|
qp->bcms = desc->bcms;
|
|
qp->nodes = desc->nodes;
|
|
qp->num_bcms = desc->num_bcms;
|
|
qp->num_nodes = desc->num_nodes;
|
|
|
|
qp->voter = of_bcm_voter_get(qp->dev, NULL);
|
|
if (IS_ERR(qp->voter))
|
|
return PTR_ERR(qp->voter);
|
|
|
|
for (i = 0; i < qp->num_bcms; i++)
|
|
qcom_icc_bcm_init(qp->bcms[i], dev);
|
|
|
|
for (i = 0; i < num_nodes; i++) {
|
|
qn = qnodes[i];
|
|
if (!qn)
|
|
continue;
|
|
|
|
if (desc->alloc_dyn_id) {
|
|
if (!qn->node)
|
|
qn->node = icc_node_create_dyn();
|
|
node = qn->node;
|
|
} else {
|
|
node = icc_node_create(qn->id);
|
|
}
|
|
|
|
if (IS_ERR(node)) {
|
|
ret = PTR_ERR(node);
|
|
goto err_remove_nodes;
|
|
}
|
|
|
|
ret = icc_node_set_name(node, provider, qn->name);
|
|
if (ret) {
|
|
icc_node_destroy(node->id);
|
|
goto err_remove_nodes;
|
|
}
|
|
|
|
node->data = qn;
|
|
icc_node_add(node, provider);
|
|
|
|
for (j = 0; j < qn->num_links; j++) {
|
|
if (desc->alloc_dyn_id)
|
|
icc_link_nodes(node, &qn->link_nodes[j]->node);
|
|
else
|
|
icc_link_create(node, qn->links[j]);
|
|
}
|
|
|
|
data->nodes[i] = node;
|
|
}
|
|
|
|
if (desc->config) {
|
|
struct resource *res;
|
|
void __iomem *base;
|
|
|
|
base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
|
if (IS_ERR(base))
|
|
goto skip_qos_config;
|
|
|
|
qp->regmap = devm_regmap_init_mmio(dev, base, desc->config);
|
|
if (IS_ERR(qp->regmap)) {
|
|
dev_info(dev, "Skipping QoS, regmap failed; %ld\n", PTR_ERR(qp->regmap));
|
|
goto skip_qos_config;
|
|
}
|
|
|
|
qp->num_clks = devm_clk_bulk_get_all(qp->dev, &qp->clks);
|
|
if (qp->num_clks == -EPROBE_DEFER)
|
|
return dev_err_probe(dev, qp->num_clks, "Failed to get QoS clocks\n");
|
|
|
|
if (qp->num_clks < 0 || (!qp->num_clks && desc->qos_requires_clocks)) {
|
|
dev_info(dev, "Skipping QoS, failed to get clk: %d\n", qp->num_clks);
|
|
goto skip_qos_config;
|
|
}
|
|
|
|
ret = qcom_icc_rpmh_configure_qos(qp);
|
|
if (ret)
|
|
dev_info(dev, "Failed to program QoS: %d\n", ret);
|
|
}
|
|
|
|
skip_qos_config:
|
|
ret = icc_provider_register(provider);
|
|
if (ret)
|
|
goto err_remove_nodes;
|
|
|
|
platform_set_drvdata(pdev, qp);
|
|
|
|
/* Populate child NoC devices if any */
|
|
if (of_get_child_count(dev->of_node) > 0) {
|
|
ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
|
|
if (ret)
|
|
goto err_deregister_provider;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_deregister_provider:
|
|
icc_provider_deregister(provider);
|
|
err_remove_nodes:
|
|
icc_nodes_remove(provider);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(qcom_icc_rpmh_probe);
|
|
|
|
void qcom_icc_rpmh_remove(struct platform_device *pdev)
|
|
{
|
|
struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
|
|
|
|
icc_provider_deregister(&qp->provider);
|
|
icc_nodes_remove(&qp->provider);
|
|
}
|
|
EXPORT_SYMBOL_GPL(qcom_icc_rpmh_remove);
|
|
|
|
MODULE_DESCRIPTION("Qualcomm RPMh interconnect driver");
|
|
MODULE_LICENSE("GPL v2");
|