Don't double the divisor on Geode UART, it runs at normal speed

diff --git a/grub-core/term/ns8250.c b/grub-core/term/ns8250.c
index 4be528df8c5a1767eb6176b0b02ca9eea20a7397..5d403c845233163b0ca7c51d14e066d9d246871f 100644 (file)
--- a/grub-core/term/ns8250.c
+++ b/grub-core/term/ns8250.c
@@ -37,7 +37,8 @@ static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
 
 /* Convert speed to divisor.  */
 static unsigned short
-serial_get_divisor (unsigned int speed)
+serial_get_divisor (const struct grub_serial_port *port,
+                   const struct grub_serial_config *config)
 {
   unsigned int i;
 
@@ -63,13 +64,16 @@ serial_get_divisor (unsigned int speed)
 
   /* Set the baud rate.  */
   for (i = 0; i < ARRAY_SIZE (divisor_tab); i++)
-    if (divisor_tab[i].speed == speed)
-  /* UART in Yeeloong runs twice the usual rate.  */
+    if (divisor_tab[i].speed == config->speed)
+      {
+       /* internal UART in Yeeloong runs twice the usual rate.  */
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
-      return 2 * divisor_tab[i].div;
-#else
-      return divisor_tab[i].div;
+       if (port->port == 0xbff003f8)
+         return 2 * divisor_tab[i].div;
+       else
 #endif
+         return divisor_tab[i].div;
+      }
   return 0;
 }
 
@@ -93,7 +97,7 @@ do_real_config (struct grub_serial_port *port)
 
   port->broken = 0;
 
-  divisor = serial_get_divisor (port->config.speed);
+  divisor = serial_get_divisor (port, &port->config);
 
   /* Turn off the interrupt.  */
   grub_outb (0, port->port + UART_IER);
@@ -188,7 +192,7 @@ serial_hw_configure (struct grub_serial_port *port,
 {
   unsigned short divisor;
 
-  divisor = serial_get_divisor (config->speed);
+  divisor = serial_get_divisor (port, config);
   if (divisor == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");