From nobody Fri May 9 11:08:46 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 4Zv5pl1HvJz5vWc9; Fri, 09 May 2025 11:08:47 +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 4Zv5pk73G4z4L2B; Fri, 09 May 2025 11:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746788927; 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=UcQGsStxV7WqVy3r8zwRVMA8+V91xp2CempC91DzN0M=; b=Kr3A0pRwvZA5Eo4Po2m+EnfwGwOHH78g2tRDcUXsOK4ffQk/OP3swy7H8+xtwFjDPN4XUM k8j0HN/XS12cVuKwJcdXi5LSaMoy2xye6SU7CHKe5H+kysBOr83lzrt+KVmHp0NZKf4M2c cNGXyIntOoBhtdRHyfq74VrdL+sXrHr1fRc2KAdq6gS5MJQE4dnS6+sBOb5rHt3OGgbqKZ R/uUQxK9lnIdUVQSji4Su8XhIvO4FQgr+lNZ8FzR+eM5/zPgwnZmDhlK2JBy2MRBIWK8h+ EqmNSH+h+zGRp4G1ov4fWQmMBmyLi2F8PDkTm13X9VZ3L6pEhlM0DSyNgFON/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746788927; 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=UcQGsStxV7WqVy3r8zwRVMA8+V91xp2CempC91DzN0M=; b=K6dvDa6Je6iNi0oyH3DzQ6EJbZJuijn7eCT42TMjtheqYMHBIpALE+bqPsB0jvI+rOmp/u 8w9gV9anjFTFUaRVHWI0qQTgmKJKymCwNWQFMNZ79V1Z8xRKpfy3M7Ml2bgDyXy2qU9NWc Y4uE1VXaApmYeM0ZkeU44glesSHfTm3uicBbvWAFl9baRQlw1Cw88xR3BQsikr6grgeXxJ FQA3QcX51YAqlMEyMv6b2mcUmLoscO6klQ8kFOO1diHNbq4w2Tv7GnMdTALR9J/pBx7Xeu lGXmGl7Gift1JKkxy99SlEbvdz9D7iKszyhUOMddTZmz0vlS1jG2kiATwm/k9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746788927; a=rsa-sha256; cv=none; b=tBRDtgVZh0L0NUDMCgxs4Ofew3ITttUdP0sAZd//DHjkPEW6hIfIUIl8QqzFiZdCI05hQ3 2dHAzwzyJBO3b/7XbQ2C1eyKe0w5Uo4dt7RVaWxtv+v8b4KnczCZxhO7PolE7ZkZFaY4UD xwpXdjpIjPjErc6TR20kTYY4l3qcye0qNBYECAnMvk63NwwGcUFwOfvfvTAnNGI/h6e1d3 vL0mYIwGaolsWjFxJmoG/87P5zpOefYsM8VFvEWrnxuWR6YUvvU/1BVZsJ257FktaXYptx dT/G2JvCWW8r4n/sNavXDC7rBOEbMTP3n2bBEtSSLbHNux+d0StPolYhXfAiLw== 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 4Zv5pk6NLVzxtP; Fri, 09 May 2025 11:08:46 +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 549B8kOc010937; Fri, 9 May 2025 11:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549B8kd1010934; Fri, 9 May 2025 11:08:46 GMT (envelope-from git) Date: Fri, 9 May 2025 11:08:46 GMT Message-Id: <202505091108.549B8kd1010934@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: 4a38527105d5 - main - pci: Ignore PCRx devices resources 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: 4a38527105d551d4ed3f8d8b51e055cc79be7c1b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4a38527105d551d4ed3f8d8b51e055cc79be7c1b commit 4a38527105d551d4ed3f8d8b51e055cc79be7c1b Author: Andrew Turner AuthorDate: 2025-05-03 05:59:45 +0000 Commit: Andrew Turner CommitDate: 2025-05-08 18:38:36 +0000 pci: Ignore PCRx devices resources Some systems provide two PCI root complex devices in the ACPI tables. Allow us to skip known pci-like devices even if they aren't detected as a PCI root complex. Reviewed by: cognet, jhb Co-authored-by: cognet Differential Revision: https://reviews.freebsd.org/D49709 --- sys/dev/acpica/acpi_resource.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 8c5a3ed57f32..8ced9b32cb22 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -67,6 +67,16 @@ struct lookup_irq_request { static char *pcilink_ids[] = { "PNP0C0F", NULL }; +/* + * Devices with invalid memory resources + */ +static char *bad_memresource_ids[] = { + /* PRCx on Radxa Orion O6 conflicts with the PCI resource range */ + "CIXH2020", + NULL +}; + + static ACPI_STATUS acpi_lookup_irq_handler(ACPI_RESOURCE *res, void *context) { @@ -620,6 +630,11 @@ acpi_res_ignore(device_t dev, int type, rman_res_t start, rman_res_t count) * access. */ if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { + if (type == SYS_RES_MEMORY && + ACPI_ID_PROBE(device_get_parent(dev), dev, bad_memresource_ids, + NULL) <= 0) + return (true); + if (ACPI_SUCCESS(AcpiGetObjectInfo(ad->ad_handle, &devinfo))) { if ((devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) != 0) { #if defined(__i386__) || defined(__amd64__)