Skip to content

L
linux
Commit 539889ee authored by Eli Billauer's avatar Eli Billauer Committed by Greg Kroah-Hartman
Browse files
Options

staging: xillybus: Register's address offset notation update 

In iowrite32() calls, the address of registers was expressed as e.g.
&ep->registers[fpga_msg_ctrl_reg]. This changes to the more common format
e.g. ep->registers + fpga_msg_ctrl_reg.

There is no functional change.
Signed-off-by: default avatarEli Billauer <eli.billauer@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 049c1fb4
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 45 deletions
drivers/staging/xillybus/xillybus.h
View file @ 539889ee
...@@ -99,7 +99,7 @@ struct xilly_endpoint { ...@@ -99,7 +99,7 @@ struct xilly_endpoint {
struct list_head ep_list; struct list_head ep_list;
int dma_using_dac; /* =1 if 64-bit DMA is used, =0 otherwise. */ int dma_using_dac; /* =1 if 64-bit DMA is used, =0 otherwise. */
__iomem u32 *registers; __iomem void *registers;
int fatal_error; int fatal_error;
struct mutex register_mutex; struct mutex register_mutex;
......
drivers/staging/xillybus/xillybus_core.c
View file @ 539889ee
...@@ -44,14 +44,14 @@ MODULE_LICENSE("GPL v2"); ...@@ -44,14 +44,14 @@ MODULE_LICENSE("GPL v2");
#define XILLY_RX_TIMEOUT (10*HZ/1000) #define XILLY_RX_TIMEOUT (10*HZ/1000)
#define XILLY_TIMEOUT (100*HZ/1000) #define XILLY_TIMEOUT (100*HZ/1000)
#define fpga_msg_ctrl_reg 0x0002 #define fpga_msg_ctrl_reg 0x0008
#define fpga_dma_control_reg 0x0008 #define fpga_dma_control_reg 0x0020
#define fpga_dma_bufno_reg 0x0009 #define fpga_dma_bufno_reg 0x0024
#define fpga_dma_bufaddr_lowaddr_reg 0x000a #define fpga_dma_bufaddr_lowaddr_reg 0x0028
#define fpga_dma_bufaddr_highaddr_reg 0x000b #define fpga_dma_bufaddr_highaddr_reg 0x002c
#define fpga_buf_ctrl_reg 0x000c #define fpga_buf_ctrl_reg 0x0030
#define fpga_buf_offset_reg 0x000d #define fpga_buf_offset_reg 0x0034
#define fpga_endian_reg 0x0010 #define fpga_endian_reg 0x0040
#define XILLYMSG_OPCODE_RELEASEBUF 1 #define XILLYMSG_OPCODE_RELEASEBUF 1
#define XILLYMSG_OPCODE_QUIESCEACK 2 #define XILLYMSG_OPCODE_QUIESCEACK 2
...@@ -170,7 +170,7 @@ irqreturn_t xillybus_isr(int irq, void *data) ...@@ -170,7 +170,7 @@ irqreturn_t xillybus_isr(int irq, void *data)
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
iowrite32(0x01, /* Message NACK */ iowrite32(0x01, /* Message NACK */
&ep->registers[fpga_msg_ctrl_reg]); ep->registers + fpga_msg_ctrl_reg);
} }
return IRQ_HANDLED; return IRQ_HANDLED;
} else if (buf[i] & (1 << 22)) /* Last message */ } else if (buf[i] & (1 << 22)) /* Last message */
...@@ -305,7 +305,7 @@ irqreturn_t xillybus_isr(int irq, void *data) ...@@ -305,7 +305,7 @@ irqreturn_t xillybus_isr(int irq, void *data)
ep->msg_counter = (ep->msg_counter + 1) & 0xf; ep->msg_counter = (ep->msg_counter + 1) & 0xf;
ep->failed_messages = 0; ep->failed_messages = 0;
iowrite32(0x03, &ep->registers[fpga_msg_ctrl_reg]); /* Message ACK */ iowrite32(0x03, ep->registers + fpga_msg_ctrl_reg); /* Message ACK */
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -387,9 +387,9 @@ static int xilly_get_dma_buffers(struct xilly_endpoint *ep, ...@@ -387,9 +387,9 @@ static int xilly_get_dma_buffers(struct xilly_endpoint *ep,
return rc; return rc;
iowrite32((u32) (dma_addr & 0xffffffff), iowrite32((u32) (dma_addr & 0xffffffff),
&ep->registers[fpga_dma_bufaddr_lowaddr_reg]); ep->registers + fpga_dma_bufaddr_lowaddr_reg);
iowrite32(((u32) ((((u64) dma_addr) >> 32) & 0xffffffff)), iowrite32(((u32) ((((u64) dma_addr) >> 32) & 0xffffffff)),
&ep->registers[fpga_dma_bufaddr_highaddr_reg]); ep->registers + fpga_dma_bufaddr_highaddr_reg);
mmiowb(); mmiowb();
if (buffers) { /* Not the message buffer */ if (buffers) { /* Not the message buffer */
...@@ -398,14 +398,14 @@ static int xilly_get_dma_buffers(struct xilly_endpoint *ep, ...@@ -398,14 +398,14 @@ static int xilly_get_dma_buffers(struct xilly_endpoint *ep,
buffers[i] = this_buffer++; buffers[i] = this_buffer++;
iowrite32(s->regdirection | s->nbuffer++, iowrite32(s->regdirection | s->nbuffer++,
&ep->registers[fpga_dma_bufno_reg]); ep->registers + fpga_dma_bufno_reg);
} else { } else {
ep->msgbuf_addr = s->salami; ep->msgbuf_addr = s->salami;
ep->msgbuf_dma_addr = dma_addr; ep->msgbuf_dma_addr = dma_addr;
ep->msg_buf_size = bytebufsize; ep->msg_buf_size = bytebufsize;
iowrite32(s->regdirection, iowrite32(s->regdirection,
&ep->registers[fpga_dma_bufno_reg]); ep->registers + fpga_dma_bufno_reg);
} }
s->left_of_salami -= bytebufsize; s->left_of_salami -= bytebufsize;
...@@ -640,7 +640,7 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint) ...@@ -640,7 +640,7 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint)
iowrite32(1 | iowrite32(1 |
(3 << 24), /* Opcode 3 for channel 0 = Send IDT */ (3 << 24), /* Opcode 3 for channel 0 = Send IDT */
&endpoint->registers[fpga_buf_ctrl_reg]); endpoint->registers + fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
wait_event_interruptible_timeout(channel->wr_wait, wait_event_interruptible_timeout(channel->wr_wait,
...@@ -812,8 +812,8 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf, ...@@ -812,8 +812,8 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf,
iowrite32(1 | (channel->chan_num << 1) iowrite32(1 | (channel->chan_num << 1)
| (bufidx << 12), | (bufidx << 12),
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
} }
...@@ -899,15 +899,15 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf, ...@@ -899,15 +899,15 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf,
mutex_lock(&channel->endpoint->register_mutex); mutex_lock(&channel->endpoint->register_mutex);
iowrite32(offsetlimit, iowrite32(offsetlimit,
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_offset_reg]); fpga_buf_offset_reg);
mmiowb(); mmiowb();
iowrite32(1 | (channel->chan_num << 1) | iowrite32(1 | (channel->chan_num << 1) |
(2 << 24) | /* 2 = offset limit */ (2 << 24) | /* 2 = offset limit */
(waiting_bufidx << 12), (waiting_bufidx << 12),
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
...@@ -999,8 +999,8 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf, ...@@ -999,8 +999,8 @@ static ssize_t xillybus_read(struct file *filp, char __user *userbuf,
iowrite32(1 | (channel->chan_num << 1) | iowrite32(1 | (channel->chan_num << 1) |
(3 << 24) | /* Opcode 3, flush it all! */ (3 << 24) | /* Opcode 3, flush it all! */
(waiting_bufidx << 12), (waiting_bufidx << 12),
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
} }
...@@ -1112,13 +1112,13 @@ static int xillybus_myflush(struct xilly_channel *channel, long timeout) ...@@ -1112,13 +1112,13 @@ static int xillybus_myflush(struct xilly_channel *channel, long timeout)
mutex_lock(&channel->endpoint->register_mutex); mutex_lock(&channel->endpoint->register_mutex);
iowrite32(end_offset_plus1 - 1, iowrite32(end_offset_plus1 - 1,
&channel->endpoint->registers[fpga_buf_offset_reg]); channel->endpoint->registers + fpga_buf_offset_reg);
mmiowb(); mmiowb();
iowrite32((channel->chan_num << 1) | /* Channel ID */ iowrite32((channel->chan_num << 1) | /* Channel ID */
(2 << 24) | /* Opcode 2, submit buffer */ (2 << 24) | /* Opcode 2, submit buffer */
(bufidx << 12), (bufidx << 12),
&channel->endpoint->registers[fpga_buf_ctrl_reg]); channel->endpoint->registers + fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
mutex_unlock(&channel->endpoint->register_mutex); mutex_unlock(&channel->endpoint->register_mutex);
...@@ -1362,14 +1362,14 @@ static ssize_t xillybus_write(struct file *filp, const char __user *userbuf, ...@@ -1362,14 +1362,14 @@ static ssize_t xillybus_write(struct file *filp, const char __user *userbuf,
mutex_lock(&channel->endpoint->register_mutex); mutex_lock(&channel->endpoint->register_mutex);
iowrite32(end_offset_plus1 - 1, iowrite32(end_offset_plus1 - 1,
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_offset_reg]); fpga_buf_offset_reg);
mmiowb(); mmiowb();
iowrite32((channel->chan_num << 1) | iowrite32((channel->chan_num << 1) |
(2 << 24) | /* 2 = submit buffer */ (2 << 24) | /* 2 = submit buffer */
(bufidx << 12), (bufidx << 12),
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
mutex_unlock(&channel->endpoint-> mutex_unlock(&channel->endpoint->
...@@ -1564,8 +1564,8 @@ static int xillybus_open(struct inode *inode, struct file *filp) ...@@ -1564,8 +1564,8 @@ static int xillybus_open(struct inode *inode, struct file *filp)
iowrite32(1 | (channel->chan_num << 1) | iowrite32(1 | (channel->chan_num << 1) |
(4 << 24) | /* Opcode 4, open channel */ (4 << 24) | /* Opcode 4, open channel */
((channel->wr_synchronous & 1) << 23), ((channel->wr_synchronous & 1) << 23),
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
} }
...@@ -1586,8 +1586,8 @@ static int xillybus_open(struct inode *inode, struct file *filp) ...@@ -1586,8 +1586,8 @@ static int xillybus_open(struct inode *inode, struct file *filp)
iowrite32((channel->chan_num << 1) | iowrite32((channel->chan_num << 1) |
(4 << 24), /* Opcode 4, open channel */ (4 << 24), /* Opcode 4, open channel */
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
} }
...@@ -1639,8 +1639,8 @@ static int xillybus_release(struct inode *inode, struct file *filp) ...@@ -1639,8 +1639,8 @@ static int xillybus_release(struct inode *inode, struct file *filp)
iowrite32((channel->chan_num << 1) | /* Channel ID */ iowrite32((channel->chan_num << 1) | /* Channel ID */
(5 << 24), /* Opcode 5, close channel */ (5 << 24), /* Opcode 5, close channel */
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
} }
mutex_unlock(&channel->rd_mutex); mutex_unlock(&channel->rd_mutex);
...@@ -1660,8 +1660,8 @@ static int xillybus_release(struct inode *inode, struct file *filp) ...@@ -1660,8 +1660,8 @@ static int xillybus_release(struct inode *inode, struct file *filp)
iowrite32(1 | (channel->chan_num << 1) | iowrite32(1 | (channel->chan_num << 1) |
(5 << 24), /* Opcode 5, close channel */ (5 << 24), /* Opcode 5, close channel */
&channel->endpoint->registers[ channel->endpoint->registers +
fpga_buf_ctrl_reg]); fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
/* /*
...@@ -1766,11 +1766,11 @@ static loff_t xillybus_llseek(struct file *filp, loff_t offset, int whence) ...@@ -1766,11 +1766,11 @@ static loff_t xillybus_llseek(struct file *filp, loff_t offset, int whence)
mutex_lock(&channel->endpoint->register_mutex); mutex_lock(&channel->endpoint->register_mutex);
iowrite32(pos >> channel->log2_element_size, iowrite32(pos >> channel->log2_element_size,
&channel->endpoint->registers[fpga_buf_offset_reg]); channel->endpoint->registers + fpga_buf_offset_reg);
mmiowb(); mmiowb();
iowrite32((channel->chan_num << 1) | iowrite32((channel->chan_num << 1) |
(6 << 24), /* Opcode 6, set address */ (6 << 24), /* Opcode 6, set address */
&channel->endpoint->registers[fpga_buf_ctrl_reg]); channel->endpoint->registers + fpga_buf_ctrl_reg);
mmiowb(); /* Just to appear safe */ mmiowb(); /* Just to appear safe */
mutex_unlock(&channel->endpoint->register_mutex); mutex_unlock(&channel->endpoint->register_mutex);
...@@ -1987,7 +1987,7 @@ static int xilly_quiesce(struct xilly_endpoint *endpoint) ...@@ -1987,7 +1987,7 @@ static int xilly_quiesce(struct xilly_endpoint *endpoint)
endpoint->idtlen = -1; endpoint->idtlen = -1;
wmb(); /* Make sure idtlen is set before sending command */ wmb(); /* Make sure idtlen is set before sending command */
iowrite32((u32) (endpoint->dma_using_dac & 0x0001), iowrite32((u32) (endpoint->dma_using_dac & 0x0001),
&endpoint->registers[fpga_dma_control_reg]); endpoint->registers + fpga_dma_control_reg);
mmiowb(); mmiowb();
wait_event_interruptible_timeout(endpoint->ep_wait, wait_event_interruptible_timeout(endpoint->ep_wait,
...@@ -2027,7 +2027,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint) ...@@ -2027,7 +2027,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint)
* necessary. * necessary.
*/ */
iowrite32(1, &endpoint->registers[fpga_endian_reg]); iowrite32(1, endpoint->registers + fpga_endian_reg);
mmiowb(); /* Writes below are affected by the one above. */ mmiowb(); /* Writes below are affected by the one above. */
/* Bootstrap phase I: Allocate temporary message buffer */ /* Bootstrap phase I: Allocate temporary message buffer */
...@@ -2044,7 +2044,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint) ...@@ -2044,7 +2044,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint)
return rc; return rc;
/* Clear the message subsystem (and counter in particular) */ /* Clear the message subsystem (and counter in particular) */
iowrite32(0x04, &endpoint->registers[fpga_msg_ctrl_reg]); iowrite32(0x04, endpoint->registers + fpga_msg_ctrl_reg);
mmiowb(); mmiowb();
endpoint->idtlen = -1; endpoint->idtlen = -1;
...@@ -2056,7 +2056,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint) ...@@ -2056,7 +2056,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint)
* buffer size. * buffer size.
*/ */
iowrite32((u32) (endpoint->dma_using_dac & 0x0001), iowrite32((u32) (endpoint->dma_using_dac & 0x0001),
&endpoint->registers[fpga_dma_control_reg]); endpoint->registers + fpga_dma_control_reg);
mmiowb(); mmiowb();
wait_event_interruptible_timeout(endpoint->ep_wait, wait_event_interruptible_timeout(endpoint->ep_wait,
...@@ -2070,7 +2070,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint) ...@@ -2070,7 +2070,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint)
/* Enable DMA */ /* Enable DMA */
iowrite32((u32) (0x0002 | (endpoint->dma_using_dac & 0x0001)), iowrite32((u32) (0x0002 | (endpoint->dma_using_dac & 0x0001)),
&endpoint->registers[fpga_dma_control_reg]); endpoint->registers + fpga_dma_control_reg);
mmiowb(); mmiowb();
/* Bootstrap phase II: Allocate buffer for IDT and obtain it */ /* Bootstrap phase II: Allocate buffer for IDT and obtain it */
......
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