From nobody Thu Dec 22 14:37:58 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NdCbC0k3Mz1HZqV; Thu, 22 Dec 2022 14:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NdCbC090Fz3H9G; Thu, 22 Dec 2022 14:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671719879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zSKcRXYB6okY+cpfl5Othhcm2zq1ccB+ZX0t83OL68Y=; b=th+zLbw8VYNYXXvd5qin5ht9DuQLsid+2ZSia0MNvRuGMkLaYk+or7PrfCQpbHssP5CYP+ KcQ1DBZJx+TmdFFlpRN5j8IluhOvbtv+ZhCVWeR2iaPip/ByumCNQuffRepgnC9Dr2Oh8A f3/3EgRTUetL6FG9bql5U0jNo1rgMY9rIISpbUlQKyhRwnT2JeKDyQBrPINQbiVvUsM6P8 CNyLNgOlBqOBBIJ/8D6tb5aRu2ecKkzwO5dHxYoDhTOFxiXNfXrhEjtv90tEVP6/Vrvier JSYa8eRqTQbIelMf+VeQmbzEpuLx67hv6zRv/ioh6zYDi4qByIQISnm4aBgRbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671719879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zSKcRXYB6okY+cpfl5Othhcm2zq1ccB+ZX0t83OL68Y=; b=TpeOSnz4TXjCVdh8n8EI6BuO0lQE07dUde5kYj8UnQZl2z09XNJfd4lQprjqvtpoAnlNG7 jFymnPUOLTWhtIf5sa5zf85U3drwUHO3RLemhpcQQqXTM2VxvGOjfLxpQJxoH9BatdYV83 zRw7jgitwEc0V+kNY+O7V7HPPik4ZQBF8c58nPNEAG/ydGxE+SjcQY1qKSgHAMJBSVglX4 vLrRToctRneDIraOd8MkJj3AoMGaZNZKFZP6ttPDHTMsLh/HfJq2FgCixadzcyXLIMJmWW da8oOrgJG233s5Wmk78vigpr8h8d9NyAm9knp6edA1+DNQyyrK7WHPfiSe6vxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671719879; a=rsa-sha256; cv=none; b=omk0pqFS1ihBdUY2FOhlYzh3zdXyMilCi5RCHyh2aTgBLTNORu8yLFR3vIuCg8BwmYhGd9 l5URlCiyNmGYIAYfGjVKQoYFRpN4YWNM8s5YW4S1al/Ft+3C9/koXsKY16VHiMDGPcMcSv 56wjcKW2rI1s46oKnvJ+BDmsZxAolV7tkQUrN46LaGsPDBldElhweY/jE4JP5rw/Svpsb/ tVMDGXchamwiHOgTCElr7pUxVQUSUN+tkUh3QO1K8UnHgmw7e0p3+ZeqI9jZGcgqA5rygz 3DzpsAbRfxz1W19uL34FAX+G1VSwxJVDlc0DPbxPV+g3ifJH86XjleXmLrBY0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NdCbB6DnKzxH1; Thu, 22 Dec 2022 14:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BMEbwI6081397; Thu, 22 Dec 2022 14:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMEbwoe081396; Thu, 22 Dec 2022 14:37:58 GMT (envelope-from git) Date: Thu, 22 Dec 2022 14:37:58 GMT Message-Id: <202212221437.2BMEbwoe081396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f9ccec823a9f - main - Add support for the new Arm Generic UART _HID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9ccec823a9f759ad6360c2a0c6336a3e2a6188a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f9ccec823a9f759ad6360c2a0c6336a3e2a6188a commit f9ccec823a9f759ad6360c2a0c6336a3e2a6188a Author: Andrew Turner AuthorDate: 2022-12-19 13:42:44 +0000 Commit: Andrew Turner CommitDate: 2022-12-22 14:24:40 +0000 Add support for the new Arm Generic UART _HID Historically the ACPI _HID for both the Arm PL011 and Generic UARTs was ARMH0011. In the Arm Base Boot Requirements 2.0 the Generic UART _HID is changed to ARMHB000. Use this new value in the PL011 driver where we support both UART types. This has been observed in some recent EDK2 builds. Sponsored by: Arm Ltd --- sys/dev/uart/uart_dev_pl011.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c index 822283369075..ae1536bc4300 100644 --- a/sys/dev/uart/uart_dev_pl011.c +++ b/sys/dev/uart/uart_dev_pl011.c @@ -341,8 +341,8 @@ UART_FDT_CLASS_AND_DEVICE(fdt_compat_data); #ifdef DEV_ACPI static struct acpi_uart_compat_data acpi_compat_data[] = { {"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_PL011, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"}, - {"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"}, - {"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_32BIT, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"}, + {"ARMHB000", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"}, + {"ARMHB000", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_32BIT, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"}, {NULL, NULL, 0, 0, 0, 0, 0, NULL}, }; UART_ACPI_CLASS_AND_DEVICE(acpi_compat_data);