@@ -98,27 +98,27 @@ struct mailbox_msg {
98
98
static void mailbox_reg_write (struct mailbox_channel * mb_chann , u32 mbox_reg , u32 data )
99
99
{
100
100
struct xdna_mailbox_res * mb_res = & mb_chann -> mb -> res ;
101
- u64 ringbuf_addr = mb_res -> mbox_base + mbox_reg ;
101
+ void __iomem * ringbuf_addr = mb_res -> mbox_base + mbox_reg ;
102
102
103
- writel (data , ( void * ) ringbuf_addr );
103
+ writel (data , ringbuf_addr );
104
104
}
105
105
106
106
static u32 mailbox_reg_read (struct mailbox_channel * mb_chann , u32 mbox_reg )
107
107
{
108
108
struct xdna_mailbox_res * mb_res = & mb_chann -> mb -> res ;
109
- u64 ringbuf_addr = mb_res -> mbox_base + mbox_reg ;
109
+ void __iomem * ringbuf_addr = mb_res -> mbox_base + mbox_reg ;
110
110
111
- return readl (( void * ) ringbuf_addr );
111
+ return readl (ringbuf_addr );
112
112
}
113
113
114
114
static int mailbox_reg_read_non_zero (struct mailbox_channel * mb_chann , u32 mbox_reg , u32 * val )
115
115
{
116
116
struct xdna_mailbox_res * mb_res = & mb_chann -> mb -> res ;
117
- u64 ringbuf_addr = mb_res -> mbox_base + mbox_reg ;
117
+ void __iomem * ringbuf_addr = mb_res -> mbox_base + mbox_reg ;
118
118
int ret , value ;
119
119
120
120
/* Poll till value is not zero */
121
- ret = readx_poll_timeout (readl , ( void * ) ringbuf_addr , value ,
121
+ ret = readx_poll_timeout (readl , ringbuf_addr , value ,
122
122
value , 1 /* us */ , 100 );
123
123
if (ret < 0 )
124
124
return ret ;
@@ -200,10 +200,10 @@ static void mailbox_release_msg(struct mailbox_channel *mb_chann,
200
200
static int
201
201
mailbox_send_msg (struct mailbox_channel * mb_chann , struct mailbox_msg * mb_msg )
202
202
{
203
+ void __iomem * write_addr ;
203
204
u32 ringbuf_size ;
204
205
u32 head , tail ;
205
206
u32 start_addr ;
206
- u64 write_addr ;
207
207
u32 tmp_tail ;
208
208
209
209
head = mailbox_get_headptr (mb_chann , CHAN_RES_X2I );
@@ -221,14 +221,14 @@ mailbox_send_msg(struct mailbox_channel *mb_chann, struct mailbox_msg *mb_msg)
221
221
222
222
if (tail >= head && tmp_tail > ringbuf_size - sizeof (u32 )) {
223
223
write_addr = mb_chann -> mb -> res .ringbuf_base + start_addr + tail ;
224
- writel (TOMBSTONE , ( void * ) write_addr );
224
+ writel (TOMBSTONE , write_addr );
225
225
226
226
/* tombstone is set. Write from the start of the ringbuf */
227
227
tail = 0 ;
228
228
}
229
229
230
230
write_addr = mb_chann -> mb -> res .ringbuf_base + start_addr + tail ;
231
- memcpy_toio (( void * ) write_addr , & mb_msg -> pkg , mb_msg -> pkg_size );
231
+ memcpy_toio (write_addr , & mb_msg -> pkg , mb_msg -> pkg_size );
232
232
mailbox_set_tailptr (mb_chann , tail + mb_msg -> pkg_size );
233
233
234
234
trace_mbox_set_tail (MAILBOX_NAME , mb_chann -> msix_irq ,
@@ -275,11 +275,11 @@ mailbox_get_resp(struct mailbox_channel *mb_chann, struct xdna_msg_header *heade
275
275
static int mailbox_get_msg (struct mailbox_channel * mb_chann )
276
276
{
277
277
struct xdna_msg_header header ;
278
+ void __iomem * read_addr ;
278
279
u32 msg_size , rest ;
279
280
u32 ringbuf_size ;
280
281
u32 head , tail ;
281
282
u32 start_addr ;
282
- u64 read_addr ;
283
283
int ret ;
284
284
285
285
if (mailbox_reg_read_non_zero (mb_chann , mb_chann -> res [CHAN_RES_I2X ].mb_tail_ptr_reg , & tail ))
@@ -302,7 +302,7 @@ static int mailbox_get_msg(struct mailbox_channel *mb_chann)
302
302
303
303
/* Peek size of the message or TOMBSTONE */
304
304
read_addr = mb_chann -> mb -> res .ringbuf_base + start_addr + head ;
305
- header .total_size = readl (( void * ) read_addr );
305
+ header .total_size = readl (read_addr );
306
306
/* size is TOMBSTONE, set next read from 0 */
307
307
if (header .total_size == TOMBSTONE ) {
308
308
if (head < tail ) {
@@ -328,7 +328,7 @@ static int mailbox_get_msg(struct mailbox_channel *mb_chann)
328
328
329
329
rest = sizeof (header ) - sizeof (u32 );
330
330
read_addr += sizeof (u32 );
331
- memcpy_fromio ((u32 * )& header + 1 , ( void * ) read_addr , rest );
331
+ memcpy_fromio ((u32 * )& header + 1 , read_addr , rest );
332
332
read_addr += rest ;
333
333
334
334
ret = mailbox_get_resp (mb_chann , & header , (u32 * )read_addr );
0 commit comments