* [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init @ 2012-04-30 13:16 ` Yilu Mao 0 siblings, 0 replies; 8+ messages in thread From: Yilu Mao @ 2012-04-30 13:16 UTC (permalink / raw) To: linux-arm-kernel If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl register will not be saved in l2x0_saved_regs. Therefore we can not use l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem by saving aux ctrl in l2x0_saved_regs just after it's being read from the register. And in case some bits of aux ctrl register are reserved, re-read and save it properly after set it if l2x0 is disabled before init. Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 Signed-off-by: Yilu Mao <ylmao@marvell.com> --- arch/arm/mm/cache-l2x0.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index a53fd2a..9893e58 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); + /* + * In case l2x controller is enabled, the aux ctrl register + * can't be set. So the original value should be stored in + * the l2x0_saved_regs for restoring when resume. + */ + l2x0_saved_regs.aux_ctrl = aux; + aux &= aux_mask; aux |= aux_val; @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) /* l2x0 controller is disabled */ writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); + /* Re-read it in case some bits are reserved. */ + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); l2x0_saved_regs.aux_ctrl = aux; l2x0_inv_all(); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init @ 2012-04-30 13:16 ` Yilu Mao 0 siblings, 0 replies; 8+ messages in thread From: Yilu Mao @ 2012-04-30 13:16 UTC (permalink / raw) To: linux-kernel Cc: linux, Baohua.Song, santosh.shilimkar, robherring2, catalin.marinas, linux-arm-kernel, Yilu Mao If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl register will not be saved in l2x0_saved_regs. Therefore we can not use l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem by saving aux ctrl in l2x0_saved_regs just after it's being read from the register. And in case some bits of aux ctrl register are reserved, re-read and save it properly after set it if l2x0 is disabled before init. Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 Signed-off-by: Yilu Mao <ylmao@marvell.com> --- arch/arm/mm/cache-l2x0.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index a53fd2a..9893e58 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); + /* + * In case l2x controller is enabled, the aux ctrl register + * can't be set. So the original value should be stored in + * the l2x0_saved_regs for restoring when resume. + */ + l2x0_saved_regs.aux_ctrl = aux; + aux &= aux_mask; aux |= aux_val; @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) /* l2x0 controller is disabled */ writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); + /* Re-read it in case some bits are reserved. */ + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); l2x0_saved_regs.aux_ctrl = aux; l2x0_inv_all(); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init 2012-04-30 13:16 ` Yilu Mao @ 2012-04-30 13:34 ` Catalin Marinas -1 siblings, 0 replies; 8+ messages in thread From: Catalin Marinas @ 2012-04-30 13:34 UTC (permalink / raw) To: linux-arm-kernel On 30 April 2012 14:16, Yilu Mao <ylmao@marvell.com> wrote: > If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl > register will not be saved in l2x0_saved_regs. Therefore we can not use > l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem > by saving aux ctrl in l2x0_saved_regs just after it's being read from > the register. > And in case some bits of aux ctrl register are reserved, re-read and > save it properly after set it if l2x0 is disabled before init. > > Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 > Signed-off-by: Yilu Mao <ylmao@marvell.com> > --- > ?arch/arm/mm/cache-l2x0.c | ? ?9 +++++++++ > ?1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c > index a53fd2a..9893e58 100644 > --- a/arch/arm/mm/cache-l2x0.c > +++ b/arch/arm/mm/cache-l2x0.c > @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > ? ? ? ?cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); > ? ? ? ?aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > > + ? ? ? /* > + ? ? ? ?* In case l2x controller is enabled, the aux ctrl register > + ? ? ? ?* can't be set. So the original value should be stored in > + ? ? ? ?* the l2x0_saved_regs for restoring when resume. > + ? ? ? ?*/ > + ? ? ? l2x0_saved_regs.aux_ctrl = aux; Why not move this > + > ? ? ? ?aux &= aux_mask; > ? ? ? ?aux |= aux_val; > > @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > ? ? ? ? ? ? ? ?/* l2x0 controller is disabled */ > ? ? ? ? ? ? ? ?writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); > > + ? ? ? ? ? ? ? /* Re-read it in case some bits are reserved. */ > + ? ? ? ? ? ? ? aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); and this > ? ? ? ? ? ? ? ?l2x0_saved_regs.aux_ctrl = aux; > > ? ? ? ? ? ? ? ?l2x0_inv_all(); somewhere after the if block and we only read the aux once. The comment may no longer make sense though. -- Catalin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init @ 2012-04-30 13:34 ` Catalin Marinas 0 siblings, 0 replies; 8+ messages in thread From: Catalin Marinas @ 2012-04-30 13:34 UTC (permalink / raw) To: Yilu Mao Cc: linux-kernel, linux, Baohua.Song, santosh.shilimkar, robherring2, linux-arm-kernel On 30 April 2012 14:16, Yilu Mao <ylmao@marvell.com> wrote: > If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl > register will not be saved in l2x0_saved_regs. Therefore we can not use > l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem > by saving aux ctrl in l2x0_saved_regs just after it's being read from > the register. > And in case some bits of aux ctrl register are reserved, re-read and > save it properly after set it if l2x0 is disabled before init. > > Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 > Signed-off-by: Yilu Mao <ylmao@marvell.com> > --- > arch/arm/mm/cache-l2x0.c | 9 +++++++++ > 1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c > index a53fd2a..9893e58 100644 > --- a/arch/arm/mm/cache-l2x0.c > +++ b/arch/arm/mm/cache-l2x0.c > @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); > aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > > + /* > + * In case l2x controller is enabled, the aux ctrl register > + * can't be set. So the original value should be stored in > + * the l2x0_saved_regs for restoring when resume. > + */ > + l2x0_saved_regs.aux_ctrl = aux; Why not move this > + > aux &= aux_mask; > aux |= aux_val; > > @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > /* l2x0 controller is disabled */ > writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); > > + /* Re-read it in case some bits are reserved. */ > + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); and this > l2x0_saved_regs.aux_ctrl = aux; > > l2x0_inv_all(); somewhere after the if block and we only read the aux once. The comment may no longer make sense though. -- Catalin ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init 2012-04-30 13:34 ` Catalin Marinas @ 2012-05-02 1:17 ` Yilu Mao -1 siblings, 0 replies; 8+ messages in thread From: Yilu Mao @ 2012-05-02 1:17 UTC (permalink / raw) To: linux-arm-kernel On 04/30/2012 09:34 PM, Catalin Marinas wrote: > On 30 April 2012 14:16, Yilu Mao<ylmao@marvell.com> wrote: >> If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl >> register will not be saved in l2x0_saved_regs. Therefore we can not use >> l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem >> by saving aux ctrl in l2x0_saved_regs just after it's being read from >> the register. >> And in case some bits of aux ctrl register are reserved, re-read and >> save it properly after set it if l2x0 is disabled before init. >> >> Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 >> Signed-off-by: Yilu Mao<ylmao@marvell.com> >> --- >> arch/arm/mm/cache-l2x0.c | 9 +++++++++ >> 1 files changed, 9 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c >> index a53fd2a..9893e58 100644 >> --- a/arch/arm/mm/cache-l2x0.c >> +++ b/arch/arm/mm/cache-l2x0.c >> @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) >> cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); >> aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); >> >> + /* >> + * In case l2x controller is enabled, the aux ctrl register >> + * can't be set. So the original value should be stored in >> + * the l2x0_saved_regs for restoring when resume. >> + */ >> + l2x0_saved_regs.aux_ctrl = aux; > > Why not move this > >> + >> aux&= aux_mask; >> aux |= aux_val; >> >> @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) >> /* l2x0 controller is disabled */ >> writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); >> >> + /* Re-read it in case some bits are reserved. */ >> + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > > and this > >> l2x0_saved_regs.aux_ctrl = aux; >> >> l2x0_inv_all(); > > somewhere after the if block and we only read the aux once. The > comment may no longer make sense though. > Hi Catalin, I want to make it clear before I provide a new patch. :) We can't only read once because we must read it before handle the aux_val and aux_mask arguments. Do you still want the "l2x0_saved_regs.aux_ctrl = aux;" operation only located after the "if"? If so, I will provide a patch for it. -- Thanks. Best Wishes, Yilu Mao ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init @ 2012-05-02 1:17 ` Yilu Mao 0 siblings, 0 replies; 8+ messages in thread From: Yilu Mao @ 2012-05-02 1:17 UTC (permalink / raw) To: Catalin Marinas Cc: Lu Mao, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, Baohua.Song@csr.com, santosh.shilimkar@ti.com, robherring2@gmail.com, linux-arm-kernel@lists.infradead.org On 04/30/2012 09:34 PM, Catalin Marinas wrote: > On 30 April 2012 14:16, Yilu Mao<ylmao@marvell.com> wrote: >> If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl >> register will not be saved in l2x0_saved_regs. Therefore we can not use >> l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem >> by saving aux ctrl in l2x0_saved_regs just after it's being read from >> the register. >> And in case some bits of aux ctrl register are reserved, re-read and >> save it properly after set it if l2x0 is disabled before init. >> >> Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 >> Signed-off-by: Yilu Mao<ylmao@marvell.com> >> --- >> arch/arm/mm/cache-l2x0.c | 9 +++++++++ >> 1 files changed, 9 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c >> index a53fd2a..9893e58 100644 >> --- a/arch/arm/mm/cache-l2x0.c >> +++ b/arch/arm/mm/cache-l2x0.c >> @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) >> cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); >> aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); >> >> + /* >> + * In case l2x controller is enabled, the aux ctrl register >> + * can't be set. So the original value should be stored in >> + * the l2x0_saved_regs for restoring when resume. >> + */ >> + l2x0_saved_regs.aux_ctrl = aux; > > Why not move this > >> + >> aux&= aux_mask; >> aux |= aux_val; >> >> @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) >> /* l2x0 controller is disabled */ >> writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); >> >> + /* Re-read it in case some bits are reserved. */ >> + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > > and this > >> l2x0_saved_regs.aux_ctrl = aux; >> >> l2x0_inv_all(); > > somewhere after the if block and we only read the aux once. The > comment may no longer make sense though. > Hi Catalin, I want to make it clear before I provide a new patch. :) We can't only read once because we must read it before handle the aux_val and aux_mask arguments. Do you still want the "l2x0_saved_regs.aux_ctrl = aux;" operation only located after the "if"? If so, I will provide a patch for it. -- Thanks. Best Wishes, Yilu Mao ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init 2012-05-02 1:17 ` Yilu Mao @ 2012-05-02 10:05 ` Catalin Marinas -1 siblings, 0 replies; 8+ messages in thread From: Catalin Marinas @ 2012-05-02 10:05 UTC (permalink / raw) To: linux-arm-kernel On Wed, May 02, 2012 at 02:17:45AM +0100, Yilu Mao wrote: > On 04/30/2012 09:34 PM, Catalin Marinas wrote: > > On 30 April 2012 14:16, Yilu Mao<ylmao@marvell.com> wrote: > >> If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl > >> register will not be saved in l2x0_saved_regs. Therefore we can not use > >> l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem > >> by saving aux ctrl in l2x0_saved_regs just after it's being read from > >> the register. > >> And in case some bits of aux ctrl register are reserved, re-read and > >> save it properly after set it if l2x0 is disabled before init. > >> > >> Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 > >> Signed-off-by: Yilu Mao<ylmao@marvell.com> > >> --- > >> arch/arm/mm/cache-l2x0.c | 9 +++++++++ > >> 1 files changed, 9 insertions(+), 0 deletions(-) > >> > >> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c > >> index a53fd2a..9893e58 100644 > >> --- a/arch/arm/mm/cache-l2x0.c > >> +++ b/arch/arm/mm/cache-l2x0.c > >> @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > >> cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); > >> aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > >> > >> + /* > >> + * In case l2x controller is enabled, the aux ctrl register > >> + * can't be set. So the original value should be stored in > >> + * the l2x0_saved_regs for restoring when resume. > >> + */ > >> + l2x0_saved_regs.aux_ctrl = aux; > > > > Why not move this > > > >> + > >> aux&= aux_mask; > >> aux |= aux_val; > >> > >> @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > >> /* l2x0 controller is disabled */ > >> writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); > >> > >> + /* Re-read it in case some bits are reserved. */ > >> + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > > > > and this > > > >> l2x0_saved_regs.aux_ctrl = aux; > >> > >> l2x0_inv_all(); > > > > somewhere after the if block and we only read the aux once. The > > comment may no longer make sense though. > > I want to make it clear before I provide a new patch. :) > We can't only read once because we must read it before handle the > aux_val and aux_mask arguments. I was thinking about something like this: diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 361a628..fbd8903 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -371,14 +371,15 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) /* l2x0 controller is disabled */ writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); - l2x0_saved_regs.aux_ctrl = aux; - l2x0_inv_all(); /* enable L2X0 */ writel_relaxed(1, l2x0_base + L2X0_CTRL); } + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); + l2x0_saved_regs.aux_ctrl = aux; + outer_cache.inv_range = l2x0_inv_range; outer_cache.clean_range = l2x0_clean_range; outer_cache.flush_range = l2x0_flush_range; -- Catalin ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init @ 2012-05-02 10:05 ` Catalin Marinas 0 siblings, 0 replies; 8+ messages in thread From: Catalin Marinas @ 2012-05-02 10:05 UTC (permalink / raw) To: Yilu Mao Cc: linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, Baohua.Song@csr.com, santosh.shilimkar@ti.com, robherring2@gmail.com, linux-arm-kernel@lists.infradead.org On Wed, May 02, 2012 at 02:17:45AM +0100, Yilu Mao wrote: > On 04/30/2012 09:34 PM, Catalin Marinas wrote: > > On 30 April 2012 14:16, Yilu Mao<ylmao@marvell.com> wrote: > >> If l2x0 controller has been enabled when calling l2x0_init, the aux ctrl > >> register will not be saved in l2x0_saved_regs. Therefore we can not use > >> l2x0_saved_regs.aux_ctrl for resume later. This patch fixed the problem > >> by saving aux ctrl in l2x0_saved_regs just after it's being read from > >> the register. > >> And in case some bits of aux ctrl register are reserved, re-read and > >> save it properly after set it if l2x0 is disabled before init. > >> > >> Change-Id: I54f3002274ffe9cdc667dba81e36e08f2e121467 > >> Signed-off-by: Yilu Mao<ylmao@marvell.com> > >> --- > >> arch/arm/mm/cache-l2x0.c | 9 +++++++++ > >> 1 files changed, 9 insertions(+), 0 deletions(-) > >> > >> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c > >> index a53fd2a..9893e58 100644 > >> --- a/arch/arm/mm/cache-l2x0.c > >> +++ b/arch/arm/mm/cache-l2x0.c > >> @@ -320,6 +320,13 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > >> cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID); > >> aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > >> > >> + /* > >> + * In case l2x controller is enabled, the aux ctrl register > >> + * can't be set. So the original value should be stored in > >> + * the l2x0_saved_regs for restoring when resume. > >> + */ > >> + l2x0_saved_regs.aux_ctrl = aux; > > > > Why not move this > > > >> + > >> aux&= aux_mask; > >> aux |= aux_val; > >> > >> @@ -364,6 +371,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) > >> /* l2x0 controller is disabled */ > >> writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); > >> > >> + /* Re-read it in case some bits are reserved. */ > >> + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); > > > > and this > > > >> l2x0_saved_regs.aux_ctrl = aux; > >> > >> l2x0_inv_all(); > > > > somewhere after the if block and we only read the aux once. The > > comment may no longer make sense though. > > I want to make it clear before I provide a new patch. :) > We can't only read once because we must read it before handle the > aux_val and aux_mask arguments. I was thinking about something like this: diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 361a628..fbd8903 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -371,14 +371,15 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) /* l2x0 controller is disabled */ writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL); - l2x0_saved_regs.aux_ctrl = aux; - l2x0_inv_all(); /* enable L2X0 */ writel_relaxed(1, l2x0_base + L2X0_CTRL); } + aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); + l2x0_saved_regs.aux_ctrl = aux; + outer_cache.inv_range = l2x0_inv_range; outer_cache.clean_range = l2x0_clean_range; outer_cache.flush_range = l2x0_flush_range; -- Catalin ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-05-02 10:06 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-04-30 13:16 [PATCH v4] ARM: cache-l2x0.c: save aux ctrl for resume in case l2x0 is enabled before init Yilu Mao 2012-04-30 13:16 ` Yilu Mao 2012-04-30 13:34 ` Catalin Marinas 2012-04-30 13:34 ` Catalin Marinas 2012-05-02 1:17 ` Yilu Mao 2012-05-02 1:17 ` Yilu Mao 2012-05-02 10:05 ` Catalin Marinas 2012-05-02 10:05 ` Catalin Marinas
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.