Skip to contentSkip to conversation

ARM: l2x0: don't set .set_debug in l310 case

PATCH In review Paolo Pisati 3 participants 5 messages Mar 24, 2013 – Mar 25, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: l2x0: don't set .set_debug in l310 case

From: Paolo Pisati <[email protected]>

commit 74ddcdb ("l2x0: Only set .set_debug on PL310 r3p0 and earlier") to actually work needs .set_debug to be not set during definition

---
 arch/arm/mm/cache-l2x0.c |    1 -
 1 file changed, 1 deletion(-)
arch/arm/mm/cache-l2x0.c +0 -1
index d457653..37f1364 100644
@@ -724,7 +724,6 @@ static const struct l2x0_of_data pl310_data = {
 		.flush_all   = l2x0_flush_all,
 		.inv_all     = l2x0_inv_all,
 		.disable     = l2x0_disable,
-		.set_debug   = pl310_set_debug,
 	},
 };
 
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 7/7 ARM: l2x0: don't set .set_debug in l310 case

commit 74ddcdb ("l2x0: Only set .set_debug on PL310 r3p0 and earlier") to actually work needs .set_debug to be not set during definition

---
 arch/arm/mm/cache-l2x0.c |    1 -
 1 file changed, 1 deletion(-)
arch/arm/mm/cache-l2x0.c +0 -1
index d457653..37f1364 100644
@@ -724,7 +724,6 @@ static const struct l2x0_of_data pl310_data = {
 		.flush_all   = l2x0_flush_all,
 		.inv_all     = l2x0_inv_all,
 		.disable     = l2x0_disable,
-		.set_debug   = pl310_set_debug,
 	},
 };
 
Signature · 1 line
1.7.10.4
#2 lore raw
In reply to Paolo Pisati
Quoted 6 lines · Paolo Pisati

From: Paolo Pisati <[email protected]>

commit 74ddcdb ("l2x0: Only set .set_debug on PL310 r3p0 and earlier") to actually work needs .set_debug to be not set during definition

Ah crap, missed this part. Can I add this into my fix and I'll put it in Russell's patch system.

Rob

Quoted 17 lines
---
 arch/arm/mm/cache-l2x0.c |    1 -
 1 file changed, 1 deletion(-)
arch/arm/mm/cache-l2x0.c +0 -1
index d457653..37f1364 100644
@@ -724,7 +724,6 @@ static const struct l2x0_of_data pl310_data = {
 		.flush_all   = l2x0_flush_all,
 		.inv_all     = l2x0_inv_all,
 		.disable     = l2x0_disable,
-		.set_debug   = pl310_set_debug,
 	},
 };
 
#3 lore raw
Quoted 10 lines · Rob Herring
Quoted 6 lines · Paolo Pisati

From: Paolo Pisati <[email protected]>

commit 74ddcdb ("l2x0: Only set .set_debug on PL310 r3p0 and earlier") to actually work needs .set_debug to be not set during definition

Ah crap, missed this part. Can I add this into my fix and I'll put it in Russell's patch system.

Of course, go ahead.

Signature · 2 lines
bye,
p.
#4 lore raw
In reply to Paolo Pisati
Quoted 15 lines · Paolo Pisati

From: Paolo Pisati <[email protected]>

commit 74ddcdb ("l2x0: Only set .set_debug on PL310 r3p0 and earlier") to actually work needs .set_debug to be not set during definition

---
 arch/arm/mm/cache-l2x0.c |    1 -
 1 file changed, 1 deletion(-)
arch/arm/mm/cache-l2x0.c +0 -0
index d457653..37f1364 100644

arch/arm/mm/cache-l2x0.c static const struct l2x0_of_data pl310_data = { · line 727

Quoted 4 lines
arch/arm/mm/cache-l2x0.c +0 -1
@@ -724,7 +724,6 @@ static const struct l2x0_of_data pl310_data = {
 		.flush_all   = l2x0_flush_all,
 		.inv_all     = l2x0_inv_all,
 		.disable     = l2x0_disable,
-		.set_debug   = pl310_set_debug,

This actually breaks the cases that need set_debug because the memcpy of the function pointers is after the set_debug init. So I'll come up with something else.

Rob