Skip to contentSkip to conversation

3rd Round for Samsung-cleanup-2 for v3.18

GIT PULL Kukjin Kim 2 participants 3 messages Sep 25, 2014 – Oct 2, 2014

Subsystems (3)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

The following changes since commit f6361c6b3880063c2248d4e453331e3dc1efbf83:

ARM: S3C24XX: remove separate restart code (2014-09-14 02:43:09 +0900)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-cleanup-2

for you to fetch changes up to 5a1f0c6d3161a37da3a651f80b18febc2e5d7b75:

ARM: EXYNOS: Fix CPU idle clock down after CPU off (2014-09-14
02:49:32 +0900)

----------------------------------------------------------------
Samsung 2nd cleanup for v3.18

- Cleanup SMP/hotplug codes from hotplug.c to platsmp.c

- Remove unneeded __ref annotation for exynos_cpu_die()

- Fix the way to power down CPU on exynos4 and CPUidle clock down after power down some CPU

----------------------------------------------------------------
Krzysztof Kozlowski (3):
ARM: EXYNOS: Move code from hotplug.c to platsmp.c
ARM: EXYNOS: Remove unneeded __ref annotation for cpu_die function
ARM: EXYNOS: Fix CPU idle clock down after CPU off

  arch/arm/mach-exynos/Makefile   |   3 --
  arch/arm/mach-exynos/common.h   |   2 -
  arch/arm/mach-exynos/hotplug.c  |  91 --------------------------------
  arch/arm/mach-exynos/platsmp.c  | 113 
++++++++++++++++++++++++++++++++++++++++
  arch/arm/mach-exynos/regs-pmu.h |   3 ++
  5 files changed, 116 insertions(+), 96 deletions(-)

delete mode 100644 arch/arm/mach-exynos/hotplug.c

#1 lore raw
Quoted 17 lines · Kukjin Kim

The following changes since commit f6361c6b3880063c2248d4e453331e3dc1efbf83:

   ARM: S3C24XX: remove separate restart code (2014-09-14 02:43:09 +0900)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-cleanup-2

for you to fetch changes up to 5a1f0c6d3161a37da3a651f80b18febc2e5d7b75:

ARM: EXYNOS: Fix CPU idle clock down after CPU off (2014-09-14
02:49:32 +0900)

----------------------------------------------------------------
Samsung 2nd cleanup for v3.18

Quoted 6 lines

- Cleanup SMP/hotplug codes from hotplug.c to platsmp.c

- Remove unneeded __ref annotation for exynos_cpu_die()

- Fix the way to power down CPU on exynos4 and CPUidle clock down after power down some CPU

Pulled into next/late with a fixup, see below. Your original changen broke allmodconfig.

Arnd

Quoted 1 line

From 9bbebfb41db4109b23d330f14ce41e4ebc825716 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Fri, 26 Sep 2014 23:09:38 +0200
Subject: [PATCH] ARM: EXYNOS: fix build error in platsmp.c

/tmp/ccYeWL3V.s: Assembler messages:
/tmp/ccYeWL3V.s:659: Error: selected processor does not support ARM mode isb ' /tmp/ccYeWL3V.s:664: Error: selected processor does not support ARM mode isb ' /tmp/ccYeWL3V.s:665: Error: selected processor does not support ARM mode `dsb ' make[3]: *** [arch/arm/mach-exynos/platsmp.o] Error 1

Fixes 17342534e1d932 ("ARM: EXYNOS: Move code from hotplug.c to platsmp.c")
arch/arm/mach-exynos/Makefile +1 -0
index 0095de99d703..5d336b43cb10 100644
@@ -20,6 +20,7 @@ obj-$(CONFIG_PM_SLEEP)		+= pm.o sleep.o
 obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
 
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
+CFLAGS_platsmp.o		:= -march=armv7-a
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
author
#2 lore raw
Quoted 21 lines · Arnd Bergmann
Quoted 19 lines · Kukjin Kim

The following changes since commit f6361c6b3880063c2248d4e453331e3dc1efbf83:

   ARM: S3C24XX: remove separate restart code (2014-09-14 02:43:09 +0900)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-cleanup-2

for you to fetch changes up to 5a1f0c6d3161a37da3a651f80b18febc2e5d7b75:

ARM: EXYNOS: Fix CPU idle clock down after CPU off (2014-09-14
02:49:32 +0900)

----------------------------------------------------------------
Samsung 2nd cleanup for v3.18

- Cleanup SMP/hotplug codes from hotplug.c to platsmp.c

Quoted 8 lines
Quoted 4 lines

- Remove unneeded __ref annotation for exynos_cpu_die()

- Fix the way to power down CPU on exynos4 and CPUidle clock down after power down some CPU

Pulled into next/late with a fixup, see below. Your original changen broke allmodconfig.

+ Russell, Krzysztof

Arnd, as I informed about that before its fixup has been applied into rmk tree.

http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=8177/1

But I'm not sure we need to keep the your fixup in arm-soc, in case of landing of the fixup in rmk tree for upcoming merge window.

Sorry for the noise anyway.

- Kukjin

Quoted 28 lines

Arnd

From 9bbebfb41db4109b23d330f14ce41e4ebc825716 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Fri, 26 Sep 2014 23:09:38 +0200
Subject: [PATCH] ARM: EXYNOS: fix build error in platsmp.c

/tmp/ccYeWL3V.s: Assembler messages:
/tmp/ccYeWL3V.s:659: Error: selected processor does not support ARM mode isb ' /tmp/ccYeWL3V.s:664: Error: selected processor does not support ARM mode isb ' /tmp/ccYeWL3V.s:665: Error: selected processor does not support ARM mode `dsb ' make[3]: *** [arch/arm/mach-exynos/platsmp.o] Error 1

Fixes 17342534e1d932 ("ARM: EXYNOS: Move code from hotplug.c to platsmp.c")
arch/arm/mach-exynos/Makefile +1 -0
index 0095de99d703..5d336b43cb10 100644
@@ -20,6 +20,7 @@ obj-$(CONFIG_PM_SLEEP)		+= pm.o sleep.o
 obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
 
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
+CFLAGS_platsmp.o		:= -march=armv7-a
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)