From nobody Tue Apr 30 05:46:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518166792890697.0706118262948; Fri, 9 Feb 2018 00:59:52 -0800 (PST) Received: from localhost ([::1]:50301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ek4XA-0002OW-1I for importer@patchew.org; Fri, 09 Feb 2018 03:59:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ek4VR-0001KT-D3 for qemu-devel@nongnu.org; Fri, 09 Feb 2018 03:58:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ek4VQ-0006Cp-AK for qemu-devel@nongnu.org; Fri, 09 Feb 2018 03:58:05 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:39593) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ek4VQ-0006CV-5a; Fri, 09 Feb 2018 03:58:04 -0500 Received: by mail-qk0-x244.google.com with SMTP id d72so9098447qkc.6; Fri, 09 Feb 2018 00:58:03 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id h195sm1363819qke.66.2018.02.09.00.58.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 00:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nrFIXok//Li2LqHTdjYg1uQcj9Dw5eZxM/i+HXDwNpg=; b=Vm7j28ugNMH1QK59A/J4i6fL0hEwZnNEmhigSDdcpAfm5RkggTPcUp+VGa6KwHGElq qelk2oSbeiX7Pvg7VcQ9CYSEPZT1NDDKss/a7Wsh8kPHwB8d8ueILxJRs/PkFwUpLdZv T90ZgwMx/NjiWE1HMSmvS/yfzoayGhtlFtTxqqwlIi8YnyVCBQJBj7hnmVa4zBjwWRWI nmSXap3/KBeHbfgSNY7GlJdRyBehVeVUjEZKyZOjeXX/yBcfanfScxton14fKsfafVAt ixHS7e3U/HS6m1HmhZ/1Gsz1vTGg9v6GYRXMx1o7NjP5B7f5oOoVV4Z1AVKKlGfxZ6zQ 5/vg== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=nrFIXok//Li2LqHTdjYg1uQcj9Dw5eZxM/i+HXDwNpg=; b=EH3dfRGVjrzgeXj/pMEJCX3/3w0rco6fShySR7BZRNcs31q313V+0PB3OK99HtCrZC 5ClzXoIvVlP6l4jTggX3Td9nE8V7KMmvjX+LvuqEVw83b7FSp6gjrvewgEgjr1VzsVXO 2xZAtYlEnQrd0Wq5afGtTI3MwTWb1iRpS/Jp+ZUz401pyygr9XszvoEkk8L7fk2QbWWv moFsmtEFvoyrPGz9ndVWLFsl8B58+mduicrlFFl4Ct/AgKWPgypGV9G7jt+SOdFVsCY6 dJDfElss6szp5NB/wjD8cwHCq2RHoMOWrTpBlkiM/yAkMF4hcJXxJrqezpF+M2RDLHe/ +RcQ== X-Gm-Message-State: APf1xPABJQjNQcgQJ8bRodbGQnxHE/pbtQHuin2H720SPqkCeOU4zkRb 16uswpraFpflAGYSfoP/AK8= X-Google-Smtp-Source: AH8x2254lGvNKDEUUSsGVVkc1/axG4YewB8z4MZl724KUFM1aoUCj469HNP7FvhaNcxWtmN4nu6TXw== X-Received: by 10.55.64.75 with SMTP id n72mr2888247qka.354.1518166683569; Fri, 09 Feb 2018 00:58:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Andrew Jeffery Date: Fri, 9 Feb 2018 05:57:54 -0300 Message-Id: <20180209085755.30414-2-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209085755.30414-1-f4bug@amsat.org> References: <20180209085755.30414-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v2 1/2] hw/arm/aspeed: directly map the serial device to the system address space X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 (qemu) info mtree address-space: cpu-memory-0 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000007ffffff (prio 0, rom): aspeed.boot_rom 000000001e600000-000000001e7fffff (prio -1, i/o): aspeed_soc.io - 000000001e784000-000000001e78401f (prio 0, i/o): serial 000000001e620000-000000001e6200ff (prio 0, i/o): aspeed.smc.ast2500-fmc 000000001e630000-000000001e6300ff (prio 0, i/o): aspeed.smc.ast2500-sp= i1 [...] 000000001e720000-000000001e728fff (prio 0, ram): aspeed.sram 000000001e782000-000000001e782fff (prio 0, i/o): aspeed.timer + 000000001e784000-000000001e78401f (prio 0, i/o): serial 000000001e785000-000000001e78501f (prio 0, i/o): aspeed.wdt 000000001e785020-000000001e78503f (prio 0, i/o): aspeed.wdt Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Andrew Jeffery Reviewed-by: C=C3=A9dric Le Goater --- hw/arm/aspeed_soc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index c83b7e207b..2a5d041b3b 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -257,7 +257,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error = **errp) /* UART - attach an 8250 to the IO space as our UART5 */ if (serial_hds[0]) { qemu_irq uart5 =3D qdev_get_gpio_in(DEVICE(&s->vic), uart_irqs[4]); - serial_mm_init(&s->iomem, ASPEED_SOC_UART_5_BASE, 2, + serial_mm_init(get_system_memory(), + ASPEED_SOC_IOMEM_BASE + ASPEED_SOC_UART_5_BASE, 2, uart5, 38400, serial_hds[0], DEVICE_LITTLE_ENDIAN); } =20 --=20 2.16.1 From nobody Tue Apr 30 05:46:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518166957223969.5872921658915; Fri, 9 Feb 2018 01:02:37 -0800 (PST) Received: from localhost ([::1]:50451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ek4Zh-0004RY-1w for importer@patchew.org; Fri, 09 Feb 2018 04:02:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ek4VT-0001Mr-Tv for qemu-devel@nongnu.org; Fri, 09 Feb 2018 03:58:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ek4VT-0006Ei-2a for qemu-devel@nongnu.org; Fri, 09 Feb 2018 03:58:07 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:43178) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ek4VS-0006ER-UX; Fri, 09 Feb 2018 03:58:07 -0500 Received: by mail-qt0-x243.google.com with SMTP id m11so9650998qtn.10; Fri, 09 Feb 2018 00:58:06 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id h195sm1363819qke.66.2018.02.09.00.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 00:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RK/O25PVdwZHeI48ZBu1+HFj1jnQmG+BwE+y0cMoJi0=; b=e6k70lOWnZS7Tl2VfJ/cGNcgw/ENGgQjvL7/7vLzxvv0UIuVdb9HgY947OAmlDefL/ 26JstlPnG1Ok8Nai0x7XJ6vY5ZA6jaiJE4POWNaRQ0eB3COWGHJwGg8KGu4ql5cxld1r IRC/vQs19hdKR6V1yON4oIW6Ti2QdJhvwPEzbw3AIQClrwutFwyWYrPrA4W+KmQFi9RH pVGLQ9LUS0zina/1SOCoYvsxTxV2E4IPtrQvFQ0GUS+fP86c68/bup3TR7/KkSQ4ED6m Kti6O2xhYnI9Qc8BegGGhUQKYdecPKpQFG5Dvvhsyld6y24CoTxB27gmGarcL2Pimh+W CrwA== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=RK/O25PVdwZHeI48ZBu1+HFj1jnQmG+BwE+y0cMoJi0=; b=KXO7KXeD3xhmuyfAWeH3K/RCBaTNszlOD7oY1/TTV7S/4UzaQTdB0Bq1whhgCI+C1X xwQXcd4ty6AbXm2dCdPOWQhtoi0LXqCfMCh4VQAiOfDdb8SV7wPagqcKgoiKHihAlxav F09w2cRsDpP44S9D5xjbBhVyxcnIKq2spRZMYqgRPnnOCiJme5xa6TviDWdZACe/6Da0 lUqkZf6FePLdJpbemxWs+a395ayes0oBRtwCW9XRSqEvpAQFAwtLX8k/rc93NM+b0CTY TVuKvHv7lR4uZwOVdI3FkLPJQEL7Se4dZUK+y3YcM5wHnjgngKXbwExA8CUQkDkEZdpW bptw== X-Gm-Message-State: APf1xPDvlHX4sw9sInHnNNO7g0/isPAtm3fV8+h9ao4bdBhjC7oL+tco 8EUKab+z833IgZSb0HPnvmI= X-Google-Smtp-Source: AH8x225NeEyuwyl0ZI4sz+1j6s5Qm8Ty9HB8+zk1K/64Ni7/t46DHbmoNmPw3wGWgVfbREufrHQmlg== X-Received: by 10.200.3.29 with SMTP id q29mr3175801qtg.173.1518166686279; Fri, 09 Feb 2018 00:58:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Andrew Jeffery Date: Fri, 9 Feb 2018 05:57:55 -0300 Message-Id: <20180209085755.30414-3-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209085755.30414-1-f4bug@amsat.org> References: <20180209085755.30414-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 2/2] hw/arm/aspeed: simplify using the 'unimplemented device' for aspeed_soc.io X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 (qemu) info mtree address-space: cpu-memory-0 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000007ffffff (prio 0, rom): aspeed.boot_rom - 000000001e600000-000000001e7fffff (prio -1, i/o): aspeed_soc.io + 000000001e600000-000000001e7fffff (prio -1000, i/o): aspeed_soc.io 000000001e620000-000000001e6200ff (prio 0, i/o): aspeed.smc.ast2500-fmc 000000001e630000-000000001e6300ff (prio 0, i/o): aspeed.smc.ast2500-sp= i1 000000001e631000-000000001e6310ff (prio 0, i/o): aspeed.smc.ast2500-sp= i2 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Andrew Jeffery --- include/hw/arm/aspeed_soc.h | 1 - hw/arm/aspeed_soc.c | 32 +++----------------------------- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index f26914a2b9..11ec0179db 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -31,7 +31,6 @@ typedef struct AspeedSoCState { =20 /*< public >*/ ARMCPU cpu; - MemoryRegion iomem; MemoryRegion sram; AspeedVICState vic; AspeedTimerCtrlState timerctrl; diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 2a5d041b3b..30d25f8b06 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "cpu.h" #include "exec/address-spaces.h" +#include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h" #include "hw/char/serial.h" #include "qemu/log.h" @@ -99,31 +100,6 @@ static const AspeedSoCInfo aspeed_socs[] =3D { }, }; =20 -/* - * IO handlers: simply catch any reads/writes to IO addresses that aren't - * handled by a device mapping. - */ - -static uint64_t aspeed_soc_io_read(void *p, hwaddr offset, unsigned size) -{ - qemu_log_mask(LOG_UNIMP, "%s: 0x%" HWADDR_PRIx " [%u]\n", - __func__, offset, size); - return 0; -} - -static void aspeed_soc_io_write(void *opaque, hwaddr offset, uint64_t valu= e, - unsigned size) -{ - qemu_log_mask(LOG_UNIMP, "%s: 0x%" HWADDR_PRIx " <- 0x%" PRIx64 " [%u]= \n", - __func__, offset, value, size); -} - -static const MemoryRegionOps aspeed_soc_io_ops =3D { - .read =3D aspeed_soc_io_read, - .write =3D aspeed_soc_io_write, - .endianness =3D DEVICE_LITTLE_ENDIAN, -}; - static void aspeed_soc_init(Object *obj) { AspeedSoCState *s =3D ASPEED_SOC(obj); @@ -199,10 +175,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error= **errp) Error *err =3D NULL, *local_err =3D NULL; =20 /* IO space */ - memory_region_init_io(&s->iomem, NULL, &aspeed_soc_io_ops, NULL, - "aspeed_soc.io", ASPEED_SOC_IOMEM_SIZE); - memory_region_add_subregion_overlap(get_system_memory(), - ASPEED_SOC_IOMEM_BASE, &s->iomem, = -1); + create_unimplemented_device("aspeed_soc.io", + ASPEED_SOC_IOMEM_BASE, ASPEED_SOC_IOMEM_SI= ZE); =20 /* CPU */ object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err); --=20 2.16.1