Skip to content

OMAP4: PM: suspend, CPU-hotplug and CPUilde support

Santosh Shilimkar linux-arm-kernel linux-omap 5 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 4/40 of 24 patches 0 repliesNew
  2. v2 posting 3/40 of 24 patches 0 repliesSuperseded
  3. v2 posting 2/40 of 24 patches 0 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v2 posting 1/424 patches0 repliesSuperseded
v10 of 25 patches0 repliesSuperseded

Patches in v2 posting 4/4 No applies recorded yet

None of the 24 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH 00/24 V2] OMAP4: PM: suspend, CPU-hotplug and CPUilde support
Quoted 4 lines · Kevin Hilman

Hi Santosh,

Santosh Shilimkar <[email protected]> writes:

Quoted 9 lines
Quoted 2 lines

The series adds OMAP4 MPUSS (MPU SubSystem) power management support for suspend (S2R), CPU hotplug and CPUidle.

There are a few more compile errors when doing OMAP1-only builds. You'll need a way to eliminate the secure calls for OMAP1.

This series causes a couple build errors when doing OMAP1-only builds (I used omap1_defconfig):

OK. Thanks for catching it.

Quoted 11 lines

First:

/work/kernel/omap/pm/arch/arm/plat-omap/common.c:24:30: fatal error: mach/omap-secure.h: No such file or directory

And trying creating a dummy header to see if it would continue to build gives:

/work/kernel/omap/pm/arch/arm/plat-omap/common.c: In function 'omap_reserve':
/work/kernel/omap/pm/arch/arm/plat-omap/common.c:70:2: error: implicit declaration of function 'omap_secure_ram_reserve_memblock' make[2]: *** [arch/arm/plat-omap/common.o] Error 1
make[1]: *** [arch/arm/plat-omap] Error 2

For OMAP1 build, omap_secure_ram_reserve_memblock() definition is needed since common.c is built for OMAP1 as well.
The trivial change in the end of this email fixes the omap1 build. Have folded that change in original patch and updated the OMAP4 PM branch - for_3_2/omap4-mpuss-pm_2

Regards
Santosh
P.S : Even with this fix, omap1_defconfig build breaks because of USB. I removed USB from build to check rest of the build and it was fine then.

---

(quoted diff) +0 -0

b/arch/arm/mach-omap2/include/mach/omap-secure.h
index 6e929c5..48247ce 100644

arch/arm/mach-omap2/include/mach/omap-secure.h +0 -0
@@ -51,7 +51,6 @@ extern u32 omap_secure_dispatcher(u32 idx, u32 flag,

u32 nargs,
u32 arg1, u32 arg2, u32 arg3, u32 arg4);
extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);
extern phys_addr_t omap_secure_ram_mempool_base(void);
-extern int omap_secure_ram_reserve_memblock(void);

#endif /* __ASSEMBLER__ */
#endif /* OMAP_ARCH_OMAP_SECURE_H */

arch/arm/plat-omap/common.c +1 -1
index 827f896..d5ef8dc 100644
@@ -21,7 +21,7 @@
 #include <plat/vram.h>
 #include <plat/dsp.h>
 
-#include <mach/omap-secure.h>
+#include <plat/omap-secure.h>
 
 
 #define NO_LENGTH_CHECK 0xffffffff
(quoted diff) +0 -0

b/arch/arm/plat-omap/include/plat/omap-secure.h
new file mode 100644
index 0000000..64f9d1c

arch/arm/plat-omap/include/plat/omap-secure.h new file +13 -0
@@ -0,0 +1,13 @@
+#ifndef __OMAP_SECURE_H__
+#define __OMAP_SECURE_H__
+
+#include <linux/types.h>
+
+#ifdef CONFIG_ARCH_OMAP2PLUS
+extern int omap_secure_ram_reserve_memblock(void);
+#else
+static inline void omap_secure_ram_reserve_memblock(void)
+{ }
+#endif
+
+#endif /* __OMAP_SECURE_H__ */