hw/sparc: Map the UART devices unconditionally

[PATCH 3/3] hw/sparc64/niagara: Map the UART device unconditionally

Posted by Philippe Mathieu-Daudé 5 years, 8 months ago

The UART is present on the machine regardless there is a
character device connected to it. Map it unconditionally.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/sparc64/niagara.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 201fb05d50..a87d55f6bb 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -151,10 +151,8 @@ static void niagara_init(MachineState *machine)
             exit(1);
         }
     }
-    if (serial_hd(0)) {
-        serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200,
-                       serial_hd(0), DEVICE_BIG_ENDIAN);
-    }
+    serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL,
+                   115200, serial_hd(0), DEVICE_BIG_ENDIAN);
     create_unimplemented_device("sun4v-iob", NIAGARA_IOBBASE, NIAGARA_IOBSIZE);
     sun4v_rtc_init(NIAGARA_RTC_BASE);
 }
-- 
2.21.3

Re: [PATCH 3/3] hw/sparc64/niagara: Map the UART device unconditionally

Posted by Artyom Tarasenko 5 years, 8 months ago

On Mon, Jun 8, 2020 at 7:21 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The UART is present on the machine regardless there is a
> character device connected to it. Map it unconditionally.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>

> ---
>  hw/sparc64/niagara.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
> index 201fb05d50..a87d55f6bb 100644
> --- a/hw/sparc64/niagara.c
> +++ b/hw/sparc64/niagara.c
> @@ -151,10 +151,8 @@ static void niagara_init(MachineState *machine)
>              exit(1);
>          }
>      }
> -    if (serial_hd(0)) {
> -        serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200,
> -                       serial_hd(0), DEVICE_BIG_ENDIAN);
> -    }
> +    serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL,
> +                   115200, serial_hd(0), DEVICE_BIG_ENDIAN);
>      create_unimplemented_device("sun4v-iob", NIAGARA_IOBBASE, NIAGARA_IOBSIZE);
>      sun4v_rtc_init(NIAGARA_RTC_BASE);
>  }
> --
> 2.21.3
>


-- 
Regards,
Artyom Tarasenko

SPARC and PPC PReP under qemu blog: http://tyom.blogspot.com/search/label/qemu

[PATCH 1/3] hw/sparc/leon3: Map the UART device unconditionally
[PATCH 2/3] hw/sparc64/niagara: Remove duplicated NIAGARA_UART_BASE definition
[PATCH 3/3] hw/sparc64/niagara: Map the UART device unconditionally