Skip to contentSkip to conversation

ARM: l2x0: protect outer_cache_fns.sync pointer assignment with OUTER_CACHE_SYNC

PATCH New Eran Ben-Avi 2 participants 4 messages Sep 22, 2013 – Sep 30, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: l2x0: protect outer_cache_fns.sync pointer assignment with OUTER_CACHE_SYNC

Outer cache sync pointer function should be assigned only if OUTER_CACHE_SYNC config option was selected, otherwise pointer is not valid.

---
?arch/arm/mm/cache-l2x0.c |?? 12 ++++++++++++
?1 file changed, 12 insertions(+)

arch/arm/mm/cache-l2x0.c +0 -0
index 447da6f..d358573 100644
@@ -128,6 +128,7 @@ static inline void l2x0_flush_line(unsigned long addr)

?}
?#endif
?
+#ifdef CONFIG_OUTER_CACHE_SYNC
?static void l2x0_cache_sync(void)
?{
???? unsigned long flags;
@@ -136,6 +137,7 @@ static void l2x0_cache_sync(void)
???? cache_sync();
???? raw_spin_unlock_irqrestore(&l2x0_lock, flags);
?}
+#endif
?
?static void __l2x0_flush_all(void)
?{
@@ -411,7 +413,9 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) ???? ??? outer_cache.inv_range = l2x0_inv_range;
???? ??? outer_cache.clean_range = l2x0_clean_range;
???? ??? outer_cache.flush_range = l2x0_flush_range;
+#ifdef CONFIG_OUTER_CACHE_SYNC
???? ??? outer_cache.sync = l2x0_cache_sync;
+#endif
???? ??? outer_cache.flush_all = l2x0_flush_all;
???? ??? outer_cache.inv_all = l2x0_inv_all;
???? ??? outer_cache.disable = l2x0_disable;
@@ -861,7 +865,9 @@ static const struct l2x0_of_data pl310_data = {
???? ??? .inv_range?? = l2x0_inv_range,
???? ??? .clean_range = l2x0_clean_range,
???? ??? .flush_range = l2x0_flush_range,
+#ifdef CONFIG_OUTER_CACHE_SYNC
???? ??? .sync??????? = l2x0_cache_sync,
+#endif
???? ??? .flush_all?? = l2x0_flush_all,
???? ??? .inv_all???? = l2x0_inv_all,
???? ??? .disable???? = l2x0_disable,
@@ -876,7 +882,9 @@ static const struct l2x0_of_data l2x0_data = {
???? ??? .inv_range?? = l2x0_inv_range,
???? ??? .clean_range = l2x0_clean_range,
???? ??? .flush_range = l2x0_flush_range,
+#ifdef CONFIG_OUTER_CACHE_SYNC
???? ??? .sync??????? = l2x0_cache_sync,
+#endif
???? ??? .flush_all?? = l2x0_flush_all,
???? ??? .inv_all???? = l2x0_inv_all,
???? ??? .disable???? = l2x0_disable,
@@ -891,7 +899,9 @@ static const struct l2x0_of_data aurora_with_outer_data = { ???? ??? .inv_range?? = aurora_inv_range,
???? ??? .clean_range = aurora_clean_range,
???? ??? .flush_range = aurora_flush_range,
+#ifdef CONFIG_OUTER_CACHE_SYNC
???? ??? .sync??????? = l2x0_cache_sync,
+#endif
???? ??? .flush_all?? = l2x0_flush_all,
???? ??? .inv_all???? = l2x0_inv_all,
???? ??? .disable???? = l2x0_disable,
@@ -914,7 +924,9 @@ static const struct l2x0_of_data bcm_l2x0_data = { ???? ??? .inv_range?? = bcm_inv_range,
???? ??? .clean_range = bcm_clean_range,
???? ??? .flush_range = bcm_flush_range,
+#ifdef CONFIG_OUTER_CACHE_SYNC
???? ??? .sync??????? = l2x0_cache_sync,
+#endif
???? ??? .flush_all?? = l2x0_flush_all,
???? ??? .inv_all???? = l2x0_inv_all,
???? ??? .disable???? = l2x0_disable,

#1 lore raw

PATCH 1/1 ARM: l2x0: protect outer_cache_fns.sync pointer assignment with OUTER_CACHE_SYNC

Quoted 29 lines · Eran Ben-Avi

Outer cache sync pointer function should be assigned only if OUTER_CACHE_SYNC config option was selected, otherwise pointer is not valid.

---
?arch/arm/mm/cache-l2x0.c |?? 12 ++++++++++++
?1 file changed, 12 insertions(+)

arch/arm/mm/cache-l2x0.c +0 -0
index 447da6f..d358573 100644
@@ -128,6 +128,7 @@ static inline void l2x0_flush_line(unsigned long addr)
 ?}

?#endif
?
+#ifdef CONFIG_OUTER_CACHE_SYNC
?static void l2x0_cache_sync(void)
?{
???? unsigned long flags;

arch/arm/mm/cache-l2x0.c +1 -0
@@ -136,6 +137,7 @@ static void l2x0_cache_sync(void)
 ???? cache_sync();
 ???? raw_spin_unlock_irqrestore(&l2x0_lock, flags);
 ?}
+#endif

?
?static void __l2x0_flush_all(void)
?{

arch/arm/mm/cache-l2x0.c void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) · line 418

Quoted 6 lines
arch/arm/mm/cache-l2x0.c +2 -0
@@ -411,7 +413,9 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
 ???? ??? outer_cache.inv_range = l2x0_inv_range;
 ???? ??? outer_cache.clean_range = l2x0_clean_range;
 ???? ??? outer_cache.flush_range = l2x0_flush_range;
+#ifdef CONFIG_OUTER_CACHE_SYNC
 ???? ??? outer_cache.sync = l2x0_cache_sync;
+#endif

Since outer_cache.sync is conditionally defined, the patch makes sense. Alternatively, we could leave the .sync member always defined and just have a conditionally defined l2x0_cache_sync (NULL when !OUTER_CACHE_SYNC).

Signature · 1 line
Catalin
#2 lore raw

PATCH 1/1 ARM: l2x0: protect outer_cache_fns.sync pointer assignment with OUTER_CACHE_SYNC

Quoted 4 lines · Catalin Marinas

Since outer_cache.sync is conditionally defined, the patch makes sense. Alternatively, we could leave the .sync member always defined and just have a conditionally defined l2x0_cache_sync (NULL when !OUTER_CACHE_SYNC).

Fully agree.
Here is updated patch:

[PATCH] ARM: l2x0: define l2x0_cache_sync according to OUTER_CACHE_SYNC selection

??? Always define outer_cache_fns sync member and conditionally assign ??? l2x0_cache_sync depends on OUTER_CACHE_SYNC selection state.

---
?arch/arm/include/asm/outercache.h |??? 2 --
?arch/arm/mm/cache-l2x0.c????????? |??? 4 ++++
?2 files changed, 4 insertions(+), 2 deletions(-)

arch/arm/include/asm/outercache.h +0 -0
index f94784f..697317c 100644
@@ -30,9 +30,7 @@ struct outer_cache_fns {

???? void (*flush_all)(void);
???? void (*inv_all)(void);
???? void (*disable)(void);
-#ifdef CONFIG_OUTER_CACHE_SYNC
???? void (*sync)(void);
-#endif
???? void (*set_debug)(unsigned long);
???? void (*resume)(void);
?};

arch/arm/mm/cache-l2x0.c +0 -0
index 447da6f..5f3a0ca 100644
@@ -128,6 +128,7 @@ static inline void l2x0_flush_line(unsigned long addr)

?}
?#endif
?
+#ifdef CONFIG_OUTER_CACHE_SYNC
?static void l2x0_cache_sync(void)
?{
???? unsigned long flags;
@@ -136,6 +137,9 @@ static void l2x0_cache_sync(void) ???? cache_sync();
???? raw_spin_unlock_irqrestore(&l2x0_lock, flags); ?}
+#else
+#define l2x0_cache_sync??? NULL
+#endif
?
?static void __l2x0_flush_all(void)
?{

Signature · 4 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 
#3 lore raw

PATCH 1/1 ARM: l2x0: protect outer_cache_fns.sync pointer assignment with OUTER_CACHE_SYNC

Quoted 6 lines · Eran Ben-Avi

[PATCH] ARM: l2x0: define l2x0_cache_sync according to OUTER_CACHE_SYNC selection

??? Always define outer_cache_fns sync member and conditionally assign ??? l2x0_cache_sync depends on OUTER_CACHE_SYNC selection state.