From nobody Fri Nov 7 11:59:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548097946765856.5122538727613; Mon, 21 Jan 2019 11:12:26 -0800 (PST) Received: from localhost ([127.0.0.1]:58365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glezh-0003Np-KD for importer@patchew.org; Mon, 21 Jan 2019 14:12:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleui-0007jF-9f for qemu-devel@nongnu.org; Mon, 21 Jan 2019 14:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glefT-0002dr-6j for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:51:32 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:46044) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1glefR-0002bk-B9 for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:51:31 -0500 Received: by mail-wr1-x444.google.com with SMTP id t6so24556309wrr.12 for ; Mon, 21 Jan 2019 10:51:28 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n82sm50386660wma.42.2019.01.21.10.51.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 10:51:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GwOkcaqB4nWlxWAy1SiSdUxzJLjM4/IN2mfdSNwClek=; b=NYRKVfhK0bl0+Rx6WK64jDuRfNTgKFq3Ifv/AFF9m3+CxYnmDg795Y6zahCpFxUgWI LZOq98MmawMUasCmvAvsmwwFeNsQ6kk6+8FqxGEx2mvvWFMgQzc+o5VJ51OGIkRc5lwn r6TY9shzKF/7d0q1VTHofuS24pMdG+iguf06w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GwOkcaqB4nWlxWAy1SiSdUxzJLjM4/IN2mfdSNwClek=; b=ABM8zn+tTwtxltcjpJrN/L6wAq6CP1gFXnwDG3DB4Js6rH9mRpP/yXjFiEnrRialse dlLz7XpLdAgnn7W+hb5OTj/nZKpTLycFB7AKi/s7sRaNpoU79gN4NJ3+59/1Foywuepv O1i/1U7swDyHE7FsB+nXsQIVDvCGbL1feETo7F0vnIvs9DUcDZ6BTwQ8cFXe/hBqjOrV /x9+eU+bFpCJbL8Iuxv+8iWiX9iWRWSgiQAKbez9bp+ZhLo0Gzv+78ZeoBTRO15rutap 5s57DqVv0PGG4O9025mpipaONT/5OuTYtFW3ikOVCSdDrQChq9F+vOM/b8P6NMVuFztj hHvQ== X-Gm-Message-State: AJcUukfII5oXc4TbUjy0KfPBEIX+fg88puNIQEd6zyLgZWG2ftKXRY+e yreOofnUaq+paxTguGU+jshUyQ== X-Google-Smtp-Source: ALg8bN6KOkKgflz9bGoxw4lJICGdOvQgAD9N9ZHfjAwub29cI487LsDpHB/T5orf8eK8JkQSUOBCkQ== X-Received: by 2002:adf:f848:: with SMTP id d8mr31169495wrq.178.1548096687479; Mon, 21 Jan 2019 10:51:27 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 18:51:01 +0000 Message-Id: <20190121185118.18550-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121185118.18550-1-peter.maydell@linaro.org> References: <20190121185118.18550-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 06/23] hw/arm/iotkit: Rename 'iotkit' local variables and functions 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: patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename various internal uses of 'iotkit' in hw/arm/iotkit.c to 'armsse', for consistency. The remaining occurences are: * related to the devices TYPE_IOTKIT_SYSCTL, TYPE_IOTKIT_SYSINFO, etc, which this refactor is not touching * references that apply specifically to the IoTKit (like the lack of a private CPU region) * the vmstate, which keeps its old "iotkit" name for migration compatibility reasons Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/iotkit.c | 68 ++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c index d5b172933c3..7ff14fd5aef 100644 --- a/hw/arm/iotkit.c +++ b/hw/arm/iotkit.c @@ -56,7 +56,7 @@ static void nsccfg_handler(void *opaque, int n, int level) s->nsccfg =3D level; } =20 -static void iotkit_forward_ppc(ARMSSE *s, const char *ppcname, int ppcnum) +static void armsse_forward_ppc(ARMSSE *s, const char *ppcname, int ppcnum) { /* Each of the 4 AHB and 4 APB PPCs that might be present in a * system using the ARMSSE has a collection of control lines which @@ -65,22 +65,22 @@ static void iotkit_forward_ppc(ARMSSE *s, const char *p= pcname, int ppcnum) * code using the ARMSSE can wire them up to the PPCs. */ SplitIRQ *splitter =3D &s->ppc_irq_splitter[ppcnum]; - DeviceState *iotkitdev =3D DEVICE(s); + DeviceState *armssedev =3D DEVICE(s); DeviceState *dev_secctl =3D DEVICE(&s->secctl); DeviceState *dev_splitter =3D DEVICE(splitter); char *name; =20 name =3D g_strdup_printf("%s_nonsec", ppcname); - qdev_pass_gpios(dev_secctl, iotkitdev, name); + qdev_pass_gpios(dev_secctl, armssedev, name); g_free(name); name =3D g_strdup_printf("%s_ap", ppcname); - qdev_pass_gpios(dev_secctl, iotkitdev, name); + qdev_pass_gpios(dev_secctl, armssedev, name); g_free(name); name =3D g_strdup_printf("%s_irq_enable", ppcname); - qdev_pass_gpios(dev_secctl, iotkitdev, name); + qdev_pass_gpios(dev_secctl, armssedev, name); g_free(name); name =3D g_strdup_printf("%s_irq_clear", ppcname); - qdev_pass_gpios(dev_secctl, iotkitdev, name); + qdev_pass_gpios(dev_secctl, armssedev, name); g_free(name); =20 /* irq_status is a little more tricky, because we need to @@ -96,15 +96,15 @@ static void iotkit_forward_ppc(ARMSSE *s, const char *p= pcname, int ppcnum) qdev_connect_gpio_out(dev_splitter, 1, qdev_get_gpio_in(DEVICE(&s->ppc_irq_orgate), ppc= num)); s->irq_status_in[ppcnum] =3D qdev_get_gpio_in(dev_splitter, 0); - qdev_init_gpio_in_named_with_opaque(iotkitdev, irq_status_forwarder, + qdev_init_gpio_in_named_with_opaque(armssedev, irq_status_forwarder, s->irq_status_in[ppcnum], name, 1); g_free(name); } =20 -static void iotkit_forward_sec_resp_cfg(ARMSSE *s) +static void armsse_forward_sec_resp_cfg(ARMSSE *s) { /* Forward the 3rd output from the splitter device as a - * named GPIO output of the iotkit object. + * named GPIO output of the armsse object. */ DeviceState *dev =3D DEVICE(s); DeviceState *dev_splitter =3D DEVICE(&s->sec_resp_splitter); @@ -115,12 +115,12 @@ static void iotkit_forward_sec_resp_cfg(ARMSSE *s) qdev_connect_gpio_out(dev_splitter, 2, s->sec_resp_cfg_in); } =20 -static void iotkit_init(Object *obj) +static void armsse_init(Object *obj) { ARMSSE *s =3D ARMSSE(obj); int i; =20 - memory_region_init(&s->container, obj, "iotkit-container", UINT64_MAX); + memory_region_init(&s->container, obj, "armsse-container", UINT64_MAX); =20 sysbus_init_child_obj(obj, "armv7m", &s->armv7m, sizeof(s->armv7m), TYPE_ARMV7M); @@ -160,9 +160,9 @@ static void iotkit_init(Object *obj) sizeof(s->nswatchdog), TYPE_CMSDK_APB_WATCHDOG); sysbus_init_child_obj(obj, "swatchdog", &s->swatchdog, sizeof(s->swatchdog), TYPE_CMSDK_APB_WATCHDOG); - sysbus_init_child_obj(obj, "iotkit-sysctl", &s->sysctl, + sysbus_init_child_obj(obj, "armsse-sysctl", &s->sysctl, sizeof(s->sysctl), TYPE_IOTKIT_SYSCTL); - sysbus_init_child_obj(obj, "iotkit-sysinfo", &s->sysinfo, + sysbus_init_child_obj(obj, "armsse-sysinfo", &s->sysinfo, sizeof(s->sysinfo), TYPE_IOTKIT_SYSINFO); object_initialize_child(obj, "nmi-orgate", &s->nmi_orgate, sizeof(s->nmi_orgate), TYPE_OR_IRQ, @@ -183,20 +183,20 @@ static void iotkit_init(Object *obj) } } =20 -static void iotkit_exp_irq(void *opaque, int n, int level) +static void armsse_exp_irq(void *opaque, int n, int level) { ARMSSE *s =3D ARMSSE(opaque); =20 qemu_set_irq(s->exp_irqs[n], level); } =20 -static void iotkit_mpcexp_status(void *opaque, int n, int level) +static void armsse_mpcexp_status(void *opaque, int n, int level) { ARMSSE *s =3D ARMSSE(opaque); qemu_set_irq(s->mpcexp_status_in[n], level); } =20 -static void iotkit_realize(DeviceState *dev, Error **errp) +static void armsse_realize(DeviceState *dev, Error **errp) { ARMSSE *s =3D ARMSSE(dev); int i; @@ -287,7 +287,7 @@ static void iotkit_realize(DeviceState *dev, Error **er= rp) for (i =3D 0; i < s->exp_numirq; i++) { s->exp_irqs[i] =3D qdev_get_gpio_in(DEVICE(&s->armv7m), i + 32); } - qdev_init_gpio_in_named(dev, iotkit_exp_irq, "EXP_IRQ", s->exp_numirq); + qdev_init_gpio_in_named(dev, armsse_exp_irq, "EXP_IRQ", s->exp_numirq); =20 /* Set up the big aliases first */ make_alias(s, &s->alias1, "alias 1", 0x10000000, 0x10000000, 0x0000000= 0); @@ -336,7 +336,7 @@ static void iotkit_realize(DeviceState *dev, Error **er= rp) qdev_get_gpio_in(dev_splitter, 0)); =20 /* This RAM lives behind the Memory Protection Controller */ - memory_region_init_ram(&s->sram0, NULL, "iotkit.sram0", 0x00008000, &e= rr); + memory_region_init_ram(&s->sram0, NULL, "armsse.sram0", 0x00008000, &e= rr); if (err) { error_propagate(errp, err); return; @@ -608,14 +608,14 @@ static void iotkit_realize(DeviceState *dev, Error **= errp) for (i =3D 0; i < IOTS_NUM_AHB_EXP_PPC; i++) { char *ppcname =3D g_strdup_printf("ahb_ppcexp%d", i); =20 - iotkit_forward_ppc(s, ppcname, i); + armsse_forward_ppc(s, ppcname, i); g_free(ppcname); } =20 for (i =3D 0; i < IOTS_NUM_APB_EXP_PPC; i++) { char *ppcname =3D g_strdup_printf("apb_ppcexp%d", i); =20 - iotkit_forward_ppc(s, ppcname, i + IOTS_NUM_AHB_EXP_PPC); + armsse_forward_ppc(s, ppcname, i + IOTS_NUM_AHB_EXP_PPC); g_free(ppcname); } =20 @@ -672,10 +672,10 @@ static void iotkit_realize(DeviceState *dev, Error **= errp) /* Create GPIO inputs which will pass the line state for our * mpcexp_irq inputs to the correct splitter devices. */ - qdev_init_gpio_in_named(dev, iotkit_mpcexp_status, "mpcexp_status", + qdev_init_gpio_in_named(dev, armsse_mpcexp_status, "mpcexp_status", IOTS_NUM_EXP_MPC); =20 - iotkit_forward_sec_resp_cfg(s); + armsse_forward_sec_resp_cfg(s); =20 /* Forward the MSC related signals */ qdev_pass_gpios(dev_secctl, dev, "mscexp_status"); @@ -695,7 +695,7 @@ static void iotkit_realize(DeviceState *dev, Error **er= rp) system_clock_scale =3D NANOSECONDS_PER_SECOND / s->mainclk_frq; } =20 -static void iotkit_idau_check(IDAUInterface *ii, uint32_t address, +static void armsse_idau_check(IDAUInterface *ii, uint32_t address, int *iregion, bool *exempt, bool *ns, bool *= nsc) { /* @@ -713,7 +713,7 @@ static void iotkit_idau_check(IDAUInterface *ii, uint32= _t address, *iregion =3D region; } =20 -static const VMStateDescription iotkit_vmstate =3D { +static const VMStateDescription armsse_vmstate =3D { .name =3D "iotkit", .version_id =3D 1, .minimum_version_id =3D 1, @@ -723,7 +723,7 @@ static const VMStateDescription iotkit_vmstate =3D { } }; =20 -static Property iotkit_properties[] =3D { +static Property armsse_properties[] =3D { DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64), @@ -731,24 +731,24 @@ static Property iotkit_properties[] =3D { DEFINE_PROP_END_OF_LIST() }; =20 -static void iotkit_reset(DeviceState *dev) +static void armsse_reset(DeviceState *dev) { ARMSSE *s =3D ARMSSE(dev); =20 s->nsccfg =3D 0; } =20 -static void iotkit_class_init(ObjectClass *klass, void *data) +static void armsse_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); IDAUInterfaceClass *iic =3D IDAU_INTERFACE_CLASS(klass); ARMSSEClass *asc =3D ARMSSE_CLASS(klass); =20 - dc->realize =3D iotkit_realize; - dc->vmsd =3D &iotkit_vmstate; - dc->props =3D iotkit_properties; - dc->reset =3D iotkit_reset; - iic->check =3D iotkit_idau_check; + dc->realize =3D armsse_realize; + dc->vmsd =3D &armsse_vmstate; + dc->props =3D armsse_properties; + dc->reset =3D armsse_reset; + iic->check =3D armsse_idau_check; asc->info =3D data; } =20 @@ -756,7 +756,7 @@ static const TypeInfo armsse_info =3D { .name =3D TYPE_ARMSSE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ARMSSE), - .instance_init =3D iotkit_init, + .instance_init =3D armsse_init, .abstract =3D true, .interfaces =3D (InterfaceInfo[]) { { TYPE_IDAU_INTERFACE }, @@ -774,7 +774,7 @@ static void armsse_register_types(void) TypeInfo ti =3D { .name =3D armsse_variants[i].name, .parent =3D TYPE_ARMSSE, - .class_init =3D iotkit_class_init, + .class_init =3D armsse_class_init, .class_data =3D (void *)&armsse_variants[i], }; type_register(&ti); --=20 2.20.1