From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Jiang Subject: Re: [PATCH v2 3/9] ntb: intel: Constify ioreadX() iomem argument (as in generic implementation) Date: Wed, 8 Jan 2020 13:29:08 -0700 Message-ID: <64659f77-f807-7c8e-7595-731056c73bf4__21822.0109398075$1578771237$gmane$org@intel.com> References: <20200108200528.4614-1-krzk@kernel.org> <20200108200528.4614-4-krzk@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20200108200528.4614-4-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" 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" List-Id: nouveau.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; >