From nobody Mon Jan 23 12:37:46 2023 X-Original-To: dev-commits-src-branches@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 4P0qPk6PHGz3bT67; Mon, 23 Jan 2023 12:37:46 +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 4P0qPk58BFz3Crm; Mon, 23 Jan 2023 12:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477466; 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=x1F8KhUauu7KxNojFfgjbryvldtnPjmC6AMqgbFW8Ko=; b=KYwoweH6rjUojjrBBFw60b24xmVs4RWnciqLdaXIGPAskPyuHVgdBAfF9SpcRbmCgQrZoq RCm1QiZXMm4x0Yd9NynVxn+TzezUW0pLIQx9H78N2K50y/FZ0GQFReuNXD/jwFvmZeMnD2 sdSMYvxm7PlX9slwmfKUHci7hqrZn5r/SgAPP7cRSoPbtNbGjaSAjzJ8d/PabY85EOhBQM sOPAzQiqgwWbEys5tSjANnrml/x+DsZP3vBPnrLtCEJBxmiU2F33NJVk2wnWhfHkJQ51dm J51CgnNdTzgweHLm7AwaGcsytQRrRHXFpJ+Omm3pGzDGgj2o+tLzp45AE6KABg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477466; 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=x1F8KhUauu7KxNojFfgjbryvldtnPjmC6AMqgbFW8Ko=; b=CVsk8RlR//u9XkNdp3GUSpE+DlxcwZ/YOzGGXu/mwySZV0xBUhnse6gpkcJGUZPP8CYlBu L6YvQWJZ7fCR+hx4+0zxX2F8f/2d5QWIdJHooj4nrtxr9DUnTfCDJi6G7QjUXANX0XPddd E9myC/YWEmHXpKjJuG9lyQ3gnAr1pwBwGvC/X/rSluFe/Obq9+r1/RMEaNrWA6uaFtzAnd IDY47+2L2p27h1DuuQ0PeGDBY+KN/bjPrMo/5gLEHKQZTOKA07MRQTCyWbLRhUXY2+Jh7H DunyYnOBc4A2fIM8VSy4mR0EV4CFdygld6GOLdJZk7Ph1ST9q96hAAqQeh5HJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674477466; a=rsa-sha256; cv=none; b=qd2z5WnV5ibRD3k7dZq2X6MIP70OCRuz+c98y98F+oTsqrJxiToK+kTxT1lGANn8fr1ss5 XQX1RkvGhhln1NGGnx1h/PM7erdG2uwszPMgtdy23k5tNRQhQ1Hpd4aEig+2c5jqEuidQK zBA5pwManzGVnS3dQeSSGdBfXedp35SAwKQ0b4Is6APDYObBf9M1suJQJ3gCi5hDJOI8yE D5WK01jzlJKRFHZFCluL5mNugFegi1dgbKzOa+4wr584ynGzXbA58nn2orNwe+ms/X6EBA ezuR/UMNO7bCQUNiG30mYLYhcxX1pp+hH9N9P+ZUjJ0icjoAz32buX6t3nJpbg== 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 4P0qPk3ydbzVDb; Mon, 23 Jan 2023 12:37:46 +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 30NCbk0k085550; Mon, 23 Jan 2023 12:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCbk9Q085549; Mon, 23 Jan 2023 12:37:46 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:37:46 GMT Message-Id: <202301231237.30NCbk9Q085549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 7217ec3ed290 - stable/13 - Add support for the new Arm Generic UART _HID List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7217ec3ed290ad47a56e7686b896879c2a4eeac4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7217ec3ed290ad47a56e7686b896879c2a4eeac4 commit 7217ec3ed290ad47a56e7686b896879c2a4eeac4 Author: Andrew Turner AuthorDate: 2022-12-19 13:42:44 +0000 Commit: Andrew Turner CommitDate: 2023-01-23 12:36:28 +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 (cherry picked from commit f9ccec823a9f759ad6360c2a0c6336a3e2a6188a) --- 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);