From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42F4FC433E1 for ; Fri, 14 Aug 2020 15:25:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2CF3207DA for ; Fri, 14 Aug 2020 15:25:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kmJ+Ih3p" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2CF3207DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6bZq-0003vP-4f for qemu-devel@archiver.kernel.org; Fri, 14 Aug 2020 11:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6bSJ-00079M-Gg for qemu-devel@nongnu.org; Fri, 14 Aug 2020 11:17:19 -0400 Received: from mail-io1-xd43.google.com ([2607:f8b0:4864:20::d43]:46927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6bSH-0000Nq-Bo for qemu-devel@nongnu.org; Fri, 14 Aug 2020 11:17:19 -0400 Received: by mail-io1-xd43.google.com with SMTP id a5so11002781ioa.13 for ; Fri, 14 Aug 2020 08:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=99yZWviJbQ7UL3d7/el/9D2CsnuHFATLeQ6iSzIG8dQ=; b=kmJ+Ih3pusHQ/3vgqaBxXK00wr5nQR+t3NzSuKnjoy6FZoHnrjQNiz1HkEugjQ/QAr OCfsNP4qfmP6XJRpToXBw85j9hmU12wYVUGBeOUBwfDYcGSM8bFFpruOQ2Nlv14mr729 VJcC8QTA/t/9vC1dgUDUohE+PPCGYWdLSAzLtCLCvw0uhBdlXoYk2K716d5U0gnRMEN8 YKBXbs03OZZVTZ69XuEgzYLxZ621vDCEWxlOQUQUa+n8HEQHXC+AaObvvg9KwL9O2Ihy R0RCGH6MKrQUAjgS3pIs9+cvtfiS7iJYeVxmQAXDr5Q/mmaOZAjQJRw6641IFGtHMac/ u4og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=99yZWviJbQ7UL3d7/el/9D2CsnuHFATLeQ6iSzIG8dQ=; b=dgjZ2K+KyOcXsJmCzrFVNMbLyMDWOt2QWQLl9dHxg2rSeADsCmaDybw3cY/Nbru1rM sR8s4ynJTC94PLH5WX0Vox4fTwAfMq/q4vempDtVhiQwfTQwyQ1gZp1oo2c7Js/2YXGH 58QVseG3lM6Uu0XQQ4B1IxgaMNuLwfaqlEyBQ4/ZCP2m/0SRWegP4XJc3sA5NiAYzhJW O+YsUNF6F41zoN72GHSlFAimyth3S5hb+vSFB+3Hjb4IySwTipiOPgRIRC+2XeL0WkDy 4MwIanGfWYIFzYIUIddAHvhU4qnTr82DVfCcvMIbK7c3cLjx/pnFyUFqGG/cKyZ3+qne lk9g== X-Gm-Message-State: AOAM530GDJkJwFJUwKuCcvWoEB+BQYH6R7+3YWyA7t6100X4ivq6twHy 9pOLw3h2jKVO49/3yeplclhW5E5EfteHkl/Vh/A= X-Google-Smtp-Source: ABdhPJy8aN7W3kg9RrzGNvrDEnjhIk8LBa3VGFI4sJmlRZAs8M7LHLEr/+6FyR3qo1K+MeJpgns3aZ8y8egwH1U9Y64= X-Received: by 2002:a5d:995a:: with SMTP id v26mr2518577ios.176.1597418236214; Fri, 14 Aug 2020 08:17:16 -0700 (PDT) MIME-Version: 1.0 References: <20200813222625.243136-1-ehabkost@redhat.com> <20200813222625.243136-9-ehabkost@redhat.com> In-Reply-To: <20200813222625.243136-9-ehabkost@redhat.com> From: Alistair Francis Date: Fri, 14 Aug 2020 08:06:47 -0700 Message-ID: Subject: Re: [PATCH 08/41] opentitan: Rename memmap enum constants To: Eduardo Habkost Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::d43; envelope-from=alistair23@gmail.com; helo=mail-io1-xd43.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Daniel P. Berrange" , "qemu-devel@nongnu.org Developers" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Aug 13, 2020 at 3:29 PM Eduardo Habkost wrote: > > Some of the enum constant names conflict with the QOM type check > macros. This needs to be addressed to allow us to transform the > QOM type check macros into functions generated by > OBJECT_DECLARE_TYPE(). > > Rename all the constants to IBEX_DEV_*, to avoid conflicts. > > Signed-off-by: Eduardo Habkost Reviewed-by: Alistair Francis Alistair > --- > include/hw/riscv/opentitan.h | 38 ++++++++-------- > hw/riscv/opentitan.c | 84 ++++++++++++++++++------------------ > 2 files changed, 61 insertions(+), 61 deletions(-) > > diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h > index 8f29b9cbbf..835a80f896 100644 > --- a/include/hw/riscv/opentitan.h > +++ b/include/hw/riscv/opentitan.h > @@ -49,25 +49,25 @@ typedef struct OpenTitanState { > } OpenTitanState; > > enum { > - IBEX_ROM, > - IBEX_RAM, > - IBEX_FLASH, > - IBEX_UART, > - IBEX_GPIO, > - IBEX_SPI, > - IBEX_FLASH_CTRL, > - IBEX_RV_TIMER, > - IBEX_AES, > - IBEX_HMAC, > - IBEX_PLIC, > - IBEX_PWRMGR, > - IBEX_RSTMGR, > - IBEX_CLKMGR, > - IBEX_PINMUX, > - IBEX_ALERT_HANDLER, > - IBEX_NMI_GEN, > - IBEX_USBDEV, > - IBEX_PADCTRL, > + IBEX_DEV_ROM, > + IBEX_DEV_RAM, > + IBEX_DEV_FLASH, > + IBEX_DEV_UART, > + IBEX_DEV_GPIO, > + IBEX_DEV_SPI, > + IBEX_DEV_FLASH_CTRL, > + IBEX_DEV_RV_TIMER, > + IBEX_DEV_AES, > + IBEX_DEV_HMAC, > + IBEX_DEV_PLIC, > + IBEX_DEV_PWRMGR, > + IBEX_DEV_RSTMGR, > + IBEX_DEV_CLKMGR, > + IBEX_DEV_PINMUX, > + IBEX_DEV_ALERT_HANDLER, > + IBEX_DEV_NMI_GEN, > + IBEX_DEV_USBDEV, > + IBEX_DEV_PADCTRL, > }; > > enum { > diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c > index a8f0039e51..23ba3b4bfc 100644 > --- a/hw/riscv/opentitan.c > +++ b/hw/riscv/opentitan.c > @@ -32,25 +32,25 @@ static const struct MemmapEntry { > hwaddr base; > hwaddr size; > } ibex_memmap[] = { > - [IBEX_ROM] = { 0x00008000, 16 * KiB }, > - [IBEX_RAM] = { 0x10000000, 0x10000 }, > - [IBEX_FLASH] = { 0x20000000, 0x80000 }, > - [IBEX_UART] = { 0x40000000, 0x10000 }, > - [IBEX_GPIO] = { 0x40010000, 0x10000 }, > - [IBEX_SPI] = { 0x40020000, 0x10000 }, > - [IBEX_FLASH_CTRL] = { 0x40030000, 0x10000 }, > - [IBEX_PINMUX] = { 0x40070000, 0x10000 }, > - [IBEX_RV_TIMER] = { 0x40080000, 0x10000 }, > - [IBEX_PLIC] = { 0x40090000, 0x10000 }, > - [IBEX_PWRMGR] = { 0x400A0000, 0x10000 }, > - [IBEX_RSTMGR] = { 0x400B0000, 0x10000 }, > - [IBEX_CLKMGR] = { 0x400C0000, 0x10000 }, > - [IBEX_AES] = { 0x40110000, 0x10000 }, > - [IBEX_HMAC] = { 0x40120000, 0x10000 }, > - [IBEX_ALERT_HANDLER] = { 0x40130000, 0x10000 }, > - [IBEX_NMI_GEN] = { 0x40140000, 0x10000 }, > - [IBEX_USBDEV] = { 0x40150000, 0x10000 }, > - [IBEX_PADCTRL] = { 0x40160000, 0x10000 } > + [IBEX_DEV_ROM] = { 0x00008000, 16 * KiB }, > + [IBEX_DEV_RAM] = { 0x10000000, 0x10000 }, > + [IBEX_DEV_FLASH] = { 0x20000000, 0x80000 }, > + [IBEX_DEV_UART] = { 0x40000000, 0x10000 }, > + [IBEX_DEV_GPIO] = { 0x40010000, 0x10000 }, > + [IBEX_DEV_SPI] = { 0x40020000, 0x10000 }, > + [IBEX_DEV_FLASH_CTRL] = { 0x40030000, 0x10000 }, > + [IBEX_DEV_PINMUX] = { 0x40070000, 0x10000 }, > + [IBEX_DEV_RV_TIMER] = { 0x40080000, 0x10000 }, > + [IBEX_DEV_PLIC] = { 0x40090000, 0x10000 }, > + [IBEX_DEV_PWRMGR] = { 0x400A0000, 0x10000 }, > + [IBEX_DEV_RSTMGR] = { 0x400B0000, 0x10000 }, > + [IBEX_DEV_CLKMGR] = { 0x400C0000, 0x10000 }, > + [IBEX_DEV_AES] = { 0x40110000, 0x10000 }, > + [IBEX_DEV_HMAC] = { 0x40120000, 0x10000 }, > + [IBEX_DEV_ALERT_HANDLER] = { 0x40130000, 0x10000 }, > + [IBEX_DEV_NMI_GEN] = { 0x40140000, 0x10000 }, > + [IBEX_DEV_USBDEV] = { 0x40150000, 0x10000 }, > + [IBEX_DEV_PADCTRL] = { 0x40160000, 0x10000 } > }; > > static void opentitan_board_init(MachineState *machine) > @@ -66,12 +66,12 @@ static void opentitan_board_init(MachineState *machine) > qdev_realize(DEVICE(&s->soc), NULL, &error_abort); > > memory_region_init_ram(main_mem, NULL, "riscv.lowrisc.ibex.ram", > - memmap[IBEX_RAM].size, &error_fatal); > + memmap[IBEX_DEV_RAM].size, &error_fatal); > memory_region_add_subregion(sys_mem, > - memmap[IBEX_RAM].base, main_mem); > + memmap[IBEX_DEV_RAM].base, main_mem); > > if (machine->firmware) { > - riscv_load_firmware(machine->firmware, memmap[IBEX_RAM].base, NULL); > + riscv_load_firmware(machine->firmware, memmap[IBEX_DEV_RAM].base, NULL); > } > > if (machine->kernel_filename) { > @@ -115,28 +115,28 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) > > /* Boot ROM */ > memory_region_init_rom(&s->rom, OBJECT(dev_soc), "riscv.lowrisc.ibex.rom", > - memmap[IBEX_ROM].size, &error_fatal); > + memmap[IBEX_DEV_ROM].size, &error_fatal); > memory_region_add_subregion(sys_mem, > - memmap[IBEX_ROM].base, &s->rom); > + memmap[IBEX_DEV_ROM].base, &s->rom); > > /* Flash memory */ > memory_region_init_rom(&s->flash_mem, OBJECT(dev_soc), "riscv.lowrisc.ibex.flash", > - memmap[IBEX_FLASH].size, &error_fatal); > - memory_region_add_subregion(sys_mem, memmap[IBEX_FLASH].base, > + memmap[IBEX_DEV_FLASH].size, &error_fatal); > + memory_region_add_subregion(sys_mem, memmap[IBEX_DEV_FLASH].base, > &s->flash_mem); > > /* PLIC */ > if (!sysbus_realize(SYS_BUS_DEVICE(&s->plic), errp)) { > return; > } > - sysbus_mmio_map(SYS_BUS_DEVICE(&s->plic), 0, memmap[IBEX_PLIC].base); > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->plic), 0, memmap[IBEX_DEV_PLIC].base); > > /* UART */ > qdev_prop_set_chr(DEVICE(&(s->uart)), "chardev", serial_hd(0)); > if (!sysbus_realize(SYS_BUS_DEVICE(&s->uart), errp)) { > return; > } > - sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart), 0, memmap[IBEX_UART].base); > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart), 0, memmap[IBEX_DEV_UART].base); > sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart), > 0, qdev_get_gpio_in(DEVICE(&s->plic), > IBEX_UART_TX_WATERMARK_IRQ)); > @@ -151,33 +151,33 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) > IBEX_UART_RX_OVERFLOW_IRQ)); > > create_unimplemented_device("riscv.lowrisc.ibex.gpio", > - memmap[IBEX_GPIO].base, memmap[IBEX_GPIO].size); > + memmap[IBEX_DEV_GPIO].base, memmap[IBEX_DEV_GPIO].size); > create_unimplemented_device("riscv.lowrisc.ibex.spi", > - memmap[IBEX_SPI].base, memmap[IBEX_SPI].size); > + memmap[IBEX_DEV_SPI].base, memmap[IBEX_DEV_SPI].size); > create_unimplemented_device("riscv.lowrisc.ibex.flash_ctrl", > - memmap[IBEX_FLASH_CTRL].base, memmap[IBEX_FLASH_CTRL].size); > + memmap[IBEX_DEV_FLASH_CTRL].base, memmap[IBEX_DEV_FLASH_CTRL].size); > create_unimplemented_device("riscv.lowrisc.ibex.rv_timer", > - memmap[IBEX_RV_TIMER].base, memmap[IBEX_RV_TIMER].size); > + memmap[IBEX_DEV_RV_TIMER].base, memmap[IBEX_DEV_RV_TIMER].size); > create_unimplemented_device("riscv.lowrisc.ibex.pwrmgr", > - memmap[IBEX_PWRMGR].base, memmap[IBEX_PWRMGR].size); > + memmap[IBEX_DEV_PWRMGR].base, memmap[IBEX_DEV_PWRMGR].size); > create_unimplemented_device("riscv.lowrisc.ibex.rstmgr", > - memmap[IBEX_RSTMGR].base, memmap[IBEX_RSTMGR].size); > + memmap[IBEX_DEV_RSTMGR].base, memmap[IBEX_DEV_RSTMGR].size); > create_unimplemented_device("riscv.lowrisc.ibex.clkmgr", > - memmap[IBEX_CLKMGR].base, memmap[IBEX_CLKMGR].size); > + memmap[IBEX_DEV_CLKMGR].base, memmap[IBEX_DEV_CLKMGR].size); > create_unimplemented_device("riscv.lowrisc.ibex.aes", > - memmap[IBEX_AES].base, memmap[IBEX_AES].size); > + memmap[IBEX_DEV_AES].base, memmap[IBEX_DEV_AES].size); > create_unimplemented_device("riscv.lowrisc.ibex.hmac", > - memmap[IBEX_HMAC].base, memmap[IBEX_HMAC].size); > + memmap[IBEX_DEV_HMAC].base, memmap[IBEX_DEV_HMAC].size); > create_unimplemented_device("riscv.lowrisc.ibex.pinmux", > - memmap[IBEX_PINMUX].base, memmap[IBEX_PINMUX].size); > + memmap[IBEX_DEV_PINMUX].base, memmap[IBEX_DEV_PINMUX].size); > create_unimplemented_device("riscv.lowrisc.ibex.alert_handler", > - memmap[IBEX_ALERT_HANDLER].base, memmap[IBEX_ALERT_HANDLER].size); > + memmap[IBEX_DEV_ALERT_HANDLER].base, memmap[IBEX_DEV_ALERT_HANDLER].size); > create_unimplemented_device("riscv.lowrisc.ibex.nmi_gen", > - memmap[IBEX_NMI_GEN].base, memmap[IBEX_NMI_GEN].size); > + memmap[IBEX_DEV_NMI_GEN].base, memmap[IBEX_DEV_NMI_GEN].size); > create_unimplemented_device("riscv.lowrisc.ibex.usbdev", > - memmap[IBEX_USBDEV].base, memmap[IBEX_USBDEV].size); > + memmap[IBEX_DEV_USBDEV].base, memmap[IBEX_DEV_USBDEV].size); > create_unimplemented_device("riscv.lowrisc.ibex.padctrl", > - memmap[IBEX_PADCTRL].base, memmap[IBEX_PADCTRL].size); > + memmap[IBEX_DEV_PADCTRL].base, memmap[IBEX_DEV_PADCTRL].size); > } > > static void lowrisc_ibex_soc_class_init(ObjectClass *oc, void *data) > -- > 2.26.2 > >