From patchwork Fri May 12 16:48:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 93285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5253370vqo; Fri, 12 May 2023 09:54:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ69uSg9Y383M1we68btefzuXFLREiQ2x0Cg0XtOAPwFk+lb5KTvgGYzhNpILFAiO+d41eq3 X-Received: by 2002:a17:902:da88:b0:1a6:d9de:1887 with SMTP id j8-20020a170902da8800b001a6d9de1887mr32356045plx.53.1683910499536; Fri, 12 May 2023 09:54:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683910499; cv=none; d=google.com; s=arc-20160816; b=YphSaftQDYpoCsPaFbsFRQUHhpG0mLLSYbV7AooFm1NZ+Pa6Nlk48GODyMbxtUmZL3 PJ3mYvZp0U28eT4KpI4gY4fDDqmkZJopH9ysFl7OZMoT440sr3q/aDL/mcVKjn5sM/xt hhlm7uL7LFtZ9LweIUAaZC27WWrjSOUN91H9mCxXX/C70miAki52rqZuAZxHqmK/pmIW e1X4zF1WKCks2fpm8wcxMaY6GbH58/oJUMXZYgNZn3EOZKcEEhXve1hQDbcq8c/fQoVn wXNpxuD+CxNHNuZV6mUpkt23xFOkLtlqORo5ZiGoIKwWzeeiVpQLmirLNdaZMUGmDHR7 85dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=HutwX+KLgfv7Jubic5/xhBrVUiQ8CRoQwUCK5WkViRc=; b=zKgZ0PsCiptUYQT7RDSzve3puxLFC3GyduDJjBcPPCclhBxVIopJtxHXf0CZVlOi9g 0DHAu9OSsqSXkPBcQJJm21lRbP3rZlUSgTlcQFYhvrqmOyMUJ8HaG+TG+NcgIFTNAICv FGKEExjriI3f6e769ttmkJrc7YI0r6BY29/u00cbEC6mzKq1f6DhK2W7J1+1vh/QOaKs seBf7Yp9r4J1G7zcyZ5sTQ08/5/0kc2YLocF22pg86Yz+609FFi3m5lc5pIVAhY8yZUf RgjeekFwRFZ//DC4cypYZQRgeaFkMrUqONr18104J21UoCW8A85/vsDcPIWliXMvKr3U 9Tdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=VfN6pVJQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j23-20020a170902759700b001adf26a9390si267962pll.191.2023.05.12.09.54.47; Fri, 12 May 2023 09:54:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=VfN6pVJQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237404AbjELQtW (ORCPT + 99 others); Fri, 12 May 2023 12:49:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbjELQtU (ORCPT ); Fri, 12 May 2023 12:49:20 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D33A435A4; Fri, 12 May 2023 09:49:18 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2ac79d4858dso108594931fa.2; Fri, 12 May 2023 09:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683910157; x=1686502157; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HutwX+KLgfv7Jubic5/xhBrVUiQ8CRoQwUCK5WkViRc=; b=VfN6pVJQ9iYFwPvisewJpSseYxIOZJ8XGtqNp3uDEu7Yzev9BZ8HV01uiYtjdteHfr uZ/wFn1Xlm/7Bn2CictEgaS+/jwGKKMkPSscmroDrnvp7iLZwOIZY+0yyrhcYhs0oNoI 3WLYzsK6BovbvoQlDDmWr/4pJ/gU8I53Y6WZyjORZJtbUbN2uqAfRuGrTkSOyrQ+j2i7 ffnOyPpVQAiaKETKdvBssKTO7qKRa0BYN+8N+jNAa1FuDykFwjGooK/MwoVlt9+1PtQp vGcZx+t8W5Roh2YA/kDEhQFN1U+XHGofmjpgT4VXSE4Vu5rzOirC8WjnCNN8wjqej2H2 /LjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683910157; x=1686502157; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HutwX+KLgfv7Jubic5/xhBrVUiQ8CRoQwUCK5WkViRc=; b=cNUy+igYaZrKqxz4E8dbBTPRR7slQ9V/vY7wVptweqHKXONhHK42lZGv+xRaMUth4d rHmuzST2mEpaylQljBLOFnMwzYyBGoJWtOvjzmsK/J7rcVtIxe46MrNXxuqVVZ/TxIe6 EM5lLf2qDiqhmCGKYDdUp61T767E6jHj2rjZ6lLRZVelxi516wwHSMjKgYAcSHzRBfyR rhNUj3JxslGbOgQlcsQYQEYELdLDCDDrVEGN3L5f2RrXgQMOwb81dZKcLUmOZ1VnyM0t yibmYYwNWdLScBC/bGqSWme0VXBTkOrAJAPGVFv5fiZgvU8EOzArTwsaM7qFIlg978Qd XwcA== X-Gm-Message-State: AC+VfDwsd7RrXwKRl9v6aoVOJLamOH7TK/U6D4KLb9E6ZGIueAfiDagT QfZ+Kg7NO3mijRJciUYhyGDz1yUVKAY= X-Received: by 2002:a2e:b61c:0:b0:2a8:bce4:c70f with SMTP id r28-20020a2eb61c000000b002a8bce4c70fmr4049054ljn.26.1683910156419; Fri, 12 May 2023 09:49:16 -0700 (PDT) Received: from localhost.localdomain ([37.130.110.122]) by smtp.gmail.com with ESMTPSA id j14-20020a2eb70e000000b002a8a77f4d03sm2839487ljo.59.2023.05.12.09.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 09:49:15 -0700 (PDT) From: Max Filippov To: linux-kernel@vger.kernel.org Cc: Chris Zankel , Max Filippov , stable@vger.kernel.org Subject: [PATCH v2] xtensa: add __bswap{si,di}2 helpers Date: Fri, 12 May 2023 09:48:15 -0700 Message-Id: <20230512164815.2150839-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, FROM_LOCAL_NOVOWEL,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765678573359661699?= X-GMAIL-MSGID: =?utf-8?q?1765708136247130572?= gcc-13 may generate calls for __bswap{si,di}2. This breaks the kernel build when optimization for size is selected. Add __bswap{si,di}2 helpers to fix that. Cc: stable@vger.kernel.org Fixes: 19c5699f9aff ("xtensa: don't link with libgcc") Signed-off-by: Max Filippov --- Changes v1->v2: - add declarations and EXPORT_SYMBOL arch/xtensa/kernel/xtensa_ksyms.c | 4 ++++ arch/xtensa/lib/Makefile | 2 +- arch/xtensa/lib/bswapdi2.S | 21 +++++++++++++++++++++ arch/xtensa/lib/bswapsi2.S | 16 ++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 arch/xtensa/lib/bswapdi2.S create mode 100644 arch/xtensa/lib/bswapsi2.S diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c index 2a31b1ab0c9f..17a7ef86fd0d 100644 --- a/arch/xtensa/kernel/xtensa_ksyms.c +++ b/arch/xtensa/kernel/xtensa_ksyms.c @@ -56,6 +56,8 @@ EXPORT_SYMBOL(empty_zero_page); */ extern long long __ashrdi3(long long, int); extern long long __ashldi3(long long, int); +extern long long __bswapdi2(long long); +extern int __bswapsi2(int); extern long long __lshrdi3(long long, int); extern int __divsi3(int, int); extern int __modsi3(int, int); @@ -66,6 +68,8 @@ extern unsigned long long __umulsidi3(unsigned int, unsigned int); EXPORT_SYMBOL(__ashldi3); EXPORT_SYMBOL(__ashrdi3); +EXPORT_SYMBOL(__bswapdi2); +EXPORT_SYMBOL(__bswapsi2); EXPORT_SYMBOL(__lshrdi3); EXPORT_SYMBOL(__divsi3); EXPORT_SYMBOL(__modsi3); diff --git a/arch/xtensa/lib/Makefile b/arch/xtensa/lib/Makefile index 7ecef0519a27..c9c2614188f7 100644 --- a/arch/xtensa/lib/Makefile +++ b/arch/xtensa/lib/Makefile @@ -4,7 +4,7 @@ # lib-y += memcopy.o memset.o checksum.o \ - ashldi3.o ashrdi3.o lshrdi3.o \ + ashldi3.o ashrdi3.o bswapdi2.o bswapsi2.o lshrdi3.o \ divsi3.o udivsi3.o modsi3.o umodsi3.o mulsi3.o umulsidi3.o \ usercopy.o strncpy_user.o strnlen_user.o lib-$(CONFIG_PCI) += pci-auto.o diff --git a/arch/xtensa/lib/bswapdi2.S b/arch/xtensa/lib/bswapdi2.S new file mode 100644 index 000000000000..d8e52e05eba6 --- /dev/null +++ b/arch/xtensa/lib/bswapdi2.S @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH GCC-exception-2.0 */ +#include +#include +#include + +ENTRY(__bswapdi2) + + abi_entry_default + ssai 8 + srli a4, a2, 16 + src a4, a4, a2 + src a4, a4, a4 + src a4, a2, a4 + srli a2, a3, 16 + src a2, a2, a3 + src a2, a2, a2 + src a2, a3, a2 + mov a3, a4 + abi_ret_default + +ENDPROC(__bswapdi2) diff --git a/arch/xtensa/lib/bswapsi2.S b/arch/xtensa/lib/bswapsi2.S new file mode 100644 index 000000000000..9c1de1344f79 --- /dev/null +++ b/arch/xtensa/lib/bswapsi2.S @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH GCC-exception-2.0 */ +#include +#include +#include + +ENTRY(__bswapsi2) + + abi_entry_default + ssai 8 + srli a3, a2, 16 + src a3, a3, a2 + src a3, a3, a3 + src a2, a2, a3 + abi_ret_default + +ENDPROC(__bswapsi2)