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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 3617EC33CA3 for ; Wed, 8 Jan 2020 20:29:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1688220705 for ; Wed, 8 Jan 2020 20:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726536AbgAHU3M (ORCPT ); Wed, 8 Jan 2020 15:29:12 -0500 Received: from mga06.intel.com ([134.134.136.31]:45383 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725446AbgAHU3M (ORCPT ); Wed, 8 Jan 2020 15:29:12 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2020 12:29:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,411,1571727600"; d="scan'208";a="223034363" Received: from djiang5-desk3.ch.intel.com ([143.182.136.137]) by orsmga006.jf.intel.com with ESMTP; 08 Jan 2020 12:29:09 -0800 Subject: Re: [PATCH v2 3/9] ntb: intel: Constify ioreadX() iomem argument (as in generic implementation) To: Krzysztof Kozlowski , Richard Henderson , Ivan Kokshaysky , Matt Turner , Alexey Brodkin , Vineet Gupta , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Yoshinori Sato , Rich Felker , Dave Airlie , David Airlie , Daniel Vetter , Ben Skeggs , Mauro Carvalho Chehab , Jiri Slaby , Nick Kossifidis , Luis Chamberlain , Kalle Valo , "David S. Miller" , Jon Mason , Allen Hubbe , "Michael S. Tsirkin" , Jason Wang , Arnd Bergmann , Geert Uytterhoeven , Thomas Gleixner , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-media@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-ntb@googlegroups.com, virtualization@lists.linux-foundation.org, linux-arch@vger.kernel.org References: <20200108200528.4614-1-krzk@kernel.org> <20200108200528.4614-4-krzk@kernel.org> From: Dave Jiang Message-ID: <64659f77-f807-7c8e-7595-731056c73bf4@intel.com> Date: Wed, 8 Jan 2020 13:29:08 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200108200528.4614-4-krzk@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org On 1/8/20 1:05 PM, Krzysztof Kozlowski wrote: > The ioreadX() helpers have inconsistent interface. On some architectures > void *__iomem address argument is a pointer to const, on some not. > > Implementations of ioreadX() do not modify the memory under the address > so they can be converted to a "const" version for const-safety and > consistency among architectures. > > Signed-off-by: Krzysztof Kozlowski > Reviewed-by: Geert Uytterhoeven Acked-by: Dave Jiang > > --- > > Changes since v1: > 1. Add Geert's review. > --- > drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- > drivers/ntb/hw/intel/ntb_hw_gen3.h | 2 +- > drivers/ntb/hw/intel/ntb_hw_intel.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c > index bb57ec239029..9202502a9787 100644 > --- a/drivers/ntb/hw/intel/ntb_hw_gen1.c > +++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c > @@ -1202,7 +1202,7 @@ int intel_ntb_peer_spad_write(struct ntb_dev *ntb, int pidx, int sidx, > ndev->peer_reg->spad); > } > > -static u64 xeon_db_ioread(void __iomem *mmio) > +static u64 xeon_db_ioread(const void __iomem *mmio) > { > return (u64)ioread16(mmio); > } > diff --git a/drivers/ntb/hw/intel/ntb_hw_gen3.h b/drivers/ntb/hw/intel/ntb_hw_gen3.h > index 75fb86ca27bb..d1455f24ec99 100644 > --- a/drivers/ntb/hw/intel/ntb_hw_gen3.h > +++ b/drivers/ntb/hw/intel/ntb_hw_gen3.h > @@ -91,7 +91,7 @@ > #define GEN3_DB_TOTAL_SHIFT 33 > #define GEN3_SPAD_COUNT 16 > > -static inline u64 gen3_db_ioread(void __iomem *mmio) > +static inline u64 gen3_db_ioread(const void __iomem *mmio) > { > return ioread64(mmio); > } > diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.h b/drivers/ntb/hw/intel/ntb_hw_intel.h > index e071e28bca3f..3c0a5a2da241 100644 > --- a/drivers/ntb/hw/intel/ntb_hw_intel.h > +++ b/drivers/ntb/hw/intel/ntb_hw_intel.h > @@ -102,7 +102,7 @@ struct intel_ntb_dev; > struct intel_ntb_reg { > int (*poll_link)(struct intel_ntb_dev *ndev); > int (*link_is_up)(struct intel_ntb_dev *ndev); > - u64 (*db_ioread)(void __iomem *mmio); > + u64 (*db_ioread)(const void __iomem *mmio); > void (*db_iowrite)(u64 db_bits, void __iomem *mmio); > unsigned long ntb_ctl; > resource_size_t db_size; >