Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp47949imu; Wed, 7 Nov 2018 12:45:54 -0800 (PST) X-Google-Smtp-Source: AJdET5dZELTD3S8FKp/qOMHzP/yo0aRGKr4Zg5QvdF0WGARYQXnxcu8GtAv+cpjqs+TV0SMM2PpV X-Received: by 2002:a63:fe0a:: with SMTP id p10mr1477794pgh.265.1541623554132; Wed, 07 Nov 2018 12:45:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541623554; cv=none; d=google.com; s=arc-20160816; b=tFnNQT/Cg4WdB6fDq3PIXz0XTiakI6/F95h5+kwxEUJhZwTZRzEzP8zTzf3eU2x0G1 MSVBp8kH6DkdQpvvDf+eElRD3x0a7NH4/Ip+c35yV++AxMbOc9WcOoGglFaOF6jgqFKr TfvYGB9FM/rKZ+5Q2bnizHWNyR1246QiZsVQXT5/1KNg3ULIB/pkH+DrPNu+g3HbH6w5 R0PIdJi6ZiqFK27l8qKJZxIy0jNwx0J65O3mFXdOPXl2N3fEmQCE6Z/DmueU4YKJpnPz 4D6xR/ExPbpLVUpjdZqRD16gwIRj2TJrbioIao4cqMywN+xYdobfPgf6jCt6Ia8yywzq Bkng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from:dkim-signature; bh=ON73W39uz1wDyrCHfnFWi9REK1J1+J7OzKwpSL3zUSA=; b=u/j+x5dX+PPg1V7JLxccZTM89py0K+mrWX3GTU+jV8JusQLsqqiePM18oBBXjZVRra +Jjx1xT4V3dj6lpPhbUCsadkH+3PQh/fgoXEbXmGz+wK1WI4BGEKJi0L5yqRHDTwJxhO TRubctqLb904/OmGlRyUhi5R+vu0J5hF9WiEL6KRmRsIm4XbXwcPbD0dRZpyjlKhCGqK e3tdvmdWlx9eggEh42Y7HHR+BDzPV45n8KFs/rC0kfJEoiDBAouPNbCe4xlcU00YmWtR 20/OeRKXa5KIM5f9v0N79t4qqj1xnaKSzjzs+bjJkzSHhkY411zt0n1TJlM+rpuoXbD0 d7ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dHWOAPJr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o125-v6si1485963pgo.302.2018.11.07.12.45.38; Wed, 07 Nov 2018 12:45:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dHWOAPJr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727251AbeKHGQu (ORCPT + 99 others); Thu, 8 Nov 2018 01:16:50 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:37185 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726517AbeKHGQu (ORCPT ); Thu, 8 Nov 2018 01:16:50 -0500 Received: by mail-wm1-f66.google.com with SMTP id p2-v6so16894923wmc.2 for ; Wed, 07 Nov 2018 12:44:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ON73W39uz1wDyrCHfnFWi9REK1J1+J7OzKwpSL3zUSA=; b=dHWOAPJrcCnwguncPiZ7ulF4H5N9xLttOuNlXEguPypo7mtKE2PMwAYAukXuaXnM6r 1D8aWDyDKdCeyFeacmyN3unAnZzSajYZ5lZ8IrIQUZuh83oA7yYLu83UctafCswGfKj4 4qkZyWhD2d5sk4ffBlya6n3VY//PvxsJP7qEJTQwxXsa1uh2cwF28T//LqPaTei+gqym nwjeljsAA0bXRGTN5d/aV8s/NUbVV2Rd3s57gRrThpqKIm8u9YR+914xQdsHMlnIzCyX g4x737cgnKJVu54HeBpCl7EzMQdLqQCB7ubTKwpQcvKN1+44H2hohL8WMwdUpdIW/u3e 2DFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ON73W39uz1wDyrCHfnFWi9REK1J1+J7OzKwpSL3zUSA=; b=o0Rkc88DKPJa4azr0zy17rWnVwcmAfhfRZAdH1yU+FdBtPYIaKpDrfz476yBmwxc02 mDZy0gkg7UOkox+blZjS79Bw8z7yQ/xfWQkIj5LT4dtXDocIIWKXJg3Pcbut3dmwdhju VMBJ43asJo08GcCQv9516w03f1CtI9QrdMGuEjXUZ4uFl8/lpzpHX6ejRcbjvxuPYqpZ 7zY/Os5pf1lH2tvk8icw6wXDf50kQhN8B5TiKXLpN/Pei/BDm4wZzNlEYvfapWGnjd1F MvinrjlE1EXwso2MTHe/u4ZKRVNkp8eWqLyDRM/9+U9pH5hSkKphnK2zwWCoodk46W5U DkqA== X-Gm-Message-State: AGRZ1gKFKM/4ctLgUTguSyXlPIeY4adyL8m2+57vhNAPBh/ecJ+CQjG+ GKuKsPFN1OF442qobAmbNFo= X-Received: by 2002:a1c:13d2:: with SMTP id 201-v6mr1417594wmt.58.1541623483738; Wed, 07 Nov 2018 12:44:43 -0800 (PST) Received: from osboxes.localdomain (bzq-79-178-252-231.red.bezeqint.net. [79.178.252.231]) by smtp.googlemail.com with ESMTPSA id y2-v6sm3578764wrh.53.2018.11.07.12.44.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Nov 2018 12:44:42 -0800 (PST) From: Carmeli Tamir To: carmeli.tamir@gmail.com, gregkh@linuxfoundation.org, natechancellor@gmail.com, chrisadr@gentoo.org, areklis909@gmail.com, dan.carpenter@oracle.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] staging: emxx_udc: Added missing __iomem modifier to handle p_regs Date: Wed, 7 Nov 2018 15:44:23 -0500 Message-Id: <1541623464-49041-3-git-send-email-carmeli.tamir@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541623464-49041-1-git-send-email-carmeli.tamir@gmail.com> References: <1541623464-49041-1-git-send-email-carmeli.tamir@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since in nbu2ss_drv_probe() p_regs is assigned from mmio_base, which is marked as __iomem, p_regs also should be market with __iomem. Signed-off-by: Carmeli Tamir --- drivers/staging/emxx_udc/emxx_udc.c | 44 ++++++++++++++++++------------------- drivers/staging/emxx_udc/emxx_udc.h | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index f49c863..3504277 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c @@ -60,21 +60,21 @@ static struct nbu2ss_udc udc_controller; /*-------------------------------------------------------------------------*/ /* Read */ -static inline u32 _nbu2ss_readl(void *address) +static inline u32 _nbu2ss_readl(void __iomem *address) { return __raw_readl(address); } /*-------------------------------------------------------------------------*/ /* Write */ -static inline void _nbu2ss_writel(void *address, u32 udata) +static inline void _nbu2ss_writel(void __iomem *address, u32 udata) { __raw_writel(udata, address); } /*-------------------------------------------------------------------------*/ /* Set Bit */ -static inline void _nbu2ss_bitset(void *address, u32 udata) +static inline void _nbu2ss_bitset(void __iomem *address, u32 udata) { u32 reg_dt = __raw_readl(address) | (udata); @@ -83,7 +83,7 @@ static inline void _nbu2ss_bitset(void *address, u32 udata) /*-------------------------------------------------------------------------*/ /* Clear Bit */ -static inline void _nbu2ss_bitclr(void *address, u32 udata) +static inline void _nbu2ss_bitclr(void __iomem *address, u32 udata) { u32 reg_dt = __raw_readl(address) & ~(udata); @@ -184,7 +184,7 @@ static u32 _nbu2ss_get_begin_ram_address(struct nbu2ss_udc *udc) u32 num, buf_type; u32 data, last_ram_adr, use_ram_size; - struct ep_regs *p_ep_regs; + struct ep_regs __iomem *p_ep_regs; last_ram_adr = (D_RAM_SIZE_CTRL / sizeof(u32)) * 2; use_ram_size = 0; @@ -377,7 +377,7 @@ static void _nbu2ss_ep_dma_exit(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep) { u32 num; u32 data; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (udc->vbus_active == 0) return; /* VBUS OFF */ @@ -408,7 +408,7 @@ static void _nbu2ss_ep_dma_exit(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep) /* Abort DMA */ static void _nbu2ss_ep_dma_abort(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep) { - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; _nbu2ss_bitclr(&preg->EP_DCR[ep->epnum - 1].EP_DCR1, DCR1_EPN_REQEN); mdelay(DMA_DISABLE_TIME); /* DCR1_EPN_REQEN Clear */ @@ -426,7 +426,7 @@ static void _nbu2ss_ep_in_end( { u32 data; u32 num; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (length >= sizeof(u32)) return; @@ -817,7 +817,7 @@ static int _nbu2ss_out_dma( u32 burst = 1; u32 data; int result = -EINVAL; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (req->dma_flag) return 1; /* DMA is forwarded */ @@ -880,7 +880,7 @@ static int _nbu2ss_epn_out_pio( union usb_reg_access temp_32; union usb_reg_access *p_buf_32; int result = 0; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (req->dma_flag) return 1; /* DMA is forwarded */ @@ -964,7 +964,7 @@ static int _nbu2ss_epn_out_transfer( u32 num; u32 i_recv_length; int result = 1; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (ep->epnum == 0) return -EINVAL; @@ -1026,7 +1026,7 @@ static int _nbu2ss_in_dma( u32 i_write_length; u32 data; int result = -EINVAL; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (req->dma_flag) return 1; /* DMA is forwarded */ @@ -1101,7 +1101,7 @@ static int _nbu2ss_epn_in_pio( union usb_reg_access temp_32; union usb_reg_access *p_buf_32 = NULL; int result = 0; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (req->dma_flag) return 1; /* DMA is forwarded */ @@ -1317,7 +1317,7 @@ static void _nbu2ss_set_endpoint_stall( u8 num, epnum; u32 data; struct nbu2ss_ep *ep; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if ((ep_adrs == 0) || (ep_adrs == 0x80)) { if (bstall) { @@ -1421,7 +1421,7 @@ static int _nbu2ss_get_ep_stall(struct nbu2ss_udc *udc, u8 ep_adrs) { u8 epnum; u32 data = 0, bit_data; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; epnum = ep_adrs & ~USB_ENDPOINT_DIR_MASK; if (epnum == 0) { @@ -1516,7 +1516,7 @@ static void _nbu2ss_epn_set_stall( u32 regdata; int limit_cnt = 0; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (ep->direct == USB_DIR_IN) { for (limit_cnt = 0 @@ -1924,7 +1924,7 @@ static inline void _nbu2ss_epn_in_int( int result = 0; u32 status; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (req->dma_flag) return; /* DMA is forwarded */ @@ -2019,7 +2019,7 @@ static inline void _nbu2ss_epn_out_dma_int( u32 num; u32 dmacnt, ep_dmacnt; u32 mpkt; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; num = ep->epnum - 1; @@ -2195,7 +2195,7 @@ static int _nbu2ss_pullup(struct nbu2ss_udc *udc, int is_on) /*-------------------------------------------------------------------------*/ static void _nbu2ss_fifo_flush(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep) { - struct fc_regs *p = udc->p_regs; + struct fc_regs __iomem *p = udc->p_regs; if (udc->vbus_active == 0) return; @@ -2413,7 +2413,7 @@ static irqreturn_t _nbu2ss_udc_irq(int irq, void *_udc) u32 epnum, int_bit; struct nbu2ss_udc *udc = (struct nbu2ss_udc *)_udc; - struct fc_regs *preg = udc->p_regs; + struct fc_regs __iomem *preg = udc->p_regs; if (gpio_get_value(VBUS_VALUE) == 0) { _nbu2ss_writel(&preg->USB_INT_STA, ~USB_INT_STA_RW); @@ -2804,7 +2804,7 @@ static int nbu2ss_ep_fifo_status(struct usb_ep *_ep) struct nbu2ss_ep *ep; struct nbu2ss_udc *udc; unsigned long flags; - struct fc_regs *preg; + struct fc_regs __iomem *preg; if (!_ep) { pr_err("%s, bad param\n", __func__); @@ -3177,7 +3177,7 @@ static int nbu2ss_drv_probe(struct platform_device *pdev) 0, driver_name, udc); /* IO Memory */ - udc->p_regs = (struct fc_regs *)mmio_base; + udc->p_regs = (struct fc_regs __iomem *)mmio_base; /* USB Function Controller Interrupt */ if (status != 0) { diff --git a/drivers/staging/emxx_udc/emxx_udc.h b/drivers/staging/emxx_udc/emxx_udc.h index 8337e38c..e28a74d 100644 --- a/drivers/staging/emxx_udc/emxx_udc.h +++ b/drivers/staging/emxx_udc/emxx_udc.h @@ -582,7 +582,7 @@ struct nbu2ss_udc { u32 curr_config; /* Current Configuration Number */ - struct fc_regs *p_regs; + struct fc_regs __iomem *p_regs; }; /* USB register access structure */ -- 2.7.4