target/linux/bcm53xx/patches-4.1/070-ARM-l2c-restore-the-behaviour-documented-above-l2c_e.patch

   1 From d965b0fca7dcde3f82c982e0bf1631069fdeb8c9 Mon Sep 17 00:00:00 2001
   2 From: Russell King <rmk+kernel@arm.linux.org.uk>
   3 Date: Fri, 15 May 2015 11:56:45 +0100
   4 Subject: [PATCH 70/74] ARM: l2c: restore the behaviour documented above
   5  l2c_enable()
   6
   7 l2c_enable() is documented that it must not be called if the cache has
   8 already been enabled.  Unfortunately, commit 6b49241ac252 ("ARM: 8259/1:
   9 l2c: Refactor the driver to use commit-like interface") changed this
  10 without updating the comment, for very little reason.  Revert this
  11 change and restore the expected behaviour.
  12
  13 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  14 ---
  15  arch/arm/mm/cache-l2x0.c | 10 +++++-----
  16  1 file changed, 5 insertions(+), 5 deletions(-)
  17
  18 --- a/arch/arm/mm/cache-l2x0.c
  19 +++ b/arch/arm/mm/cache-l2x0.c
  20 @@ -129,10 +129,6 @@ static void l2c_enable(void __iomem *bas
  21  {
  22         unsigned long flags;
  23
  24 -       /* Do not touch the controller if already enabled. */
  25 -       if (readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN)
  26 -               return;
  27 -
  28         l2x0_saved_regs.aux_ctrl = aux;
  29         l2c_configure(base);
  30
  31 @@ -163,7 +159,11 @@ static void l2c_save(void __iomem *base)
  32
  33  static void l2c_resume(void)
  34  {
  35 -       l2c_enable(l2x0_base, l2x0_saved_regs.aux_ctrl, l2x0_data->num_lock);
  36 +       void __iomem *base = l2x0_base;
  37 +
  38 +       /* Do not touch the controller if already enabled. */
  39 +       if (!(readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN))
  40 +               l2c_enable(base, l2x0_saved_regs.aux_ctrl, l2x0_data->num_lock);
  41  }
  42
  43  /*