From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.rutland@arm.com (Mark Rutland) Date: Fri, 5 Jun 2015 11:04:58 +0100 Subject: [PATCHv3 11/12] ARM: migrate to common PSCI client code In-Reply-To: <20150604094529.GB8346@e104818-lin.cambridge.arm.com> References: <1432648350-5454-1-git-send-email-mark.rutland@arm.com> <1432648350-5454-12-git-send-email-mark.rutland@arm.com> <20150603151625.GA599@leverpostej> <20150604094529.GB8346@e104818-lin.cambridge.arm.com> Message-ID: <20150605100458.GD599@leverpostej> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Jun 04, 2015 at 10:45:30AM +0100, Catalin Marinas wrote: > Hi Mark, > > 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 > > > Acked-by: Catalin Marinas > > > Cc: Ashwin Chaugule > > > Cc: Lorenzo Pieralisi > > > Cc: Rob Herring > > > Cc: Russell King > > > Cc: Will Deacon > > > --- > > > 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 [1]. I've pushed the whole series with the tags provided today to psci/rework [2]. I tried a merge with the arm64 for-next/core branch locally, and got a trivial conflict in smp.c against the changes in "arm64: Use common outgoing-CPU-notification code". Hopefully that's easy to fix up locally. > BTW, can we skip patch 11 in this series and still allow > drivers/firmware/psci.c only for arm64, with the aim of moving the arm32 > code later? We could, though I would prefer to have the two unified from the beginning. Thanks, Mark. [1] git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git arm64/psci-rework [2] git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git psci/rework