2013-03-24 18:27:39

by Paolo Pisati

Subject: [PATCH] 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

Signed-off-by: Paolo Pisati <[email protected]>
---
arch/arm/mm/cache-l2x0.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index d457653..37f1364 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -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,
},
};

--
1.7.10.4

2013-03-24 20:30:12

by Paolo Pisati

Subject: [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

Signed-off-by: Paolo Pisati <[email protected]>
---
arch/arm/mm/cache-l2x0.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index d457653..37f1364 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -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,
},
};

--
1.7.10.4

2013-03-24 21:15:04

by Rob Herring

Subject: Re: [PATCH] ARM: l2x0: don't set .set_debug in l310 case

On 03/24/2013 01:27 PM, Paolo Pisati wrote:
> 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
>
> Signed-off-by: Paolo Pisati <[email protected]>

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

Rob

> ---
> arch/arm/mm/cache-l2x0.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> index d457653..37f1364 100644
> --- a/arch/arm/mm/cache-l2x0.c
> +++ b/arch/arm/mm/cache-l2x0.c
> @@ -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,
> },
> };
>
>

2013-03-25 10:30:10

by Paolo Pisati

Subject: Re: [PATCH] ARM: l2x0: don't set .set_debug in l310 case

On Sun, Mar 24, 2013 at 04:14:57PM -0500, Rob Herring wrote:
> On 03/24/2013 01:27 PM, Paolo Pisati wrote:
> > 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
> >
> > Signed-off-by: Paolo Pisati <[email protected]>
>
> 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.
--
bye,
p.

2013-03-25 15:07:52

by Rob Herring

Subject: Re: [PATCH] ARM: l2x0: don't set .set_debug in l310 case

On 03/24/2013 01:27 PM, Paolo Pisati wrote:
> 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
>
> Signed-off-by: Paolo Pisati <[email protected]>
> ---
> arch/arm/mm/cache-l2x0.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> index d457653..37f1364 100644
> --- a/arch/arm/mm/cache-l2x0.c
> +++ b/arch/arm/mm/cache-l2x0.c
> @@ -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