KGDB_8250: consolidate config string
PATCH 2/3 KGDB_8250: consolidate config string
Merge mmio and mmap of the KGDB_8250 config string into mmio (with mapping semantic). I see no point in current mmio that accepts pre-mapped addresses from the user. Moreover, this conforms to the interface of 8250_early.
Signed-off-by Jan Kiszka <[email protected]>
--- drivers/serial/8250_kgdb.c | 36 ++++++++++++++---------------------- lib/Kconfig.kgdb | 2 +- 2 files changed, 15 insertions(+), 23 deletions(-)
drivers/serial/8250_kgdb.c +14 -22
@@ -208,7 +208,7 @@ static int kgdb8250_uart_init(void)/* * Syntax for this cmdline option is: -* <io|mmio|mmap>,<address>[/<regshift>],<baud rate>,<irq> or +* <io|mmio>,<address>[/<regshift>],<baud rate>,<irq> or * ttyS<n>,<baud rate> */ static int kgdb8250_parse_config (char *str)
@@ -225,13 +225,9 @@ static int kgdb8250_parse_config(char *sif (!strncmp (str,"io" ,2 )) { kgdb8250_port.iotype =UPIO_PORT ; str +=2 ; - }else if (!strncmp (str,"mmap" ,4 )) { - kgdb8250_port.iotype =UPIO_MEM ; - kgdb8250_port.flags |=UPF_IOREMAP ; - str +=4 ; }else if (!strncmp (str,"mmio" ,4 )) { kgdb8250_port.iotype =UPIO_MEM ; - kgdb8250_port.flags &= ~UPF_IOREMAP ; + kgdb8250_port.flags =UPF_IOREMAP ; str +=4 ; }else if (!strncmp (str,"ttyS" ,4 )) { str +=4 ;
@@ -246,7 +242,7 @@ static int kgdb8250_parse_config(char *sif (late_init_passed)return err;printk (KERN_WARNING "kgdb8250: ttyS%d init delayed, " -"use io|mmio|mmap syntax for early init.\n" , +"use io/mmio syntax for early init.\n" , line);return 0 ; }
@@ -272,14 +268,9 @@ static int kgdb8250_parse_config(char *sif (kgdb8250_port.iotype ==UPIO_PORT ) kgdb8250_port.iobase =simple_strtoul (str, &str,16 ); -else { -if (kgdb8250_port.flags &UPF_IOREMAP ) - kgdb8250_port.mapbase = - (unsigned long )simple_strtoul (str, &str,16 ); -else - kgdb8250_port.membase = - (void *)simple_strtoul (str, &str,16 ); - } +else + kgdb8250_port.mapbase = + (unsigned long )simple_strtoul (str, &str,16 );if (*str =='/' ) { str++;
@@ -362,11 +353,11 @@ static int kgdb8250_late_init(void)kgdb8250_uart_init ();/* Request memory/io regions that we use. */ -if (kgdb8250_port.flags &UPF_IOREMAP ) { +if (kgdb8250_port.iotype ==UPIO_MEM ) {if (!request_mem_region (kgdb8250_port.mapbase,8 << kgdb8250_port.regshift,"kgdb" )) goto rollback; - }else if (kgdb8250_port.iotype ==UPIO_PORT ) { + }else {if (!request_region (kgdb8250_port.iobase,8 << kgdb8250_port.regshift,"kgdb" )) goto rollback;
@@ -423,14 +414,15 @@ static void kgdb8250_cleanup(void) fully_initialized =0 ; -if (kgdb8250_port.iotype ==UPIO_PORT ) { +if (kgdb8250_port.iotype ==UPIO_MEM ) { +if (kgdb8250_port.flags &UPF_IOREMAP ) +iounmap (kgdb8250_port.membase); +release_mem_region (kgdb8250_port.mapbase, +8 << kgdb8250_port.regshift); + }else {ioport_unmap (ioaddr);release_region (kgdb8250_port.iobase,8 << kgdb8250_port.regshift); - }else if (kgdb8250_port.flags &UPF_IOREMAP ) { -iounmap (kgdb8250_port.membase); -release_mem_region (kgdb8250_port.mapbase, -8 << kgdb8250_port.regshift); }/* Give the port back to the 8250 driver. */
lib/Kconfig.kgdb +1 -1
@@ -43,7 +43,7 @@ config KGDB_8250 passed as kernel or module parameter, respectively. The configuration comes in two flavors: - <io|mmio|mmap>,<address>[/<regshift>],<baud rate>,<irq> + <io|mmio>,<address>[/<regshift>],<baud rate>,<irq> or ttyS<n>,<baud rate>