| Message ID | 20190228150626.1388-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | [U-Boot,v1] x86: acpi: Not every platform has serial console a first device | expand |
On Thu, Feb 28, 2019 at 05:06:26PM +0200, Andy Shevchenko wrote: > We may not do an assumption that current console device is always a first > of UCLASS_SERIAL one. > > For example, on properly described Intel Edison board the console UART > is a third one. > > Use current serial device as described in global data. > > Fixes: a61cbad78e67 ("dm: serial: Adjust serial_getinfo() to use proper API") > Cc: Simon Glass <sjg@chromium.org> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > arch/x86/lib/acpi_table.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c > index 04058a60d7..5848b6fcd8 100644 > --- a/arch/x86/lib/acpi_table.c > +++ b/arch/x86/lib/acpi_table.c > @@ -347,7 +347,7 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) > uint serial_width; > int access_size; > int space_id; > - int ret; > + int ret = 0; This should be -ENODEV. > > /* Fill out header fields */ > acpi_fill_header(header, "SPCR"); > @@ -355,8 +355,8 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) > header->revision = 2; > > /* Read the device once, here. It is reused below */ > - ret = uclass_first_device_err(UCLASS_SERIAL, &dev); > - if (!ret) > + dev = gd->cur_serial_dev; > + if (dev) > ret = serial_getinfo(dev, &serial_info); > if (ret) > serial_info.type = SERIAL_CHIP_UNKNOWN; > -- > 2.20.1 >
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 04058a60d7..5848b6fcd8 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -347,7 +347,7 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) uint serial_width; int access_size; int space_id; - int ret; + int ret = 0; /* Fill out header fields */ acpi_fill_header(header, "SPCR"); @@ -355,8 +355,8 @@ static void acpi_create_spcr(struct acpi_spcr *spcr) header->revision = 2; /* Read the device once, here. It is reused below */ - ret = uclass_first_device_err(UCLASS_SERIAL, &dev); - if (!ret) + dev = gd->cur_serial_dev; + if (dev) ret = serial_getinfo(dev, &serial_info); if (ret) serial_info.type = SERIAL_CHIP_UNKNOWN;
We may not do an assumption that current console device is always a first of UCLASS_SERIAL one. For example, on properly described Intel Edison board the console UART is a third one. Use current serial device as described in global data. Fixes: a61cbad78e67 ("dm: serial: Adjust serial_getinfo() to use proper API") Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- arch/x86/lib/acpi_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)