From patchwork Fri Feb 3 18:09:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1737185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=NkAe4NeS; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P7kHD5y23z23hd for ; Sat, 4 Feb 2023 05:11:04 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pO0WC-0001cX-HW; Fri, 03 Feb 2023 13:10:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pO0WA-0001NU-KF for qemu-devel@nongnu.org; Fri, 03 Feb 2023 13:10:34 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pO0W6-0008VI-SL for qemu-devel@nongnu.org; Fri, 03 Feb 2023 13:10:34 -0500 Received: by mail-wm1-x32c.google.com with SMTP id n13so4495461wmr.4 for ; Fri, 03 Feb 2023 10:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hq0o8xFHFnAca4/TyyUs1kwk1RCOrbTiudwSIBAx5Y8=; b=NkAe4NeSByaQj/kWcPGd7EtgfdGSl5MNN5FjupRrVOyGbuKjHpzBNN/TOpZnZnItW1 /qTQdQUvQT0g3Pa9hpKVGqQy7++ySoZm0QAosN2EC9nAWHNCDNl/mFDQmkr3Lfd+9pFm jyrOB16kzUi9phWqZn/tswpB8jWmc6Evi5EIUUGylvtsoOIfMz55sdY1umBIkE1mBaQk XF6dvPk+omBlXhTwY2UBLOxdKIyWxNoL76oQ5L3SX3Fv/gI75akqXF6PuEY0JcwvtbIW ffCf6h8aCOpI3OL6RTr+apSE1WUDu6EkNX4sCzNk+PiCNqtgP3UoR75T3jsM9xI941fb H9rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hq0o8xFHFnAca4/TyyUs1kwk1RCOrbTiudwSIBAx5Y8=; b=UD8xQzePtE+XLjTVpPf6hGRXqQTky90tKvMW6Chi8ZYzPzFVs1OtAVRHdpWTrYNHhy tfJplG0C16DS1AdQBp5RRxXC7u2u4x+0EuQ+nV7GUB9P2rSx/VBW8imaA3GOH6YW81+E ZRjCrYNA3rS/Of78X9f+NUbrfELEDuWUl022KA4ciTJy9djQQG8H5RYOfM0x4q60p8Tn LCn8+YDIj0ho1chPuCaMxtm4g5jlxRL183YA4f4iOeMAkQwRmfmNdC/oWvCenaguk3cW hIxxdEhFWl41kt+IRWrvkOUzNT4FlREzGWs08hNeqZ8NcdWBT12bDoJKubMsjMypY0Dw 0G8g== X-Gm-Message-State: AO0yUKUrysRWI6XsvZNcmGs+QVjzh34pahBjt4Af4JlOu1eBADHSl6vY jUkDuRgY92FRwR3VHmpIH1rBHefcI+PVFyYY X-Google-Smtp-Source: AK7set89aLfY4b2HWONNVykLFyNPZpyvlZf4HiTX4e5Yo9KVAqEQjbx1V6Z9Jvnz66sWfRQ4aBoMaA== X-Received: by 2002:a05:600c:b8e:b0:3dc:405b:99b4 with SMTP id fl14-20020a05600c0b8e00b003dc405b99b4mr13095532wmb.25.1675447829817; Fri, 03 Feb 2023 10:10:29 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id 14-20020a05600c228e00b003dd9232f036sm5347442wmf.23.2023.02.03.10.10.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 Feb 2023 10:10:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Markus Armbruster , Eduardo Habkost , qemu-riscv@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" , Alistair Francis , Peter Maydell Subject: [PATCH 14/19] hw/microblaze: Set QDev properties using QDev API Date: Fri, 3 Feb 2023 19:09:09 +0100 Message-Id: <20230203180914.49112-15-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230203180914.49112-1-philmd@linaro.org> References: <20230203180914.49112-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org No need to use the low-level QOM API when an object inherits from QDev. Directly use the QDev API to set its properties. Signed-off-by: Philippe Mathieu-Daudé --- hw/microblaze/petalogix_ml605_mmu.c | 40 +++++++++++------------- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 40 ++++++++++-------------- 3 files changed, 35 insertions(+), 47 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index a24fadddca..c8cc7d2375 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -71,9 +71,9 @@ petalogix_ml605_init(MachineState *machine) { ram_addr_t ram_size = machine->ram_size; MemoryRegion *address_space_mem = get_system_memory(); - DeviceState *dev, *dma, *eth0; + DeviceState *cpu, *dev, *dma, *eth0; Object *ds, *cs; - MicroBlazeCPU *cpu; + MicroBlazeCPU *mbcpu; SysBusDevice *busdev; DriveInfo *dinfo; int i; @@ -82,16 +82,16 @@ petalogix_ml605_init(MachineState *machine) qemu_irq irq[32]; /* init CPUs */ - cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); - object_property_set_str(OBJECT(cpu), "version", "8.10.a", &error_abort); + cpu = DEVICE(object_new(TYPE_MICROBLAZE_CPU)); + mbcpu = MICROBLAZE_CPU(cpu); + qdev_prop_set_string(cpu, "version", "8.10.a"); /* Use FPU but don't use floating point conversion and square * root instructions */ - object_property_set_int(OBJECT(cpu), "use-fpu", 1, &error_abort); - object_property_set_bool(OBJECT(cpu), "dcache-writeback", true, - &error_abort); - object_property_set_bool(OBJECT(cpu), "endianness", true, &error_abort); - qdev_realize(DEVICE(cpu), NULL, &error_abort); + qdev_prop_set_uint8(cpu, "use-fpu", 1); + qdev_prop_set_bit(cpu, "dcache-writeback", true); + qdev_prop_set_bit(cpu, "endianness", true); + qdev_realize(cpu, NULL, &error_abort); /* Attach emulated BRAM through the LMB. */ memory_region_init_ram(phys_lmb_bram, NULL, "petalogix_ml605.lmb_bram", @@ -115,7 +115,7 @@ petalogix_ml605_init(MachineState *machine) sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, - qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ)); + qdev_get_gpio_in(cpu, MB_CPU_IRQ)); for (i = 0; i < 32; i++) { irq[i] = qdev_get_gpio_in(dev, i); } @@ -148,10 +148,8 @@ petalogix_ml605_init(MachineState *machine) qdev_set_nic_properties(eth0, &nd_table[0]); qdev_prop_set_uint32(eth0, "rxmem", 0x1000); qdev_prop_set_uint32(eth0, "txmem", 0x1000); - object_property_set_link(OBJECT(eth0), "axistream-connected", ds, - &error_abort); - object_property_set_link(OBJECT(eth0), "axistream-control-connected", cs, - &error_abort); + qdev_prop_set_link(eth0, "axistream-connected", ds); + qdev_prop_set_link(eth0, "axistream-control-connected", cs); sysbus_realize_and_unref(SYS_BUS_DEVICE(eth0), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(eth0), 0, AXIENET_BASEADDR); sysbus_connect_irq(SYS_BUS_DEVICE(eth0), 0, irq[AXIENET_IRQ]); @@ -161,10 +159,8 @@ petalogix_ml605_init(MachineState *machine) cs = object_property_get_link(OBJECT(eth0), "axistream-control-connected-target", NULL); qdev_prop_set_uint32(dma, "freqhz", 100 * 1000000); - object_property_set_link(OBJECT(dma), "axistream-connected", ds, - &error_abort); - object_property_set_link(OBJECT(dma), "axistream-control-connected", cs, - &error_abort); + qdev_prop_set_link(dma, "axistream-connected", ds); + qdev_prop_set_link(dma, "axistream-control-connected", cs); sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, AXIDMA_BASEADDR); sysbus_connect_irq(SYS_BUS_DEVICE(dma), 0, irq[AXIDMA_IRQ0]); @@ -200,11 +196,11 @@ petalogix_ml605_init(MachineState *machine) } /* setup PVR to match kernel settings */ - cpu->cfg.pvr_regs[4] = 0xc56b8000; - cpu->cfg.pvr_regs[5] = 0xc56be000; - cpu->cfg.pvr_regs[10] = 0x0e000000; /* virtex 6 */ + mbcpu->cfg.pvr_regs[4] = 0xc56b8000; + mbcpu->cfg.pvr_regs[5] = 0xc56be000; + mbcpu->cfg.pvr_regs[10] = 0x0e000000; /* virtex 6 */ - microblaze_load_kernel(cpu, MEMORY_BASEADDR, ram_size, + microblaze_load_kernel(mbcpu, MEMORY_BASEADDR, ram_size, machine->initrd_filename, BINARY_DEVICE_TREE_FILE, NULL); diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 9d959d1ad8..9df1dd72f3 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -70,7 +70,7 @@ petalogix_s3adsp1800_init(MachineState *machine) MemoryRegion *sysmem = get_system_memory(); cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); - object_property_set_str(OBJECT(cpu), "version", "7.10.d", &error_abort); + qdev_prop_set_string(DEVICE(cpu), "version", "7.10.d"); qdev_realize(DEVICE(cpu), NULL, &error_abort); /* Attach emulated BRAM through the LMB. */ diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index 5a2016672a..e6f221d3eb 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "exec/address-spaces.h" +#include "hw/qdev-properties.h" #include "hw/boards.h" #include "cpu.h" #include "boot.h" @@ -76,35 +77,26 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) { XlnxZynqMPPMUSoCState *s = XLNX_ZYNQMP_PMU_SOC(dev); + DeviceState *cpu = DEVICE(&s->cpu); - object_property_set_uint(OBJECT(&s->cpu), "base-vectors", - XLNX_ZYNQMP_PMU_ROM_ADDR, &error_abort); - object_property_set_bool(OBJECT(&s->cpu), "use-stack-protection", true, - &error_abort); - object_property_set_uint(OBJECT(&s->cpu), "use-fpu", 0, &error_abort); - object_property_set_uint(OBJECT(&s->cpu), "use-hw-mul", 0, &error_abort); - object_property_set_bool(OBJECT(&s->cpu), "use-barrel", true, - &error_abort); - object_property_set_bool(OBJECT(&s->cpu), "use-msr-instr", true, - &error_abort); - object_property_set_bool(OBJECT(&s->cpu), "use-pcmp-instr", true, - &error_abort); - object_property_set_bool(OBJECT(&s->cpu), "use-mmu", false, &error_abort); - object_property_set_bool(OBJECT(&s->cpu), "endianness", true, - &error_abort); - object_property_set_str(OBJECT(&s->cpu), "version", "8.40.b", - &error_abort); - object_property_set_uint(OBJECT(&s->cpu), "pvr", 0, &error_abort); + qdev_prop_set_uint32(cpu, "base-vectors", XLNX_ZYNQMP_PMU_ROM_ADDR); + qdev_prop_set_bit(cpu, "use-stack-protection", true); + qdev_prop_set_uint8(cpu, "use-fpu", 0); + qdev_prop_set_uint8(cpu, "use-hw-mul", 0); + qdev_prop_set_bit(cpu, "use-barrel", true); + qdev_prop_set_bit(cpu, "use-msr-instr", true); + qdev_prop_set_bit(cpu, "use-pcmp-instr", true); + qdev_prop_set_bit(cpu, "use-mmu", false); + qdev_prop_set_bit(cpu, "endianness", true); + qdev_prop_set_string(cpu, "version", "8.40.b"); + qdev_prop_set_uint8(cpu, "pvr", 0); if (!qdev_realize(DEVICE(&s->cpu), NULL, errp)) { return; } - object_property_set_uint(OBJECT(&s->intc), "intc-intr-size", 0x10, - &error_abort); - object_property_set_uint(OBJECT(&s->intc), "intc-level-edge", 0x0, - &error_abort); - object_property_set_uint(OBJECT(&s->intc), "intc-positive", 0xffff, - &error_abort); + qdev_prop_set_uint32(DEVICE(&s->intc), "intc-intr-size", 0x10); + qdev_prop_set_uint32(DEVICE(&s->intc), "intc-level-edge", 0x0); + qdev_prop_set_uint32(DEVICE(&s->intc), "intc-positive", 0xffff); if (!sysbus_realize(SYS_BUS_DEVICE(&s->intc), errp)) { return; }