[PATCH V5 1/6] arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data
Gregory CLEMENT
gregory.clement at free-electrons.com
Wed Sep 26 12:33:10 EDT 2012
On 09/26/2012 06:14 PM, Jason Cooper wrote:
> On Wed, Sep 26, 2012 at 06:02:45PM +0200, Gregory CLEMENT wrote:
>> Instead of having multiple functions belonging to outer_cache and
>> filling this structure on the fly, use a outer_cache_fns field inside
>> l2x0_of_data and just memcopy it into outer_cache depending of the
>> type of the l2x0 cache. For non DT case, the former code was kept.
>>
>> Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
>> Tested-and-reviewed-by: Yehuda Yitschak <yehuday at marvell.com>
>> Tested-and-reviewed-by: Lior Amsalem <alior at marvell.com>
>>
>> Cc: Barry Song <21cnbao at gmail.com>
>> Cc: Will Deacon <will.deacon at arm.com>
>> Cc: Santosh Shilimkar <santosh.shilimkar at ti.com>
>> Cc: Rob Herring <rob.herring at calxeda.com>
>> Cc: Arnd Bergmann <arnd at arndb.de>
>> Cc: Olof Johansson <olof at lixom.net>
>> Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
>> ---
>> arch/arm/mm/cache-l2x0.c | 55 +++++++++++++++++++++++++++++++++-------------
>> 1 file changed, 40 insertions(+), 15 deletions(-)
>>
>> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
>> index 2a8e380..8b9c0ae 100644
>> --- a/arch/arm/mm/cache-l2x0.c
>> +++ b/arch/arm/mm/cache-l2x0.c
>> @@ -39,8 +39,9 @@ struct l2x0_regs l2x0_saved_regs;
>> struct l2x0_of_data {
>> void (*setup)(const struct device_node *, u32 *, u32 *);
>> void (*save)(void);
>> - void (*resume)(void);
>> + struct outer_cache_fns outer_cache;
>> };
>> +static bool of_init = false;
>>
>> static inline void cache_wait_way(void __iomem *reg, unsigned long mask)
>> {
>> @@ -376,13 +377,15 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
>> writel_relaxed(1, l2x0_base + L2X0_CTRL);
>> }
>>
>> - outer_cache.inv_range = l2x0_inv_range;
>> - outer_cache.clean_range = l2x0_clean_range;
>> - outer_cache.flush_range = l2x0_flush_range;
>> - outer_cache.sync = l2x0_cache_sync;
>> - outer_cache.flush_all = l2x0_flush_all;
>> - outer_cache.inv_all = l2x0_inv_all;
>> - outer_cache.disable = l2x0_disable;
>> + if (!of_init) {
>> + outer_cache.inv_range = l2x0_inv_range;
>> + outer_cache.clean_range = l2x0_clean_range;
>> + outer_cache.flush_range = l2x0_flush_range;
>> + outer_cache.sync = l2x0_cache_sync;
>> + outer_cache.flush_all = l2x0_flush_all;
>> + outer_cache.inv_all = l2x0_inv_all;
>> + outer_cache.disable = l2x0_disable;
>> + }
>>
>> printk(KERN_INFO "%s cache controller enabled\n", type);
>> printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
>> @@ -533,15 +536,34 @@ static void pl310_resume(void)
>> }
>>
>> static const struct l2x0_of_data pl310_data = {
>> - pl310_of_setup,
>> - pl310_save,
>> - pl310_resume,
>> + .setup = pl310_of_setup,
>> + .save = pl310_save,
>> + .outer_cache = {
>> + .resume = pl310_resume,
>> + .inv_range = l2x0_inv_range,
>> + .clean_range = l2x0_clean_range,
>> + .flush_range = l2x0_flush_range,
>> + .sync = l2x0_cache_sync,
>> + .flush_all = l2x0_flush_all,
>> + .inv_all = l2x0_inv_all,
>> + .disable = l2x0_disable,
>> + .set_debug = pl310_set_debug,
>> + },
>> };
>>
>> static const struct l2x0_of_data l2x0_data = {
>> - l2x0_of_setup,
>> - NULL,
>> - l2x0_resume,
>> + .setup = l2x0_of_setup,
>> + .save = NULL,
>> + .outer_cache = {
>> + .resume = l2x0_resume,
>> + .inv_range = l2x0_inv_range,
>> + .clean_range = l2x0_clean_range,
>> + .flush_range = l2x0_flush_range,
>> + .sync = l2x0_cache_sync,
>> + .flush_all = l2x0_flush_all,
>> + .inv_all = l2x0_inv_all,
>> + .disable = l2x0_disable,
>> + },
>> };
>>
>> static const struct of_device_id l2x0_ids[] __initconst = {
>> @@ -581,9 +603,12 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
>> if (data->save)
>> data->save();
>>
>> + /* */
>
> Was there a comment here?
No it was due to a bad combination of keys with my editor.
I have fixed in in the git repository now.
And the updated patch is the following:
Subject: [PATCH V5 1/6] arm: cache-l2x0: make outer_cache_fns a field of
l2x0_of_data
Instead of having multiple functions belonging to outer_cache and
filling this structure on the fly, use a outer_cache_fns field inside
l2x0_of_data and just memcopy it into outer_cache depending of the
type of the l2x0 cache. For non DT case, the former code was kept.
Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
Tested-and-reviewed-by: Yehuda Yitschak <yehuday at marvell.com>
Tested-and-reviewed-by: Lior Amsalem <alior at marvell.com>
Cc: Barry Song <21cnbao at gmail.com>
Cc: Will Deacon <will.deacon at arm.com>
Cc: Santosh Shilimkar <santosh.shilimkar at ti.com>
Cc: Rob Herring <rob.herring at calxeda.com>
Cc: Arnd Bergmann <arnd at arndb.de>
Cc: Olof Johansson <olof at lixom.net>
Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
---
arch/arm/mm/cache-l2x0.c | 54 +++++++++++++++++++++++++++++++++-------------
1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 2a8e380..1f7aad6 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -39,8 +39,9 @@ struct l2x0_regs l2x0_saved_regs;
struct l2x0_of_data {
void (*setup)(const struct device_node *, u32 *, u32 *);
void (*save)(void);
- void (*resume)(void);
+ struct outer_cache_fns outer_cache;
};
+static bool of_init = false;
static inline void cache_wait_way(void __iomem *reg, unsigned long mask)
{
@@ -376,13 +377,15 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
writel_relaxed(1, l2x0_base + L2X0_CTRL);
}
- outer_cache.inv_range = l2x0_inv_range;
- outer_cache.clean_range = l2x0_clean_range;
- outer_cache.flush_range = l2x0_flush_range;
- outer_cache.sync = l2x0_cache_sync;
- outer_cache.flush_all = l2x0_flush_all;
- outer_cache.inv_all = l2x0_inv_all;
- outer_cache.disable = l2x0_disable;
+ if (!of_init) {
+ outer_cache.inv_range = l2x0_inv_range;
+ outer_cache.clean_range = l2x0_clean_range;
+ outer_cache.flush_range = l2x0_flush_range;
+ outer_cache.sync = l2x0_cache_sync;
+ outer_cache.flush_all = l2x0_flush_all;
+ outer_cache.inv_all = l2x0_inv_all;
+ outer_cache.disable = l2x0_disable;
+ }
printk(KERN_INFO "%s cache controller enabled\n", type);
printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
@@ -533,15 +536,34 @@ static void pl310_resume(void)
}
static const struct l2x0_of_data pl310_data = {
- pl310_of_setup,
- pl310_save,
- pl310_resume,
+ .setup = pl310_of_setup,
+ .save = pl310_save,
+ .outer_cache = {
+ .resume = pl310_resume,
+ .inv_range = l2x0_inv_range,
+ .clean_range = l2x0_clean_range,
+ .flush_range = l2x0_flush_range,
+ .sync = l2x0_cache_sync,
+ .flush_all = l2x0_flush_all,
+ .inv_all = l2x0_inv_all,
+ .disable = l2x0_disable,
+ .set_debug = pl310_set_debug,
+ },
};
static const struct l2x0_of_data l2x0_data = {
- l2x0_of_setup,
- NULL,
- l2x0_resume,
+ .setup = l2x0_of_setup,
+ .save = NULL,
+ .outer_cache = {
+ .resume = l2x0_resume,
+ .inv_range = l2x0_inv_range,
+ .clean_range = l2x0_clean_range,
+ .flush_range = l2x0_flush_range,
+ .sync = l2x0_cache_sync,
+ .flush_all = l2x0_flush_all,
+ .inv_all = l2x0_inv_all,
+ .disable = l2x0_disable,
+ },
};
static const struct of_device_id l2x0_ids[] __initconst = {
@@ -581,9 +603,11 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
if (data->save)
data->save();
+ of_init = true;
l2x0_init(l2x0_base, aux_val, aux_mask);
- outer_cache.resume = data->resume;
+ memcpy(&outer_cache, &data->outer_cache, sizeof(outer_cache));
+
return 0;
}
#endif
--
1.7.9.5
More information about the linux-arm-kernel
mailing list