target/linux/omap4/patches/000-hwmod_dont_wait.patch

   1 From: Benoit Cousson <b-cousson@ti.com>
   2 Date: Sat, 17 Dec 2011 00:09:11 +0000 (-0800)
   3 Subject: ARM: OMAP4: hwmod: Don't wait for the idle status if modulemode is not supported
   4 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=commitdiff_plain;h=bfc141e3a515008d85e57af39c9faa4d2bbc65e0;hp=ddf536d0d7e1f0b63a681c970888730a4437414d
   5
   6 ARM: OMAP4: hwmod: Don't wait for the idle status if modulemode is not supported
   7
   8 If the module does not have any modulemode, the _disable_module function
   9 will do nothing. There is then no point waiting for a idle status change.
  10
  11 It will remove the following warnings.
  12
  13 [    0.331848] omap_hwmod: dmm: _wait_target_disable failed
  14 [    0.339935] omap_hwmod: emif_fw: _wait_target_disable failed
  15 [    0.348358] omap_hwmod: l3_main_1: _wait_target_disable failed
  16 [    0.356964] omap_hwmod: l3_main_2: _wait_target_disable failed
  17 [    0.365600] omap_hwmod: l4_abe: _wait_target_disable failed
  18 [    0.373931] omap_hwmod: l4_cfg: _wait_target_disable failed
  19 [    0.382263] omap_hwmod: l4_per: _wait_target_disable failed
  20 [    0.391113] omap_hwmod: l4_wkup: _wait_target_disable failed
  21 [    0.399536] omap_hwmod: dma_system: _wait_target_disable failed
  22 [    0.408325] omap_hwmod: dss_core: _wait_target_disable failed
  23 [    0.416839] omap_hwmod: dss_dispc: _wait_target_disable failed
  24 [    0.425445] omap_hwmod: dss_dsi1: _wait_target_disable failed
  25 [    0.433990] omap_hwmod: dss_dsi2: _wait_target_disable failed
  26 [    0.442504] omap_hwmod: dss_hdmi: _wait_target_disable failed
  27 [    0.451019] omap_hwmod: dss_rfbi: _wait_target_disable failed
  28 [    0.459564] omap_hwmod: dss_venc: _wait_target_disable failed
  29 [    0.489471] omap_hwmod: mailbox: _wait_target_disable failed
  30 [    0.505920] omap_hwmod: spinlock: _wait_target_disable failed
  31
  32 Note: For such module, the state is managed automatically by HW according
  33 to clock domain transition. It is then not possible to wait for idle even
  34 later in the _idle function since the status will change at clock domain
  35 boundary.
  36
  37 Signed-off-by: Benoit Cousson <b-cousson@ti.com>
  38 Cc: Paul Walmsley <paul@pwsan.com>
  39 Cc: Rajendra Nayak <rnayak@ti.com>
  40 [paul@pwsan.com: renamed fns to indicate that they are OMAP4-only; moved
  41  _wait_target_disable() into _disable_module(), removing duplicate code]
  42 Signed-off-by: Paul Walmsley <paul@pwsan.com>
  43 Signed-off-by: Tony Lindgren <tony@atomide.com>
  44 ---
  45
  46 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
  47 index 207a2ff..ebace0f 100644
  48 --- a/arch/arm/mach-omap2/omap_hwmod.c
  49 +++ b/arch/arm/mach-omap2/omap_hwmod.c
  50 @@ -706,27 +706,65 @@ static void _enable_module(struct omap_hwmod *oh)
  51  }
  52
  53  /**
  54 - * _disable_module - enable CLKCTRL modulemode on OMAP4
  55 + * _omap4_wait_target_disable - wait for a module to be disabled on OMAP4
  56 + * @oh: struct omap_hwmod *
  57 + *
  58 + * Wait for a module @oh to enter slave idle.  Returns 0 if the module
  59 + * does not have an IDLEST bit or if the module successfully enters
  60 + * slave idle; otherwise, pass along the return value of the
  61 + * appropriate *_cm*_wait_module_idle() function.
  62 + */
  63 +static int _omap4_wait_target_disable(struct omap_hwmod *oh)
  64 +{
  65 +       if (!cpu_is_omap44xx())
  66 +               return 0;
  67 +
  68 +       if (!oh)
  69 +               return -EINVAL;
  70 +
  71 +       if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
  72 +               return 0;
  73 +
  74 +       if (oh->flags & HWMOD_NO_IDLEST)
  75 +               return 0;
  76 +
  77 +       return omap4_cminst_wait_module_idle(oh->clkdm->prcm_partition,
  78 +                                            oh->clkdm->cm_inst,
  79 +                                            oh->clkdm->clkdm_offs,
  80 +                                            oh->prcm.omap4.clkctrl_offs);
  81 +}
  82 +
  83 +/**
  84 + * _omap4_disable_module - enable CLKCTRL modulemode on OMAP4
  85   * @oh: struct omap_hwmod *
  86   *
  87   * Disable the PRCM module mode related to the hwmod @oh.
  88 - * No return value.
  89 + * Return EINVAL if the modulemode is not supported and 0 in case of success.
  90   */
  91 -static void _disable_module(struct omap_hwmod *oh)
  92 +static int _omap4_disable_module(struct omap_hwmod *oh)
  93  {
  94 +       int v;
  95 +
  96         /* The module mode does not exist prior OMAP4 */
  97 -       if (cpu_is_omap24xx() || cpu_is_omap34xx())
  98 -               return;
  99 +       if (!cpu_is_omap44xx())
 100 +               return -EINVAL;
 101
 102         if (!oh->clkdm || !oh->prcm.omap4.modulemode)
 103 -               return;
 104 +               return -EINVAL;
 105
 106 -       pr_debug("omap_hwmod: %s: _disable_module\n", oh->name);
 107 +       pr_debug("omap_hwmod: %s: %s\n", oh->name, __func__);
 108
 109         omap4_cminst_module_disable(oh->clkdm->prcm_partition,
 110                                     oh->clkdm->cm_inst,
 111                                     oh->clkdm->clkdm_offs,
 112                                     oh->prcm.omap4.clkctrl_offs);
 113 +
 114 +       v = _omap4_wait_target_disable(oh);
 115 +       if (v)
 116 +               pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
 117 +                       oh->name);
 118 +
 119 +       return 0;
 120  }
 121
 122  /**
 123 @@ -1153,36 +1191,6 @@ static int _wait_target_ready(struct omap_hwmod *oh)
 124  }
 125
 126  /**
 127 - * _wait_target_disable - wait for a module to be disabled
 128 - * @oh: struct omap_hwmod *
 129 - *
 130 - * Wait for a module @oh to enter slave idle.  Returns 0 if the module
 131 - * does not have an IDLEST bit or if the module successfully enters
 132 - * slave idle; otherwise, pass along the return value of the
 133 - * appropriate *_cm*_wait_module_idle() function.
 134 - */
 135 -static int _wait_target_disable(struct omap_hwmod *oh)
 136 -{
 137 -       /* TODO: For now just handle OMAP4+ */
 138 -       if (cpu_is_omap24xx() || cpu_is_omap34xx())
 139 -               return 0;
 140 -
 141 -       if (!oh)
 142 -               return -EINVAL;
 143 -
 144 -       if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
 145 -               return 0;
 146 -
 147 -       if (oh->flags & HWMOD_NO_IDLEST)
 148 -               return 0;
 149 -
 150 -       return omap4_cminst_wait_module_idle(oh->clkdm->prcm_partition,
 151 -                                            oh->clkdm->cm_inst,
 152 -                                            oh->clkdm->clkdm_offs,
 153 -                                            oh->prcm.omap4.clkctrl_offs);
 154 -}
 155 -
 156 -/**
 157   * _lookup_hardreset - fill register bit info for this hwmod/reset line
 158   * @oh: struct omap_hwmod *
 159   * @name: name of the reset line in the context of this hwmod
 160 @@ -1524,8 +1532,6 @@ static int _enable(struct omap_hwmod *oh)
 161   */
 162  static int _idle(struct omap_hwmod *oh)
 163  {
 164 -       int ret;
 165 -
 166         pr_debug("omap_hwmod: %s: idling\n", oh->name);
 167
 168         if (oh->_state != _HWMOD_STATE_ENABLED) {
 169 @@ -1537,11 +1543,9 @@ static int _idle(struct omap_hwmod *oh)
 170         if (oh->class->sysc)
 171                 _idle_sysc(oh);
 172         _del_initiator_dep(oh, mpu_oh);
 173 -       _disable_module(oh);
 174 -       ret = _wait_target_disable(oh);
 175 -       if (ret)
 176 -               pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
 177 -                       oh->name);
 178 +
 179 +       _omap4_disable_module(oh);
 180 +
 181         /*
 182          * The module must be in idle mode before disabling any parents
 183          * clocks. Otherwise, the parent clock might be disabled before
 184 @@ -1642,11 +1646,7 @@ static int _shutdown(struct omap_hwmod *oh)
 185         if (oh->_state == _HWMOD_STATE_ENABLED) {
 186                 _del_initiator_dep(oh, mpu_oh);
 187                 /* XXX what about the other system initiators here? dma, dsp */
 188 -               _disable_module(oh);
 189 -               ret = _wait_target_disable(oh);
 190 -               if (ret)
 191 -                       pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
 192 -                               oh->name);
 193 +               _omap4_disable_module(oh);
 194                 _disable_clocks(oh);
 195                 if (oh->clkdm)
 196                         clkdm_hwmod_disable(oh->clkdm, oh);