tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

term/serial: Improve detection of duplicate serial ports

Browse Source 
We currently rely on some pretty fragile comparison by name to
identify whether a serial port being configured is identical

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Benjamin Herrenschmidt 2022-12-23 12:48:49 +11:00 committed by Daniel Kiper
parent e37dbba665
commit 35782e165f
6 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grub-core/term/arc/serial.c
View File

@ -106,6 +106,10 @@ grub_arcserial_add_port (const char *path)
struct grub_serial_port *port;
grub_err_t err;
FOR_SERIAL_PORTS (port)
if (grub_strcmp(path, port->name) == 0)
return port;
port = grub_zalloc (sizeof (*port));
if (!port)
return NULL;

6
grub-core/term/ieee1275/serial.c
View File

@ -227,6 +227,10 @@ add_port (struct ofserial_hash_ent *ent)
if (!ent->shortest)
return NULL;
FOR_SERIAL_PORTS (port)
if (port->elem == ent)
return port;
port = grub_zalloc (sizeof (*port));
if (!port)
return NULL;
@ -248,7 +252,7 @@ add_port (struct ofserial_hash_ent *ent)
return port;
}
const struct grub_serial_port *
struct grub_serial_port *
grub_ofserial_add_port (const char *path)
{
struct ofserial_hash_ent *ent;

16
grub-core/term/ns8250.c
View File

@ -364,6 +364,14 @@ grub_serial_ns8250_add_port (grub_port_t port, struct grub_serial_config *config
return &com_ports[i];
}
FOR_SERIAL_PORTS (p)
if (p->mmio == false && p->port == port)
{
if (config != NULL)
grub_serial_port_configure (p, config);
return p;
}
grub_outb (0x5a, port + UART_SR);
if (grub_inb (port + UART_SR) != 0x5a)
return NULL;
@ -409,6 +417,14 @@ grub_serial_ns8250_add_mmio (grub_addr_t addr, unsigned int acc_size,
return &com_ports[i];
}
FOR_SERIAL_PORTS (p)
if (p->mmio == true && p->mmio_base == addr)
{
if (config != NULL)
grub_serial_port_configure (p, config);
return p;
}
p = grub_malloc (sizeof (*p));
if (p == NULL)
return NULL;

57
grub-core/term/serial.c
View File

@ -37,8 +37,6 @@
GRUB_MOD_LICENSE ("GPLv3+");
#define FOR_SERIAL_PORTS(var) FOR_LIST_ELEMENTS((var), (grub_serial_ports))
enum
{
OPTION_UNIT,
@ -65,7 +63,7 @@ static const struct grub_arg_option options[] =
{0, 0, 0, 0, 0, 0}
};
static struct grub_serial_port *grub_serial_ports;
struct grub_serial_port *grub_serial_ports;
struct grub_serial_output_state
{
@ -147,26 +145,30 @@ grub_serial_find (const char *name)
{
struct grub_serial_port *port;
/*
* First look for an exact match by name, this will take care of
* things like "com0" which have already been created and that
* this function cannot re-create.
*/
FOR_SERIAL_PORTS (port)
if (grub_strcmp (port->name, name) == 0)
break;
return port;
#if (defined(__mips__) || defined (__i386__) || defined (__x86_64__)) && !defined(GRUB_MACHINE_EMU) && !defined(GRUB_MACHINE_ARC)
if (!port && grub_strncmp (name, "port", sizeof ("port") - 1) == 0
if (grub_strncmp (name, "port", sizeof ("port") - 1) == 0
&& grub_isxdigit (name [sizeof ("port") - 1]))
{
port = grub_serial_ns8250_add_port (grub_strtoul (&name[sizeof ("port") - 1],
0, 16), NULL);
if (port == NULL)
return NULL;
if (port != NULL)
return port;
}
if (!port && grub_strncmp (name, "mmio,", sizeof ("mmio,") - 1) == 0
if (grub_strncmp (name, "mmio,", sizeof ("mmio,") - 1) == 0
&& grub_isxdigit (name [sizeof ("mmio,") - 1]))
{
const char *p1, *p = &name[sizeof ("mmio,") - 1];
grub_addr_t addr = grub_strtoul (p, &p1, 16);
unsigned int acc_size = 1;
unsigned int nlen = p1 - p;
/*
* If we reach here, we know there's a digit after "mmio,", so
@ -203,48 +205,35 @@ grub_serial_find (const char *name)
grub_error (GRUB_ERR_BAD_ARGUMENT, N_("incorrect MMIO access size"));
}
/*
* Specifying the access size is optional an grub_serial_ns8250_add_mmio()
* will not add it to the name. So the original loop trying to match an
* existing port above might have missed this one. Let's do another
* search ignoring the access size part of the string. At this point
* nlen contains the length of the name up to the end of the address.
*/
FOR_SERIAL_PORTS (port)
if (grub_strncmp (port->name, name, nlen) == 0) {
break;
}
port = grub_serial_ns8250_add_mmio (addr, acc_size, NULL);
if (port == NULL)
return NULL;
if (port != NULL)
return port;
}
#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_IEEE1275) && !defined(GRUB_MACHINE_QEMU)
if (!port && grub_strcmp (name, "auto") == 0)
if (grub_strcmp (name, "auto") == 0)
{
/* Look for an SPCR if any. If not, default to com0. */
port = grub_ns8250_spcr_init ();
if (port == NULL)
{
FOR_SERIAL_PORTS (port)
if (grub_strcmp (port->name, "com0") == 0)
break;
}
if (port != NULL)
return port;
FOR_SERIAL_PORTS (port)
if (grub_strcmp (port->name, "com0") == 0)
return port;
}
#endif
#endif
#ifdef GRUB_MACHINE_IEEE1275
if (!port && grub_strncmp (name, "ieee1275/", sizeof ("ieee1275/") - 1) == 0)
if (grub_strncmp (name, "ieee1275/", sizeof ("ieee1275/") - 1) == 0)
{
port = grub_ofserial_add_port (&name[sizeof ("ieee1275/") - 1]);
if (port == NULL)
return NULL;
if (port != NULL)
return port;
}
#endif
return port;
return NULL;
}
static grub_err_t

2
include/grub/ieee1275/console.h
View File

@ -28,7 +28,7 @@ void grub_console_init_lately (void);
/* Finish the console system. */
void grub_console_fini (void);
const char *
struct grub_serial_port *
grub_ofserial_add_port (const char *name);
#endif /* ! GRUB_CONSOLE_MACHINE_HEADER */

3
include/grub/serial.h
View File

@ -219,4 +219,7 @@ extern void grub_serial_init (void);
extern void grub_serial_fini (void);
#endif
extern struct grub_serial_port *grub_serial_ports;
#define FOR_SERIAL_PORTS(var) FOR_LIST_ELEMENTS((var), (grub_serial_ports))
#endif