From nobody Sun May 5 10:38:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) client-ip=209.85.128.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599341060; cv=none; d=zohomail.com; s=zohoarc; b=IADVBGJRyZ7zxWwmKtpAwHPJ2rjJzsbt63ncgAvz7eJwunnfrFUE7QiX1Gfz4Mo2n2F65L95qZQEEyF+Ox7MzfAIQ8ybjQhQvq+6urA/xy5S5FTHbSwqozfCUTiZG6x13P4X7risGHck2TYzRjduGK/PREEQhXS35cHCjVT2+YY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599341060; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=BdDznY8S0BQXDdPB7zGIQilI2U7UILqzIY71jz2SzvM=; b=YQLh7EJsNVOyXUj7R3LZWN6mW9gwcIRWFpDid8b441meKeWqlWSvyeSOSspYND6x7k9R3OmemsEMPW1i0ofBAT1SKLz1IxJuGM7vQ8+bgq9L7qIbfabsHqvOOU93N6jSVbLaca+ef3+FoGPExK86N1kzFdYAuzkUk+dCRbUpWQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.zohomail.com with SMTPS id 1599341060405966.0520577171052; Sat, 5 Sep 2020 14:24:20 -0700 (PDT) Received: by mail-wm1-f67.google.com with SMTP id q9so9796996wmj.2 for ; Sat, 05 Sep 2020 14:24:19 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id q186sm20629903wma.45.2020.09.05.14.24.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Sep 2020 14:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BdDznY8S0BQXDdPB7zGIQilI2U7UILqzIY71jz2SzvM=; b=LstX07paRhFsI70d4HZwovde+TW4Lqgmpk7v7nRJTck5Supygg0OmNz7eXjIelHYI+ L2UXNT4j1hN7RdJQ7Bav5Msuw2TkqTLWC5Id24uwdLoGa+x0yro8XRNgJ+OpHwpLOT2u C+eaGG0N9yLMzJMDCC1IdudFgn3VVpvBrcMUmzFIUyPoeOAzIJK95rghHBbtRAxnMi4c GMz11D0dzPlRj1L0hSpjOCa2dQ1ZGBtT2r47HCabv+OJxq89ZYkeBhGZAnsO20Lu3LI7 02EuK5c0zobVb3CPdocxm6IzUvfJL/1uykY4TzBuexEyUp73PXCixNNlA7T6j8UD4aTM TFQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=BdDznY8S0BQXDdPB7zGIQilI2U7UILqzIY71jz2SzvM=; b=r/wDJoGwP9i9LuyRdOP5Lnc5rjRI3JDTOoVOPSqF2Ba+YtWJ5rvqDWIuveBoVs2kL8 Q5Ip7nRaeLI1/ltO2vWxMpTHtLLQOsBMEOd6NjUb2dyEJ55blSphqC4J0TN26VSoaDGm GpA28DeXb9Hpg1TseKTiWS/w7UYDLSyuyenfT/x8Fu0IWh82FqkZTosAtpbIUmRrVl8z Q2RbEOKFhK/i+nI9bmY6l3lo9CxIkSJl/9+PEqZvTndXTVMiWUnAAzG+mdh5zcHcQkEW /Hf0t3deyZu5zeddMP+Qg+G36+CU0016Y0SD38FDylhmzNG+a5PRGcvL7KRrxIowWt2E vNgQ== X-Gm-Message-State: AOAM530MixD2w8BptqWfH5aQeQ/pA5nVn+Ak1QjVI/vdI5B28Ysk2wnv opaMQ9n3kshDRR3ReLMAgws= X-Google-Smtp-Source: ABdhPJxkYoNqFhr/jEjadq0ljg+WXnCU7/4kK7WccjyldCnY9NJOMA+2wLRRuXxjVcgDXUxvqRXycA== X-Received: by 2002:a05:600c:2053:: with SMTP id p19mr13412672wmg.50.1599341058390; Sat, 05 Sep 2020 14:24:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Peter Maydell , Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/arm/aspeed: Map the UART5 device unconditionally Date: Sat, 5 Sep 2020 23:24:15 +0200 Message-Id: <20200905212415.760452-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The UART5 is present on the machine regardless there is a character device connected to it. Map it unconditionally. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- hw/arm/aspeed_ast2600.c | 8 +++----- hw/arm/aspeed_soc.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index 9d95e421435..1450bde7cf2 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -325,11 +325,9 @@ static void aspeed_soc_ast2600_realize(DeviceState *de= v, Error **errp) } =20 /* UART - attach an 8250 to the IO space as our UART5 */ - if (serial_hd(0)) { - qemu_irq uart5 =3D aspeed_soc_get_irq(s, ASPEED_DEV_UART5); - serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], = 2, - uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); - } + serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2, + aspeed_soc_get_irq(s, ASPEED_DEV_UART5), + 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); =20 /* I2C */ object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr), diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 35be126db6f..7eefd54ac07 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -283,11 +283,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error= **errp) } =20 /* UART - attach an 8250 to the IO space as our UART5 */ - if (serial_hd(0)) { - qemu_irq uart5 =3D aspeed_soc_get_irq(s, ASPEED_DEV_UART5); - serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], = 2, - uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); - } + serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2, + aspeed_soc_get_irq(s, ASPEED_DEV_UART5), 38400, + serial_hd(0), DEVICE_LITTLE_ENDIAN); =20 /* I2C */ object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr), --=20 2.26.2