From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933161AbeARQF4 (ORCPT ); Thu, 18 Jan 2018 11:05:56 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36626 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933070AbeARQFy (ORCPT ); Thu, 18 Jan 2018 11:05:54 -0500 X-Google-Smtp-Source: ACJfBosNqutvHsYbdi0tInJzxzXr6oXdtVQrWRtQYyeMI+FUtPdsueA/zfVNhd5rMhyR7AL8YFzkKg== Date: Thu, 18 Jan 2018 08:05:52 -0800 (PST) X-Google-Original-Date: Thu, 18 Jan 2018 08:01:55 PST (-0800) Subject: Re: [PATCH] MIPS: use generic GCC library routines from lib/ In-Reply-To: <20180117090348.GA20406@mredfearn-linux> CC: antonynpavlov@gmail.com, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, ralf@linux-mips.org From: Palmer Dabbelt To: matt.redfearn@mips.com Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 17 Jan 2018 01:03:48 PST (-0800), matt.redfearn@mips.com wrote: > Hi, > > On Wed, Jan 17, 2018 at 09:51:21AM +0300, Antony Pavlov wrote: >> The commit b35cd9884fa5 ("lib: Add shared copies of >> some GCC library routines") makes it possible >> to share generic GCC library routines by several >> architectures. >> >> This commit removes several generic GCC library >> routines from arch/mips/lib/ in favour of similar >> routines from lib/. >> >> Signed-off-by: Antony Pavlov >> Cc: Palmer Dabbelt >> Cc: Ralf Baechle >> Cc: linux-mips@linux-mips.org >> Cc: linux-kernel@vger.kernel.org >> --- >> arch/mips/Kconfig | 5 +++++ >> arch/mips/lib/Makefile | 2 +- >> arch/mips/lib/ashldi3.c | 30 ------------------------------ >> arch/mips/lib/ashrdi3.c | 32 -------------------------------- >> arch/mips/lib/cmpdi2.c | 28 ---------------------------- >> arch/mips/lib/lshrdi3.c | 30 ------------------------------ >> arch/mips/lib/ucmpdi2.c | 22 ---------------------- >> 7 files changed, 6 insertions(+), 143 deletions(-) >> delete mode 100644 arch/mips/lib/ashldi3.c >> delete mode 100644 arch/mips/lib/ashrdi3.c >> delete mode 100644 arch/mips/lib/cmpdi2.c >> delete mode 100644 arch/mips/lib/lshrdi3.c >> delete mode 100644 arch/mips/lib/ucmpdi2.c >> >> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig >> index 350a990fc719..9cd49ee848c6 100644 >> --- a/arch/mips/Kconfig >> +++ b/arch/mips/Kconfig >> @@ -73,6 +73,11 @@ config MIPS >> select RTC_LIB if !MACH_LOONGSON64 >> select SYSCTL_EXCEPTION_TRACE >> select VIRT_TO_BUS >> + select GENERIC_ASHLDI3 >> + select GENERIC_ASHRDI3 >> + select GENERIC_LSHRDI3 >> + select GENERIC_CMPDI2 >> + select GENERIC_UCMPDI2 > > Please preserve alphabetical order > >> >> menu "Machine selection" >> >> diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile >> index 78c2affeabf8..195ab4cb0840 100644 >> --- a/arch/mips/lib/Makefile >> +++ b/arch/mips/lib/Makefile >> @@ -16,4 +16,4 @@ obj-$(CONFIG_CPU_R3000) += r3k_dump_tlb.o >> obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o >> >> # libgcc-style stuff needed in the kernel >> -obj-y += ashldi3.o ashrdi3.o bswapsi.o bswapdi.o cmpdi2.o lshrdi3.o ucmpdi2.o >> +obj-y += bswapsi.o bswapdi.o >> diff --git a/arch/mips/lib/ashldi3.c b/arch/mips/lib/ashldi3.c >> deleted file mode 100644 >> index 24cd6903e797..000000000000 >> --- a/arch/mips/lib/ashldi3.c >> +++ /dev/null >> @@ -1,30 +0,0 @@ >> -// SPDX-License-Identifier: GPL-2.0 >> -#include >> - >> -#include "libgcc.h" >> - >> -long long notrace __ashldi3(long long u, word_type b) >> -{ >> - DWunion uu, w; >> - word_type bm; >> - >> - if (b == 0) >> - return u; >> - >> - uu.ll = u; >> - bm = 32 - b; >> - >> - if (bm <= 0) { >> - w.s.low = 0; >> - w.s.high = (unsigned int) uu.s.low << -bm; >> - } else { >> - const unsigned int carries = (unsigned int) uu.s.low >> bm; >> - >> - w.s.low = (unsigned int) uu.s.low << b; >> - w.s.high = ((unsigned int) uu.s.high << b) | carries; >> - } >> - >> - return w.ll; >> -} >> - >> -EXPORT_SYMBOL(__ashldi3); >> diff --git a/arch/mips/lib/ashrdi3.c b/arch/mips/lib/ashrdi3.c >> deleted file mode 100644 >> index 23f5295af51e..000000000000 >> --- a/arch/mips/lib/ashrdi3.c >> +++ /dev/null >> @@ -1,32 +0,0 @@ >> -// SPDX-License-Identifier: GPL-2.0 >> -#include >> - >> -#include "libgcc.h" >> - >> -long long notrace __ashrdi3(long long u, word_type b) >> -{ >> - DWunion uu, w; >> - word_type bm; >> - >> - if (b == 0) >> - return u; >> - >> - uu.ll = u; >> - bm = 32 - b; >> - >> - if (bm <= 0) { >> - /* w.s.high = 1..1 or 0..0 */ >> - w.s.high = >> - uu.s.high >> 31; >> - w.s.low = uu.s.high >> -bm; >> - } else { >> - const unsigned int carries = (unsigned int) uu.s.high << bm; >> - >> - w.s.high = uu.s.high >> b; >> - w.s.low = ((unsigned int) uu.s.low >> b) | carries; >> - } >> - >> - return w.ll; >> -} >> - >> -EXPORT_SYMBOL(__ashrdi3); >> diff --git a/arch/mips/lib/cmpdi2.c b/arch/mips/lib/cmpdi2.c >> deleted file mode 100644 >> index 93cfc785927d..000000000000 >> --- a/arch/mips/lib/cmpdi2.c >> +++ /dev/null >> @@ -1,28 +0,0 @@ >> -// SPDX-License-Identifier: GPL-2.0 >> -#include >> - >> -#include "libgcc.h" >> - >> -word_type notrace __cmpdi2(long long a, long long b) >> -{ >> - const DWunion au = { >> - .ll = a >> - }; >> - const DWunion bu = { >> - .ll = b >> - }; >> - >> - if (au.s.high < bu.s.high) >> - return 0; >> - else if (au.s.high > bu.s.high) >> - return 2; >> - >> - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) >> - return 0; >> - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) >> - return 2; >> - >> - return 1; >> -} >> - >> -EXPORT_SYMBOL(__cmpdi2); >> diff --git a/arch/mips/lib/lshrdi3.c b/arch/mips/lib/lshrdi3.c >> deleted file mode 100644 >> index 914b971aca3b..000000000000 >> --- a/arch/mips/lib/lshrdi3.c >> +++ /dev/null >> @@ -1,30 +0,0 @@ >> -// SPDX-License-Identifier: GPL-2.0 >> -#include >> - >> -#include "libgcc.h" >> - >> -long long notrace __lshrdi3(long long u, word_type b) >> -{ >> - DWunion uu, w; >> - word_type bm; >> - >> - if (b == 0) >> - return u; >> - >> - uu.ll = u; >> - bm = 32 - b; >> - >> - if (bm <= 0) { >> - w.s.high = 0; >> - w.s.low = (unsigned int) uu.s.high >> -bm; >> - } else { >> - const unsigned int carries = (unsigned int) uu.s.high << bm; >> - >> - w.s.high = (unsigned int) uu.s.high >> b; >> - w.s.low = ((unsigned int) uu.s.low >> b) | carries; >> - } >> - >> - return w.ll; >> -} >> - >> -EXPORT_SYMBOL(__lshrdi3); >> diff --git a/arch/mips/lib/ucmpdi2.c b/arch/mips/lib/ucmpdi2.c >> deleted file mode 100644 >> index c31c78ca4175..000000000000 >> --- a/arch/mips/lib/ucmpdi2.c >> +++ /dev/null >> @@ -1,22 +0,0 @@ >> -// SPDX-License-Identifier: GPL-2.0 >> -#include >> - >> -#include "libgcc.h" >> - >> -word_type notrace __ucmpdi2(unsigned long long a, unsigned long long b) > > The version of __ucmpdi2 in /lib/ is not marked notrace. We have seen > issues before with compiler intrinsics not being marked notrace - see > aedcfbe06558 ("MIPS: lib: Mark intrinsics notrace") > > Please ensure that the /lib/ version is equivalent before switching to > that version. IIRC we marked the others as notrace for a similar reason, I must have just missed this one somehow. I can submit a patch. Thanks! > > Thanks, > Matt > >> -{ >> - const DWunion au = {.ll = a}; >> - const DWunion bu = {.ll = b}; >> - >> - if ((unsigned int) au.s.high < (unsigned int) bu.s.high) >> - return 0; >> - else if ((unsigned int) au.s.high > (unsigned int) bu.s.high) >> - return 2; >> - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) >> - return 0; >> - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) >> - return 2; >> - return 1; >> -} >> - >> -EXPORT_SYMBOL(__ucmpdi2); >> -- >> 2.15.1 >> >>