{"id":2228875,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228875/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427124738.966578-28-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260427124738.966578-28-peter.maydell@linaro.org>","date":"2026-04-27T12:47:01","name":"[PULL,27/63] hw: Move ARM_SYSCTL_GPIO definitions to arm sysctl specific header","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"ff48ec7b63cc0dea0a176955eade4cf848e94c6a","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/1.1/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427124738.966578-28-peter.maydell@linaro.org/mbox/","series":[{"id":501642,"url":"http://patchwork.ozlabs.org/api/1.1/series/501642/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501642","date":"2026-04-27T12:46:34","name":"[PULL,01/63] docs/system: add FEAT_AA32 and FEAT_AA64 to emulation list","version":1,"mbox":"http://patchwork.ozlabs.org/series/501642/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228875/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228875/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=srHfm4lc;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g43Xq17Gqz1yHv\n\tfor ; Mon, 27 Apr 2026 22:58:51 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wHLU8-0006Sh-6f; Mon, 27 Apr 2026 08:54:48 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wHLNq-00084k-9q\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 08:48:25 -0400","from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1wHLNi-0005fU-Qk\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 08:48:13 -0400","by mail-wm1-x32b.google.com with SMTP id\n 5b1f17b1804b1-488a88aeec9so127020295e9.2\n for ; Mon, 27 Apr 2026 05:48:05 -0700 (PDT)","from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488ffc5e3f4sm448974115e9.2.2026.04.27.05.48.03\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 27 Apr 2026 05:48:03 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777294085; x=1777898885; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to; bh=7ZMrAR860LVLLbEn3nTo+Jz2p6zIzurqX1lJh5uQLiY=;\n b=srHfm4lcUF36gz9rsxxNUMhTrzyO9wMLqmOhshbYoet1CLd4p4/NkX0yzUb2Lg8AjX\n 4JaY9W8SZ2Q/7dwTL+0HLRFq+mRsqUkU4cFZSvDSaN5YpEYSy8c2OjmarGr9I/JqnqrG\n wJHK4td5IyWI7nzNGeugll5gXqrpcMfSWGYEvIN45WSjF35IIIbBoQqdVrStGs8tVfZc\n CjJhEccP//IpeMRMNhhzOJdaqs7qgLD3Q9qj5gU3wunrsE1IOo90tGP7lOpPu5stH3pf\n YIy/BFGbSagyUlWyuqNDgFL/Rc++DXjANpCIncSSfGI/czymIkWTXD0ooXrc9bNcyxhq\n 9f6g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777294085; x=1777898885;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=7ZMrAR860LVLLbEn3nTo+Jz2p6zIzurqX1lJh5uQLiY=;\n b=WdRkb/jlnio4lgKi9O4eUhu4944mB6rzE8vP7ijfun1Hu9qRm4VpxboXNmKpVczRpN\n GLspW6xrR3Az/7LzPYuvu5MTkyH3MDBwdYAYIX36wasesZsK6NHMDwbjH+oFbYchq2wC\n ilTZNR/xnLV1UafeLYuWEdeC75C8+IlFXHs8IMkYQd4uSJlhNoiLeRswLlQGNknar1SG\n ljFjJvdRNN3ROgnFn7v79FUQDrDLUjLb29s0mu1yfmU+WzkP+xIaq2l/A4cQ7T68F+X4\n Mjk63UdfPNfT48gMaPsLpjdbpnk8vMe55BYHCQuftZ7O33FClyGE8b3nkGtUANrZIrjl\n i3Tw==","X-Gm-Message-State":"AOJu0Yxa1Zh1yK6WY0wGj5BHjGdcQR+nSA8qL3vHareWXMHRsYui0kn7\n n76C+USl4UHESlwBMPm/bonS3h/nECaSivXx6lF+2xmbIfVHGM1bOe+w2CSjo+PdBXGC4HbDsZm\n 6UPLa","X-Gm-Gg":"AeBDievt4pNKruRLVrB2gHFoHDBm0VoX549OoLjHEjFtDjZmCvbCXMgGkP05RSGFKgq\n pgYv2Ypkl70ReuczIcRG62V/kZOQhfdjp8c4e5SHNuh4UJEkQLOFI2OXaJe4lqkCAbvt78ej6cf\n NloggqchkBhpzgs1i+WCk988c3gn5W2EPC9Vd2Ut1Xh0RyuQkuQ3sN7dO1uFD+raMWxz8vMbXlv\n 5eIkRgUXW9QS5scNzsfrNeFVY9Y0b1yrts1520B18HHalXzTY7+0TZjjvFFAtvmNNJECkR9Z9Og\n IqeMKpQp7oRznFqF92i3/+hyin28AszEoa9nVOibSYXF5NT0HJNyAYg5quBcDZcTSADO6U5zKUy\n QNzCBJnAmywtYv8B7nocAWuh4qPSnUK2rPJKzKPIg95hMLJopVo06IS2C15dHxOsSuQjrBeCWp0\n fj75jdwzvLS7IocBRQS76KqHjzfzWmcplSrlvWLljsn/KuwQJynJVo2s3JHTD0xGldLnKcbDwO2\n eQIKyl3H3FSgQvn4UNV/PZB3te/9pA5QSXRzssQPA==","X-Received":"by 2002:a05:600c:4714:b0:48a:5574:3a5b with SMTP id\n 5b1f17b1804b1-48a55743d05mr384702495e9.27.1777294084480;\n Mon, 27 Apr 2026 05:48:04 -0700 (PDT)","From":"Peter Maydell ","To":"qemu-devel@nongnu.org","Subject":"[PULL 27/63] hw: Move ARM_SYSCTL_GPIO definitions to arm sysctl\n specific header","Date":"Mon, 27 Apr 2026 13:47:01 +0100","Message-ID":"<20260427124738.966578-28-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260427124738.966578-1-peter.maydell@linaro.org>","References":"<20260427124738.966578-1-peter.maydell@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::32b;\n envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"include/hw/arm/primecell.h used to be more expansive, but now the\nonly thing it defines is the ARM_SYSCTL_GPIO_* constants for the GPIO\nlines for the arm-sysctl system-control device used on the Realview,\nVersatile and Versatile Express boards.\n\nReplace it with a header file specific to that device.\n\nvirt.c and vmapple.c included primecell.h despite not using the\nconstants it defined; there we can simply drop the include entirely.\n\nSigned-off-by: Peter Maydell \nReviewed-by: Philippe Mathieu-Daudé \nMessage-id: 20260416172627.690396-1-peter.maydell@linaro.org\n---\n MAINTAINERS | 2 +-\n hw/arm/realview.c | 2 +-\n hw/arm/vexpress.c | 2 +-\n hw/arm/virt.c | 1 -\n hw/misc/arm_sysctl.c | 2 +-\n hw/vmapple/vmapple.c | 1 -\n include/hw/arm/primecell.h | 12 ------------\n include/hw/misc/arm_sysctl.h | 16 ++++++++++++++++\n 8 files changed, 20 insertions(+), 18 deletions(-)\n delete mode 100644 include/hw/arm/primecell.h\n create mode 100644 include/hw/misc/arm_sysctl.h","diff":"diff --git a/MAINTAINERS b/MAINTAINERS\nindex 8d980d6c40..50a8e161c6 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -759,7 +759,6 @@ F: hw/ssi/pl022.c\n F: include/hw/ssi/pl022.h\n F: hw/rtc/pl031.c\n F: include/hw/rtc/pl031.h\n-F: include/hw/arm/primecell.h\n F: hw/timer/cmsdk-apb-timer.c\n F: include/hw/timer/cmsdk-apb-timer.h\n F: tests/qtest/cmsdk-apb-timer-test.c\n@@ -1113,6 +1112,7 @@ F: hw/*/versatile*\n F: hw/i2c/arm_sbcon_i2c.c\n F: include/hw/i2c/arm_sbcon_i2c.h\n F: hw/misc/arm_sysctl.c\n+F: include/hw/misc/arm_sysctl.h\n F: docs/system/arm/versatile.rst\n \n Virt\ndiff --git a/hw/arm/realview.c b/hw/arm/realview.c\nindex 7c49995c80..2b9f3271d6 100644\n--- a/hw/arm/realview.c\n+++ b/hw/arm/realview.c\n@@ -12,9 +12,9 @@\n #include \"target/arm/cpu.h\"\n #include \"hw/core/sysbus.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/arm/machines-qom.h\"\n #include \"hw/core/split-irq.h\"\n+#include \"hw/misc/arm_sysctl.h\"\n #include \"hw/net/lan9118.h\"\n #include \"hw/net/smc91c111.h\"\n #include \"hw/pci/pci.h\"\ndiff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c\nindex b178798085..f26d8c6f8d 100644\n--- a/hw/arm/vexpress.c\n+++ b/hw/arm/vexpress.c\n@@ -26,8 +26,8 @@\n #include \"qemu/datadir.h\"\n #include \"hw/core/sysbus.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/arm/machines-qom.h\"\n+#include \"hw/misc/arm_sysctl.h\"\n #include \"hw/net/lan9118.h\"\n #include \"hw/i2c/i2c.h\"\n #include \"net/net.h\"\ndiff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex f62253e1ab..77891f0820 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -36,7 +36,6 @@\n #include \"monitor/qdev.h\"\n #include \"hw/core/sysbus.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/arm/virt.h\"\n #include \"hw/arm/machines-qom.h\"\n #include \"hw/block/flash.h\"\ndiff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c\nindex 7b320f89c1..ebc95b9bb5 100644\n--- a/hw/misc/arm_sysctl.c\n+++ b/hw/misc/arm_sysctl.c\n@@ -14,8 +14,8 @@\n #include \"system/runstate.h\"\n #include \"qemu/bitops.h\"\n #include \"hw/core/sysbus.h\"\n+#include \"hw/misc/arm_sysctl.h\"\n #include \"migration/vmstate.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"qemu/log.h\"\n #include \"qemu/module.h\"\n #include \"qom/object.h\"\ndiff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c\nindex b1379eafef..607181f517 100644\n--- a/hw/vmapple/vmapple.c\n+++ b/hw/vmapple/vmapple.c\n@@ -32,7 +32,6 @@\n #include \"hw/core/sysbus.h\"\n #include \"hw/usb/usb.h\"\n #include \"hw/arm/boot.h\"\n-#include \"hw/arm/primecell.h\"\n #include \"hw/char/pl011.h\"\n #include \"hw/intc/arm_gic.h\"\n #include \"hw/intc/arm_gicv3_common.h\"\ndiff --git a/include/hw/arm/primecell.h b/include/hw/arm/primecell.h\ndeleted file mode 100644\nindex 7337c3b3ca..0000000000\n--- a/include/hw/arm/primecell.h\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-#ifndef PRIMECELL_H\n-#define PRIMECELL_H\n-\n-/* Declarations for ARM PrimeCell based periperals. */\n-/* Also includes some devices that are currently only used by the\n- ARM boards. */\n-\n-/* arm_sysctl GPIO lines */\n-#define ARM_SYSCTL_GPIO_MMC_WPROT 0\n-#define ARM_SYSCTL_GPIO_MMC_CARDIN 1\n-\n-#endif\ndiff --git a/include/hw/misc/arm_sysctl.h b/include/hw/misc/arm_sysctl.h\nnew file mode 100644\nindex 0000000000..424069cd6e\n--- /dev/null\n+++ b/include/hw/misc/arm_sysctl.h\n@@ -0,0 +1,16 @@\n+/*\n+ * Status and system control registers for ARM RealView/Versatile boards.\n+ *\n+ * Copyright (c) Linaro Ltd\n+ *\n+ * SPDX-License-Identifier: GPL-2.0-or-later\n+ */\n+\n+#ifndef HW_MISC_ARM_SYSCTL_H\n+#define HW_MISC_ARM_SYSCTL_H\n+\n+/* arm_sysctl inbound GPIO lines */\n+#define ARM_SYSCTL_GPIO_MMC_WPROT 0\n+#define ARM_SYSCTL_GPIO_MMC_CARDIN 1\n+\n+#endif\n","prefixes":["PULL","27/63"]}