Skip to content

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

[PATCH] sunzilog iomem annotations 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5bba3bb4
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
drivers/serial/sunzilog.c
View file @ 39087943
...@@ -112,7 +112,7 @@ struct uart_sunzilog_port { ...@@ -112,7 +112,7 @@ struct uart_sunzilog_port {
#endif #endif
}; };
#define ZILOG_CHANNEL_FROM_PORT(PORT) ((struct zilog_channel *)((PORT)->membase)) #define ZILOG_CHANNEL_FROM_PORT(PORT) ((struct zilog_channel __iomem *)((PORT)->membase))
#define UART_ZILOG(PORT) ((struct uart_sunzilog_port *)(PORT)) #define UART_ZILOG(PORT) ((struct uart_sunzilog_port *)(PORT))
#define ZS_IS_KEYB(UP) ((UP)->flags & SUNZILOG_FLAG_CONS_KEYB) #define ZS_IS_KEYB(UP) ((UP)->flags & SUNZILOG_FLAG_CONS_KEYB)
...@@ -133,7 +133,7 @@ struct uart_sunzilog_port { ...@@ -133,7 +133,7 @@ struct uart_sunzilog_port {
* The port lock must be held and local IRQs must be disabled * The port lock must be held and local IRQs must be disabled
* when {read,write}_zsreg is invoked. * when {read,write}_zsreg is invoked.
*/ */
static unsigned char read_zsreg(struct zilog_channel *channel, static unsigned char read_zsreg(struct zilog_channel __iomem *channel,
unsigned char reg) unsigned char reg)
{ {
unsigned char retval; unsigned char retval;
...@@ -146,7 +146,7 @@ static unsigned char read_zsreg(struct zilog_channel *channel, ...@@ -146,7 +146,7 @@ static unsigned char read_zsreg(struct zilog_channel *channel,
return retval; return retval;
} }
static void write_zsreg(struct zilog_channel *channel, static void write_zsreg(struct zilog_channel __iomem *channel,
unsigned char reg, unsigned char value) unsigned char reg, unsigned char value)
{ {
sbus_writeb(reg, &channel->control); sbus_writeb(reg, &channel->control);
...@@ -155,7 +155,7 @@ static void write_zsreg(struct zilog_channel *channel, ...@@ -155,7 +155,7 @@ static void write_zsreg(struct zilog_channel *channel,
ZSDELAY(); ZSDELAY();
} }
static void sunzilog_clear_fifo(struct zilog_channel *channel) static void sunzilog_clear_fifo(struct zilog_channel __iomem *channel)
{ {
int i; int i;
...@@ -182,7 +182,7 @@ static void sunzilog_clear_fifo(struct zilog_channel *channel) ...@@ -182,7 +182,7 @@ static void sunzilog_clear_fifo(struct zilog_channel *channel)
/* This function must only be called when the TX is not busy. The UART /* This function must only be called when the TX is not busy. The UART
* port lock must be held and local interrupts disabled. * port lock must be held and local interrupts disabled.
*/ */
static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs) static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *regs)
{ {
int i; int i;
...@@ -258,7 +258,7 @@ static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs) ...@@ -258,7 +258,7 @@ static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs)
* The UART port lock must be held and local interrupts disabled. * The UART port lock must be held and local interrupts disabled.
*/ */
static void sunzilog_maybe_update_regs(struct uart_sunzilog_port *up, static void sunzilog_maybe_update_regs(struct uart_sunzilog_port *up,
struct zilog_channel *channel) struct zilog_channel __iomem *channel)
{ {
if (!ZS_REGS_HELD(up)) { if (!ZS_REGS_HELD(up)) {
if (ZS_TX_ACTIVE(up)) { if (ZS_TX_ACTIVE(up)) {
...@@ -315,7 +315,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up, ...@@ -315,7 +315,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,
static struct tty_struct * static struct tty_struct *
sunzilog_receive_chars(struct uart_sunzilog_port *up, sunzilog_receive_chars(struct uart_sunzilog_port *up,
struct zilog_channel *channel, struct zilog_channel __iomem *channel,
struct pt_regs *regs) struct pt_regs *regs)
{ {
struct tty_struct *tty; struct tty_struct *tty;
...@@ -419,7 +419,7 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up, ...@@ -419,7 +419,7 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
} }
static void sunzilog_status_handle(struct uart_sunzilog_port *up, static void sunzilog_status_handle(struct uart_sunzilog_port *up,
struct zilog_channel *channel, struct zilog_channel __iomem *channel,
struct pt_regs *regs) struct pt_regs *regs)
{ {
unsigned char status; unsigned char status;
...@@ -471,7 +471,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up, ...@@ -471,7 +471,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,
} }
static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
struct zilog_channel *channel) struct zilog_channel __iomem *channel)
{ {
struct circ_buf *xmit; struct circ_buf *xmit;
...@@ -548,7 +548,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg ...@@ -548,7 +548,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg
struct uart_sunzilog_port *up = dev_id; struct uart_sunzilog_port *up = dev_id;
while (up) { while (up) {
struct zilog_channel *channel struct zilog_channel __iomem *channel
= ZILOG_CHANNEL_FROM_PORT(&up->port); = ZILOG_CHANNEL_FROM_PORT(&up->port);
struct tty_struct *tty; struct tty_struct *tty;
unsigned char r3; unsigned char r3;
...@@ -609,7 +609,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg ...@@ -609,7 +609,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg
*/ */
static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port) static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port)
{ {
struct zilog_channel *channel; struct zilog_channel __iomem *channel;
unsigned long flags; unsigned long flags;
unsigned char status; unsigned char status;
...@@ -662,7 +662,7 @@ static unsigned int sunzilog_get_mctrl(struct uart_port *port) ...@@ -662,7 +662,7 @@ static unsigned int sunzilog_get_mctrl(struct uart_port *port)
static void sunzilog_set_mctrl(struct uart_port *port, unsigned int mctrl) static void sunzilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
{ {
struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port; struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
unsigned char set_bits, clear_bits; unsigned char set_bits, clear_bits;
set_bits = clear_bits = 0; set_bits = clear_bits = 0;
...@@ -694,7 +694,7 @@ static void sunzilog_stop_tx(struct uart_port *port, unsigned int tty_stop) ...@@ -694,7 +694,7 @@ static void sunzilog_stop_tx(struct uart_port *port, unsigned int tty_stop)
static void sunzilog_start_tx(struct uart_port *port, unsigned int tty_start) static void sunzilog_start_tx(struct uart_port *port, unsigned int tty_start)
{ {
struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port; struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
unsigned char status; unsigned char status;
up->flags |= SUNZILOG_FLAG_TX_ACTIVE; up->flags |= SUNZILOG_FLAG_TX_ACTIVE;
...@@ -736,7 +736,7 @@ static void sunzilog_start_tx(struct uart_port *port, unsigned int tty_start) ...@@ -736,7 +736,7 @@ static void sunzilog_start_tx(struct uart_port *port, unsigned int tty_start)
static void sunzilog_stop_rx(struct uart_port *port) static void sunzilog_stop_rx(struct uart_port *port)
{ {
struct uart_sunzilog_port *up = UART_ZILOG(port); struct uart_sunzilog_port *up = UART_ZILOG(port);
struct zilog_channel *channel; struct zilog_channel __iomem *channel;
if (ZS_IS_CONS(up)) if (ZS_IS_CONS(up))
return; return;
...@@ -752,7 +752,7 @@ static void sunzilog_stop_rx(struct uart_port *port) ...@@ -752,7 +752,7 @@ static void sunzilog_stop_rx(struct uart_port *port)
static void sunzilog_enable_ms(struct uart_port *port) static void sunzilog_enable_ms(struct uart_port *port)
{ {
struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port; struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
unsigned char new_reg; unsigned char new_reg;
new_reg = up->curregs[R15] | (DCDIE | SYNCIE | CTSIE); new_reg = up->curregs[R15] | (DCDIE | SYNCIE | CTSIE);
...@@ -768,7 +768,7 @@ static void sunzilog_enable_ms(struct uart_port *port) ...@@ -768,7 +768,7 @@ static void sunzilog_enable_ms(struct uart_port *port)
static void sunzilog_break_ctl(struct uart_port *port, int break_state) static void sunzilog_break_ctl(struct uart_port *port, int break_state)
{ {
struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port; struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
unsigned char set_bits, clear_bits, new_reg; unsigned char set_bits, clear_bits, new_reg;
unsigned long flags; unsigned long flags;
...@@ -794,7 +794,7 @@ static void sunzilog_break_ctl(struct uart_port *port, int break_state) ...@@ -794,7 +794,7 @@ static void sunzilog_break_ctl(struct uart_port *port, int break_state)
static void __sunzilog_startup(struct uart_sunzilog_port *up) static void __sunzilog_startup(struct uart_sunzilog_port *up)
{ {
struct zilog_channel *channel; struct zilog_channel __iomem *channel;
channel = ZILOG_CHANNEL_FROM_PORT(&up->port); channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
up->prev_status = sbus_readb(&channel->control); up->prev_status = sbus_readb(&channel->control);
...@@ -849,7 +849,7 @@ static int sunzilog_startup(struct uart_port *port) ...@@ -849,7 +849,7 @@ static int sunzilog_startup(struct uart_port *port)
static void sunzilog_shutdown(struct uart_port *port) static void sunzilog_shutdown(struct uart_port *port)
{ {
struct uart_sunzilog_port *up = UART_ZILOG(port); struct uart_sunzilog_port *up = UART_ZILOG(port);
struct zilog_channel *channel; struct zilog_channel __iomem *channel;
unsigned long flags; unsigned long flags;
if (ZS_IS_CONS(up)) if (ZS_IS_CONS(up))
...@@ -1027,7 +1027,7 @@ static struct uart_ops sunzilog_pops = { ...@@ -1027,7 +1027,7 @@ static struct uart_ops sunzilog_pops = {
}; };
static struct uart_sunzilog_port *sunzilog_port_table; static struct uart_sunzilog_port *sunzilog_port_table;
static struct zilog_layout **sunzilog_chip_regs; static struct zilog_layout __iomem **sunzilog_chip_regs;
static struct uart_sunzilog_port *sunzilog_irq_chain; static struct uart_sunzilog_port *sunzilog_irq_chain;
static int zilog_irq = -1; static int zilog_irq = -1;
...@@ -1053,10 +1053,10 @@ static void * __init alloc_one_table(unsigned long size) ...@@ -1053,10 +1053,10 @@ static void * __init alloc_one_table(unsigned long size)
static void __init sunzilog_alloc_tables(void) static void __init sunzilog_alloc_tables(void)
{ {
sunzilog_port_table = (struct uart_sunzilog_port *) sunzilog_port_table =
alloc_one_table(NUM_CHANNELS * sizeof(struct uart_sunzilog_port)); alloc_one_table(NUM_CHANNELS * sizeof(struct uart_sunzilog_port));
sunzilog_chip_regs = (struct zilog_layout **) sunzilog_chip_regs =
alloc_one_table(NUM_SUNZILOG * sizeof(struct zilog_layout *)); alloc_one_table(NUM_SUNZILOG * sizeof(struct zilog_layout __iomem *));
if (sunzilog_port_table == NULL || sunzilog_chip_regs == NULL) { if (sunzilog_port_table == NULL || sunzilog_chip_regs == NULL) {
prom_printf("SunZilog: Cannot allocate tables.\n"); prom_printf("SunZilog: Cannot allocate tables.\n");
...@@ -1069,7 +1069,7 @@ static void __init sunzilog_alloc_tables(void) ...@@ -1069,7 +1069,7 @@ static void __init sunzilog_alloc_tables(void)
/* We used to attempt to use the address property of the Zilog device node /* We used to attempt to use the address property of the Zilog device node
* but that totally is not necessary on sparc64. * but that totally is not necessary on sparc64.
*/ */
static struct zilog_layout * __init get_zs_sun4u(int chip, int zsnode) static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode)
{ {
unsigned long mapped_addr; unsigned long mapped_addr;
unsigned int sun4u_ino; unsigned int sun4u_ino;
...@@ -1133,7 +1133,7 @@ static struct zilog_layout * __init get_zs_sun4u(int chip, int zsnode) ...@@ -1133,7 +1133,7 @@ static struct zilog_layout * __init get_zs_sun4u(int chip, int zsnode)
} }
} }
return (struct zilog_layout *) mapped_addr; return (struct zilog_layout __iomem *) mapped_addr;
} }
#else /* CONFIG_SPARC64 */ #else /* CONFIG_SPARC64 */
...@@ -1141,10 +1141,10 @@ static struct zilog_layout * __init get_zs_sun4u(int chip, int zsnode) ...@@ -1141,10 +1141,10 @@ static struct zilog_layout * __init get_zs_sun4u(int chip, int zsnode)
* XXX The sun4d case is utterly screwed: it tries to re-walk the tree * XXX The sun4d case is utterly screwed: it tries to re-walk the tree
* (for the 3rd time) in order to find bootbus and cpu. Streamline it. * (for the 3rd time) in order to find bootbus and cpu. Streamline it.
*/ */
static struct zilog_layout * __init get_zs_sun4cmd(int chip, int node) static struct zilog_layout __iomem * __init get_zs_sun4cmd(int chip, int node)
{ {
struct linux_prom_irqs irq_info[2]; struct linux_prom_irqs irq_info[2];
unsigned long mapped_addr = 0; void __iomem *mapped_addr = NULL;
int zsnode, cpunode, bbnode; int zsnode, cpunode, bbnode;
struct linux_prom_registers zsreg[4]; struct linux_prom_registers zsreg[4];
struct resource res; struct resource res;
...@@ -1230,12 +1230,12 @@ static struct zilog_layout * __init get_zs_sun4cmd(int chip, int node) ...@@ -1230,12 +1230,12 @@ static struct zilog_layout * __init get_zs_sun4cmd(int chip, int node)
prom_halt(); prom_halt();
} }
return (struct zilog_layout *) mapped_addr; return (struct zilog_layout __iomem *) mapped_addr;
} }
#endif /* !(CONFIG_SPARC64) */ #endif /* !(CONFIG_SPARC64) */
/* Get the address of the registers for SunZilog instance CHIP. */ /* Get the address of the registers for SunZilog instance CHIP. */
static struct zilog_layout * __init get_zs(int chip, int node) static struct zilog_layout __iomem * __init get_zs(int chip, int node)
{ {
if (chip < 0 || chip >= NUM_SUNZILOG) { if (chip < 0 || chip >= NUM_SUNZILOG) {
prom_printf("SunZilog: Illegal chip number %d in get_zs.\n", chip); prom_printf("SunZilog: Illegal chip number %d in get_zs.\n", chip);
...@@ -1261,7 +1261,7 @@ static struct zilog_layout * __init get_zs(int chip, int node) ...@@ -1261,7 +1261,7 @@ static struct zilog_layout * __init get_zs(int chip, int node)
zilog_irq = 12; zilog_irq = 12;
res.end = (res.start + (8 - 1)); res.end = (res.start + (8 - 1));
res.flags = IORESOURCE_IO; res.flags = IORESOURCE_IO;
return (struct zilog_layout *) sbus_ioremap(&res, 0, 8, "SunZilog"); return sbus_ioremap(&res, 0, 8, "SunZilog");
} }
return get_zs_sun4cmd(chip, node); return get_zs_sun4cmd(chip, node);
...@@ -1270,7 +1270,7 @@ static struct zilog_layout * __init get_zs(int chip, int node) ...@@ -1270,7 +1270,7 @@ static struct zilog_layout * __init get_zs(int chip, int node)
#define ZS_PUT_CHAR_MAX_DELAY 2000 /* 10 ms */ #define ZS_PUT_CHAR_MAX_DELAY 2000 /* 10 ms */
static void sunzilog_put_char(struct zilog_channel *channel, unsigned char ch) static void sunzilog_put_char(struct zilog_channel __iomem *channel, unsigned char ch)
{ {
int loops = ZS_PUT_CHAR_MAX_DELAY; int loops = ZS_PUT_CHAR_MAX_DELAY;
...@@ -1485,7 +1485,7 @@ static void __init sunzilog_scan(struct zs_probe_scan *t, int node) ...@@ -1485,7 +1485,7 @@ static void __init sunzilog_scan(struct zs_probe_scan *t, int node)
static void __init sunzilog_prepare(void) static void __init sunzilog_prepare(void)
{ {
struct uart_sunzilog_port *up; struct uart_sunzilog_port *up;
struct zilog_layout *rp; struct zilog_layout __iomem *rp;
int channel, chip; int channel, chip;
/* /*
...@@ -1501,8 +1501,8 @@ static void __init sunzilog_prepare(void) ...@@ -1501,8 +1501,8 @@ static void __init sunzilog_prepare(void)
for (chip = 0; chip < NUM_SUNZILOG; chip++) { for (chip = 0; chip < NUM_SUNZILOG; chip++) {
rp = sunzilog_chip_regs[chip]; rp = sunzilog_chip_regs[chip];
up[(chip * 2) + 0].port.membase = (char *) &rp->channelA; up[(chip * 2) + 0].port.membase = (void __iomem *)&rp->channelA;
up[(chip * 2) + 1].port.membase = (char *) &rp->channelB; up[(chip * 2) + 1].port.membase = (void __iomem *)&rp->channelB;
/* Channel A */ /* Channel A */
up[(chip * 2) + 0].port.iotype = SERIAL_IO_MEM; up[(chip * 2) + 0].port.iotype = SERIAL_IO_MEM;
...@@ -1592,7 +1592,7 @@ static void __init sunzilog_init_hw(void) ...@@ -1592,7 +1592,7 @@ static void __init sunzilog_init_hw(void)
for (i = 0; i < NUM_CHANNELS; i++) { for (i = 0; i < NUM_CHANNELS; i++) {
struct uart_sunzilog_port *up = &sunzilog_port_table[i]; struct uart_sunzilog_port *up = &sunzilog_port_table[i];
struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port); struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
unsigned long flags; unsigned long flags;
int baud, brg; int baud, brg;
...@@ -1636,7 +1636,7 @@ static void __init sunzilog_init_hw(void) ...@@ -1636,7 +1636,7 @@ static void __init sunzilog_init_hw(void)
} }
} }
static struct zilog_layout * __init get_zs(int chip, int node); static struct zilog_layout __iomem * __init get_zs(int chip, int node);
static void __init sunzilog_scan_probe(struct zs_probe_scan *t, int node) static void __init sunzilog_scan_probe(struct zs_probe_scan *t, int node)
{ {
......
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