From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 05/46] arm-virt: refactor gpios creation
Date: Fri, 29 Jan 2021 10:59:31 +0000 [thread overview]
Message-ID: <20210129110012.8660-6-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org>
From: Maxim Uvarov <maxim.uvarov@linaro.org>
No functional change. Just refactor code to better
support secure and normal world gpios.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/virt.c | 57 ++++++++++++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 21 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 86070dfd98b..5e364656037 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -820,17 +820,43 @@ static void virt_powerdown_req(Notifier *n, void *opaque)
}
}
-static void create_gpio(const VirtMachineState *vms)
+static void create_gpio_keys(const VirtMachineState *vms,
+ DeviceState *pl061_dev,
+ uint32_t phandle)
+{
+ gpio_key_dev = sysbus_create_simple("gpio-key", -1,
+ qdev_get_gpio_in(pl061_dev, 3));
+
+ qemu_fdt_add_subnode(vms->fdt, "/gpio-keys");
+ qemu_fdt_setprop_string(vms->fdt, "/gpio-keys", "compatible", "gpio-keys");
+ qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#size-cells", 0);
+ qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#address-cells", 1);
+
+ qemu_fdt_add_subnode(vms->fdt, "/gpio-keys/poweroff");
+ qemu_fdt_setprop_string(vms->fdt, "/gpio-keys/poweroff",
+ "label", "GPIO Key Poweroff");
+ qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys/poweroff", "linux,code",
+ KEY_POWER);
+ qemu_fdt_setprop_cells(vms->fdt, "/gpio-keys/poweroff",
+ "gpios", phandle, 3, 0);
+}
+
+static void create_gpio_devices(const VirtMachineState *vms, int gpio,
+ MemoryRegion *mem)
{
char *nodename;
DeviceState *pl061_dev;
- hwaddr base = vms->memmap[VIRT_GPIO].base;
- hwaddr size = vms->memmap[VIRT_GPIO].size;
- int irq = vms->irqmap[VIRT_GPIO];
+ hwaddr base = vms->memmap[gpio].base;
+ hwaddr size = vms->memmap[gpio].size;
+ int irq = vms->irqmap[gpio];
const char compat[] = "arm,pl061\0arm,primecell";
+ SysBusDevice *s;
- pl061_dev = sysbus_create_simple("pl061", base,
- qdev_get_gpio_in(vms->gic, irq));
+ pl061_dev = qdev_new("pl061");
+ s = SYS_BUS_DEVICE(pl061_dev);
+ sysbus_realize_and_unref(s, &error_fatal);
+ memory_region_add_subregion(mem, base, sysbus_mmio_get_region(s, 0));
+ sysbus_connect_irq(s, 0, qdev_get_gpio_in(vms->gic, irq));
uint32_t phandle = qemu_fdt_alloc_phandle(vms->fdt);
nodename = g_strdup_printf("/pl061@%" PRIx64, base);
@@ -847,21 +873,10 @@ static void create_gpio(const VirtMachineState *vms)
qemu_fdt_setprop_string(vms->fdt, nodename, "clock-names", "apb_pclk");
qemu_fdt_setprop_cell(vms->fdt, nodename, "phandle", phandle);
- gpio_key_dev = sysbus_create_simple("gpio-key", -1,
- qdev_get_gpio_in(pl061_dev, 3));
- qemu_fdt_add_subnode(vms->fdt, "/gpio-keys");
- qemu_fdt_setprop_string(vms->fdt, "/gpio-keys", "compatible", "gpio-keys");
- qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#size-cells", 0);
- qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#address-cells", 1);
-
- qemu_fdt_add_subnode(vms->fdt, "/gpio-keys/poweroff");
- qemu_fdt_setprop_string(vms->fdt, "/gpio-keys/poweroff",
- "label", "GPIO Key Poweroff");
- qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys/poweroff", "linux,code",
- KEY_POWER);
- qemu_fdt_setprop_cells(vms->fdt, "/gpio-keys/poweroff",
- "gpios", phandle, 3, 0);
g_free(nodename);
+
+ /* Child gpio devices */
+ create_gpio_keys(vms, pl061_dev, phandle);
}
static void create_virtio_devices(const VirtMachineState *vms)
@@ -1990,7 +2005,7 @@ static void machvirt_init(MachineState *machine)
if (has_ged && aarch64 && firmware_loaded && virt_is_acpi_enabled(vms)) {
vms->acpi_dev = create_acpi_ged(vms);
} else {
- create_gpio(vms);
+ create_gpio_devices(vms, VIRT_GPIO, sysmem);
}
/* connect powerdown request */
--
2.20.1
next prev parent reply other threads:[~2021-01-29 11:02 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 10:59 [PULL 00/46] target-arm queue Peter Maydell
2021-01-29 10:59 ` [PULL 01/46] target/arm: Implement ID_PFR2 Peter Maydell
2021-01-29 10:59 ` [PULL 02/46] target/arm: Conditionalize DBGDIDR Peter Maydell
2021-01-29 10:59 ` [PULL 03/46] arm: rename xlnx-zcu102.canbusN properties Peter Maydell
2021-01-29 10:59 ` [PULL 04/46] hw: gpio: implement gpio-pwr driver for qemu reset/poweroff Peter Maydell
2021-01-29 10:59 ` Peter Maydell [this message]
2021-01-29 10:59 ` [PULL 06/46] arm-virt: add secure pl061 for reset/power down Peter Maydell
2021-01-29 10:59 ` [PULL 07/46] hw/misc: Fix arith overflow in NPCM7XX PWM module Peter Maydell
2021-01-29 10:59 ` [PULL 08/46] target/arm: Replace magic value by MMU_DATA_LOAD definition Peter Maydell
2021-01-29 10:59 ` [PULL 09/46] configure: Move preadv check to meson.build Peter Maydell
2021-01-29 10:59 ` [PULL 10/46] configure: cross-compiling with empty cross_prefix Peter Maydell
2021-01-29 10:59 ` [PULL 11/46] osdep: build with non-working system() function Peter Maydell
2021-01-29 10:59 ` [PULL 12/46] darwin: remove redundant dependency declaration Peter Maydell
2021-01-29 10:59 ` [PULL 13/46] darwin: fix cross-compiling for Darwin Peter Maydell
2021-01-29 10:59 ` [PULL 14/46] configure: cross compile should use x86_64 cpu_family Peter Maydell
2021-01-29 10:59 ` [PULL 15/46] darwin: detect CoreAudio for build Peter Maydell
2021-01-29 10:59 ` [PULL 16/46] darwin: remove 64-bit build detection on 32-bit OS Peter Maydell
2021-01-29 10:59 ` [PULL 17/46] hvf: Add hypervisor entitlement to output binaries Peter Maydell
2021-01-29 10:59 ` [PULL 18/46] hw/misc/pvpanic: split-out generic and bus dependent code Peter Maydell
2021-01-29 10:59 ` [PULL 19/46] hw/misc/pvpanic: add PCI interface support Peter Maydell
2021-01-29 10:59 ` [PULL 20/46] pvpanic : update pvpanic spec document Peter Maydell
2021-01-29 10:59 ` [PULL 21/46] tests/qtest: add a test case for pvpanic-pci Peter Maydell
2021-01-29 15:57 ` Peter Maydell
2021-01-29 17:00 ` Mihai Carabas
2021-01-29 10:59 ` [PULL 22/46] ptimer: Add new ptimer_set_period_from_clock() function Peter Maydell
2021-01-29 10:59 ` [PULL 23/46] clock: Add new clock_has_source() function Peter Maydell
2021-01-29 10:59 ` [PULL 24/46] tests: Add a simple test of the CMSDK APB timer Peter Maydell
2021-01-29 10:59 ` [PULL 25/46] tests: Add a simple test of the CMSDK APB watchdog Peter Maydell
2021-01-29 10:59 ` [PULL 26/46] tests: Add a simple test of the CMSDK APB dual timer Peter Maydell
2021-01-29 10:59 ` [PULL 27/46] hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer Peter Maydell
2021-01-29 10:59 ` [PULL 28/46] hw/timer/cmsdk-apb-timer: Add Clock input Peter Maydell
2021-01-29 10:59 ` [PULL 29/46] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-29 10:59 ` [PULL 30/46] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-29 10:59 ` [PULL 31/46] hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ" Peter Maydell
2021-01-29 10:59 ` [PULL 32/46] hw/arm/armsse: Wire up clocks Peter Maydell
2021-01-29 10:59 ` [PULL 33/46] hw/arm/mps2: Inline CMSDK_APB_TIMER creation Peter Maydell
2021-01-29 11:00 ` [PULL 34/46] hw/arm/mps2: Create and connect SYSCLK Clock Peter Maydell
2021-01-29 11:00 ` [PULL 35/46] hw/arm/mps2-tz: Create and connect ARMSSE Clocks Peter Maydell
2021-01-29 11:00 ` [PULL 36/46] hw/arm/musca: " Peter Maydell
2021-01-29 11:00 ` [PULL 37/46] hw/arm/stellaris: Convert SSYS to QOM device Peter Maydell
2021-01-29 11:00 ` [PULL 38/46] hw/arm/stellaris: Create Clock input for watchdog Peter Maydell
2021-01-29 11:00 ` [PULL 39/46] hw/timer/cmsdk-apb-timer: Convert to use Clock input Peter Maydell
2021-01-29 11:00 ` [PULL 40/46] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-29 11:00 ` [PULL 41/46] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-29 11:00 ` [PULL 42/46] tests/qtest/cmsdk-apb-watchdog-test: Test clock changes Peter Maydell
2021-01-29 11:00 ` [PULL 43/46] hw/arm/armsse: Use Clock to set system_clock_scale Peter Maydell
2021-01-29 11:00 ` [PULL 44/46] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE Peter Maydell
2021-01-29 11:00 ` [PULL 45/46] arm: Remove frq " Peter Maydell
2021-01-29 11:00 ` [PULL 46/46] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS Peter Maydell
2021-01-29 11:42 ` [PULL 00/46] target-arm queue no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210129110012.8660-6-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).