serial: amba-pl011: complete support to ZTE uart
Subsystems (3)
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
Complete support to ZTE uart with adding specific registers mask.
We use a magic amba periphid value as pl011 device on ZTE does not have a periphid value in register. The magic value should also be feed via device tree "arm,primecell-periphid" property to match pl011 driver and get ZTE uart data.
Signed-off-by Jun Nie <[email protected]>
--- drivers/tty/serial/amba-pl011.c | 73 +++++++++++++++++++++++++++++++++-------- include/linux/amba/serial.h | 4 +++ 2 files changed, 64 insertions(+), 13 deletions(-)
drivers/tty/serial/amba-pl011.c +60 -13
@@ -93,6 +93,10 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {struct vendor_data {const u16 *reg_offset;unsigned int ifls; +unsigned int fr_busy; +unsigned int fr_dsr; +unsigned int fr_cts; +unsigned int fr_ri;bool access_32b;bool oversampling;bool dma_threshold;
@@ -111,6 +115,10 @@ static unsigned int get_fifosize_arm(struct amba_device *dev)static struct vendor_data vendor_arm = { .reg_offset = pl011_std_offsets, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,
@@ -121,6 +129,10 @@ static struct vendor_data vendor_arm = {static struct vendor_data vendor_sbsa = { .reg_offset = pl011_std_offsets, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,
@@ -163,6 +175,10 @@ static unsigned int get_fifosize_st(struct amba_device *dev)static struct vendor_data vendor_st = { .reg_offset = pl011_st_offsets, .ifls =UART011_IFLS_RX_HALF |UART011_IFLS_TX_HALF , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = true, .dma_threshold = true, .cts_event_workaround = true,
@@ -187,11 +203,25 @@ static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = { [REG_DMACR] = ZX_UART011_DMACR, }; +static unsigned int get_fifosize_zte (struct amba_device *dev) +{ +return 16 ; +} +static struct vendor_data vendor_zte__maybe_unused = { .reg_offset = pl011_zte_offsets, .access_32b = true, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , - .get_fifosize = get_fifosize_arm, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .fr_ri =ZX_UART011_FR_RI , + .oversampling = false, + .dma_threshold = false, + .cts_event_workaround = false, + .always_enabled = false, + .fixed_options = false, + .get_fifosize = get_fifosize_zte, };/* Deals with DMA transactions */
@@ -236,6 +266,10 @@ struct uart_amba_port {unsigned int im;/* interrupt mask */ unsigned int old_status;unsigned int fifosize;/* vendor-specific */ +unsigned int fr_busy;/* vendor-specific */ +unsigned int fr_dsr;/* vendor-specific */ +unsigned int fr_cts;/* vendor-specific */ +unsigned int fr_ri;/* vendor-specific */ unsigned int old_cr;/* state during shutdown */ bool autorts;unsigned int fixed_baud;/* vendor-set fixed baud rate */
@@ -1166,7 +1200,7 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap)return ;/* Disable RX and TX DMA */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();spin_lock_irq (&uap->port.lock);
@@ -1415,11 +1449,11 @@ static void pl011_modem_status(struct uart_amba_port *uap)if (delta & UART01x_FR_DCD)uart_handle_dcd_change (&uap->port, status & UART01x_FR_DCD); -if (delta & UART01x_FR_DSR) +if (delta & uap->fr_dsr) uap->port.icount.dsr++; -if (delta & UART01x_FR_CTS) -uart_handle_cts_change (&uap->port, status & UART01x_FR_CTS); +if (delta & uap->fr_cts) +uart_handle_cts_change (&uap->port, status & uap->fr_cts);wake_up_interruptible (&uap->port.state->port.delta_msr_wait); }
@@ -1492,7 +1526,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port)struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port);unsigned int status =pl011_read (uap,REG_FR ); -return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; +return status & (uap->fr_busy | UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; }static unsigned int pl011_get_mctrl (struct uart_port *port)
@@ -1507,9 +1541,9 @@ static unsigned int pl011_get_mctrl(struct uart_port *port) result |= tiocmbitTIOCMBIT (UART01x_FR_DCD,TIOCM_CAR ); -TIOCMBIT (UART01x_FR_DSR,TIOCM_DSR ); -TIOCMBIT (UART01x_FR_CTS,TIOCM_CTS ); -TIOCMBIT (UART011_FR_RI ,TIOCM_RNG ); +TIOCMBIT (uap->fr_dsr,TIOCM_DSR ); +TIOCMBIT (uap->fr_cts,TIOCM_CTS ); +TIOCMBIT (uap->fr_ri,TIOCM_RNG );#undef TIOCMBITreturn result; }
@@ -2086,7 +2120,7 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)return ret; } -static struct uart_ops amba_pl011_pops = { +static const struct uart_ops amba_pl011_pops = { .tx_empty = pl011_tx_empty, .set_mctrl = pl011_set_mctrl, .get_mctrl = pl011_get_mctrl,
@@ -2190,7 +2224,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)* Finally, wait for transmitter to become empty * and restore the TCR */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();if (!uap->vendor->always_enabled)pl011_write (old_cr, uap,REG_CR );
@@ -2472,8 +2506,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)return PTR_ERR (uap->clk); uap->reg_offset = vendor->reg_offset; - uap->vendor = vendor; - uap->fifosize = vendor->get_fifosize (dev); + uap->vendor = vendor; + uap->fifosize = vendor->get_fifosize (dev); + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->fr_ri = vendor->fr_ri; uap->port.iotype = vendor->access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq = dev->irq[0 ]; uap->port.ops = &amba_pl011_pops;
@@ -2555,6 +2593,10 @@ static int sbsa_uart_probe(struct platform_device *pdev) uap->reg_offset = vendor_sbsa.reg_offset; uap->vendor = &vendor_sbsa; uap->fifosize =32 ; + uap->fr_busy = vendor_sbsa.fr_busy; + uap->fr_dsr = vendor_sbsa.fr_dsr; + uap->fr_cts = vendor_sbsa.fr_cts; + uap->fr_ri = vendor_sbsa.fr_ri; uap->port.iotype = vendor_sbsa.access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq =platform_get_irq (pdev,0 ); uap->port.ops = &sbsa_uart_pops;
@@ -2615,6 +2657,11 @@ static struct amba_id pl011_ids[] = { .mask = 0x00ffffff, .data = &vendor_st, }, + { + .id = 0xfefefe, + .mask = 0xffffff, + .data = &vendor_zte, + }, { 0, 0 }, };
include/linux/amba/serial.h +4 -0
@@ -103,6 +103,10 @@#define UART01x_FR_DSR 0x002#define UART01x_FR_CTS 0x001#define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) +#define ZX_UART01x_FR_BUSY 0x300 +#define ZX_UART01x_FR_DSR 0x008 +#define ZX_UART01x_FR_CTS 0x002 +#define ZX_UART011_FR_RI 0x001#define UART011_CR_CTSEN 0x8000/* CTS hardware flow control */ #define UART011_CR_RTSEN 0x4000/* RTS hardware flow control */
Signature · 1 line
1.9.1
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
2016-03-23 15:12 GMT+08:00 Jun Nie <[email protected]>:
Quoted 217 lines
Complete support to ZTE uart with adding specific registers mask.
We use a magic amba periphid value as pl011 device on ZTE does not have a periphid value in register. The magic value should also be feed via device tree "arm,primecell-periphid" property to match pl011 driver and get ZTE uart data.Signed-off-by Jun Nie <[email protected]>--- drivers/tty/serial/amba-pl011.c | 73 +++++++++++++++++++++++++++++++++-------- include/linux/amba/serial.h | 4 +++ 2 files changed, 64 insertions(+), 13 deletions(-)drivers/tty/serial/amba-pl011.c +60
-13@@ -93,6 +93,10 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {struct vendor_data {const u16 *reg_offset;unsigned int ifls; +unsigned int fr_busy; +unsigned int fr_dsr; +unsigned int fr_cts; +unsigned int fr_ri;bool access_32b;bool oversampling;bool dma_threshold;@@ -111,6 +115,10 @@ static unsigned int get_fifosize_arm(struct amba_device *dev)static struct vendor_data vendor_arm = { .reg_offset = pl011_std_offsets, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,@@ -121,6 +129,10 @@ static struct vendor_data vendor_arm = {static struct vendor_data vendor_sbsa = { .reg_offset = pl011_std_offsets, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,@@ -163,6 +175,10 @@ static unsigned int get_fifosize_st(struct amba_device *dev)static struct vendor_data vendor_st = { .reg_offset = pl011_st_offsets, .ifls =UART011_IFLS_RX_HALF |UART011_IFLS_TX_HALF , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = true, .dma_threshold = true, .cts_event_workaround = true,@@ -187,11 +203,25 @@ static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = { [REG_DMACR] = ZX_UART011_DMACR, }; +static unsigned int get_fifosize_zte (struct amba_device *dev) +{ +return 16 ; +} +static struct vendor_data vendor_zte__maybe_unused = { .reg_offset = pl011_zte_offsets, .access_32b = true, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , - .get_fifosize = get_fifosize_arm, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .fr_ri =ZX_UART011_FR_RI , + .oversampling = false, + .dma_threshold = false, + .cts_event_workaround = false, + .always_enabled = false, + .fixed_options = false, + .get_fifosize = get_fifosize_zte, };/* Deals with DMA transactions */ @@ -236,6 +266,10 @@ struct uart_amba_port {unsigned int im;/* interrupt mask */ unsigned int old_status;unsigned int fifosize;/* vendor-specific */ +unsigned int fr_busy;/* vendor-specific */ +unsigned int fr_dsr;/* vendor-specific */ +unsigned int fr_cts;/* vendor-specific */ +unsigned int fr_ri;/* vendor-specific */ unsigned int old_cr;/* state during shutdown */ bool autorts;unsigned int fixed_baud;/* vendor-set fixed baud rate */ @@ -1166,7 +1200,7 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap)return ;/* Disable RX and TX DMA */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();spin_lock_irq (&uap->port.lock);@@ -1415,11 +1449,11 @@ static void pl011_modem_status(struct uart_amba_port *uap)if (delta & UART01x_FR_DCD)uart_handle_dcd_change (&uap->port, status & UART01x_FR_DCD); -if (delta & UART01x_FR_DSR) +if (delta & uap->fr_dsr) uap->port.icount.dsr++; -if (delta & UART01x_FR_CTS) -uart_handle_cts_change (&uap->port, status & UART01x_FR_CTS); +if (delta & uap->fr_cts) +uart_handle_cts_change (&uap->port, status & uap->fr_cts);wake_up_interruptible (&uap->port.state->port.delta_msr_wait); }@@ -1492,7 +1526,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port)struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port);unsigned int status =pl011_read (uap,REG_FR ); -return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; +return status & (uap->fr_busy | UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; }static unsigned int pl011_get_mctrl (struct uart_port *port)@@ -1507,9 +1541,9 @@ static unsigned int pl011_get_mctrl(struct uart_port *port) result |= tiocmbitTIOCMBIT (UART01x_FR_DCD,TIOCM_CAR ); -TIOCMBIT (UART01x_FR_DSR,TIOCM_DSR ); -TIOCMBIT (UART01x_FR_CTS,TIOCM_CTS ); -TIOCMBIT (UART011_FR_RI ,TIOCM_RNG ); +TIOCMBIT (uap->fr_dsr,TIOCM_DSR ); +TIOCMBIT (uap->fr_cts,TIOCM_CTS ); +TIOCMBIT (uap->fr_ri,TIOCM_RNG );#undef TIOCMBITreturn result; }@@ -2086,7 +2120,7 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)return ret; } -static struct uart_ops amba_pl011_pops = { +static const struct uart_ops amba_pl011_pops = { .tx_empty = pl011_tx_empty, .set_mctrl = pl011_set_mctrl, .get_mctrl = pl011_get_mctrl,@@ -2190,7 +2224,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)* Finally, wait for transmitter to become empty * and restore the TCR */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();if (!uap->vendor->always_enabled)pl011_write (old_cr, uap,REG_CR );@@ -2472,8 +2506,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)return PTR_ERR (uap->clk); uap->reg_offset = vendor->reg_offset; - uap->vendor = vendor; - uap->fifosize = vendor->get_fifosize (dev); + uap->vendor = vendor; + uap->fifosize = vendor->get_fifosize (dev); + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->fr_ri = vendor->fr_ri; uap->port.iotype = vendor->access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq = dev->irq[0 ]; uap->port.ops = &amba_pl011_pops;@@ -2555,6 +2593,10 @@ static int sbsa_uart_probe(struct platform_device *pdev) uap->reg_offset = vendor_sbsa.reg_offset; uap->vendor = &vendor_sbsa; uap->fifosize =32 ; + uap->fr_busy = vendor_sbsa.fr_busy; + uap->fr_dsr = vendor_sbsa.fr_dsr; + uap->fr_cts = vendor_sbsa.fr_cts; + uap->fr_ri = vendor_sbsa.fr_ri; uap->port.iotype = vendor_sbsa.access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq =platform_get_irq (pdev,0 ); uap->port.ops = &sbsa_uart_pops;@@ -2615,6 +2657,11 @@ static struct amba_id pl011_ids[] = { .mask = 0x00ffffff, .data = &vendor_st, }, + { + .id = 0xfefefe, + .mask = 0xffffff, + .data = &vendor_zte, + }, { 0, 0 }, };include/linux/amba/serial.h +4
-1@@ -103,6 +103,10 @@#define UART01x_FR_DSR 0x002#define UART01x_FR_CTS 0x001#define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) +#define ZX_UART01x_FR_BUSY 0x300 +#define ZX_UART01x_FR_DSR 0x008 +#define ZX_UART01x_FR_CTS 0x002 +#define ZX_UART011_FR_RI 0x001#define UART011_CR_CTSEN 0x8000/* CTS hardware flow control */ #define UART011_CR_RTSEN 0x4000/* RTS hardware flow control */ --
Quoted 2 lines
1.9.1
Russell,
Do you have any more comments with this AMBA version?
Thanks!
Jun
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
Quoted 215 lines · Jun Nie
2016-03-23 15:12 GMT+08:00 Jun Nie <[email protected]>:
Quoted 214 lines
Complete support to ZTE uart with adding specific registers mask.
We use a magic amba periphid value as pl011 device on ZTE does not have a periphid value in register. The magic value should also be feed via device tree "arm,primecell-periphid" property to match pl011 driver and get ZTE uart data.Signed-off-by Jun Nie <[email protected]>--- drivers/tty/serial/amba-pl011.c | 73 +++++++++++++++++++++++++++++++++-------- include/linux/amba/serial.h | 4 +++ 2 files changed, 64 insertions(+), 13 deletions(-)drivers/tty/serial/amba-pl011.c +60
-13@@ -93,6 +93,10 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {struct vendor_data {const u16 *reg_offset;unsigned int ifls; +unsigned int fr_busy; +unsigned int fr_dsr; +unsigned int fr_cts; +unsigned int fr_ri;bool access_32b;bool oversampling;bool dma_threshold;@@ -111,6 +115,10 @@ static unsigned int get_fifosize_arm(struct amba_device *dev)static struct vendor_data vendor_arm = { .reg_offset = pl011_std_offsets, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,@@ -121,6 +129,10 @@ static struct vendor_data vendor_arm = {static struct vendor_data vendor_sbsa = { .reg_offset = pl011_std_offsets, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,@@ -163,6 +175,10 @@ static unsigned int get_fifosize_st(struct amba_device *dev)static struct vendor_data vendor_st = { .reg_offset = pl011_st_offsets, .ifls =UART011_IFLS_RX_HALF |UART011_IFLS_TX_HALF , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = true, .dma_threshold = true, .cts_event_workaround = true,@@ -187,11 +203,25 @@ static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = { [REG_DMACR] = ZX_UART011_DMACR, }; +static unsigned int get_fifosize_zte (struct amba_device *dev) +{ +return 16 ; +} +static struct vendor_data vendor_zte__maybe_unused = { .reg_offset = pl011_zte_offsets, .access_32b = true, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , - .get_fifosize = get_fifosize_arm, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .fr_ri =ZX_UART011_FR_RI , + .oversampling = false, + .dma_threshold = false, + .cts_event_workaround = false, + .always_enabled = false, + .fixed_options = false, + .get_fifosize = get_fifosize_zte, };/* Deals with DMA transactions */ @@ -236,6 +266,10 @@ struct uart_amba_port {unsigned int im;/* interrupt mask */ unsigned int old_status;unsigned int fifosize;/* vendor-specific */ +unsigned int fr_busy;/* vendor-specific */ +unsigned int fr_dsr;/* vendor-specific */ +unsigned int fr_cts;/* vendor-specific */ +unsigned int fr_ri;/* vendor-specific */ unsigned int old_cr;/* state during shutdown */ bool autorts;unsigned int fixed_baud;/* vendor-set fixed baud rate */ @@ -1166,7 +1200,7 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap)return ;/* Disable RX and TX DMA */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();spin_lock_irq (&uap->port.lock);@@ -1415,11 +1449,11 @@ static void pl011_modem_status(struct uart_amba_port *uap)if (delta & UART01x_FR_DCD)uart_handle_dcd_change (&uap->port, status & UART01x_FR_DCD); -if (delta & UART01x_FR_DSR) +if (delta & uap->fr_dsr) uap->port.icount.dsr++; -if (delta & UART01x_FR_CTS) -uart_handle_cts_change (&uap->port, status & UART01x_FR_CTS); +if (delta & uap->fr_cts) +uart_handle_cts_change (&uap->port, status & uap->fr_cts);wake_up_interruptible (&uap->port.state->port.delta_msr_wait); }@@ -1492,7 +1526,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port)struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port);unsigned int status =pl011_read (uap,REG_FR ); -return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; +return status & (uap->fr_busy | UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; }static unsigned int pl011_get_mctrl (struct uart_port *port)@@ -1507,9 +1541,9 @@ static unsigned int pl011_get_mctrl(struct uart_port *port) result |= tiocmbitTIOCMBIT (UART01x_FR_DCD,TIOCM_CAR ); -TIOCMBIT (UART01x_FR_DSR,TIOCM_DSR ); -TIOCMBIT (UART01x_FR_CTS,TIOCM_CTS ); -TIOCMBIT (UART011_FR_RI ,TIOCM_RNG ); +TIOCMBIT (uap->fr_dsr,TIOCM_DSR ); +TIOCMBIT (uap->fr_cts,TIOCM_CTS ); +TIOCMBIT (uap->fr_ri,TIOCM_RNG );#undef TIOCMBITreturn result; }@@ -2086,7 +2120,7 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)return ret; } -static struct uart_ops amba_pl011_pops = { +static const struct uart_ops amba_pl011_pops = { .tx_empty = pl011_tx_empty, .set_mctrl = pl011_set_mctrl, .get_mctrl = pl011_get_mctrl,@@ -2190,7 +2224,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)* Finally, wait for transmitter to become empty * and restore the TCR */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();if (!uap->vendor->always_enabled)pl011_write (old_cr, uap,REG_CR );@@ -2472,8 +2506,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)return PTR_ERR (uap->clk); uap->reg_offset = vendor->reg_offset; - uap->vendor = vendor; - uap->fifosize = vendor->get_fifosize (dev); + uap->vendor = vendor; + uap->fifosize = vendor->get_fifosize (dev); + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->fr_ri = vendor->fr_ri; uap->port.iotype = vendor->access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq = dev->irq[0 ]; uap->port.ops = &amba_pl011_pops;@@ -2555,6 +2593,10 @@ static int sbsa_uart_probe(struct platform_device *pdev) uap->reg_offset = vendor_sbsa.reg_offset; uap->vendor = &vendor_sbsa; uap->fifosize =32 ; + uap->fr_busy = vendor_sbsa.fr_busy; + uap->fr_dsr = vendor_sbsa.fr_dsr; + uap->fr_cts = vendor_sbsa.fr_cts; + uap->fr_ri = vendor_sbsa.fr_ri; uap->port.iotype = vendor_sbsa.access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq =platform_get_irq (pdev,0 ); uap->port.ops = &sbsa_uart_pops;@@ -2615,6 +2657,11 @@ static struct amba_id pl011_ids[] = { .mask = 0x00ffffff, .data = &vendor_st, }, + { + .id = 0xfefefe, + .mask = 0xffffff, + .data = &vendor_zte, + }, { 0, 0 }, };include/linux/amba/serial.h +4
-0@@ -103,6 +103,10 @@#define UART01x_FR_DSR 0x002#define UART01x_FR_CTS 0x001#define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) +#define ZX_UART01x_FR_BUSY 0x300 +#define ZX_UART01x_FR_DSR 0x008 +#define ZX_UART01x_FR_CTS 0x002 +#define ZX_UART011_FR_RI 0x001
Quoted 5 lines
Quoted 5 lines
include/linux/amba/serial.h +0
-1#define UART011_CR_CTSEN 0x8000/* CTS hardware flow control */ #define UART011_CR_RTSEN 0x4000/* RTS hardware flow control */ --1.9.1
Russell,
Do you have any comments to these change?
Jun
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
2016-04-12 21:01 GMT+08:00 Jun Nie <[email protected]>:
Quoted 248 lines · Jun Nie
Quoted 239 lines
2016-03-23 15:12 GMT+08:00 Jun Nie <[email protected]>:
Quoted 237 lines
Complete support to ZTE uart with adding specific registers mask.
We use a magic amba periphid value as pl011 device on ZTE does not have a periphid value in register. The magic value should also be feed via device tree "arm,primecell-periphid" property to match pl011 driver and get ZTE uart data.Signed-off-by Jun Nie <[email protected]>--- drivers/tty/serial/amba-pl011.c | 73 +++++++++++++++++++++++++++++++++-------- include/linux/amba/serial.h | 4 +++ 2 files changed, 64 insertions(+), 13 deletions(-)drivers/tty/serial/amba-pl011.c +8
-0@@ -93,6 +93,10 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {struct vendor_data {const u16 *reg_offset;unsigned int ifls; +unsigned int fr_busy; +unsigned int fr_dsr; +unsigned int fr_cts; +unsigned int fr_ri;bool access_32b;bool oversampling;bool dma_threshold;@@ -111,6 +115,10 @@ static unsigned int get_fifosize_arm(struct amba_device *dev)static struct vendor_data vendor_arm = { .reg_offset = pl011_std_offsets, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false,.cts_event_workaround = false,
drivers/tty/serial/amba-pl011.c +8
-0@@ -121,6 +129,10 @@ static struct vendor_data vendor_arm = {static struct vendor_data vendor_sbsa = { .reg_offset = pl011_std_offsets, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,@@ -163,6 +175,10 @@ static unsigned int get_fifosize_st(struct amba_device *dev)static struct vendor_data vendor_st = { .reg_offset = pl011_st_offsets, .ifls =UART011_IFLS_RX_HALF |UART011_IFLS_TX_HALF , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = true,.dma_threshold = true,
.cts_event_workaround = true,drivers/tty/serial/amba-pl011.c +15
-1@@ -187,11 +203,25 @@ static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = { [REG_DMACR ] =ZX_UART011_DMACR , }; +static unsigned int get_fifosize_zte (struct amba_device *dev) +{ +return 16 ; +} +static struct vendor_data vendor_zte__maybe_unused = { .reg_offset = pl011_zte_offsets, .access_32b = true, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , - .get_fifosize = get_fifosize_arm, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .fr_ri =ZX_UART011_FR_RI , + .oversampling = false, + .dma_threshold = false, + .cts_event_workaround = false, + .always_enabled = false, + .fixed_options = false, + .get_fifosize = get_fifosize_zte, };/* Deals with DMA transactions */
drivers/tty/serial/amba-pl011.c +4
-0@@ -236,6 +266,10 @@ struct uart_amba_port {unsigned int im;/* interrupt mask */ unsigned int old_status;unsigned int fifosize;/* vendor-specific */ +unsigned int fr_busy;/* vendor-specific */ +unsigned int fr_dsr;/* vendor-specific */ +unsigned int fr_cts;/* vendor-specific */ +unsigned int fr_ri;/* vendor-specific */ unsigned int old_cr;/* state during shutdown */ bool autorts;unsigned int
fixed_baud; /* vendor-set fixed baud
rate */drivers/tty/serial/amba-pl011.c +1
-1@@ -1166,7 +1200,7 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap) return;/* Disable RX and TX DMA */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();spin_lock_irq(&uap->port.lock);drivers/tty/serial/amba-pl011.c +3
-3@@ -1415,11 +1449,11 @@ static void pl011_modem_status(struct uart_amba_port *uap)if (delta & UART01x_FR_DCD)uart_handle_dcd_change (&uap->port, status & UART01x_FR_DCD); -if (delta & UART01x_FR_DSR) +if (delta & uap->fr_dsr) uap->port.icount.dsr++; -if (delta & UART01x_FR_CTS) -uart_handle_cts_change (&uap->port, status & UART01x_FR_CTS); +if (delta & uap->fr_cts) +uart_handle_cts_change (&uap->port, status & uap->fr_cts);wake_up_interruptible(&uap->port.state->port.delta_msr_wait);}
drivers/tty/serial/amba-pl011.c +1
-1@@ -1492,7 +1526,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port)struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port);unsigned int status =pl011_read (uap,REG_FR ); -return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; +return status & (uap->fr_busy | UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ;}static unsigned int
pl011_get_mctrl(struct uart_port *port)drivers/tty/serial/amba-pl011.c +3
-3@@ -1507,9 +1541,9 @@ static unsigned int pl011_get_mctrl(struct uart_port *port) result |= tiocmbitTIOCMBIT (UART01x_FR_DCD ,TIOCM_CAR ); -TIOCMBIT (UART01x_FR_DSR,TIOCM_DSR ); -TIOCMBIT (UART01x_FR_CTS,TIOCM_CTS ); -TIOCMBIT (UART011_FR_RI ,TIOCM_RNG ); +TIOCMBIT (uap->fr_dsr,TIOCM_DSR ); +TIOCMBIT (uap->fr_cts,TIOCM_CTS ); +TIOCMBIT (uap->fr_ri,TIOCM_RNG );#undef TIOCMBITreturn result;}drivers/tty/serial/amba-pl011.c +1
-1@@ -2086,7 +2120,7 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)return ret; } -static struct uart_ops amba_pl011_pops = { +static const struct uart_ops amba_pl011_pops = { .tx_empty = pl011_tx_empty, .set_mctrl = pl011_set_mctrl,.get_mctrl = pl011_get_mctrl,drivers/tty/serial/amba-pl011.c +1
-1@@ -2190,7 +2224,7 @@ pl011_console_write(struct console *co, const char*s, unsigned int count) * Finally, wait for transmitter to become empty * and restore the TCR */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();if (!uap->vendor->always_enabled)pl011_write(old_cr, uap, REG_CR);drivers/tty/serial/amba-pl011.c +6
-2@@ -2472,8 +2506,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)return PTR_ERR (uap->clk); uap->reg_offset = vendor->reg_offset; - uap->vendor = vendor; - uap->fifosize = vendor->get_fifosize (dev); + uap->vendor = vendor; + uap->fifosize = vendor->get_fifosize (dev); + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->fr_ri = vendor->fr_ri; uap->port.iotype = vendor->access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq = dev->irq[0 ];uap->port.ops = &amba_pl011_pops;drivers/tty/serial/amba-pl011.c +4
-0@@ -2555,6 +2593,10 @@ static int sbsa_uart_probe(struct platform_device *pdev) uap->reg_offset = vendor_sbsa.reg_offset; uap->vendor = &vendor_sbsa; uap->fifosize =32 ; + uap->fr_busy = vendor_sbsa.fr_busy; + uap->fr_dsr = vendor_sbsa.fr_dsr; + uap->fr_cts = vendor_sbsa.fr_cts; + uap->fr_ri = vendor_sbsa.fr_ri; uap->port.iotype = vendor_sbsa.access_32b ?UPIO_MEM32 :UPIO_MEM ;uap->port.irq = platform_get_irq(pdev, 0); uap->port.ops = &sbsa_uart_pops;drivers/tty/serial/amba-pl011.c +5
-0@@ -2615,6 +2657,11 @@ static struct amba_id pl011_ids[] = { .mask = 0x00ffffff, .data = &vendor_st, }, + { + .id = 0xfefefe, + .mask = 0xffffff, + .data = &vendor_zte, + }, { 0, 0 }, };include/linux/amba/serial.h +4
-0@@ -103,6 +103,10 @@#define UART01x_FR_DSR 0x002#define UART01x_FR_CTS 0x001#define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) +#define ZX_UART01x_FR_BUSY 0x300 +#define ZX_UART01x_FR_DSR 0x008 +#define ZX_UART01x_FR_CTS 0x002 +#define ZX_UART011_FR_RI 0x001Quoted 5 lines
Quoted 5 lines
include/linux/amba/serial.h +0
-0#define UART011_CR_CTSEN 0x8000/* CTS hardware flow control */ #define
UART011_CR_RTSEN0x4000/* RTS hardware flow control */
--
1.9.1Russell,
Quoted 3 lines
Do you have any comments to these change?
Jun
Greg,
Do you have any idea on how to drive review on this patch? Seems maintainer Russell is too busy and missing for this thread and others do not have comments. Your comments are appreciated!
Thanks!
Jun
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
Quoted 251 lines · Jun Nie
2016-04-12 21:01 GMT+08:00 Jun Nie <[email protected]>:
Quoted 250 lines · Jun Nie
Quoted 239 lines
2016-03-23 15:12 GMT+08:00 Jun Nie <[email protected]>:
Quoted 237 lines
Complete support to ZTE uart with adding specific registers mask.
We use a magic amba periphid value as pl011 device on ZTE does not have a periphid value in register. The magic value should also be feed via device tree "arm,primecell-periphid" property to match pl011 driver and get ZTE uart data.Signed-off-by Jun Nie <[email protected]>--- drivers/tty/serial/amba-pl011.c | 73 +++++++++++++++++++++++++++++++++-------- include/linux/amba/serial.h | 4 +++ 2 files changed, 64 insertions(+), 13 deletions(-)drivers/tty/serial/amba-pl011.c +8
-0@@ -93,6 +93,10 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {struct vendor_data {const u16 *reg_offset;unsigned int ifls; +unsigned int fr_busy; +unsigned int fr_dsr; +unsigned int fr_cts; +unsigned int fr_ri;bool access_32b;bool oversampling;bool dma_threshold;@@ -111,6 +115,10 @@ static unsigned int get_fifosize_arm(struct amba_device *dev)static struct vendor_data vendor_arm = { .reg_offset = pl011_std_offsets, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false,.cts_event_workaround = false,
drivers/tty/serial/amba-pl011.c +8
-0@@ -121,6 +129,10 @@ static struct vendor_data vendor_arm = {static struct vendor_data vendor_sbsa = { .reg_offset = pl011_std_offsets, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,@@ -163,6 +175,10 @@ static unsigned int get_fifosize_st(struct amba_device *dev)static struct vendor_data vendor_st = { .reg_offset = pl011_st_offsets, .ifls =UART011_IFLS_RX_HALF |UART011_IFLS_TX_HALF , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = true,.dma_threshold = true,
.cts_event_workaround = true,drivers/tty/serial/amba-pl011.c +15
-1@@ -187,11 +203,25 @@ static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = { [REG_DMACR ] =ZX_UART011_DMACR , }; +static unsigned int get_fifosize_zte (struct amba_device *dev) +{ +return 16 ; +} +static struct vendor_data vendor_zte__maybe_unused = { .reg_offset = pl011_zte_offsets, .access_32b = true, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , - .get_fifosize = get_fifosize_arm, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .fr_ri =ZX_UART011_FR_RI , + .oversampling = false, + .dma_threshold = false, + .cts_event_workaround = false, + .always_enabled = false, + .fixed_options = false, + .get_fifosize = get_fifosize_zte, };/* Deals with DMA transactions */
drivers/tty/serial/amba-pl011.c +4
-0@@ -236,6 +266,10 @@ struct uart_amba_port {unsigned int im;/* interrupt mask */ unsigned int old_status;unsigned int fifosize;/* vendor-specific */ +unsigned int fr_busy;/* vendor-specific */ +unsigned int fr_dsr;/* vendor-specific */ +unsigned int fr_cts;/* vendor-specific */ +unsigned int fr_ri;/* vendor-specific */ unsigned int old_cr;/* state during shutdown */ bool autorts;unsigned int
fixed_baud; /* vendor-set fixed baud
rate */drivers/tty/serial/amba-pl011.c +1
-1@@ -1166,7 +1200,7 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap) return;/* Disable RX and TX DMA */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();spin_lock_irq(&uap->port.lock);drivers/tty/serial/amba-pl011.c +3
-3@@ -1415,11 +1449,11 @@ static void pl011_modem_status(struct uart_amba_port *uap)if (delta & UART01x_FR_DCD)uart_handle_dcd_change (&uap->port, status & UART01x_FR_DCD); -if (delta & UART01x_FR_DSR) +if (delta & uap->fr_dsr) uap->port.icount.dsr++; -if (delta & UART01x_FR_CTS) -uart_handle_cts_change (&uap->port, status & UART01x_FR_CTS); +if (delta & uap->fr_cts) +uart_handle_cts_change (&uap->port, status & uap->fr_cts);wake_up_interruptible(&uap->port.state->port.delta_msr_wait);}
drivers/tty/serial/amba-pl011.c +1
-1@@ -1492,7 +1526,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port)struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port);unsigned int status =pl011_read (uap,REG_FR ); -return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; +return status & (uap->fr_busy | UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ;}static unsigned int
pl011_get_mctrl(struct uart_port *port)drivers/tty/serial/amba-pl011.c +3
-3@@ -1507,9 +1541,9 @@ static unsigned int pl011_get_mctrl(struct uart_port *port) result |= tiocmbitTIOCMBIT (UART01x_FR_DCD ,TIOCM_CAR ); -TIOCMBIT (UART01x_FR_DSR,TIOCM_DSR ); -TIOCMBIT (UART01x_FR_CTS,TIOCM_CTS ); -TIOCMBIT (UART011_FR_RI ,TIOCM_RNG ); +TIOCMBIT (uap->fr_dsr,TIOCM_DSR ); +TIOCMBIT (uap->fr_cts,TIOCM_CTS ); +TIOCMBIT (uap->fr_ri,TIOCM_RNG );#undef TIOCMBITreturn result;}drivers/tty/serial/amba-pl011.c +1
-1@@ -2086,7 +2120,7 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)return ret; } -static struct uart_ops amba_pl011_pops = { +static const struct uart_ops amba_pl011_pops = { .tx_empty = pl011_tx_empty, .set_mctrl = pl011_set_mctrl,.get_mctrl = pl011_get_mctrl,drivers/tty/serial/amba-pl011.c +1
-1@@ -2190,7 +2224,7 @@ pl011_console_write(struct console *co, const char*s, unsigned int count) * Finally, wait for transmitter to become empty * and restore the TCR */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();if (!uap->vendor->always_enabled)pl011_write(old_cr, uap, REG_CR);drivers/tty/serial/amba-pl011.c +6
-2@@ -2472,8 +2506,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)return PTR_ERR (uap->clk); uap->reg_offset = vendor->reg_offset; - uap->vendor = vendor; - uap->fifosize = vendor->get_fifosize (dev); + uap->vendor = vendor; + uap->fifosize = vendor->get_fifosize (dev); + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->fr_ri = vendor->fr_ri; uap->port.iotype = vendor->access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq = dev->irq[0 ];uap->port.ops = &amba_pl011_pops;drivers/tty/serial/amba-pl011.c +4
-0@@ -2555,6 +2593,10 @@ static int sbsa_uart_probe(struct platform_device *pdev) uap->reg_offset = vendor_sbsa.reg_offset; uap->vendor = &vendor_sbsa; uap->fifosize =32 ; + uap->fr_busy = vendor_sbsa.fr_busy; + uap->fr_dsr = vendor_sbsa.fr_dsr; + uap->fr_cts = vendor_sbsa.fr_cts; + uap->fr_ri = vendor_sbsa.fr_ri; uap->port.iotype = vendor_sbsa.access_32b ?UPIO_MEM32 :UPIO_MEM ;uap->port.irq = platform_get_irq(pdev, 0); uap->port.ops = &sbsa_uart_pops;drivers/tty/serial/amba-pl011.c +5
-0@@ -2615,6 +2657,11 @@ static struct amba_id pl011_ids[] = { .mask = 0x00ffffff, .data = &vendor_st, }, + { + .id = 0xfefefe, + .mask = 0xffffff, + .data = &vendor_zte, + }, { 0, 0 }, };include/linux/amba/serial.h +4
-0@@ -103,6 +103,10 @@#define UART01x_FR_DSR 0x002#define UART01x_FR_CTS 0x001#define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) +#define ZX_UART01x_FR_BUSY 0x300 +#define ZX_UART01x_FR_DSR 0x008 +#define ZX_UART01x_FR_CTS 0x002 +#define ZX_UART011_FR_RI 0x001Quoted 5 lines
Quoted 5 lines
include/linux/amba/serial.h +0
-0#define UART011_CR_CTSEN 0x8000/* CTS hardware flow control */ #define
UART011_CR_RTSEN0x4000/* RTS hardware flow control */
--
1.9.1Russell,
Do you have any comments to these change?
Quoted 7 lines
Quoted 1 line
Jun
Greg,
Do you have any idea on how to drive review on this patch? Seems maintainer Russell is too busy and missing for this thread and others do not have comments. Your comments are appreciated!
I would like to get Russell's opinion of this before merging it.
thanks,
greg k-h
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
2016-04-29 4:11 GMT+08:00 Greg KH <[email protected]>:
Quoted 260 lines · Jun Nie
Quoted 251 lines
2016-04-12 21:01 GMT+08:00 Jun Nie <[email protected]>:
Quoted 250 lines · Jun Nie
Quoted 239 lines
2016-03-23 15:12 GMT+08:00 Jun Nie <[email protected]>:
Quoted 237 lines
Complete support to ZTE uart with adding specific registers mask.
We use a magic amba periphid value as pl011 device on ZTE does not have a periphid value in register. The magic value should also be feed via device tree "arm,primecell-periphid" property to match pl011 driver and get ZTE uart data.Signed-off-by Jun Nie <[email protected]>--- drivers/tty/serial/amba-pl011.c | 73 +++++++++++++++++++++++++++++++++-------- include/linux/amba/serial.h | 4 +++ 2 files changed, 64 insertions(+), 13 deletions(-)drivers/tty/serial/amba-pl011.c +8
-0@@ -93,6 +93,10 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {struct vendor_data {const u16 *reg_offset;unsigned int ifls; +unsigned int fr_busy; +unsigned int fr_dsr; +unsigned int fr_cts; +unsigned int fr_ri;bool access_32b;bool oversampling;bool dma_threshold;@@ -111,6 +115,10 @@ static unsigned int get_fifosize_arm(struct amba_device *dev)static struct vendor_data vendor_arm = { .reg_offset = pl011_std_offsets, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false,.cts_event_workaround = false,
drivers/tty/serial/amba-pl011.c +8
-0@@ -121,6 +129,10 @@ static struct vendor_data vendor_arm = {static struct vendor_data vendor_sbsa = { .reg_offset = pl011_std_offsets, + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = false, .dma_threshold = false, .cts_event_workaround = false,@@ -163,6 +175,10 @@ static unsigned int get_fifosize_st(struct amba_device *dev)static struct vendor_data vendor_st = { .reg_offset = pl011_st_offsets, .ifls =UART011_IFLS_RX_HALF |UART011_IFLS_TX_HALF , + .fr_busy = UART01x_FR_BUSY, + .fr_dsr = UART01x_FR_DSR, + .fr_cts = UART01x_FR_CTS, + .fr_ri =UART011_FR_RI , .oversampling = true,.dma_threshold = true,
.cts_event_workaround = true,drivers/tty/serial/amba-pl011.c +15
-1@@ -187,11 +203,25 @@ static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = { [REG_DMACR ] =ZX_UART011_DMACR , }; +static unsigned int get_fifosize_zte (struct amba_device *dev) +{ +return 16 ; +} +static struct vendor_data vendor_zte__maybe_unused = { .reg_offset = pl011_zte_offsets, .access_32b = true, .ifls =UART011_IFLS_RX4_8 |UART011_IFLS_TX4_8 , - .get_fifosize = get_fifosize_arm, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .fr_ri =ZX_UART011_FR_RI , + .oversampling = false, + .dma_threshold = false, + .cts_event_workaround = false, + .always_enabled = false, + .fixed_options = false, + .get_fifosize = get_fifosize_zte, };/* Deals with DMA transactions */
drivers/tty/serial/amba-pl011.c +4
-0@@ -236,6 +266,10 @@ struct uart_amba_port {unsigned int im;/* interrupt mask */ unsigned int old_status;unsigned int fifosize;/* vendor-specific */ +unsigned int fr_busy;/* vendor-specific */ +unsigned int fr_dsr;/* vendor-specific */ +unsigned int fr_cts;/* vendor-specific */ +unsigned int fr_ri;/* vendor-specific */ unsigned int old_cr;/* state during shutdown */ bool autorts;unsigned int
fixed_baud; /* vendor-set fixed baud
rate */drivers/tty/serial/amba-pl011.c +1
-1@@ -1166,7 +1200,7 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap) return;/* Disable RX and TX DMA */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();spin_lock_irq(&uap->port.lock);drivers/tty/serial/amba-pl011.c +3
-3@@ -1415,11 +1449,11 @@ static void pl011_modem_status(struct uart_amba_port *uap)if (delta & UART01x_FR_DCD)uart_handle_dcd_change (&uap->port, status & UART01x_FR_DCD); -if (delta & UART01x_FR_DSR) +if (delta & uap->fr_dsr) uap->port.icount.dsr++; -if (delta & UART01x_FR_CTS) -uart_handle_cts_change (&uap->port, status & UART01x_FR_CTS); +if (delta & uap->fr_cts) +uart_handle_cts_change (&uap->port, status & uap->fr_cts);wake_up_interruptible(&uap->port.state->port.delta_msr_wait);}
drivers/tty/serial/amba-pl011.c +1
-1@@ -1492,7 +1526,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port)struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port);unsigned int status =pl011_read (uap,REG_FR ); -return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ; +return status & (uap->fr_busy | UART01x_FR_TXFF) ?0 :TIOCSER_TEMT ;}static unsigned int
pl011_get_mctrl(struct uart_port *port)drivers/tty/serial/amba-pl011.c +3
-3@@ -1507,9 +1541,9 @@ static unsigned int pl011_get_mctrl(struct uart_port *port) result |= tiocmbitTIOCMBIT (UART01x_FR_DCD ,TIOCM_CAR ); -TIOCMBIT (UART01x_FR_DSR,TIOCM_DSR ); -TIOCMBIT (UART01x_FR_CTS,TIOCM_CTS ); -TIOCMBIT (UART011_FR_RI ,TIOCM_RNG ); +TIOCMBIT (uap->fr_dsr,TIOCM_DSR ); +TIOCMBIT (uap->fr_cts,TIOCM_CTS ); +TIOCMBIT (uap->fr_ri,TIOCM_RNG );#undef TIOCMBITreturn result;}drivers/tty/serial/amba-pl011.c +1
-1@@ -2086,7 +2120,7 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)return ret; } -static struct uart_ops amba_pl011_pops = { +static const struct uart_ops amba_pl011_pops = { .tx_empty = pl011_tx_empty, .set_mctrl = pl011_set_mctrl,.get_mctrl = pl011_get_mctrl,drivers/tty/serial/amba-pl011.c +1
-1@@ -2190,7 +2224,7 @@ pl011_console_write(struct console *co, const char*s, unsigned int count) * Finally, wait for transmitter to become empty * and restore the TCR */ -while (pl011_read (uap,REG_FR ) & UART01x_FR_BUSY) +while (pl011_read (uap,REG_FR ) & uap->fr_busy)cpu_relax ();if (!uap->vendor->always_enabled)pl011_write(old_cr, uap, REG_CR);drivers/tty/serial/amba-pl011.c +6
-2@@ -2472,8 +2506,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)return PTR_ERR (uap->clk); uap->reg_offset = vendor->reg_offset; - uap->vendor = vendor; - uap->fifosize = vendor->get_fifosize (dev); + uap->vendor = vendor; + uap->fifosize = vendor->get_fifosize (dev); + uap->fr_busy = vendor->fr_busy; + uap->fr_dsr = vendor->fr_dsr; + uap->fr_cts = vendor->fr_cts; + uap->fr_ri = vendor->fr_ri; uap->port.iotype = vendor->access_32b ?UPIO_MEM32 :UPIO_MEM ; uap->port.irq = dev->irq[0 ];uap->port.ops = &amba_pl011_pops;drivers/tty/serial/amba-pl011.c +4
-0@@ -2555,6 +2593,10 @@ static int sbsa_uart_probe(struct platform_device *pdev) uap->reg_offset = vendor_sbsa.reg_offset; uap->vendor = &vendor_sbsa; uap->fifosize =32 ; + uap->fr_busy = vendor_sbsa.fr_busy; + uap->fr_dsr = vendor_sbsa.fr_dsr; + uap->fr_cts = vendor_sbsa.fr_cts; + uap->fr_ri = vendor_sbsa.fr_ri; uap->port.iotype = vendor_sbsa.access_32b ?UPIO_MEM32 :UPIO_MEM ;uap->port.irq = platform_get_irq(pdev, 0); uap->port.ops = &sbsa_uart_pops;drivers/tty/serial/amba-pl011.c +5
-0@@ -2615,6 +2657,11 @@ static struct amba_id pl011_ids[] = { .mask = 0x00ffffff, .data = &vendor_st, }, + { + .id = 0xfefefe, + .mask = 0xffffff, + .data = &vendor_zte, + }, { 0, 0 }, };include/linux/amba/serial.h +4
-0@@ -103,6 +103,10 @@#define UART01x_FR_DSR 0x002#define UART01x_FR_CTS 0x001#define UART01x_FR_TMSK (UART01x_FR_TXFF + UART01x_FR_BUSY) +#define ZX_UART01x_FR_BUSY 0x300 +#define ZX_UART01x_FR_DSR 0x008 +#define ZX_UART01x_FR_CTS 0x002 +#define ZX_UART011_FR_RI 0x001Quoted 5 lines
Quoted 5 lines
include/linux/amba/serial.h +0
-0#define UART011_CR_CTSEN 0x8000/* CTS hardware flow control */ #define
UART011_CR_RTSEN0x4000/* RTS hardware flow control */
--
1.9.1Russell,
Do you have any comments to these change?
Quoted 7 lines
Quoted 1 line
Jun
Greg,
Do you have any idea on how to drive review on this patch? Seems maintainer Russell is too busy and missing for this thread and others do not have comments. Your comments are appreciated!
Quoted 5 lines
I would like to get Russell's opinion of this before merging it.
thanks,
greg k-h
Russell,
Could you help have a look at this patch? Thanks!
Jun
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
Quoted 14 lines · Jun Nie
Quoted 14 lines
Quoted 11 lines
Quoted 5 lines
Russell,
Do you have any comments to these change?
Jun
Greg,
Do you have any idea on how to drive review on this patch? Seems maintainer Russell is too busy and missing for this thread and others do not have comments. Your comments are appreciated!
I would like to get Russell's opinion of this before merging it.
Quoted 7 lines
Quoted 3 lines
thanks,
greg k-h
Russell,
Could you help have a look at this patch? Thanks!
Hi Russell,
I think this version of the patch is trying to address the comment you put on v1, i.e. instead of extending platform driver we should try to probe ZTE UART from AMBA bus.
The solution here is to fake a AMBA peripheral ID which does not exist on hardware with a magic number. While it's working, it looks too hackish, and doesn't really scale in the long run. I hope that's also the reason you are unwilling to provide your ACK :)
Unless you have a better solution to suggest, I would think that platform driver is a sensible way to support the device, and will go back to v1 approach.
Shawn
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
Quoted 29 lines · Shawn Guo
Quoted 14 lines · Jun Nie
Quoted 14 lines
Quoted 11 lines
Quoted 5 lines
Russell,
Do you have any comments to these change?
Jun
Greg,
Do you have any idea on how to drive review on this patch? Seems maintainer Russell is too busy and missing for this thread and others do not have comments. Your comments are appreciated!
I would like to get Russell's opinion of this before merging it.
Quoted 7 lines
Quoted 3 lines
thanks,
greg k-h
Russell,
Could you help have a look at this patch? Thanks!
Hi Russell,
I think this version of the patch is trying to address the comment you put on v1, i.e. instead of extending platform driver we should try to probe ZTE UART from AMBA bus.
Quoted 8 lines
The solution here is to fake a AMBA peripheral ID which does not exist on hardware with a magic number. While it's working, it looks too hackish, and doesn't really scale in the long run. I hope that's also the reason you are unwilling to provide your ACK :)
Unless you have a better solution to suggest, I would think that platform driver is a sensible way to support the device, and will go back to v1 approach.
Just found that Russell's email address changed. Resend to the new address.
Shawn
Russell King - ARM Linux
maintainerPATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
Quoted 10 lines · Shawn Guo
Quoted 9 lines · Shawn Guo
I think this version of the patch is trying to address the comment you put on v1, i.e. instead of extending platform driver we should try to probe ZTE UART from AMBA bus.
The solution here is to fake a AMBA peripheral ID which does not exist on hardware with a magic number. While it's working, it looks too hackish, and doesn't really scale in the long run. I hope that's also the reason you are unwilling to provide your ACK :)
Quoted 6 lines
Quoted 3 lines
Unless you have a better solution to suggest, I would think that platform driver is a sensible way to support the device, and will go back to v1 approach.
Just found that Russell's email address changed. Resend to the new address.
So, if I were to do this, there wouldn't be any objection?
An alternative would be to use the real hardware ID if it exists, add a compatible to DT, and use of_device_is_compatible() in the driver to discover if it's a zte device.
8<====
Subject: [PATCH] amba: make ZTE pseudo-ID more "official"
Signed-off-by Russell King <[email protected]>
--- drivers/tty/serial/amba-pl011.c | 4 ++-- include/linux/amba/bus.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/tty/serial/amba-pl011.c +2 -2
@@ -2659,8 +2659,8 @@ static struct amba_id pl011_ids[] = { .data = &vendor_st, }, { - .id = 0xfefefe, - .mask = 0xffffff, + .id = AMBA_LINUX_ID(0x00, 0xf, 0xefe), + .mask = 0x00ffffff, .data = &vendor_zte, }, { 0, 0 },
include/linux/amba/bus.h +5 -0
@@ -53,8 +53,13 @@ enum amba_vendor {AMBA_VENDOR_ST =0x80 ,AMBA_VENDOR_QCOM =0x51 ,AMBA_VENDOR_LSI =0xb6 , + AMBA_VENDOR_LINUX = 0xef, /* This value is not official */ }; +#define AMBA_LINUX_ID (conf, rev, part) \ + (((conf) & 0xff) << 24 | ((rev) & 0xf) << 20 | \ + AMBA_VENDOR_LINUX << 12 | ((part) & 0xfff)) +extern struct bus_type amba_bustype;#define to_amba_device (d) container_of(d, struct amba_device, dev)
Signature · 6 lines
2.1.0 -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: [email protected] down 400kbps up according to speedtest.net.
PATCH v2 1/1 serial: amba-pl011: complete support to ZTE uart
Quoted 5 lines · Russell King - ARM Linux
So, if I were to do this, there wouldn't be any objection?
An alternative would be to use the real hardware ID if it exists, add a compatible to DT, and use
of_device_is_compatible()in the driver to discover if it's a zte device.
Comparing to this, I think the "official" pseudo-ID approach is cleaner. I will send a patch to incorporate the suggested changes below.
Thanks, Russell.
Shawn
Quoted 55 lines
8<====
Subject: [PATCH] amba: make ZTE pseudo-ID more "official"Signed-off-by Russell King <[email protected]>--- drivers/tty/serial/amba-pl011.c | 4 ++-- include/linux/amba/bus.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)drivers/tty/serial/amba-pl011.c +2
-2@@ -2659,8 +2659,8 @@ static struct amba_id pl011_ids[] = { .data = &vendor_st, }, { - .id = 0xfefefe, - .mask = 0xffffff, + .id = AMBA_LINUX_ID(0x00, 0xf, 0xefe), + .mask = 0x00ffffff, .data = &vendor_zte, }, { 0, 0 },include/linux/amba/bus.h +5
-0@@ -53,8 +53,13 @@ enum amba_vendor {AMBA_VENDOR_ST =0x80 ,AMBA_VENDOR_QCOM =0x51 ,AMBA_VENDOR_LSI =0xb6 , + AMBA_VENDOR_LINUX = 0xef, /* This value is not official */ }; +#define AMBA_LINUX_ID (conf, rev, part) \ + (((conf) & 0xff) << 24 | ((rev) & 0xf) << 20 | \ + AMBA_VENDOR_LINUX << 12 | ((part) & 0xfff)) +extern struct bus_type amba_bustype;#define to_amba_device (d) container_of(d, struct amba_device, dev)Signature · 11 lines
2.1.0 -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel