From patchwork Wed Sep 20 05:21:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 142582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4399845vqi; Wed, 20 Sep 2023 13:15:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBccA8TqjsTdgDJ1waluwZA4W0kQr9QgFzYWgVOjL/gnycGJmpP6xG9StQVzHJr/muoKrY X-Received: by 2002:a05:6a21:3291:b0:12e:98a3:77b7 with SMTP id yt17-20020a056a21329100b0012e98a377b7mr4126199pzb.59.1695240944810; Wed, 20 Sep 2023 13:15:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695240944; cv=none; d=google.com; s=arc-20160816; b=OEywDkkYBXdBPSj3AkshqR24sQkHSGqyy/PMMnEYxeD89A93SVHmrmoI+aJKKETdjz yG55XZkQy2AB/W8lTex/k1UghlC2UNgr38QY/BWfccgLnYiguFdwWujHHM5aO/iIvOmG oO3An647uwIj3fXR36giwT+cSsQZoPXEwgK+5ge6LmwpQy6D47zKpWsU9wlYPs+0sgEQ 59vq3uUEGNTbLPqDtV5r95xBNJv8pQjgg7x5oCr6Odh4jBPuHMwipjNaoIzOnA8IW8lD r0dhsTH64YDUEAEK6w+t92q3mhZCWzHzrrjGCi6KAaHzeYQ1N/zkxu/dOrMpYQoyZBg4 q1hw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wYiT4DruSD+QC32dES8hhCpNakimhJKyMGf+5+i73PQ=; fh=6/+MrGEwXu3chX+JgIyVPR9luFinEXEbVHdRWlFWSv8=; b=jCHUEw8wUbFxnkyOBLDyDgPji0RrDbUGypZNGAhBgFMR0/Q4AC0L7NvnepvOM301iW BVgEvB82+pmHUJ96L/7+k3zXTFpEvbGiMD+mssWasQFTpvekqpMAzTr6Ib9o0NHO9Uwr aQRDrU4ul7R8clpNfYuY7ApoRG055ncThBMkXXomSgsKHSn8lErbbYn0zCNJi7HwTlLb gxGPC7AG3GPHj7HXAT9EqKAIY7av9LSU1EWXjP1GdDvUGJ4wvEqlcOSl8Fbq48cHfSGs 11QeykCM/gC9ukstWISMii4VR82gBWLsMIzWR0BwX79yWdikqUamXRE8v5TToM7gPh6u 1IYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=1SA6bvTQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id f10-20020a170902ce8a00b001bf3a0306bcsi13047098plg.5.2023.09.20.13.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 13:15:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=1SA6bvTQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 4A82382B2E5E; Tue, 19 Sep 2023 22:22:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232738AbjITFW0 (ORCPT + 26 others); Wed, 20 Sep 2023 01:22:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232594AbjITFVw (ORCPT ); Wed, 20 Sep 2023 01:21:52 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6F47F3 for ; Tue, 19 Sep 2023 22:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=wYiT4DruSD+QC32dES8hhCpNakimhJKyMGf+5+i73PQ=; b=1SA6bvTQV2Vk09FYca8lUX8/en sVV57qGZ/26jHOL/POPyxs05mIJHAa49pv13lxW8gjnxCvQOcgzdMkxYsni7rDe4sIO3kcdY7bIfN X/t96CMQWNpMQU/gxGtrcVFTAr4uNMznh4UZ9BCFRBg6/QvM9usq+vPx+wVIqkC5T8iVPmDxT7xwV P6AaSESTff3eVtAHn42AAXXVOtjmQ4ffEB/k7elyG0hbVHA17h9mNqPKbUvj7tCCeGu772LN25p4J UkEONw7qHXJiRvJM9YNMoufwhdL4K24Skx5TmtCHXkMxVSbF1qUrpDJWH+p7ONLCdk31DsDUS9lGP /isNwHrg==; Received: from [2601:1c2:980:9ec0::9fed] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qipek-001tym-1P; Wed, 20 Sep 2023 05:21:46 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Chris Zankel , Max Filippov Subject: [PATCH 15/16] xtensa: umulsidi3: fix conditional expression Date: Tue, 19 Sep 2023 22:21:38 -0700 Message-ID: <20230920052139.10570-16-rdunlap@infradead.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230920052139.10570-1-rdunlap@infradead.org> References: <20230920052139.10570-1-rdunlap@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 19 Sep 2023 22:22:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777588969027802561 X-GMAIL-MSGID: 1777588969027802561 Even when a variant has one or more of these defines set to 1, the multiplier code paths are not used. Change the expression so that the correct code paths are used. arch/xtensa/lib/umulsidi3.S:44:38: warning: "XCHAL_NO_MUL" is not defined, evaluates to 0 [-Wundef] 44 | #if defined(__XTENSA_CALL0_ABI__) && XCHAL_NO_MUL arch/xtensa/lib/umulsidi3.S:145:38: warning: "XCHAL_NO_MUL" is not defined, evaluates to 0 [-Wundef] 145 | #if defined(__XTENSA_CALL0_ABI__) && XCHAL_NO_MUL arch/xtensa/lib/umulsidi3.S:159:5: warning: "XCHAL_NO_MUL" is not defined, evaluates to 0 [-Wundef] 159 | #if XCHAL_NO_MUL Fixes: 8939c58d68f9 ("xtensa: add __umulsidi3 helper") Signed-off-by: Randy Dunlap Cc: Chris Zankel Cc: Max Filippov --- arch/xtensa/lib/umulsidi3.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -- a/arch/xtensa/lib/umulsidi3.S b/arch/xtensa/lib/umulsidi3.S --- a/arch/xtensa/lib/umulsidi3.S +++ b/arch/xtensa/lib/umulsidi3.S @@ -3,7 +3,9 @@ #include #include -#if !XCHAL_HAVE_MUL16 && !XCHAL_HAVE_MUL32 && !XCHAL_HAVE_MAC16 +#if XCHAL_HAVE_MUL16 || XCHAL_HAVE_MUL32 || XCHAL_HAVE_MAC16 +#define XCHAL_NO_MUL 0 +#else #define XCHAL_NO_MUL 1 #endif