Skip to content

Samsung PM consolidation part 2 (multiplatform)

Kukjin Kim linux-arm-kernel linux-samsung-soc 2 versions – New

Get series with b4
b4 am '[email protected]'

Versions newest first · linked by author and title

  1. v2 Latest posting 2/20 of 12 patches 0 repliesNew
  2. v2 posting 1/20 of 12 patches 0 repliesSuperseded

Patches in v2 posting 2/2 No applies recorded yet

None of the 12 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 v2 00/12] Samsung PM consolidation part 2 (multiplatform)
Quoted 6 lines · Tomasz Figa
Quoted 4 lines · Tomasz Figa

Hi Kukjin,

Quoted 1 line · Tomasz Figa

Current Samsung PM code is heavily unprepared for multiplatform

systems.

Quoted 7 lines
Quoted 4 lines
Quoted 4 lines

The design implies accessing functions and global variables defined in particular mach- subdirectory from common code in plat-, which is not allowed when building ARCH_MULTIPLATFORM. In addition there is a lot of forced code unification, which makes common function handle any

possible

Quoted 2 lines
Quoted 2 lines

quirks of all supported SoCs. In the end this design turned out to not work too well, ending with a lot of empty functions exported from

mach-,

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

just because code in common pm.c calls them. Moreover, recent trend of moving lower level suspend/resume code to proper drivers, like pinctrl or clk, made a lot of code there redundant, especially on DT-only platforms
like Exynos.

Quoted 74 lines
Quoted 3 lines
Quoted 3 lines

This patch series attempts to untie Exynos PM support from the legacy Samsung PM core and make it multiplatform-aware, by isolating truly generic parts of the latter, making them multiplatform-friendly and

then

Quoted 1 line
Quoted 1 line

reimplementing Exynos PM support in a multiplatform-capable way by

using

Quoted 1 line
Quoted 1 line

those generic parts. The result is that now PM initialization is

started

Quoted 66 lines
Quoted 66 lines

from mach-exynos*-dt, which calls Exynos-specific initialization code that
registers platform_suspend_ops, so control flow is basically reversed ending with mach- code calling more generic plat- code if needed.

This is limited to Exynos right now, but remaining SoCs could follow in further series.

Depends on Samsung PM consolidation part 1 (clocks) series:
- http://thread.gmane.org/gmane.linux.kernel.samsung-soc/26816

On Exynos4210-based Trats, Exynos4412-based Trats2 and Exynos5250-based Arndale boards (except suspend/resume, which is broken because of unrelated reasons):

Changes since v1 (RFC):
- fixed l2x0 resume,
- fixed checkpatch complaints (about issues in existing code being
moved),
- rebased on top of current linux-next,
- slightly reordered patches to make the order more logical.

Tomasz Figa (12):
ARM: EXYNOS: Do not resume l2x0 if not enabled before suspend
ARM: SAMSUNG: Add soc_is_s3c2410() helper
ARM: SAMSUNG: pm: Save UART DIVSLOT register based on SoC type
ARM: SAMSUNG: pm: Use debug_ll_addr() to get UART base address
ARM: SAMSUNG: pm: Consolidate PM debug functions
ARM: SAMSUNG: pm: Move Samsung PM debug code into separate file
ARM: SAMSUNG: Move common save/restore helpers to separate file
ARM: SAMSUNG: pm: Move s3c_pm_check_* prototypes to plat/pm-common.h
ARM: EXYNOS: Kconfig: Fix abuse of CONFIG_PM
ARM: EXYNOS: Remove PM initcalls and useless indirection
ARM: EXYNOS: Stop using legacy Samsung PM code
ARM: exynos: Allow wake-up using GIC interrupts

  arch/arm/mach-exynos/Kconfig                   |  16 +--
  arch/arm/mach-exynos/Makefile                  |   2 +-
  arch/arm/mach-exynos/common.c                  |   1 +
  arch/arm/mach-exynos/common.h                  |  14 ++
  arch/arm/mach-exynos/include/mach/pm-core.h    |  75 -----------
  arch/arm/mach-exynos/pm.c                      | 172
+++++++++++++++++++------
  arch/arm/mach-exynos/regs-pmu.h                |   2 +
  arch/arm/mach-exynos/sleep.S                   |  85 ++++++++++++
  arch/arm/mach-s3c64xx/pm.c                     |   1 -
  arch/arm/mach-s5p64x0/pm.c                     |   1 -
  arch/arm/plat-samsung/Makefile                 |   2 +
  arch/arm/plat-samsung/include/plat/cpu.h       |   6 +
  arch/arm/plat-samsung/include/plat/pm-common.h | 110 ++++++++++++++++
  arch/arm/plat-samsung/include/plat/pm.h        |  80 +-----------
  arch/arm/plat-samsung/pm-check.c               |   2 +-
  arch/arm/plat-samsung/pm-common.c              |  75 +++++++++++
  arch/arm/plat-samsung/pm-debug.c               |  98 ++++++++++++++
  arch/arm/plat-samsung/pm.c                     | 146
---------------------
  arch/arm/plat-samsung/s5p-sleep.S              |  43 -------
  19 files changed, 531 insertions(+), 400 deletions(-)

delete mode 100644 arch/arm/mach-exynos/include/mach/pm-core.h create mode 100644 arch/arm/mach-exynos/sleep.S
create mode 100644 arch/arm/plat-samsung/include/plat/pm-common.h create mode 100644 arch/arm/plat-samsung/pm-common.c create mode 100644 arch/arm/plat-samsung/pm-debug.c

Hi Tomasz,

Build error happens with s3c6400_defconfig:

In file included from arch/arm/plat-samsung/pm.c:38:0:
arch/arm/mach-s3c64xx/include/mach/pm-core.h: In function 's3c_pm_arch_update_uart':
arch/arm/mach-s3c64xx/include/mach/pm-core.h:64:32: error: 'S3C2410_UCON' undeclared (first use in this function) arch/arm/mach-s3c64xx/include/mach/pm-core.h:64:32: note: each undeclared identifier is reported only once for each function it appears in arch/arm/mach-s3c64xx/include/mach/pm-core.h:65:24: error:
'S3C6400_UCON_CLKMASK' undeclared (first use in this function) arch/arm/mach-s3c64xx/include/mach/pm-core.h:73:16: error:
'S3C2410_UCON_TXILEVEL' undeclared (first use in this function) arch/arm/mach-s3c64xx/include/mach/pm-core.h:73:40: error:
'S3C2410_UCON_RXILEVEL' undeclared (first use in this function) arch/arm/mach-s3c64xx/include/mach/pm-core.h:87:18: error:
'S3C6400_UCON_UCLK0' undeclared (first use in this function) arch/arm/mach-s3c64xx/include/mach/pm-core.h:89:15: error:
'S3C6400_UCON_PCLK2' undeclared (first use in this function) make[2]: *** [arch/arm/plat-samsung/pm.o] Error 1
make[1]: *** [arch/arm/plat-samsung] Error 2
make[1]: *** Waiting for unfinished jobs....

And with s5p64x0_defconfig:

In file included from arch/arm/plat-samsung/pm.c:38:0:
arch/arm/mach-s5p64x0/include/mach/pm-core.h: In function 's3c_pm_arch_update_uart':
arch/arm/mach-s5p64x0/include/mach/pm-core.h:57:32: error: 'S3C2410_UCON' undeclared (first use in this function) arch/arm/mach-s5p64x0/include/mach/pm-core.h:57:32: note: each undeclared identifier is reported only once for each function it appears in arch/arm/mach-s5p64x0/include/mach/pm-core.h:58:24: error:
'S3C6400_UCON_CLKMASK' undeclared (first use in this function) arch/arm/mach-s5p64x0/include/mach/pm-core.h:68:16: error:
'S3C2410_UCON_TXILEVEL' undeclared (first use in this function) arch/arm/mach-s5p64x0/include/mach/pm-core.h:68:40: error:
'S3C2410_UCON_RXILEVEL' undeclared (first use in this function) arch/arm/mach-s5p64x0/include/mach/pm-core.h:85:18: error:
'S3C6400_UCON_UCLK0' undeclared (first use in this function) arch/arm/mach-s5p64x0/include/mach/pm-core.h:87:11: error:
'S3C6400_UCON_PCLK2' undeclared (first use in this function) make[2]: *** [arch/arm/plat-samsung/pm.o] Error 1
make[2]: *** Waiting for unfinished jobs....
CC arch/arm/mach-s5p64x0/setup-sdhci-gpio.o
CC fs/char_dev.o
make[1]: *** [arch/arm/plat-samsung] Error 2
make[1]: *** Waiting for unfinished jobs....

Please see the 'v3.15-next/s2r-pm-samsung-2' branch.

- Kukjin