From nobody Wed Aug 13 10:10:19 2025 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 4c23z02snqz64W8k; Wed, 13 Aug 2025 10:10:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c23z00sBXz3ttL; Wed, 13 Aug 2025 10:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755079820; 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=rCITLk8iU7QceQpyXQIuP56C0s1KMMrr5/yBac3T9YI=; b=qU4jrCpbxROuranZ5FK42RTAxt0kY+ZK7hHZw2lvo0m0TP14AQhhTl98T9qtF+74J3AeZy lLuUWFnZCO9BlY0pXGvdkWT5T0KLLflLyWlgYGLMYhz1sQDcbhVAR6r4/2gwjBBK5Agt1w WSTyq/HjUstv1TSWrgY8XnuiBDVH3Jozda4YVEY0sBtZxgYPfAfQlutd4IbZwcAZeMM6lK +hqyiaf99+DKUWBQCquw9cz7Ybi2Xvp4c6ze6YkWru/Tji6HboG9z1X5OFXRzMYJEnas3u 7EKNwdnSh9f6JCa+zLM0vmvglBL2K3F9afQfBszxx9G8HPLHDGYu8YRun29LaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755079820; 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=rCITLk8iU7QceQpyXQIuP56C0s1KMMrr5/yBac3T9YI=; b=hKQTpYTDF2ukbILErokpxEYWA8CPmdEk0R0XI3HTbirQwNza/2N45yKULc6yVizLQSu7ih cuRO9uSaUvdQrhuBEcR9WkuobY2WGjkS4JvVgS/n5Eo/Zcs/4z8MRckjhL9/kaR/KOQ2Iy efjq7fw7XNkoxdPahYf/EB45HtKP+5J7SvbyNRebCPxgEm9m8FEEnCcahl/Zpr6EejGR1x mE4DBjArVR4gCf1+e709RdYXg2XIp/XwGqXTVO4JoNzK3Tt15rNHMgfM96ppgvuupgsVPm 0bvlqCLj1R1TVwU0RkklND5Oty0GdUjlhGH3bsgeZ7OHRmWmyE4eAOs4ebqOKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755079820; a=rsa-sha256; cv=none; b=IrrhdWxtoHBXCLHWbyqKoLtgGe3943t7wo3C/ZFHqz3h6N3DDrbSADhQNW5TTzNtnENgXl jNe/dUpPEQ6cRdnPrKNWa2IGE5t3j8XN+lPO1Ihqqte1UxET0LzkYbsBgSY5zfwWgFATW4 8pkodv9tlyZT+KoA0cJZIV8D8AKrA5A1enACYpQrTmqk0BD9tOsGAyOUJDc4LEweVZaGnP tDt91wMPPXcBbA7+epQL9iMWjiNadj5rzP7EmCEMK3Ti3stbyDoQi2sh5IQW4qX0LD/EH3 +bC9wLJE2di3Z+LbSDKqCiRW/kNx+3wHGsQKa1F72H54Zw80YeLxQ2urUZnXWg== 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 4c23z00Sc8z1HpW; Wed, 13 Aug 2025 10:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57DAAJPr099286; Wed, 13 Aug 2025 10:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DAAJta099283; Wed, 13 Aug 2025 10:10:19 GMT (envelope-from git) Date: Wed, 13 Aug 2025 10:10:19 GMT Message-Id: <202508131010.57DAAJta099283@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: e822f1d6f533 - main - uart: Add UART_ACPI_SPCR_CLASS 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e822f1d6f5333cc7ff47a88238c269b8a6a6f01a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e822f1d6f5333cc7ff47a88238c269b8a6a6f01a commit e822f1d6f5333cc7ff47a88238c269b8a6a6f01a Author: Andrew Turner AuthorDate: 2025-08-13 09:23:07 +0000 Commit: Andrew Turner CommitDate: 2025-08-13 09:31:16 +0000 uart: Add UART_ACPI_SPCR_CLASS We don't care about most of acpi_uart_compat_data in the spcr code. Split out the mapping from the SPCR interface type to uart class into a new struct. This allows new SPCR interface types to be added that don't have an entry in the DSDT, e.g. some PCI uarts may not. Reviewed by: imp, jhibbits Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51878 --- sys/dev/uart/uart_cpu_acpi.c | 12 ++++++------ sys/dev/uart/uart_cpu_acpi.h | 8 ++++++++ sys/dev/uart/uart_dev_ns8250.c | 7 +++++++ sys/dev/uart/uart_dev_pl011.c | 8 ++++++++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c index 2e2ff101619b..da77603f0093 100644 --- a/sys/dev/uart/uart_cpu_acpi.c +++ b/sys/dev/uart/uart_cpu_acpi.c @@ -44,15 +44,15 @@ #include #include -static struct acpi_uart_compat_data * +static struct acpi_spcr_compat_data * uart_cpu_acpi_scan(uint8_t interface_type) { - struct acpi_uart_compat_data **cd, *curcd; + struct acpi_spcr_compat_data **cd, *curcd; int i; - SET_FOREACH(cd, uart_acpi_class_and_device_set) { + SET_FOREACH(cd, uart_acpi_spcr_class_set) { curcd = *cd; - for (i = 0; curcd[i].cd_hid != NULL; i++) { + for (i = 0; curcd[i].cd_class != NULL; i++) { if (curcd[i].cd_port_subtype == interface_type) return (&curcd[i]); } @@ -135,7 +135,7 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) { vm_paddr_t spcr_physaddr; ACPI_TABLE_SPCR *spcr; - struct acpi_uart_compat_data *cd; + struct acpi_spcr_compat_data *cd; struct uart_class *class; int error = ENXIO; @@ -229,7 +229,7 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di) ACPI_TABLE_DBG2 *dbg2; ACPI_DBG2_DEVICE *dbg2_dev; ACPI_GENERIC_ADDRESS *base_address; - struct acpi_uart_compat_data *cd; + struct acpi_spcr_compat_data *cd; struct uart_class *class; int error; bool found; diff --git a/sys/dev/uart/uart_cpu_acpi.h b/sys/dev/uart/uart_cpu_acpi.h index c11ead373b86..7205303f0084 100644 --- a/sys/dev/uart/uart_cpu_acpi.h +++ b/sys/dev/uart/uart_cpu_acpi.h @@ -35,6 +35,14 @@ struct uart_class; +struct acpi_spcr_compat_data { + struct uart_class *cd_class; + uint16_t cd_port_subtype; +}; +SET_DECLARE(uart_acpi_spcr_class_set, struct acpi_spcr_compat_data); +#define UART_ACPI_SPCR_CLASS(data) \ + DATA_SET(uart_acpi_spcr_class_set, data) + struct acpi_uart_compat_data { const char *cd_hid; struct uart_class *cd_class; diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index 0f19ede6d9df..09eadb5d75e3 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -492,6 +492,13 @@ UART_CLASS(uart_ns8250_class); * XXX -- refactor out ACPI and FDT ifdefs */ #ifdef DEV_ACPI +static struct acpi_spcr_compat_data acpi_spcr_compat_data[] = { + { &uart_ns8250_class, ACPI_DBG2_16550_COMPATIBLE }, + { &uart_ns8250_class, ACPI_DBG2_16550_SUBSET }, + { NULL, 0 }, +}; +UART_ACPI_SPCR_CLASS(acpi_spcr_compat_data); + static struct acpi_uart_compat_data acpi_compat_data[] = { {"AMD0020", &uart_ns8250_class, 0, 2, 0, 48000000, UART_F_BUSY_DETECT, "AMD / Synopsys Designware UART"}, {"AMDI0020", &uart_ns8250_class, 0, 2, 0, 48000000, UART_F_BUSY_DETECT, "AMD / Synopsys Designware UART"}, diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c index a0d5a5b1c7e2..dca2765cac59 100644 --- a/sys/dev/uart/uart_dev_pl011.c +++ b/sys/dev/uart/uart_dev_pl011.c @@ -391,6 +391,14 @@ UART_FDT_CLASS_AND_DEVICE(fdt_compat_data); #endif #ifdef DEV_ACPI +static struct acpi_spcr_compat_data acpi_spcr_compat_data[] = { + { &uart_pl011_class, ACPI_DBG2_ARM_PL011 }, + { &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC }, + { &uart_pl011_class, ACPI_DBG2_ARM_SBSA_32BIT }, + { NULL, 0 }, +}; +UART_ACPI_SPCR_CLASS(acpi_spcr_compat_data); + static struct acpi_uart_compat_data acpi_compat_data[] = { {"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_PL011, 2, 0, 0, 0, "uart pl011"}, {"ARMHB000", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC, 2, 0, 0, 0, "uart pl011"},