Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clk: fixed-rate: add devm_clk_hw_register_fixed_rate

Browse source 
[ Upstream commit 1d7d20658534c7d36fe6f4252f6f1a27d9631a99 ]

Add devm_clk_hw_register_fixed_rate(), devres-managed helper to register
fixed-rate clock.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220916061740.87167-3-dmitry.baryshkov@linaro.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Stable-dep-of: ee0cf5e07f44 ("clk: fixed-rate: fix clk_hw_register_fixed_rate_with_accuracy_parent_hw")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2022-09-16 09:17:39 +03:00 • committed by Ksawlii
parent 0ed81d9cfe
commit 3ba0c9762c
2 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/clk/clk-fixed-rate.c
View file

@ -49,12 +49,24 @@ const struct clk_ops clk_fixed_rate_ops = {
}; };
EXPORT_SYMBOL_GPL(clk_fixed_rate_ops); EXPORT_SYMBOL_GPL(clk_fixed_rate_ops);
static void devm_clk_hw_register_fixed_rate_release(struct device *dev, void *res)
{
struct clk_fixed_rate *fix = res;
/*
* We can not use clk_hw_unregister_fixed_rate, since it will kfree()
* the hw, resulting in double free. Just unregister the hw and let
* devres code kfree() it.
*/
clk_hw_unregister(&fix->hw);
}
struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev, struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,
struct device_node *np, const char *name, struct device_node *np, const char *name,
const char *parent_name, const struct clk_hw *parent_hw, const char *parent_name, const struct clk_hw *parent_hw,
const struct clk_parent_data *parent_data, unsigned long flags, const struct clk_parent_data *parent_data, unsigned long flags,
unsigned long fixed_rate, unsigned long fixed_accuracy, unsigned long fixed_rate, unsigned long fixed_accuracy,
unsigned long clk_fixed_flags) unsigned long clk_fixed_flags, bool devm)
{ {
struct clk_fixed_rate *fixed; struct clk_fixed_rate *fixed;
struct clk_hw *hw; struct clk_hw *hw;
@ -62,6 +74,10 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,
int ret = -EINVAL; int ret = -EINVAL;
/* allocate fixed-rate clock */ /* allocate fixed-rate clock */
if (devm)
fixed = devres_alloc(devm_clk_hw_register_fixed_rate_release,
sizeof(*fixed), GFP_KERNEL);
else
fixed = kzalloc(sizeof(*fixed), GFP_KERNEL); fixed = kzalloc(sizeof(*fixed), GFP_KERNEL);
if (!fixed) if (!fixed)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -90,9 +106,13 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,
else if (np) else if (np)
ret = of_clk_hw_register(np, hw); ret = of_clk_hw_register(np, hw);
if (ret) { if (ret) {
if (devm)
devres_free(fixed);
else
kfree(fixed); kfree(fixed);
hw = ERR_PTR(ret); hw = ERR_PTR(ret);
} } else if (devm)
devres_add(dev, fixed);
return hw; return hw;
} }

29
include/linux/clk-provider.h
View file

@ -364,7 +364,7 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,
const char *parent_name, const struct clk_hw *parent_hw, const char *parent_name, const struct clk_hw *parent_hw,
const struct clk_parent_data *parent_data, unsigned long flags, const struct clk_parent_data *parent_data, unsigned long flags,
unsigned long fixed_rate, unsigned long fixed_accuracy, unsigned long fixed_rate, unsigned long fixed_accuracy,
unsigned long clk_fixed_flags); unsigned long clk_fixed_flags, bool devm);
struct clk *clk_register_fixed_rate(struct device *dev, const char *name, struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
const char *parent_name, unsigned long flags, const char *parent_name, unsigned long flags,
unsigned long fixed_rate); unsigned long fixed_rate);
@ -379,7 +379,20 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
*/ */
#define clk_hw_register_fixed_rate(dev, name, parent_name, flags, fixed_rate) \ #define clk_hw_register_fixed_rate(dev, name, parent_name, flags, fixed_rate) \
__clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \ __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \
NULL, (flags), (fixed_rate), 0, 0) NULL, (flags), (fixed_rate), 0, 0, false)
/**
* devm_clk_hw_register_fixed_rate - register fixed-rate clock with the clock
* framework
* @dev: device that is registering this clock
* @name: name of this clock
* @parent_name: name of clock's parent
* @flags: framework-specific flags
* @fixed_rate: non-adjustable clock rate
*/
#define devm_clk_hw_register_fixed_rate(dev, name, parent_name, flags, fixed_rate) \
__clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \
NULL, (flags), (fixed_rate), 0, 0, true)
/** /**
* clk_hw_register_fixed_rate_parent_hw - register fixed-rate clock with * clk_hw_register_fixed_rate_parent_hw - register fixed-rate clock with
* the clock framework * the clock framework
@ -392,7 +405,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
#define clk_hw_register_fixed_rate_parent_hw(dev, name, parent_hw, flags, \ #define clk_hw_register_fixed_rate_parent_hw(dev, name, parent_hw, flags, \
fixed_rate) \ fixed_rate) \
__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw), \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw), \
NULL, (flags), (fixed_rate), 0, 0) NULL, (flags), (fixed_rate), 0, 0, false)
/** /**
* clk_hw_register_fixed_rate_parent_data - register fixed-rate clock with * clk_hw_register_fixed_rate_parent_data - register fixed-rate clock with
* the clock framework * the clock framework
@ -406,7 +419,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
fixed_rate) \ fixed_rate) \
__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \
(parent_data), (flags), (fixed_rate), 0, \ (parent_data), (flags), (fixed_rate), 0, \
0) 0, false)
/** /**
* clk_hw_register_fixed_rate_with_accuracy - register fixed-rate clock with * clk_hw_register_fixed_rate_with_accuracy - register fixed-rate clock with
* the clock framework * the clock framework
@ -422,7 +435,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
fixed_accuracy) \ fixed_accuracy) \
__clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), \ __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), \
NULL, NULL, (flags), (fixed_rate), \ NULL, NULL, (flags), (fixed_rate), \
(fixed_accuracy), 0) (fixed_accuracy), 0, false)
/** /**
* clk_hw_register_fixed_rate_with_accuracy_parent_hw - register fixed-rate * clk_hw_register_fixed_rate_with_accuracy_parent_hw - register fixed-rate
* clock with the clock framework * clock with the clock framework
@ -437,7 +450,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
parent_hw, flags, fixed_rate, fixed_accuracy) \ parent_hw, flags, fixed_rate, fixed_accuracy) \
__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw) \
NULL, NULL, (flags), (fixed_rate), \ NULL, NULL, (flags), (fixed_rate), \
(fixed_accuracy), 0) (fixed_accuracy), 0, false)
/** /**
* clk_hw_register_fixed_rate_with_accuracy_parent_data - register fixed-rate * clk_hw_register_fixed_rate_with_accuracy_parent_data - register fixed-rate
* clock with the clock framework * clock with the clock framework
@ -452,7 +465,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
parent_data, flags, fixed_rate, fixed_accuracy) \ parent_data, flags, fixed_rate, fixed_accuracy) \
__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \
(parent_data), NULL, (flags), \ (parent_data), NULL, (flags), \
(fixed_rate), (fixed_accuracy), 0) (fixed_rate), (fixed_accuracy), 0, false)
/** /**
* clk_hw_register_fixed_rate_parent_accuracy - register fixed-rate clock with * clk_hw_register_fixed_rate_parent_accuracy - register fixed-rate clock with
* the clock framework * the clock framework
@ -466,7 +479,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
flags, fixed_rate) \ flags, fixed_rate) \
__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \
(parent_data), (flags), (fixed_rate), 0, \ (parent_data), (flags), (fixed_rate), 0, \
CLK_FIXED_RATE_PARENT_ACCURACY) CLK_FIXED_RATE_PARENT_ACCURACY, false)
void clk_unregister_fixed_rate(struct clk *clk); void clk_unregister_fixed_rate(struct clk *clk);
void clk_hw_unregister_fixed_rate(struct clk_hw *hw); void clk_hw_unregister_fixed_rate(struct clk_hw *hw);