From nobody Sun Nov 24 10:56:25 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F18C149DFA for ; Thu, 8 Aug 2024 12:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723121708; cv=none; b=P7uqumllrz0C5Cdk8PmSaDivmVp/CJYK9xEnP5pNApJdzouajPWcW6xWGjXg1ms1hLFbTbpXxiODcRZn6O6adIj5Ztn7W8tINzb5klGn+KJU++jZwLJxsXkBDZCA0I/+QLZptPLaPEZ4njkMV0JCPJXpki9znQINRMkHVDipMcA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723121708; c=relaxed/simple; bh=SvK/+TGJjFXnGJoS3EcQ8H/clkUTFMgPlchoA47WW6w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YB00ARePd4ntTDiVMeUYhm6nwtPusmyd8aA7GtWWzVMYebTD3P7a4U+FIoN1M4zgvQCo1sqps+pYH67kY/CrzUeUod8E+QVpiAT2Tm5ut1WBZ/AV6qQiWo2yj21aBMgVjI6qrRoRR4g8mG5GWu38KbB0eUCMLVpL5gVe7TzIsc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I2PAofOx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I2PAofOx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98C77C32782; Thu, 8 Aug 2024 12:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723121707; bh=SvK/+TGJjFXnGJoS3EcQ8H/clkUTFMgPlchoA47WW6w=; h=From:To:Cc:Subject:Date:From; b=I2PAofOxtVJc6MV8JD20r0Bw/uGR60EcCGBU+wBF3aeOgxm1G+xGQ0iYrLyde7mvL HCnkNAFCN1rzD2RRQTWaPsf/dne/804s5owEmXxhNzFaaZxJDmdqDd8i/FreVKBQ/8 gBpVEQAvnptVaV73gxInEMgNBQ3y6rdficg6JDb1yOrlQ0dqka6gXGuSTfIIHjv5so sdV6wCnmDZsAJMWSY1867hQxjExsTW9UnOHMVeZ1goS9dlVNOnZPYel6uUktSJgKto /IKygVyDGDBGahgdWt26+sFpT+x6x5HVu20XKrZMEtgXMifBK6EECW16LmAvhgTFu+ H3/cUIzZR502w== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1sc2fZ-00000000pDx-2RcE; Thu, 08 Aug 2024 14:55:05 +0200 From: Mauro Carvalho Chehab To: Peter Maydell Cc: Jonathan Cameron , Shiju Jose , Mauro Carvalho Chehab , "Michael S. Tsirkin" , Ani Sinha , Igor Mammedov , Shannon Zhao , linux-kernel@vger.kernel.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH] arm/virt: place power button pin number on a define Date: Thu, 8 Aug 2024 14:54:52 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab Content-Type: text/plain; charset="utf-8" Having magic numbers inside the code is not a good idea, as it is error-prone. So, instead, create a macro with the number definition. Link: https://lore.kernel.org/qemu-devel/CAFEAcA-PYnZ-32MRX+PgvzhnoAV80zBKM= Yg61j2f=3DoHaGfwSsg@mail.gmail.com/ Signed-off-by: Mauro Carvalho Chehab Suggested-by: Peter Maydell Reviewed-by: Jonathan Cameron Reviewed-by: Igor Mammedov --- hw/arm/virt-acpi-build.c | 6 +++--- hw/arm/virt.c | 7 ++++--- include/hw/arm/virt.h | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index e10cad86dd73..f76fb117adff 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -154,10 +154,10 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemM= apEntry *gpio_memmap, aml_append(dev, aml_name_decl("_CRS", crs)); =20 Aml *aei =3D aml_resource_template(); - /* Pin 3 for power button */ - const uint32_t pin_list[1] =3D {3}; + + const uint32_t pin =3D GPIO_PIN_POWER_BUTTON; aml_append(aei, aml_gpio_int(AML_CONSUMER, AML_EDGE, AML_ACTIVE_HIGH, - AML_EXCLUSIVE, AML_PULL_UP, 0, pin_list, = 1, + AML_EXCLUSIVE, AML_PULL_UP, 0, &pin, 1, "GPO0", NULL, 0)); aml_append(dev, aml_name_decl("_AEI", aei)); =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 719e83e6a1e7..687fe0bb8bc9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1004,7 +1004,7 @@ static void virt_powerdown_req(Notifier *n, void *opa= que) if (s->acpi_dev) { acpi_send_event(s->acpi_dev, ACPI_POWER_DOWN_STATUS); } else { - /* use gpio Pin 3 for power button event */ + /* use gpio Pin for power button event */ qemu_set_irq(qdev_get_gpio_in(gpio_key_dev, 0), 1); } } @@ -1013,7 +1013,8 @@ static void create_gpio_keys(char *fdt, DeviceState *= pl061_dev, uint32_t phandle) { gpio_key_dev =3D sysbus_create_simple("gpio-key", -1, - qdev_get_gpio_in(pl061_dev, 3)); + qdev_get_gpio_in(pl061_dev, + GPIO_PIN_POWER_BU= TTON)); =20 qemu_fdt_add_subnode(fdt, "/gpio-keys"); qemu_fdt_setprop_string(fdt, "/gpio-keys", "compatible", "gpio-keys"); @@ -1024,7 +1025,7 @@ static void create_gpio_keys(char *fdt, DeviceState *= pl061_dev, qemu_fdt_setprop_cell(fdt, "/gpio-keys/poweroff", "linux,code", KEY_POWER); qemu_fdt_setprop_cells(fdt, "/gpio-keys/poweroff", - "gpios", phandle, 3, 0); + "gpios", phandle, GPIO_PIN_POWER_BUTTON, 0); } =20 #define SECURE_GPIO_POWEROFF 0 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index ab961bb6a9b8..a4d937ed45ac 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -47,6 +47,9 @@ /* See Linux kernel arch/arm64/include/asm/pvclock-abi.h */ #define PVTIME_SIZE_PER_CPU 64 =20 +/* GPIO pins */ +#define GPIO_PIN_POWER_BUTTON 3 + enum { VIRT_FLASH, VIRT_MEM, --=20 2.45.2