From patchwork Thu May 23 14:23:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 165019 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2265763ili; Thu, 23 May 2019 07:27:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzc9Sq29QcbySPZDTqzhQamX2ZmN7RsjEAZLob1O+DfISGXCWoWLoKzxTBW3xxMM3u4J3Qq X-Received: by 2002:a17:906:b85a:: with SMTP id ga26mr70353276ejb.20.1558621656579; Thu, 23 May 2019 07:27:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558621656; cv=none; d=google.com; s=arc-20160816; b=CjjXyJEMKn/Z++Y0vM8IxcrcqkmHA3empWYsF9Bdm51xc6udvjJI2HT2CD4333tDJt h413RbkASN4B8nJ+jdVjqUvX29sQL6zNcSzbdsDArzYfhFv+cdGCalqj5pQqUKG98/dS 2opOONQNGH8RlwWASfIPFRdsyEO51WuMRwNCz4VGKqjI3w4xO5HpUwtLgFGTtCc48il4 j9jARBiyFEL4TISpcj56edg2vkphrI6hfrNcTav1qh5gSHRIVjnLpZKrN3wTlseZ9KrU PUMWi5apBYeNdxl9zjTaFG9VqXti9k4Wga6mPV+MfafFzi3ccA406d8WYQ2v3CTQJZg8 T0tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=exxIKDT1hSlWQGoFaTkC2wgALrrl2HNKcUB/LvRbfDw=; b=aZm13yoGGrjWmH2cckTsl6oLNhGjmyUcg0rdFmdN++AYcnM5R1JuaxIhF/ldcuz70l Od82oTJWErnIfwiGOByOHuVyFbdUEZ6AWTaY4zUprQlX8Pd5biYuFceYmWaPGY3ZixWS Zi+aDZ3xHNZ2A2S3d/CCssmEQGZfXaLLw9i14645d2YiPnvj0fh5u7vjzWi1N5QSPVqW lTdzDwObqIiaLFKnZdkWatEzHZVwkpU7JLfUbP0szS0LxEo5ZkaG2WxpweIxhybSi5GM 5b/oCV1z8Bq+J5jkVUlCu6kv+w5QEAEKFLnVwwuketf7WpyHA2r5dpA+rJNaZcNVw+qs WXHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kKac+OuO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v1si1557715ejk.50.2019.05.23.07.27.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 May 2019 07:27:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kKac+OuO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:37485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTogx-0005Qk-BA for patch@linaro.org; Thu, 23 May 2019 10:27:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTodr-0002r8-13 for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTodo-00073l-Kj for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:22 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45146) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTodj-0006xh-AM for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:17 -0400 Received: by mail-wr1-x443.google.com with SMTP id b18so6482751wrq.12 for ; Thu, 23 May 2019 07:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=exxIKDT1hSlWQGoFaTkC2wgALrrl2HNKcUB/LvRbfDw=; b=kKac+OuO8Ys/0dUOT7UXZK9TgxDQygzqM510cJ15czSxywllaipYrkxsSMss0bMAlV z3jh1V75aGxqx3x6IqrVRPzPDomUcOBX9vp8fJRQwF8wx7V/GuY7TgpLpcbR7fX3euFM GOLH72RYElH8qGndJSNWM1dIq+Cm1UE4+0iImBY9EZHNa/BEQzZ5y+3MFsbm8VyzCPy+ ajM29H++5bik2I88QQF2nT+gorN/3kEkc90MB35lMhBGTJvLGMm4YIqKkwy86rSIB20C NZfy7q70W2YTE/1OjLYoGm3plZRbnRQFAU6CLfm4qPW00KqDUKEeAD9MhDciHRVEj4kL 1+ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=exxIKDT1hSlWQGoFaTkC2wgALrrl2HNKcUB/LvRbfDw=; b=HBvuP1fAO4TOG3UJ9+HsVtaXKqM3SOjxyB5rUZXuew63Ek1zaAEXk2ZNC6RXuvj6dH BxmMHb410RGT4p3HDLFQ1ArLJYbmVX9nF+vuIQ6FCcaySpOn0bxp6gRr4G+1rhGG5VnS mk6cLGydrsZVhtTvtqjfyn3G/BdoJ2CC91v9xQhJ8g4e3rQz7u8YjMaTXWjG6PB1APtR RkpAsw5UVzGVkC7IcavwkfISpkcBTbUAHdM3+BfXZ4ponRV/0QM+YpYEBP2V58MrvRQ6 wtL9B05oTq6yzBUvf23tMo/zeradtG12zkC2W15rECOw1MYIT5IbBoskyBowNvVtASyx bZyw== X-Gm-Message-State: APjAAAV/AmPEqVvGmkB0FLAMw0hZVGMuqH24UUkMqmcUSRI6GnKwq5CN 2u0yuQpuD+mrVqQ+ADOhyPTTVaXjxXEk4g== X-Received: by 2002:adf:f6c4:: with SMTP id y4mr33407175wrp.37.1558621452353; Thu, 23 May 2019 07:24:12 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id z5sm9700617wmi.34.2019.05.23.07.24.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 07:24:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 23 May 2019 15:23:57 +0100 Message-Id: <20190523142357.5175-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523142357.5175-1-peter.maydell@linaro.org> References: <20190523142357.5175-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PULL 12/12] hw/arm/exynos4210: QOM'ify the Exynos4210 SoC 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-id: 20190520214342.13709-5-philmd@redhat.com Signed-off-by: Peter Maydell --- include/hw/arm/exynos4210.h | 9 +++++++-- hw/arm/exynos4210.c | 28 ++++++++++++++++++++++++---- hw/arm/exynos4_boards.c | 9 ++++++--- 3 files changed, 37 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index 098a69ec73d..27c684e851d 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -85,6 +85,9 @@ typedef struct Exynos4210Irq { } Exynos4210Irq; typedef struct Exynos4210State { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ ARMCPU *cpu[EXYNOS4210_NCPUS]; Exynos4210Irq irqs; qemu_irq *irq_table; @@ -98,11 +101,13 @@ typedef struct Exynos4210State { I2CBus *i2c_if[EXYNOS4210_I2C_NUMBER]; } Exynos4210State; +#define TYPE_EXYNOS4210_SOC "exynos4210" +#define EXYNOS4210_SOC(obj) \ + OBJECT_CHECK(Exynos4210State, obj, TYPE_EXYNOS4210_SOC) + void exynos4210_write_secondary(ARMCPU *cpu, const struct arm_boot_info *info); -Exynos4210State *exynos4210_init(MemoryRegion *system_mem); - /* Initialize exynos4210 IRQ subsystem stub */ qemu_irq *exynos4210_init_irq(Exynos4210Irq *env); diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index f942ed2be96..e99e9cd11bd 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -178,9 +178,10 @@ static void pl330_create(uint32_t base, qemu_irq irq, int nreq) sysbus_connect_irq(busdev, 0, irq); } -Exynos4210State *exynos4210_init(MemoryRegion *system_mem) +static void exynos4210_realize(DeviceState *socdev, Error **errp) { - Exynos4210State *s = g_new0(Exynos4210State, 1); + Exynos4210State *s = EXYNOS4210_SOC(socdev); + MemoryRegion *system_mem = get_system_memory(); qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS]; SysBusDevice *busdev; DeviceState *dev; @@ -435,6 +436,25 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) qemu_irq_invert(s->irq_table[exynos4210_get_irq(36, 1)]), 32); pl330_create(EXYNOS4210_PL330_BASE2_ADDR, qemu_irq_invert(s->irq_table[exynos4210_get_irq(34, 1)]), 1); - - return s; } + +static void exynos4210_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->realize = exynos4210_realize; +} + +static const TypeInfo exynos4210_info = { + .name = TYPE_EXYNOS4210_SOC, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(Exynos4210State), + .class_init = exynos4210_class_init, +}; + +static void exynos4210_register_types(void) +{ + type_register_static(&exynos4210_info); +} + +type_init(exynos4210_register_types) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index fa0d7016413..71f58586c14 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -45,7 +45,7 @@ typedef enum Exynos4BoardType { } Exynos4BoardType; typedef struct Exynos4BoardState { - Exynos4210State *soc; + Exynos4210State soc; MemoryRegion dram0_mem; MemoryRegion dram1_mem; } Exynos4BoardState; @@ -130,7 +130,10 @@ exynos4_boards_init_common(MachineState *machine, exynos4_boards_init_ram(s, get_system_memory(), exynos4_board_ram_size[board_type]); - s->soc = exynos4210_init(get_system_memory()); + object_initialize(&s->soc, sizeof(s->soc), TYPE_EXYNOS4210_SOC); + qdev_set_parent_bus(DEVICE(&s->soc), sysbus_get_default()); + object_property_set_bool(OBJECT(&s->soc), true, "realized", + &error_fatal); return s; } @@ -148,7 +151,7 @@ static void smdkc210_init(MachineState *machine) EXYNOS4_BOARD_SMDKC210); lan9215_init(SMDK_LAN9118_BASE_ADDR, - qemu_irq_invert(s->soc->irq_table[exynos4210_get_irq(37, 1)])); + qemu_irq_invert(s->soc.irq_table[exynos4210_get_irq(37, 1)])); arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo); }