mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
9368cdf90f
Commitf316cdff8d("clk: Annotate struct clk_hw_onecell_data with __counted_by") annotated the hws member of 'struct clk_hw_onecell_data' with __counted_by, which informs the bounds sanitizer about the number of elements in hws, so that it can warn when hws is accessed out of bounds. As noted in that change, the __counted_by member must be initialized with the number of elements before the first array access happens, otherwise there will be a warning from each access prior to the initialization because the number of elements is zero. This occurs in clk_dvp_probe() due to ->num being assigned after ->hws has been accessed: UBSAN: array-index-out-of-bounds in drivers/clk/bcm/clk-bcm2711-dvp.c:59:2 index 0 is out of range for type 'struct clk_hw *[] __counted_by(num)' (aka 'struct clk_hw *[]') Move the ->num initialization to before the first access of ->hws, which clears up the warning. Cc: stable@vger.kernel.org Fixes:f316cdff8d("clk: Annotate struct clk_hw_onecell_data with __counted_by") Signed-off-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/r/20240425-cbl-bcm-assign-counted-by-val-before-access-v1-1-e2db3b82d5ef@kernel.org Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
124 lines
2.9 KiB
C
124 lines
2.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
// Copyright 2020 Cerno
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/reset-controller.h>
|
|
#include <linux/reset/reset-simple.h>
|
|
|
|
#define DVP_HT_RPI_SW_INIT 0x04
|
|
#define DVP_HT_RPI_MISC_CONFIG 0x08
|
|
|
|
#define NR_CLOCKS 2
|
|
#define NR_RESETS 6
|
|
|
|
struct clk_dvp {
|
|
struct clk_hw_onecell_data *data;
|
|
struct reset_simple_data reset;
|
|
};
|
|
|
|
static const struct clk_parent_data clk_dvp_parent = {
|
|
.index = 0,
|
|
};
|
|
|
|
static int clk_dvp_probe(struct platform_device *pdev)
|
|
{
|
|
struct clk_hw_onecell_data *data;
|
|
struct clk_dvp *dvp;
|
|
void __iomem *base;
|
|
int ret;
|
|
|
|
dvp = devm_kzalloc(&pdev->dev, sizeof(*dvp), GFP_KERNEL);
|
|
if (!dvp)
|
|
return -ENOMEM;
|
|
platform_set_drvdata(pdev, dvp);
|
|
|
|
dvp->data = devm_kzalloc(&pdev->dev,
|
|
struct_size(dvp->data, hws, NR_CLOCKS),
|
|
GFP_KERNEL);
|
|
if (!dvp->data)
|
|
return -ENOMEM;
|
|
data = dvp->data;
|
|
|
|
base = devm_platform_ioremap_resource(pdev, 0);
|
|
if (IS_ERR(base))
|
|
return PTR_ERR(base);
|
|
|
|
dvp->reset.rcdev.owner = THIS_MODULE;
|
|
dvp->reset.rcdev.nr_resets = NR_RESETS;
|
|
dvp->reset.rcdev.ops = &reset_simple_ops;
|
|
dvp->reset.rcdev.of_node = pdev->dev.of_node;
|
|
dvp->reset.membase = base + DVP_HT_RPI_SW_INIT;
|
|
spin_lock_init(&dvp->reset.lock);
|
|
|
|
ret = devm_reset_controller_register(&pdev->dev, &dvp->reset.rcdev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
data->num = NR_CLOCKS;
|
|
|
|
data->hws[0] = clk_hw_register_gate_parent_data(&pdev->dev,
|
|
"hdmi0-108MHz",
|
|
&clk_dvp_parent, 0,
|
|
base + DVP_HT_RPI_MISC_CONFIG, 3,
|
|
CLK_GATE_SET_TO_DISABLE,
|
|
&dvp->reset.lock);
|
|
if (IS_ERR(data->hws[0]))
|
|
return PTR_ERR(data->hws[0]);
|
|
|
|
data->hws[1] = clk_hw_register_gate_parent_data(&pdev->dev,
|
|
"hdmi1-108MHz",
|
|
&clk_dvp_parent, 0,
|
|
base + DVP_HT_RPI_MISC_CONFIG, 4,
|
|
CLK_GATE_SET_TO_DISABLE,
|
|
&dvp->reset.lock);
|
|
if (IS_ERR(data->hws[1])) {
|
|
ret = PTR_ERR(data->hws[1]);
|
|
goto unregister_clk0;
|
|
}
|
|
|
|
ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get,
|
|
data);
|
|
if (ret)
|
|
goto unregister_clk1;
|
|
|
|
return 0;
|
|
|
|
unregister_clk1:
|
|
clk_hw_unregister_gate(data->hws[1]);
|
|
|
|
unregister_clk0:
|
|
clk_hw_unregister_gate(data->hws[0]);
|
|
return ret;
|
|
};
|
|
|
|
static void clk_dvp_remove(struct platform_device *pdev)
|
|
{
|
|
struct clk_dvp *dvp = platform_get_drvdata(pdev);
|
|
struct clk_hw_onecell_data *data = dvp->data;
|
|
|
|
clk_hw_unregister_gate(data->hws[1]);
|
|
clk_hw_unregister_gate(data->hws[0]);
|
|
}
|
|
|
|
static const struct of_device_id clk_dvp_dt_ids[] = {
|
|
{ .compatible = "brcm,brcm2711-dvp", },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, clk_dvp_dt_ids);
|
|
|
|
static struct platform_driver clk_dvp_driver = {
|
|
.probe = clk_dvp_probe,
|
|
.remove_new = clk_dvp_remove,
|
|
.driver = {
|
|
.name = "brcm2711-dvp",
|
|
.of_match_table = clk_dvp_dt_ids,
|
|
},
|
|
};
|
|
module_platform_driver(clk_dvp_driver);
|
|
|
|
MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
|
|
MODULE_DESCRIPTION("BCM2711 DVP clock driver");
|
|
MODULE_LICENSE("GPL");
|