mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
![Kees Cook](/assets/img/avatar_default.png)
The kzalloc() function has a 2-factor argument form, kcalloc(). This patch replaces cases of: kzalloc(a * b, gfp) with: kcalloc(a * b, gfp) as well as handling cases of: kzalloc(a * b * c, gfp) with: kzalloc(array3_size(a, b, c), gfp) as it's slightly less ugly than: kzalloc_array(array_size(a, b), c, gfp) This does, however, attempt to ignore constant size factors like: kzalloc(4 * 1024, gfp) though any constants defined via macros get caught up in the conversion. Any factors with a sizeof() of "unsigned char", "char", and "u8" were dropped, since they're redundant. The Coccinelle script used for this was: // Fix redundant parens around sizeof(). @@ type TYPE; expression THING, E; @@ ( kzalloc( - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | kzalloc( - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression COUNT; typedef u8; typedef __u8; @@ ( kzalloc( - sizeof(u8) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(__u8) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(char) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(unsigned char) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(u8) * COUNT + COUNT , ...) | kzalloc( - sizeof(__u8) * COUNT + COUNT , ...) | kzalloc( - sizeof(char) * COUNT + COUNT , ...) | kzalloc( - sizeof(unsigned char) * COUNT + COUNT , ...) ) // 2-factor product with sizeof(type/expression) and identifier or constant. @@ type TYPE; expression THING; identifier COUNT_ID; constant COUNT_CONST; @@ ( - kzalloc + kcalloc ( - sizeof(TYPE) * (COUNT_ID) + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * COUNT_ID + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * (COUNT_CONST) + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * COUNT_CONST + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (COUNT_ID) + COUNT_ID, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * COUNT_ID + COUNT_ID, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (COUNT_CONST) + COUNT_CONST, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * COUNT_CONST + COUNT_CONST, sizeof(THING) , ...) ) // 2-factor product, only identifiers. @@ identifier SIZE, COUNT; @@ - kzalloc + kcalloc ( - SIZE * COUNT + COUNT, SIZE , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( kzalloc( - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) ) // 3-factor product with 2 sizeof(variable), with redundant parens removed. @@ expression THING1, THING2; identifier COUNT; type TYPE1, TYPE2; @@ ( kzalloc( - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc( - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc( - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) ) // 3-factor product, only identifiers, with redundant parens removed. @@ identifier STRIDE, SIZE, COUNT; @@ ( kzalloc( - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) ) // Any remaining multi-factor products, first at least 3-factor products, // when they're not all constants... @@ expression E1, E2, E3; constant C1, C2, C3; @@ ( kzalloc(C1 * C2 * C3, ...) | kzalloc( - (E1) * E2 * E3 + array3_size(E1, E2, E3) , ...) | kzalloc( - (E1) * (E2) * E3 + array3_size(E1, E2, E3) , ...) | kzalloc( - (E1) * (E2) * (E3) + array3_size(E1, E2, E3) , ...) | kzalloc( - E1 * E2 * E3 + array3_size(E1, E2, E3) , ...) ) // And then all remaining 2 factors products when they're not all constants, // keeping sizeof() as the second factor argument. @@ expression THING, E1, E2; type TYPE; constant C1, C2, C3; @@ ( kzalloc(sizeof(THING) * C2, ...) | kzalloc(sizeof(TYPE) * C2, ...) | kzalloc(C1 * C2 * C3, ...) | kzalloc(C1 * C2, ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * (E2) + E2, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * E2 + E2, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (E2) + E2, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * E2 + E2, sizeof(THING) , ...) | - kzalloc + kcalloc ( - (E1) * E2 + E1, E2 , ...) | - kzalloc + kcalloc ( - (E1) * (E2) + E1, E2 , ...) | - kzalloc + kcalloc ( - E1 * E2 + E1, E2 , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org>
257 lines
7 KiB
C
257 lines
7 KiB
C
/*
|
|
* Copyright 2013-2015 Emilio López
|
|
*
|
|
* Emilio López <emilio@elopez.com.ar>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/reset-controller.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
|
|
/**
|
|
* sunxi_usb_reset... - reset bits in usb clk registers handling
|
|
*/
|
|
|
|
struct usb_reset_data {
|
|
void __iomem *reg;
|
|
spinlock_t *lock;
|
|
struct clk *clk;
|
|
struct reset_controller_dev rcdev;
|
|
};
|
|
|
|
static int sunxi_usb_reset_assert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
struct usb_reset_data *data = container_of(rcdev,
|
|
struct usb_reset_data,
|
|
rcdev);
|
|
unsigned long flags;
|
|
u32 reg;
|
|
|
|
clk_prepare_enable(data->clk);
|
|
spin_lock_irqsave(data->lock, flags);
|
|
|
|
reg = readl(data->reg);
|
|
writel(reg & ~BIT(id), data->reg);
|
|
|
|
spin_unlock_irqrestore(data->lock, flags);
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sunxi_usb_reset_deassert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
struct usb_reset_data *data = container_of(rcdev,
|
|
struct usb_reset_data,
|
|
rcdev);
|
|
unsigned long flags;
|
|
u32 reg;
|
|
|
|
clk_prepare_enable(data->clk);
|
|
spin_lock_irqsave(data->lock, flags);
|
|
|
|
reg = readl(data->reg);
|
|
writel(reg | BIT(id), data->reg);
|
|
|
|
spin_unlock_irqrestore(data->lock, flags);
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct reset_control_ops sunxi_usb_reset_ops = {
|
|
.assert = sunxi_usb_reset_assert,
|
|
.deassert = sunxi_usb_reset_deassert,
|
|
};
|
|
|
|
/**
|
|
* sunxi_usb_clk_setup() - Setup function for usb gate clocks
|
|
*/
|
|
|
|
#define SUNXI_USB_MAX_SIZE 32
|
|
|
|
struct usb_clk_data {
|
|
u32 clk_mask;
|
|
u32 reset_mask;
|
|
bool reset_needs_clk;
|
|
};
|
|
|
|
static void __init sunxi_usb_clk_setup(struct device_node *node,
|
|
const struct usb_clk_data *data,
|
|
spinlock_t *lock)
|
|
{
|
|
struct clk_onecell_data *clk_data;
|
|
struct usb_reset_data *reset_data;
|
|
const char *clk_parent;
|
|
const char *clk_name;
|
|
void __iomem *reg;
|
|
int qty;
|
|
int i = 0;
|
|
int j = 0;
|
|
|
|
reg = of_io_request_and_map(node, 0, of_node_full_name(node));
|
|
if (IS_ERR(reg))
|
|
return;
|
|
|
|
clk_parent = of_clk_get_parent_name(node, 0);
|
|
if (!clk_parent)
|
|
return;
|
|
|
|
/* Worst-case size approximation and memory allocation */
|
|
qty = find_last_bit((unsigned long *)&data->clk_mask,
|
|
SUNXI_USB_MAX_SIZE);
|
|
|
|
clk_data = kmalloc(sizeof(struct clk_onecell_data), GFP_KERNEL);
|
|
if (!clk_data)
|
|
return;
|
|
|
|
clk_data->clks = kcalloc(qty + 1, sizeof(struct clk *), GFP_KERNEL);
|
|
if (!clk_data->clks) {
|
|
kfree(clk_data);
|
|
return;
|
|
}
|
|
|
|
for_each_set_bit(i, (unsigned long *)&data->clk_mask,
|
|
SUNXI_USB_MAX_SIZE) {
|
|
of_property_read_string_index(node, "clock-output-names",
|
|
j, &clk_name);
|
|
clk_data->clks[i] = clk_register_gate(NULL, clk_name,
|
|
clk_parent, 0,
|
|
reg, i, 0, lock);
|
|
WARN_ON(IS_ERR(clk_data->clks[i]));
|
|
|
|
j++;
|
|
}
|
|
|
|
/* Adjust to the real max */
|
|
clk_data->clk_num = i;
|
|
|
|
of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
|
|
|
|
/* Register a reset controller for usb with reset bits */
|
|
if (data->reset_mask == 0)
|
|
return;
|
|
|
|
reset_data = kzalloc(sizeof(*reset_data), GFP_KERNEL);
|
|
if (!reset_data)
|
|
return;
|
|
|
|
if (data->reset_needs_clk) {
|
|
reset_data->clk = of_clk_get(node, 0);
|
|
if (IS_ERR(reset_data->clk)) {
|
|
pr_err("Could not get clock for reset controls\n");
|
|
kfree(reset_data);
|
|
return;
|
|
}
|
|
}
|
|
|
|
reset_data->reg = reg;
|
|
reset_data->lock = lock;
|
|
reset_data->rcdev.nr_resets = __fls(data->reset_mask) + 1;
|
|
reset_data->rcdev.ops = &sunxi_usb_reset_ops;
|
|
reset_data->rcdev.of_node = node;
|
|
reset_controller_register(&reset_data->rcdev);
|
|
}
|
|
|
|
static const struct usb_clk_data sun4i_a10_usb_clk_data __initconst = {
|
|
.clk_mask = BIT(8) | BIT(7) | BIT(6),
|
|
.reset_mask = BIT(2) | BIT(1) | BIT(0),
|
|
};
|
|
|
|
static DEFINE_SPINLOCK(sun4i_a10_usb_lock);
|
|
|
|
static void __init sun4i_a10_usb_setup(struct device_node *node)
|
|
{
|
|
sunxi_usb_clk_setup(node, &sun4i_a10_usb_clk_data, &sun4i_a10_usb_lock);
|
|
}
|
|
CLK_OF_DECLARE(sun4i_a10_usb, "allwinner,sun4i-a10-usb-clk", sun4i_a10_usb_setup);
|
|
|
|
static const struct usb_clk_data sun5i_a13_usb_clk_data __initconst = {
|
|
.clk_mask = BIT(8) | BIT(6),
|
|
.reset_mask = BIT(1) | BIT(0),
|
|
};
|
|
|
|
static void __init sun5i_a13_usb_setup(struct device_node *node)
|
|
{
|
|
sunxi_usb_clk_setup(node, &sun5i_a13_usb_clk_data, &sun4i_a10_usb_lock);
|
|
}
|
|
CLK_OF_DECLARE(sun5i_a13_usb, "allwinner,sun5i-a13-usb-clk", sun5i_a13_usb_setup);
|
|
|
|
static const struct usb_clk_data sun6i_a31_usb_clk_data __initconst = {
|
|
.clk_mask = BIT(18) | BIT(17) | BIT(16) | BIT(10) | BIT(9) | BIT(8),
|
|
.reset_mask = BIT(2) | BIT(1) | BIT(0),
|
|
};
|
|
|
|
static void __init sun6i_a31_usb_setup(struct device_node *node)
|
|
{
|
|
sunxi_usb_clk_setup(node, &sun6i_a31_usb_clk_data, &sun4i_a10_usb_lock);
|
|
}
|
|
CLK_OF_DECLARE(sun6i_a31_usb, "allwinner,sun6i-a31-usb-clk", sun6i_a31_usb_setup);
|
|
|
|
static const struct usb_clk_data sun8i_a23_usb_clk_data __initconst = {
|
|
.clk_mask = BIT(16) | BIT(11) | BIT(10) | BIT(9) | BIT(8),
|
|
.reset_mask = BIT(2) | BIT(1) | BIT(0),
|
|
};
|
|
|
|
static void __init sun8i_a23_usb_setup(struct device_node *node)
|
|
{
|
|
sunxi_usb_clk_setup(node, &sun8i_a23_usb_clk_data, &sun4i_a10_usb_lock);
|
|
}
|
|
CLK_OF_DECLARE(sun8i_a23_usb, "allwinner,sun8i-a23-usb-clk", sun8i_a23_usb_setup);
|
|
|
|
static const struct usb_clk_data sun8i_h3_usb_clk_data __initconst = {
|
|
.clk_mask = BIT(19) | BIT(18) | BIT(17) | BIT(16) |
|
|
BIT(11) | BIT(10) | BIT(9) | BIT(8),
|
|
.reset_mask = BIT(3) | BIT(2) | BIT(1) | BIT(0),
|
|
};
|
|
|
|
static void __init sun8i_h3_usb_setup(struct device_node *node)
|
|
{
|
|
sunxi_usb_clk_setup(node, &sun8i_h3_usb_clk_data, &sun4i_a10_usb_lock);
|
|
}
|
|
CLK_OF_DECLARE(sun8i_h3_usb, "allwinner,sun8i-h3-usb-clk", sun8i_h3_usb_setup);
|
|
|
|
static const struct usb_clk_data sun9i_a80_usb_mod_data __initconst = {
|
|
.clk_mask = BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2) | BIT(1),
|
|
.reset_mask = BIT(19) | BIT(18) | BIT(17),
|
|
.reset_needs_clk = 1,
|
|
};
|
|
|
|
static DEFINE_SPINLOCK(a80_usb_mod_lock);
|
|
|
|
static void __init sun9i_a80_usb_mod_setup(struct device_node *node)
|
|
{
|
|
sunxi_usb_clk_setup(node, &sun9i_a80_usb_mod_data, &a80_usb_mod_lock);
|
|
}
|
|
CLK_OF_DECLARE(sun9i_a80_usb_mod, "allwinner,sun9i-a80-usb-mod-clk", sun9i_a80_usb_mod_setup);
|
|
|
|
static const struct usb_clk_data sun9i_a80_usb_phy_data __initconst = {
|
|
.clk_mask = BIT(10) | BIT(5) | BIT(4) | BIT(3) | BIT(2) | BIT(1),
|
|
.reset_mask = BIT(21) | BIT(20) | BIT(19) | BIT(18) | BIT(17),
|
|
.reset_needs_clk = 1,
|
|
};
|
|
|
|
static DEFINE_SPINLOCK(a80_usb_phy_lock);
|
|
|
|
static void __init sun9i_a80_usb_phy_setup(struct device_node *node)
|
|
{
|
|
sunxi_usb_clk_setup(node, &sun9i_a80_usb_phy_data, &a80_usb_phy_lock);
|
|
}
|
|
CLK_OF_DECLARE(sun9i_a80_usb_phy, "allwinner,sun9i-a80-usb-phy-clk", sun9i_a80_usb_phy_setup);
|