Skip to content

L
linux
Commit 5aae9ea9 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] net2280 iomem annotations 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9bb50192
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
drivers/usb/gadget/net2280.c
View file @ 5aae9ea9
...@@ -253,7 +253,7 @@ net2280_enable (struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) ...@@ -253,7 +253,7 @@ net2280_enable (struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
return 0; return 0;
} }
static int handshake (u32 *ptr, u32 mask, u32 done, int usec) static int handshake (u32 __iomem *ptr, u32 mask, u32 done, int usec)
{ {
u32 result; u32 result;
...@@ -272,7 +272,7 @@ static int handshake (u32 *ptr, u32 mask, u32 done, int usec) ...@@ -272,7 +272,7 @@ static int handshake (u32 *ptr, u32 mask, u32 done, int usec)
static struct usb_ep_ops net2280_ep_ops; static struct usb_ep_ops net2280_ep_ops;
static void ep_reset (struct net2280_regs *regs, struct net2280_ep *ep) static void ep_reset (struct net2280_regs __iomem *regs, struct net2280_ep *ep)
{ {
u32 tmp; u32 tmp;
...@@ -512,7 +512,7 @@ net2280_free_buffer ( ...@@ -512,7 +512,7 @@ net2280_free_buffer (
static void static void
write_fifo (struct net2280_ep *ep, struct usb_request *req) write_fifo (struct net2280_ep *ep, struct usb_request *req)
{ {
struct net2280_ep_regs *regs = ep->regs; struct net2280_ep_regs __iomem *regs = ep->regs;
u8 *buf; u8 *buf;
u32 tmp; u32 tmp;
unsigned count, total; unsigned count, total;
...@@ -572,7 +572,8 @@ write_fifo (struct net2280_ep *ep, struct usb_request *req) ...@@ -572,7 +572,8 @@ write_fifo (struct net2280_ep *ep, struct usb_request *req)
*/ */
static void out_flush (struct net2280_ep *ep) static void out_flush (struct net2280_ep *ep)
{ {
u32 *statp, tmp; u32 __iomem *statp;
u32 tmp;
ASSERT_OUT_NAKING (ep); ASSERT_OUT_NAKING (ep);
...@@ -605,7 +606,7 @@ static void out_flush (struct net2280_ep *ep) ...@@ -605,7 +606,7 @@ static void out_flush (struct net2280_ep *ep)
static int static int
read_fifo (struct net2280_ep *ep, struct net2280_request *req) read_fifo (struct net2280_ep *ep, struct net2280_request *req)
{ {
struct net2280_ep_regs *regs = ep->regs; struct net2280_ep_regs __iomem *regs = ep->regs;
u8 *buf = req->req.buf + req->req.actual; u8 *buf = req->req.buf + req->req.actual;
unsigned count, tmp, is_short; unsigned count, tmp, is_short;
unsigned cleanup = 0, prevent = 0; unsigned cleanup = 0, prevent = 0;
...@@ -732,12 +733,12 @@ static const u32 dmactl_default = ...@@ -732,12 +733,12 @@ static const u32 dmactl_default =
/* erratum 0116 workaround part 2 (no AUTOSTART) */ /* erratum 0116 workaround part 2 (no AUTOSTART) */
| (1 << DMA_ENABLE); | (1 << DMA_ENABLE);
static inline void spin_stop_dma (struct net2280_dma_regs *dma) static inline void spin_stop_dma (struct net2280_dma_regs __iomem *dma)
{ {
handshake (&dma->dmactl, (1 << DMA_ENABLE), 0, 50); handshake (&dma->dmactl, (1 << DMA_ENABLE), 0, 50);
} }
static inline void stop_dma (struct net2280_dma_regs *dma) static inline void stop_dma (struct net2280_dma_regs __iomem *dma)
{ {
writel (readl (&dma->dmactl) & ~(1 << DMA_ENABLE), &dma->dmactl); writel (readl (&dma->dmactl) & ~(1 << DMA_ENABLE), &dma->dmactl);
spin_stop_dma (dma); spin_stop_dma (dma);
...@@ -745,7 +746,7 @@ static inline void stop_dma (struct net2280_dma_regs *dma) ...@@ -745,7 +746,7 @@ static inline void stop_dma (struct net2280_dma_regs *dma)
static void start_queue (struct net2280_ep *ep, u32 dmactl, u32 td_dma) static void start_queue (struct net2280_ep *ep, u32 dmactl, u32 td_dma)
{ {
struct net2280_dma_regs *dma = ep->dma; struct net2280_dma_regs __iomem *dma = ep->dma;
writel ((1 << VALID_BIT) | (ep->is_in << DMA_DIRECTION), writel ((1 << VALID_BIT) | (ep->is_in << DMA_DIRECTION),
&dma->dmacount); &dma->dmacount);
...@@ -766,7 +767,7 @@ static void start_queue (struct net2280_ep *ep, u32 dmactl, u32 td_dma) ...@@ -766,7 +767,7 @@ static void start_queue (struct net2280_ep *ep, u32 dmactl, u32 td_dma)
static void start_dma (struct net2280_ep *ep, struct net2280_request *req) static void start_dma (struct net2280_ep *ep, struct net2280_request *req)
{ {
u32 tmp; u32 tmp;
struct net2280_dma_regs *dma = ep->dma; struct net2280_dma_regs __iomem *dma = ep->dma;
/* FIXME can't use DMA for ZLPs */ /* FIXME can't use DMA for ZLPs */
...@@ -2579,7 +2580,7 @@ static void handle_stat1_irqs (struct net2280 *dev, u32 stat) ...@@ -2579,7 +2580,7 @@ static void handle_stat1_irqs (struct net2280 *dev, u32 stat)
stat &= ~DMA_INTERRUPTS; stat &= ~DMA_INTERRUPTS;
scratch >>= 9; scratch >>= 9;
for (num = 0; scratch; num++) { for (num = 0; scratch; num++) {
struct net2280_dma_regs *dma; struct net2280_dma_regs __iomem *dma;
tmp = 1 << num; tmp = 1 << num;
if ((tmp & scratch) == 0) if ((tmp & scratch) == 0)
...@@ -2748,7 +2749,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2748,7 +2749,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
{ {
struct net2280 *dev; struct net2280 *dev;
unsigned long resource, len; unsigned long resource, len;
void *base = NULL; void __iomem *base = NULL;
int retval, i; int retval, i;
char buf [8], *bufp; char buf [8], *bufp;
...@@ -2806,12 +2807,12 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2806,12 +2807,12 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
retval = -EFAULT; retval = -EFAULT;
goto done; goto done;
} }
dev->regs = (struct net2280_regs *) base; dev->regs = (struct net2280_regs __iomem *) base;
dev->usb = (struct net2280_usb_regs *) (base + 0x0080); dev->usb = (struct net2280_usb_regs __iomem *) (base + 0x0080);
dev->pci = (struct net2280_pci_regs *) (base + 0x0100); dev->pci = (struct net2280_pci_regs __iomem *) (base + 0x0100);
dev->dma = (struct net2280_dma_regs *) (base + 0x0180); dev->dma = (struct net2280_dma_regs __iomem *) (base + 0x0180);
dev->dep = (struct net2280_dep_regs *) (base + 0x0200); dev->dep = (struct net2280_dep_regs __iomem *) (base + 0x0200);
dev->epregs = (struct net2280_ep_regs *) (base + 0x0300); dev->epregs = (struct net2280_ep_regs __iomem *) (base + 0x0300);
/* put into initial config, link up all endpoints */ /* put into initial config, link up all endpoints */
writel (0, &dev->usb->usbctl); writel (0, &dev->usb->usbctl);
......
drivers/usb/gadget/net2280.h
View file @ 5aae9ea9
...@@ -446,7 +446,7 @@ struct net2280_ep_regs { /* [11.9] */ ...@@ -446,7 +446,7 @@ struct net2280_ep_regs { /* [11.9] */
*/ */
static inline u32 static inline u32
get_idx_reg (struct net2280_regs *regs, u32 index) get_idx_reg (struct net2280_regs __iomem *regs, u32 index)
{ {
writel (index, &regs->idxaddr); writel (index, &regs->idxaddr);
/* NOTE: synchs device/cpu memory views */ /* NOTE: synchs device/cpu memory views */
...@@ -454,7 +454,7 @@ get_idx_reg (struct net2280_regs *regs, u32 index) ...@@ -454,7 +454,7 @@ get_idx_reg (struct net2280_regs *regs, u32 index)
} }
static inline void static inline void
set_idx_reg (struct net2280_regs *regs, u32 index, u32 value) set_idx_reg (struct net2280_regs __iomem *regs, u32 index, u32 value)
{ {
writel (index, &regs->idxaddr); writel (index, &regs->idxaddr);
writel (value, &regs->idxdata); writel (value, &regs->idxdata);
...@@ -507,8 +507,8 @@ struct net2280_dma { ...@@ -507,8 +507,8 @@ struct net2280_dma {
struct net2280_ep { struct net2280_ep {
struct usb_ep ep; struct usb_ep ep;
struct net2280_ep_regs *regs; struct net2280_ep_regs __iomem *regs;
struct net2280_dma_regs *dma; struct net2280_dma_regs __iomem *dma;
struct net2280_dma *dummy; struct net2280_dma *dummy;
dma_addr_t td_dma; /* of dummy */ dma_addr_t td_dma; /* of dummy */
struct net2280 *dev; struct net2280 *dev;
...@@ -539,7 +539,7 @@ static inline void allow_status (struct net2280_ep *ep) ...@@ -539,7 +539,7 @@ static inline void allow_status (struct net2280_ep *ep)
/* count (<= 4) bytes in the next fifo write will be valid */ /* count (<= 4) bytes in the next fifo write will be valid */
static inline void set_fifo_bytecount (struct net2280_ep *ep, unsigned count) static inline void set_fifo_bytecount (struct net2280_ep *ep, unsigned count)
{ {
writeb (count, 2 + (u8 *) &ep->regs->ep_cfg); writeb (count, 2 + (u8 __iomem *) &ep->regs->ep_cfg);
} }
struct net2280_request { struct net2280_request {
...@@ -566,12 +566,12 @@ struct net2280 { ...@@ -566,12 +566,12 @@ struct net2280 {
/* pci state used to access those endpoints */ /* pci state used to access those endpoints */
struct pci_dev *pdev; struct pci_dev *pdev;
struct net2280_regs *regs; struct net2280_regs __iomem *regs;
struct net2280_usb_regs *usb; struct net2280_usb_regs __iomem *usb;
struct net2280_pci_regs *pci; struct net2280_pci_regs __iomem *pci;
struct net2280_dma_regs *dma; struct net2280_dma_regs __iomem *dma;
struct net2280_dep_regs *dep; struct net2280_dep_regs __iomem *dep;
struct net2280_ep_regs *epregs; struct net2280_ep_regs __iomem *epregs;
struct pci_pool *requests; struct pci_pool *requests;
// statistics... // statistics...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7