From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F124C4338F for ; Mon, 2 Aug 2021 15:24:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C515610FC for ; Mon, 2 Aug 2021 15:24:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3C515610FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=K45TF5l2pYzhmwyurKU64oilxRPyw5hKR257VLOi4wc=; b=G/0t/P1Rf5Mz/z ybhcmB0KADw7UyyoMeMnuYXwjRBPVKfYRymEfAm0YKktJaLxhusyDZv7IFt+gtsFrvkU5iUCSnbP5 JoUM8VzmBReVfhmNcQVrJSPW3dsD9jR4h1w844OSytSwRJsno27lJ/z4prF1ByM95mFFQYLzkfWN2 LcCabUQLMgfFJrCQTaOilzv70htGYldjAPhid5by/NRbOy0ENfLHYKt4HKPJwLWDDUIrLvPE89xyn 6NNrOP/qYrzvQjZrpJ0QR2PilzfsQoLl7tzIp15Pe/mXm0dF1r1kl7R/vADmxmt37iaU8oqSw6NzO OBysX82u/pz8UBCOnyKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAZlb-00Gupa-7H; Mon, 02 Aug 2021 15:22:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAZlW-00GuoQ-Vi for linux-arm-kernel@lists.infradead.org; Mon, 02 Aug 2021 15:22:08 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 64E5A60725; Mon, 2 Aug 2021 15:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627917726; bh=scBi9JQGesVoVdIDm8pTXxoX8QYbu2/TP4O6Bq8cYIc=; h=From:To:Cc:Subject:Date:From; b=ERMtwfPGy17ZOZXbqimbuLFIscdtR/cPoILVcD7UMRwQaifZp9aGX/YtHZYfJeafK xC+lPSE3hVAYoaGGbpEz6OTaq6oAVae70OrCSGJjIhSHv5YqNgXl87uuUccd/MIGaf eKmF5G3uBv7lJuahx3AOKXkzWZZSoWkdOoAEJTSCvqIG7G11lXRGxpJ2yDsGWGmsbd eB6PnxBSKSF+01wgU/drkbNzVG0c50MSKHFTFTYtSiEvna5bTFq+uYIbq55Oj2VEtv 72DcLW8dQP9RMVeOLV1s9bEJ6gUY0NSSpuoF6utqzpEiGSta6lbGAwp/JbsrF/Wgb3 bwV46o/WQSGwA== From: Arnd Bergmann To: "David S. Miller" , Jakub Kicinski , Lars Povlsen , Steen Hegelund , UNGLinuxDriver@microchip.com, Bjarni Jonasson Cc: Arnd Bergmann , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: sparx5: fix bitmask on 32-bit targets Date: Mon, 2 Aug 2021 17:21:53 +0200 Message-Id: <20210802152201.1158412-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210802_082207_080189_6D7C95B9 X-CRM114-Status: GOOD ( 14.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann I saw the build failure that was fixed in commit 6387f65e2acb ("net: sparx5: fix compiletime_assert for GCC 4.9") and noticed another issue that was introduced in the same patch: Using GENMASK() to create a 64-bit mask does not work on 32-bit architectures. This probably won't ever happen on this driver since it's specific to a 64-bit SoC, but it's better to write it portably, so use GENMASK_ULL() instead. Fixes: f3cad2611a77 ("net: sparx5: add hostmode with phylink support") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c index 1a240e6bddd0..cb68eaaac881 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c @@ -32,7 +32,7 @@ static void __ifh_encode_bitfield(void *ifh, u64 value, u32 pos, u32 width) u32 byte = (35 - (pos / 8)); /* Calculate the Start bit position in the Start IFH byte */ u32 bit = (pos % 8); - u64 encode = GENMASK(bit + width - 1, bit) & (value << bit); + u64 encode = GENMASK_ULL(bit + width - 1, bit) & (value << bit); /* The b0-b7 goes into the start IFH byte */ if (encode & 0xFF) -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel