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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 C30E0C433DF for ; Thu, 20 Aug 2020 00:08:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A826207FB for ; Thu, 20 Aug 2020 00:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597882123; bh=qfVjAFsYUJbEzJSUeRe9YMyUSPn194uANA9bKchzc2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sy2FYdsv/sa+xOHfnqgnihokRCcl9P3iIDVOgcYcCJVoRDh3yIZxZi8VWzx7e03uM aFNNKeVgMKddSl1wdIsgCV6DJzO+D8syiMhG1YKYU/gUwAOdXYTqoZhT+b0CHF0K6P xWI9kpfIo5lxo9EnuRfaRR3Tz6sM0HrsRCHjCJEM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728267AbgHTAIm (ORCPT ); Wed, 19 Aug 2020 20:08:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:60462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728175AbgHTADA (ORCPT ); Wed, 19 Aug 2020 20:03:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 05921208C7; Thu, 20 Aug 2020 00:02:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597881779; bh=qfVjAFsYUJbEzJSUeRe9YMyUSPn194uANA9bKchzc2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mu49c63dNVmszdY6APzuQm8R1MWS+pvRid0gwKnAoa/UND1bW1E4p0Rur9mTYECcz KvS0ZyqFbQmTONUKkC3JpsFEttDlCETAt0lPq+MhcwuPkwv/AxA534uTfjKGiOxcDN FEa++BZAEHNcQc60Csz28RvUXsabpZqDnoh9PWzk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luc Van Oostenryck , kernel test robot , Andrew Morton , Richard Henderson , Ivan Kokshaysky , Matt Turner , Stephen Boyd , Arnd Bergmann , Linus Torvalds , Sasha Levin , linux-alpha@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 21/22] alpha: fix annotation of io{read,write}{16,32}be() Date: Wed, 19 Aug 2020 20:02:28 -0400 Message-Id: <20200820000229.215333-21-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200820000229.215333-1-sashal@kernel.org> References: <20200820000229.215333-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luc Van Oostenryck [ Upstream commit bd72866b8da499e60633ff28f8a4f6e09ca78efe ] These accessors must be used to read/write a big-endian bus. The value returned or written is native-endian. However, these accessors are defined using be{16,32}_to_cpu() or cpu_to_be{16,32}() to make the endian conversion but these expect a __be{16,32} when none is present. Keeping them would need a force cast that would solve nothing at all. So, do the conversion using swab{16,32}, like done in asm-generic for similar situations. Reported-by: kernel test robot Signed-off-by: Luc Van Oostenryck Signed-off-by: Andrew Morton Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Stephen Boyd Cc: Arnd Bergmann Link: http://lkml.kernel.org/r/20200622114232.80039-1-luc.vanoostenryck@gmail.com Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/alpha/include/asm/io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index b771bf1b53523..103270d5a9fc6 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h @@ -502,10 +502,10 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) } #endif -#define ioread16be(p) be16_to_cpu(ioread16(p)) -#define ioread32be(p) be32_to_cpu(ioread32(p)) -#define iowrite16be(v,p) iowrite16(cpu_to_be16(v), (p)) -#define iowrite32be(v,p) iowrite32(cpu_to_be32(v), (p)) +#define ioread16be(p) swab16(ioread16(p)) +#define ioread32be(p) swab32(ioread32(p)) +#define iowrite16be(v,p) iowrite16(swab16(v), (p)) +#define iowrite32be(v,p) iowrite32(swab32(v), (p)) #define inb_p inb #define inw_p inw -- 2.25.1