[PATCHv3 11/12] ARM: migrate to common PSCI client code
catalin.marinas at arm.com
Fri Jun 5 03:35:38 PDT 2015
On Fri, Jun 05, 2015 at 11:04:58AM +0100, Mark Rutland wrote:
> On Thu, Jun 04, 2015 at 10:45:30AM +0100, Catalin Marinas wrote:
> > On Wed, Jun 03, 2015 at 04:16:39PM +0100, Mark Rutland wrote:
> > > On Tue, May 26, 2015 at 02:52:29PM +0100, Mark Rutland wrote:
> > > > Now that the common PSCI client code has been factored out to
> > > > drivers/firmware, and made safe for 32-bit use, move the 32-bit ARM code
> > > > over to it. This results in a moderate reduction of duplicated lines,
> > > > and will prevent further duplication as the PSCI client code is updated
> > > > for PSCI 1.0 and beyond.
> > > >
> > > > The two legacy platform users of the PSCI invocation code are updated to
> > > > account for interface changes. In both cases the power state parameter
> > > > is changed to an opaque u32 token in preparation for PSCI 1.0 power
> > > > state changes.
> > > >
> > > > Signed-off-by: Mark Rutland <mark.rutland at arm.com>
> > > > Acked-by: Catalin Marinas <catalin.marinas at arm.com>
> > > > Cc: Ashwin Chaugule <ashwin.chaugule at linaro.org>
> > > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
> > > > Cc: Rob Herring <robh at kernel.org>
> > > > Cc: Russell King <rmk+kernel at arm.linux.org.uk>
> > > > Cc: Will Deacon <will.deacon at arm.com>
> > > > ---
> > > > arch/arm/Kconfig | 1 +
> > > > arch/arm/include/asm/psci.h | 23 ---
> > > > arch/arm/kernel/Makefile | 2 +-
> > > > arch/arm/kernel/psci.c | 299 --------------------------------------
> > > > arch/arm/kernel/psci_smp.c | 29 +++-
> > > > arch/arm/kernel/setup.c | 3 +-
> > > > arch/arm/mach-highbank/highbank.c | 2 +-
> > > > arch/arm/mach-highbank/pm.c | 8 +-
> > > > drivers/cpuidle/cpuidle-calxeda.c | 7 +-
> > > > 9 files changed, 32 insertions(+), 342 deletions(-)
> > > > delete mode 100644 arch/arm/kernel/psci.c
> > >
> > > Do you have any objections to the arch/arm changes in this patch?
> > >
> > > If not, could I please have your ack?
> > >
> > > As there are arm, arm64, and drivers changes in the series I was hoping
> > > this could all go via arm-soc.
> > If we don't hear from Russell by the end of today, I propose that we
> > merge patches 1-8 in the arm64 tree (mostly fixes for PSCI). This series
> > is blocking other developments like PSCI 1.0, so I really want to get
> > parts of it merged in 4.2.
> I've pushed the first 8 patches to my arm64/psci-rework branch .
>  git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git arm64/psci-rework
Thanks. I pulled this into the arm64 for-next/core branch.
> I've pushed the whole series with the tags provided today to
> psci/rework .
>  git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git psci/rework
As long as you don't rebase arm64/psci-rework, you can send this branch
to arm-soc once Russell acks the arm part.
More information about the linux-arm-kernel