Page MenuHomeFreeBSD
Files F147954511

D27422.diff
No OneTemporary
Actions

D27422.diff
View Options

Index: head/sys/dev/uart/uart_bus_fdt.c
===================================================================
--- head/sys/dev/uart/uart_bus_fdt.c
+++ head/sys/dev/uart/uart_bus_fdt.c
@@ -175,26 +175,39 @@
int
uart_cpu_fdt_probe(struct uart_class **classp, bus_space_tag_t *bst,
bus_space_handle_t *bsh, int *baud, u_int *rclk, u_int *shiftp,
- u_int *iowidthp)
+ u_int *iowidthp, const int devtype)
{
const char *propnames[] = {"stdout-path", "linux,stdout-path", "stdout",
"stdin-path", "stdin", NULL};
+ const char *propnames_dbgport[] = {"freebsd,debug-path", NULL};
const char **name;
struct uart_class *class;
phandle_t node, chosen;
pcell_t br, clk, shift, iowidth;
- char *cp;
+ char *cp = NULL;
int err;
/* Has the user forced a specific device node? */
- cp = kern_getenv("hw.fdt.console");
+ switch (devtype) {
+ case UART_DEV_DBGPORT:
+ cp = kern_getenv("hw.fdt.dbgport");
+ name = propnames_dbgport;
+ break;
+ case UART_DEV_CONSOLE:
+ cp = kern_getenv("hw.fdt.console");
+ name = propnames;
+ break;
+ default:
+ return (ENXIO);
+ }
+
if (cp == NULL) {
/*
- * Retrieve /chosen/std{in,out}.
+ * Retrieve a node from /chosen.
*/
node = -1;
if ((chosen = OF_finddevice("/chosen")) != -1) {
- for (name = propnames; *name != NULL; name++) {
+ for (; *name != NULL; name++) {
if (phandle_chosen_propdev(chosen, *name,
&node) == 0)
break;
Index: head/sys/dev/uart/uart_cpu_arm64.c
===================================================================
--- head/sys/dev/uart/uart_cpu_arm64.c
+++ head/sys/dev/uart/uart_cpu_arm64.c
@@ -100,15 +100,11 @@
if (uart_cpu_acpi_spcr(devtype, di) == 0)
return (0);
#endif
-
- if (devtype != UART_DEV_CONSOLE)
- return (ENXIO);
-
err = ENXIO;
#ifdef FDT
if (err != 0) {
err = uart_cpu_fdt_probe(&class, &bst, &bsh, &br, &rclk,
- &shift, &iowidth);
+ &shift, &iowidth, devtype);
}
#endif
if (err != 0)
Index: head/sys/dev/uart/uart_cpu_fdt.h
===================================================================
--- head/sys/dev/uart/uart_cpu_fdt.h
+++ head/sys/dev/uart/uart_cpu_fdt.h
@@ -51,7 +51,7 @@
DATA_SET(uart_fdt_class_set, data)
int uart_cpu_fdt_probe(struct uart_class **, bus_space_tag_t *,
- bus_space_handle_t *, int *, u_int *, u_int *, u_int *);
+ bus_space_handle_t *, int *, u_int *, u_int *, u_int *, const int);
int uart_fdt_get_clock(phandle_t node, pcell_t *cell);
int uart_fdt_get_shift(phandle_t node, pcell_t *cell);
int uart_fdt_get_io_width(phandle_t node, pcell_t *cell);
Index: head/sys/dev/uart/uart_cpu_fdt.c
===================================================================
--- head/sys/dev/uart/uart_cpu_fdt.c
+++ head/sys/dev/uart/uart_cpu_fdt.c
@@ -87,10 +87,8 @@
if (!err)
return (0);
- if (devtype != UART_DEV_CONSOLE)
- return (ENXIO);
-
- err = uart_cpu_fdt_probe(&class, &bst, &bsh, &br, &rclk, &shift, &iowidth);
+ err = uart_cpu_fdt_probe(&class, &bst, &bsh, &br, &rclk,
+ &shift, &iowidth, devtype);
if (err != 0)
return (err);

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 15, 9:21 PM (20 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29735171
Default Alt Text
D27422.diff (2 KB)

Event Timeline