From patchwork Thu Nov 23 14:20:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 168958 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp488819vqx; Thu, 23 Nov 2023 06:32:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IG0S8Z8vMo+fr9SOiAtd5dhq0J8BsHNCk0Ml4GzzWXq1mzR6ITJRp/0NOi8XoOTRrCfZ5QL X-Received: by 2002:a05:6808:1645:b0:3b2:d6ce:f582 with SMTP id az5-20020a056808164500b003b2d6cef582mr7026326oib.34.1700749957851; Thu, 23 Nov 2023 06:32:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700749957; cv=none; d=google.com; s=arc-20160816; b=Aosp9/xjfqrl+9syd1nWOyE5qE0ER3szUBL4UIy0ode3Y5bAUO3u5YCE0bgHUHYroh 1Ffj5Rs/N4NnhyqHIzEn9ExP1ZpXby/PC2jOvrZmy66U8LgTj4g5AbYNIDnbtnIip7x4 qr5DjBh+Xtr8lsxkwzjpj/4MwI/1xfnEAU+YhuaZ/cQt7zyIwG9BQ/YHZXZFW6F/HrU0 /icUCffvl3VRHXLCVKhl+3A1h8mfAUa0ZrUDS5LaSu9zLFsGiVOJXL5qb+nNmGUI69CJ Lc68UQByw69+R8uRDQjEIw59Xkf8hQ6T+g4DZJx+BjKjxV+8ZQKltHjVchHLUy1h8VcU 1f3w== 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=vq9Z99XOknBw1NPfnsUEC03wyl+CF9tYqf+2ZDt+ydw=; fh=srb/EijQIrMEdOeqn3qQX6qrsAGyqHAqeSFkl/qDdLM=; b=ii+JJTvvUuvUAnQCVW997nNxjkhIe2Zp3NU2SYhu2ndjPTCvUuYCsELiPNNWJV7Zr1 9NLttsHKEDQtrCF+3o6hzE84mwWWP7nwVtfyoQgtpB8grOUAy2PGAU3IYeB7a0+LQluH +E/xNnR0QpYgb74eHVyjBKOVZtBIVjyMUr/m4bryLWEJ+TcdwTihfB1o45muBug2alQc JHDri/aeBB6kJwPz5QvWMUUe8XXkjoEgq+AsYfeTv5kbMhqj61pYdS0UC/T1za/xoeSn 0uNIzholuKcUjLDVeSlTSFyUxBa7sbF/iaDodNil4KSheQzVYsSuSS10EyhzUhmCc2fU TKww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AdzdpZUw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id q204-20020a632ad5000000b005af44ed3148si1440156pgq.367.2023.11.23.06.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 06:32:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AdzdpZUw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 04FF88087500; Thu, 23 Nov 2023 06:32:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345802AbjKWOcX (ORCPT + 99 others); Thu, 23 Nov 2023 09:32:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345820AbjKWOcU (ORCPT ); Thu, 23 Nov 2023 09:32:20 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B622D50 for ; Thu, 23 Nov 2023 06:32:27 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DCD1C433C8; Thu, 23 Nov 2023 14:32:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700749946; bh=JR2VE5NBCn4H/f+6HbF5xLbWKYKxrxRzNHs2+4xlYt0=; h=From:To:Cc:Subject:Date:From; b=AdzdpZUwlcEd1C0e1sNAEOCIgXoCEA9/Gz00kDOkP49HAdmX4ysgQsWHxfozKRomn BhXGrqBtLihj4U3kSE7Sij/fVrAspvVpSj0F6P4Nx9Cjrwzr8KHaiYpGQfTgT6ENp/ nnpkcywHUyVQ6EhhqMJ/Aw8U9IKYAj71pC9pAmEMRX9DtF/GTi5MyqGo9RjeVjhrrI uMOW2kdTG5SsJqTeAVm8TaWbwKDVEvvGifhhKpSrQVVMjKgyzGp7kbN3oMZJHO7MXB phLZAGbYXbpyHvzV6ng5sSp1HWd1CriyYN1RITTSk+5LyfVPPepUitV8n2NPN0t5nu m3M6inZ7TklCA== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] riscv: Use asm-generic for {read,write}{bwlq} and their relaxed variant Date: Thu, 23 Nov 2023 22:20:03 +0800 Message-Id: <20231123142003.1759-1-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 06:32:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783365587613247515 X-GMAIL-MSGID: 1783365587613247515 The asm-generic implementation is functionally identical to the riscv version. Signed-off-by: Jisheng Zhang --- arch/riscv/include/asm/mmio.h | 62 +---------------------------------- 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/arch/riscv/include/asm/mmio.h b/arch/riscv/include/asm/mmio.h index 4c58ee7f95ec..a491590593ca 100644 --- a/arch/riscv/include/asm/mmio.h +++ b/arch/riscv/include/asm/mmio.h @@ -80,54 +80,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) #endif /* - * Unordered I/O memory access primitives. These are even more relaxed than - * the relaxed versions, as they don't even order accesses between successive - * operations to the I/O regions. - */ -#define readb_cpu(c) ({ u8 __r = __raw_readb(c); __r; }) -#define readw_cpu(c) ({ u16 __r = le16_to_cpu((__force __le16)__raw_readw(c)); __r; }) -#define readl_cpu(c) ({ u32 __r = le32_to_cpu((__force __le32)__raw_readl(c)); __r; }) - -#define writeb_cpu(v, c) ((void)__raw_writeb((v), (c))) -#define writew_cpu(v, c) ((void)__raw_writew((__force u16)cpu_to_le16(v), (c))) -#define writel_cpu(v, c) ((void)__raw_writel((__force u32)cpu_to_le32(v), (c))) - -#ifdef CONFIG_64BIT -#define readq_cpu(c) ({ u64 __r = le64_to_cpu((__force __le64)__raw_readq(c)); __r; }) -#define writeq_cpu(v, c) ((void)__raw_writeq((__force u64)cpu_to_le64(v), (c))) -#endif - -/* - * Relaxed I/O memory access primitives. These follow the Device memory - * ordering rules but do not guarantee any ordering relative to Normal memory - * accesses. These are defined to order the indicated access (either a read or - * write) with all other I/O memory accesses to the same peripheral. Since the - * platform specification defines that all I/O regions are strongly ordered on - * channel 0, no explicit fences are required to enforce this ordering. - */ -/* FIXME: These are now the same as asm-generic */ -#define __io_rbr() do {} while (0) -#define __io_rar() do {} while (0) -#define __io_rbw() do {} while (0) -#define __io_raw() do {} while (0) - -#define readb_relaxed(c) ({ u8 __v; __io_rbr(); __v = readb_cpu(c); __io_rar(); __v; }) -#define readw_relaxed(c) ({ u16 __v; __io_rbr(); __v = readw_cpu(c); __io_rar(); __v; }) -#define readl_relaxed(c) ({ u32 __v; __io_rbr(); __v = readl_cpu(c); __io_rar(); __v; }) - -#define writeb_relaxed(v, c) ({ __io_rbw(); writeb_cpu((v), (c)); __io_raw(); }) -#define writew_relaxed(v, c) ({ __io_rbw(); writew_cpu((v), (c)); __io_raw(); }) -#define writel_relaxed(v, c) ({ __io_rbw(); writel_cpu((v), (c)); __io_raw(); }) - -#ifdef CONFIG_64BIT -#define readq_relaxed(c) ({ u64 __v; __io_rbr(); __v = readq_cpu(c); __io_rar(); __v; }) -#define writeq_relaxed(v, c) ({ __io_rbw(); writeq_cpu((v), (c)); __io_raw(); }) -#endif - -/* - * I/O memory access primitives. Reads are ordered relative to any following - * Normal memory read and delay() loop. Writes are ordered relative to any - * prior Normal memory write. The memory barriers here are necessary as RISC-V + * I/O barriers. The memory barriers here are necessary as RISC-V * doesn't define any ordering between the memory space and the I/O space. */ #define __io_br() do {} while (0) @@ -135,17 +88,4 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) #define __io_bw() ({ __asm__ __volatile__ ("fence w,o" : : : "memory"); }) #define __io_aw() mmiowb_set_pending() -#define readb(c) ({ u8 __v; __io_br(); __v = readb_cpu(c); __io_ar(__v); __v; }) -#define readw(c) ({ u16 __v; __io_br(); __v = readw_cpu(c); __io_ar(__v); __v; }) -#define readl(c) ({ u32 __v; __io_br(); __v = readl_cpu(c); __io_ar(__v); __v; }) - -#define writeb(v, c) ({ __io_bw(); writeb_cpu((v), (c)); __io_aw(); }) -#define writew(v, c) ({ __io_bw(); writew_cpu((v), (c)); __io_aw(); }) -#define writel(v, c) ({ __io_bw(); writel_cpu((v), (c)); __io_aw(); }) - -#ifdef CONFIG_64BIT -#define readq(c) ({ u64 __v; __io_br(); __v = readq_cpu(c); __io_ar(__v); __v; }) -#define writeq(v, c) ({ __io_bw(); writeq_cpu((v), (c)); __io_aw(); }) -#endif - #endif /* _ASM_RISCV_MMIO_H */