From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:504:998a:b0:1be9:327d:8ee3 with SMTP id i10csp1448263njn; Sun, 12 Jan 2025 14:57:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXvBHUIL9Fhs2iaZlb4sQcofAUhcJaw6rzJpBdhwTIePRIzocWuZwtlTkC/ugxNscZom5SOrJtjFTzV+A==@linaro.org X-Google-Smtp-Source: AGHT+IHgi77cCzhhCFYoSMo1kjguwKqJczW31XS5+NSqLOqE7IRM7Z9A1ji3f6tsICjMSKz4K3BC X-Received: by 2002:a05:622a:15d4:b0:46a:2876:d667 with SMTP id d75a77b69052e-46c7108fcc3mr303359931cf.18.1736722651290; Sun, 12 Jan 2025 14:57:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736722651; cv=none; d=google.com; s=arc-20240605; b=DNEz4HlLN8Jq0sGsquj6cH7EW6RHJvXJrD4XGVcw7KywzwWgVqT6CNShiDp2hwSxco U1MU9X51vSIWCCvK4gxrFSy4tidWdpPZLzvba1/UAotRe44GLZSH3ohbRqTz3/SKWeh2 laCl6KXnJMQGpfqyTuvNA5aqBlidqtz2GZ74XCerOYeur224EZhjiZRi+/VnlNRcxucd e+cdARmZ/yjuy9sogUG4IK01pvVK9vbGr2D/M/IDOso12a8gcmMmfwvw3Jpawk+1GFMQ SQNyeKURPG1gYqPBqhfBNYIofBtFthGwvxE7QW5sJ25plq/XXhxgXnD2Oh5iaSdpHtes p+6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BowyydtiNf13IGVqTkq6nfH3HgTKKikK+aOyxCGRJEY=; fh=x1ehAVLcWQVcw7zrMsboqolREEqUtepR8G/oP2aIx1c=; b=UYEf80NgtczqgX/inhbuTFjAFx80taj/10xqxDQn5PiWAXBK/H7dupalGgFE/saOp0 7i5+0KMqtZ9+hYjkL4a1+3WjrkgUcIy3eu0Z5MBh99XONwe3LR8fyYyC4XsMeEnxeTYU 7EHSHYY1GC85LfRZeWyDC8XtwXjeWj83Jd0/zc2NtQOw7Bf0pZf2Bmg9NLK28/uRsVzi /ltWDJOQaC/PR7TbCSerXqQuMayMj8Q/Nygz5eob11LDanlZ96ITLbYRwO8sdsPeQHMm vJwjMB/1VdphsormA/nk1xwoGwqUXCFXJrXz7KcsL12wxIlYLyKHVLz1RTVcpPuDxYCP hhcg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PiIYG3XD; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-46c873e787asi74463011cf.250.2025.01.12.14.57.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Jan 2025 14:57:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PiIYG3XD; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tX6sg-00073N-EE; Sun, 12 Jan 2025 17:56:30 -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 1tX6sa-00072p-VF for qemu-arm@nongnu.org; Sun, 12 Jan 2025 17:56:26 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tX6sZ-0001Z3-7T for qemu-arm@nongnu.org; Sun, 12 Jan 2025 17:56:24 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43624b2d453so38191675e9.2 for ; Sun, 12 Jan 2025 14:56:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736722581; x=1737327381; darn=nongnu.org; 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=BowyydtiNf13IGVqTkq6nfH3HgTKKikK+aOyxCGRJEY=; b=PiIYG3XDPK6YCpzbuYS5sjWDMaRxgtCX3zIYlvYhmcj5/W6GbHhrNMxniDPP0rIMkG dsPcSSg4d7jUgoY/Y2Rep1IbZpkTqTqGhmvTCksVffPqW9Qie1NVaNkTJEW5rL55kHvE oziGuaMQVO/7qFA4b3YkI7OsEy3YcNU7MJlIT/RKi+U5pYY3KmvX3dFwyAzeleQ4XluP XqcXttvz4VDSjjG7jgDQB6qvQ+KiEGlAx1iZEqav7cY4C23Zt48tiUPNbwhx/YMze7Wt +TxUQ8IwH9DHhgFEcZxbcI0OarINVYPAA/a1gA3NoBTaZMvqlgfIavM6GHx4a92tr+97 cjbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736722581; x=1737327381; 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=BowyydtiNf13IGVqTkq6nfH3HgTKKikK+aOyxCGRJEY=; b=inCCTumNFCDqFPq5RJSMoKNN42VnG5Un2ZABrKoPb0raJfj3sufUFgb4DL6DigwJCF o765ZNWuIRo51wnNy6epciKjVasUG7rW6ARpmbNT/tIYrgHlK3OA/8Dd2PhP+GDHff9J Vx8qF4nIqxPzpSZLeCdUfqtLn8fLFeX7MLwhZtXiDbTMA6G5gj3JkQ0sbsS/1kizPdDm 8m3VyCuZwSwthwg7/Nu7sPACRGUhuFQF8gOlVQ1tPOG2BkGNnqI9aALbo/NVryCkHsQH VBhALRQiUWeFL1j0zomoSxcsPUh7xG4iqr5Zy6vYFwWjKkkk9D27HE5UvueQh6lm1cnd R28w== X-Forwarded-Encrypted: i=1; AJvYcCWApJCoMGnaYq8PEsT1q8Jnd1M9uilvnaotiQ+NHEpG+oPORrCwySIqw5+ZqKJR5EpiYPLHiVUuAA==@nongnu.org X-Gm-Message-State: AOJu0YwW1caU/oZvKM3RPMsBsSdvZzjRSVkffbl5L8JWE0uJTxOhj2+6 jqaNzWKo/REcGRWjFoL9+aDYtr8q6aRkSGh6JSnKo90DwvU6yAiE1sEZDbKAra4= X-Gm-Gg: ASbGncvwHZV7YbXgeMkizsnGGD/WyrS8ziVGJtEcBVLOqKjkZZSNi8EleuN3xJ+JLFJ L9XAJKyJ2WQ/YnELRzRct13pySrHEFlH0VbHM6OaBCF7wCI7uiRuSCjynHYOPBqyefatx2V9252 VsxeKBNiuj+npU+eI8AsHOJLqrWQ8+tAkEaCGrpy6RSdfB+xlXGfInDM2e/L8UUXW6RIVNDjr6Y oyIyQmuahF4H/7vUe51jzW95ohhEGA+/KhYsfBfX59ZfXdvKjJocpxLIKwIGDoVciuofdqeiQlC slYarD69pZwsvyInAEsopHH460WwXEE= X-Received: by 2002:a05:600c:46d2:b0:434:a1d3:a321 with SMTP id 5b1f17b1804b1-436e2679db4mr164289725e9.3.1736722581599; Sun, 12 Jan 2025 14:56:21 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e38325esm10604058f8f.27.2025.01.12.14.56.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 12 Jan 2025 14:56:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Samuel Tardieu , qemu-arm@nongnu.org, Peter Maydell , Felipe Balbi , Subbaraya Sundeep , Alistair Francis , Joel Stanley , Alexandre Iooss , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] hw/arm/nrf51: Rename ARMv7MState 'cpu' -> 'armv7m' Date: Sun, 12 Jan 2025 23:56:12 +0100 Message-ID: <20250112225614.33723-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250112225614.33723-1-philmd@linaro.org> References: <20250112225614.33723-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: bQNDamGNOFDU The ARMv7MState object is not simply a CPU, it also contains the NVIC, SysTick timer, and various MemoryRegions. Rename the field as 'armv7m', like other Cortex-M boards. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/arm/nrf51_soc.h | 2 +- hw/arm/nrf51_soc.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h index e52a56e75e0..f88ab1b7d3e 100644 --- a/include/hw/arm/nrf51_soc.h +++ b/include/hw/arm/nrf51_soc.h @@ -30,7 +30,7 @@ struct NRF51State { SysBusDevice parent_obj; /*< public >*/ - ARMv7MState cpu; + ARMv7MState armv7m; NRF51UARTState uart; NRF51RNGState rng; diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index 37dd4cf5f40..dee06ab5654 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -76,16 +76,16 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) } /* This clock doesn't need migration because it is fixed-frequency */ clock_set_hz(s->sysclk, HCLK_FRQ); - qdev_connect_clock_in(DEVICE(&s->cpu), "cpuclk", s->sysclk); + qdev_connect_clock_in(DEVICE(&s->armv7m), "cpuclk", s->sysclk); /* * This SoC has no systick device, so don't connect refclk. * TODO: model the lack of systick (currently the armv7m object * will always provide one). */ - object_property_set_link(OBJECT(&s->cpu), "memory", OBJECT(&s->container), + object_property_set_link(OBJECT(&s->armv7m), "memory", OBJECT(&s->container), &error_abort); - if (!sysbus_realize(SYS_BUS_DEVICE(&s->cpu), errp)) { + if (!sysbus_realize(SYS_BUS_DEVICE(&s->armv7m), errp)) { return; } @@ -104,7 +104,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart), 0); memory_region_add_subregion_overlap(&s->container, NRF51_UART_BASE, mr, 0); sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart), 0, - qdev_get_gpio_in(DEVICE(&s->cpu), + qdev_get_gpio_in(DEVICE(&s->armv7m), BASE_TO_IRQ(NRF51_UART_BASE))); /* RNG */ @@ -115,7 +115,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->rng), 0); memory_region_add_subregion_overlap(&s->container, NRF51_RNG_BASE, mr, 0); sysbus_connect_irq(SYS_BUS_DEVICE(&s->rng), 0, - qdev_get_gpio_in(DEVICE(&s->cpu), + qdev_get_gpio_in(DEVICE(&s->armv7m), BASE_TO_IRQ(NRF51_RNG_BASE))); /* UICR, FICR, NVMC, FLASH */ @@ -161,7 +161,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer[i]), 0, base_addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer[i]), 0, - qdev_get_gpio_in(DEVICE(&s->cpu), + qdev_get_gpio_in(DEVICE(&s->armv7m), BASE_TO_IRQ(base_addr))); } @@ -185,10 +185,10 @@ static void nrf51_soc_init(Object *obj) memory_region_init(&s->container, obj, "nrf51-container", UINT64_MAX); - object_initialize_child(OBJECT(s), "armv6m", &s->cpu, TYPE_ARMV7M); - qdev_prop_set_string(DEVICE(&s->cpu), "cpu-type", + object_initialize_child(OBJECT(s), "armv6m", &s->armv7m, TYPE_ARMV7M); + qdev_prop_set_string(DEVICE(&s->armv7m), "cpu-type", ARM_CPU_TYPE_NAME("cortex-m0")); - qdev_prop_set_uint32(DEVICE(&s->cpu), "num-irq", 32); + qdev_prop_set_uint32(DEVICE(&s->armv7m), "num-irq", 32); object_initialize_child(obj, "uart", &s->uart, TYPE_NRF51_UART); object_property_add_alias(obj, "serial0", OBJECT(&s->uart), "chardev"); -- 2.47.1