system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 10:48:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

uart: Add uart_cpu_acpi_setup to setup the uart

Browse source 
In preperation for adding debug port support add a generic function
to setup the uart from ACPI tables.

Reviewed by:	imp
Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D44358
This commit is contained in:
Andrew Turner 2024-03-14 16:43:28 +00:00
parent 473c0b44ae
commit a931b85a09
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/dev/uart/uart_cpu_acpi.c
View file

@ -138,7 +138,7 @@ uart_cpu_acpi_init_devinfo(struct uart_devinfo *di, struct uart_class *class,
return (0);
}
int
static int
uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di)
{
vm_paddr_t spcr_physaddr;
@ -147,10 +147,6 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di)
struct uart_class *class;
int error = ENXIO;
/* SPCR only tells us about consoles. */
if (devtype != UART_DEV_CONSOLE)
return (error);
/* Look for the SPCR table. */
spcr_physaddr = acpi_find_table(ACPI_SIG_SPCR);
if (spcr_physaddr == 0)
@ -213,3 +209,13 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di)
acpi_unmap_table(spcr);
return (error);
}
int
uart_cpu_acpi_setup(int devtype, struct uart_devinfo *di)
{
switch(devtype) {
case UART_DEV_CONSOLE:
return (uart_cpu_acpi_spcr(devtype, di));
}
return (ENXIO);
}

4
sys/dev/uart/uart_cpu_acpi.h
View file

@ -64,7 +64,7 @@ SET_DECLARE(uart_acpi_class_set, struct acpi_uart_compat_data);
#define UART_ACPI_CLASS(data) \
DATA_SET(uart_acpi_class_set, data)
/* Try to initialize UART device from SPCR data. */
int uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di);
/* Try to initialize UART device from ACPI tables */
int uart_cpu_acpi_setup(int devtype, struct uart_devinfo *di);
#endif /* _DEV_UART_CPU_ACPI_H_ */

2
sys/dev/uart/uart_cpu_arm64.c
View file

@ -125,7 +125,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
#ifdef DEV_ACPI
/* Check if SPCR can tell us what console to use. */
if (uart_cpu_acpi_spcr(devtype, di) == 0)
if (uart_cpu_acpi_setup(devtype, di) == 0)
return (0);
#endif
#ifdef FDT

2
sys/dev/uart/uart_cpu_x86.c
View file

@ -70,7 +70,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
* !late_console, we haven't set up our own page tables yet, so we
* can't map ACPI tables to look at them.
*/
if (late_console && uart_cpu_acpi_spcr(devtype, di) == 0)
if (late_console && uart_cpu_acpi_setup(devtype, di) == 0)
return (0);
#endif