From nobody Wed Jan 15 02:26:33 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 4YXqcn68Y7z5klg2; Wed, 15 Jan 2025 02:26:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXqcn53Btz3dHr; Wed, 15 Jan 2025 02:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736907993; 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=rCTsKMw1vKIdRNWTdM+Umr/LhvlamMog3cu5YGmrpu8=; b=G39tO1LpYosKZHNfJ3t+WdKbapNc/LC4DyYJe0xCZAM+JYWBzvmgrwwMUbBeG37IZHJ9Rp 4rnJZjcapgW/ukGKjBIyZVDM7lNeQCKEVbmaztZu9E97sXLuQ7Ign4tqphSzTF5QCUUQ+/ v6h30BaCIdpkuiLUWAb8Kc76NV56lzwBQAZp4FfVeGhHSZlkzh1kmr6Gx1aFoI3/X1x+je SI7JxRBvhZEemCh/UIKgn8bLsEDZVs+zwNfUWC2VaP8PeFttGY2Mq5g/AMf6IUbK1tVqr+ vGWiwYjcLYnT/HcO9X5w4Pb7FXXYLWoCNVEoTxhxKVbnVzDNIyt1oqcr5gijWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736907993; 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=rCTsKMw1vKIdRNWTdM+Umr/LhvlamMog3cu5YGmrpu8=; b=p96uH7Y4+moHcQSGZuOlE7aFaMB1Y/Gp+v56AFpmKffoDFuk2gwsvssuVUeE+Z4VbUl+ng h5r6HZRVBU4ok40OqyinkZ6we9mR1DU+N4UXD4rZ9SZSU52e/zwqCHT3j5spoozsB/XJzi +ixAxz3U3h+POVfyms+cLs8cxdtTqSCEyj40spnbycY4WMpZ2ZX+GNDwdhbWmPqvPE6Rly NYdq/9IZT/XJw6Vs25JDREmVYsD3kDjS+wSpvRgZHOSChqLdYdBw+9SiPt9ritw1Eo0iOa ALzhF0RQDjgvvj29EcVB3oYo0iH6IlFV1oMno/fUBdyOH4IMCq2CXD6zcFlJAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736907993; a=rsa-sha256; cv=none; b=oSseQLWUk25vR211ue4tLEB1LWaWUR6IIqXBMC9rpJSu6ELbsZ4D9vXX33H0+Sv8JNCxeJ lprh/TtwFaSAkb2C9WawdJV9rZSYiA7TI423FoGS2+qPeQ8I9Yby4O2tLdtDKZcgyugtf/ Jj03gHwDZh7ZqO+ZAUrgXLUGgAzCKQyYB6kqYiK1O5c0t3+5AylNAd++uFV6DfJKQl3vFZ kWrFDhGDNkmh7mMX4xG15jA0MNzaBAN3Mtze/QcpWgeP1TVNtP34W+/CLRHdwuqEICJ5D0 cJ/61Jv6i69XUawvY/aDaFNUScaC/QD+aX4H4dUpRd73IdWi3zMYX7QDurvy/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YXqcn4ZVqzBvM; Wed, 15 Jan 2025 02:26:33 +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 50F2QXZ2028382; Wed, 15 Jan 2025 02:26:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50F2QX9R028379; Wed, 15 Jan 2025 02:26:33 GMT (envelope-from git) Date: Wed, 15 Jan 2025 02:26:33 GMT Message-Id: <202501150226.50F2QX9R028379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5db3699be68f - main - Kill ignore regshft flag 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5db3699be68f3a49d96d58c78af6f12e2dc1b38b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5db3699be68f3a49d96d58c78af6f12e2dc1b38b commit 5db3699be68f3a49d96d58c78af6f12e2dc1b38b Author: Warner Losh AuthorDate: 2025-01-15 02:21:26 +0000 Commit: Warner Losh CommitDate: 2025-01-15 02:24:36 +0000 Kill ignore regshft flag This flag was introduced to ignore bad firmware values. These were present in older versions of EDK-II that many devices (both Ampere and Amazon) used. QEMU also used this value, but fixed it. But since it's tied to the firmware bug not the device name ID it doesn't make sense to have it flagged there. Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D47947 --- sys/dev/uart/uart_bus.h | 1 - sys/dev/uart/uart_cpu_acpi.c | 12 ------------ sys/dev/uart/uart_dev_pl011.c | 6 +++--- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h index ccf8ad06a8ec..a605e3d20be7 100644 --- a/sys/dev/uart/uart_bus.h +++ b/sys/dev/uart/uart_bus.h @@ -56,7 +56,6 @@ /* UART quirk flags */ #define UART_F_BUSY_DETECT 0x1 -#define UART_F_IGNORE_SPCR_REGSHFT 0x2 /* * UART class & instance (=softc) diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c index ce00a09fee33..7382c47a8db6 100644 --- a/sys/dev/uart/uart_cpu_acpi.c +++ b/sys/dev/uart/uart_cpu_acpi.c @@ -221,12 +221,6 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) di->pci_info.device = spcr->PciDeviceId; } - /* Apply device tweaks. */ - if ((cd->cd_quirks & UART_F_IGNORE_SPCR_REGSHFT) == - UART_F_IGNORE_SPCR_REGSHFT) { - di->bas.regshft = cd->cd_regshft; - } - /* Create a bus space handle. */ error = bus_space_map(di->bas.bst, spcr->SerialPort.Address, uart_getrange(class), 0, &di->bas.bsh); @@ -296,12 +290,6 @@ next: /* XXX: Find the correct value */ di->baudrate = 115200; - /* Apply device tweaks. */ - if ((cd->cd_quirks & UART_F_IGNORE_SPCR_REGSHFT) == - UART_F_IGNORE_SPCR_REGSHFT) { - di->bas.regshft = cd->cd_regshft; - } - /* Create a bus space handle. */ error = bus_space_map(di->bas.bst, base_address->Address, uart_getrange(class), 0, &di->bas.bsh); diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c index e7a2ff7a85f1..a0d5a5b1c7e2 100644 --- a/sys/dev/uart/uart_dev_pl011.c +++ b/sys/dev/uart/uart_dev_pl011.c @@ -392,9 +392,9 @@ 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"}, - {"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"}, + {"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"}, + {"ARMHB000", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_32BIT, 2, 0, 0, 0, "uart pl011"}, {NULL, NULL, 0, 0, 0, 0, 0, NULL}, }; UART_ACPI_CLASS_AND_DEVICE(acpi_compat_data);