From patchwork Wed Jul 12 09:43:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 787109 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x6vQL6x63z9s65 for ; Wed, 12 Jul 2017 19:52:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BBEC5C21E89; Wed, 12 Jul 2017 09:51:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A47DFC21FA5; Wed, 12 Jul 2017 09:44:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 08CB1C21EA8; Wed, 12 Jul 2017 09:43:46 +0000 (UTC) Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.denx.de (Postfix) with ESMTPS id A5A90C21F8F for ; Wed, 12 Jul 2017 09:43:41 +0000 (UTC) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 3x6vCQ5dnRz9ttBg; Wed, 12 Jul 2017 11:43:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id DtQhrb9labBK; Wed, 12 Jul 2017 11:43:30 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 3x6vCQ58xjz9ttBV; Wed, 12 Jul 2017 11:43:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3929C8B830; Wed, 12 Jul 2017 11:43:41 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id R5BqA7RViSqO; Wed, 12 Jul 2017 11:43:41 +0200 (CEST) Received: from pc13941vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.8]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 14F468B7FE; Wed, 12 Jul 2017 11:43:41 +0200 (CEST) Received: by pc13941vm.idsi0.si.c-s.fr (Postfix, from userid 0) id D8ED76A666; Wed, 12 Jul 2017 11:43:40 +0200 (CEST) Message-Id: <8afbabcec9a9cb58c2be76d4b7956b2288aef556.1499629706.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy To: Wolfgang Denk , Heiko Schocher , Tom Rini , Mario Six , York Sun Date: Wed, 12 Jul 2017 11:43:40 +0200 (CEST) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 12/14] powerpc: move get_pvr() and get_svr() into C X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Avoid unnecessary assembly functions when they can easily be written in C. Signed-off-by: Christophe Leroy --- arch/powerpc/cpu/mpc83xx/start.S | 10 ---------- arch/powerpc/cpu/mpc85xx/start.S | 10 ---------- arch/powerpc/cpu/mpc86xx/start.S | 10 ---------- arch/powerpc/cpu/mpc8xx/start.S | 5 ----- arch/powerpc/include/asm/ppc.h | 11 +++++++++-- 5 files changed, 9 insertions(+), 37 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 2fed4a1fec..d99ae27a65 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -116,16 +116,6 @@ disable_addr_trans: mtspr SRR1, r3 rfi - .globl get_svr -get_svr: - mfspr r3, SVR - blr - - .globl get_pvr -get_pvr: - mfspr r3, PVR - blr - .globl ppcDWstore ppcDWstore: lfd 1, 0(r4) diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 63fdffddb1..f03e1a0bfe 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1427,16 +1427,6 @@ dcache_status: andi. r3,r3,L1CSR0_DCE blr - .globl get_pvr -get_pvr: - mfspr r3,PVR - blr - - .globl get_svr -get_svr: - mfspr r3,SVR - blr - /*------------------------------------------------------------------------------- */ /* Function: in8 */ /* Description: Input 8 bits */ diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index ec5f4a756a..b9e544d23c 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -545,16 +545,6 @@ int_return: dc_read: blr - .globl get_pvr -get_pvr: - mfspr r3, PVR - blr - - .globl get_svr -get_svr: - mfspr r3, SVR - blr - /* * Function: in8 diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index 4c25d3765b..202ea81ae4 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -305,11 +305,6 @@ int_return: SYNC rfi - .globl get_pvr -get_pvr: - mfspr r3, PVR - blr - /*------------------------------------------------------------------------------*/ /* diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h index c41dc1fee0..e8650e4388 100644 --- a/arch/powerpc/include/asm/ppc.h +++ b/arch/powerpc/include/asm/ppc.h @@ -48,8 +48,15 @@ static inline uint get_immr(uint mask) return mask ? (immr & mask) : immr; } #endif -uint get_pvr(void); -uint get_svr(void); +static inline uint get_pvr(void) +{ + return mfspr(PVR); +} + +static inline uint get_svr(void) +{ + return mfspr(SVR); +} #if defined(CONFIG_MPC85xx) || \ defined(CONFIG_MPC86xx) || \