From nobody Mon Sep 29 23:17:25 2025 X-Original-To: dev-commits-src-main@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 4cbHCT66hNz691RP; Mon, 29 Sep 2025 23:17:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbHCT5QnGz3JvQ; Mon, 29 Sep 2025 23:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759187845; 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=jmE7RlD4dJSGy/Tow2xL61Q9U28GQJlNSi9UD8uCJ5A=; b=cPAXh4ZqjakL8o5XxwFOpInCFchaVXFZcPXbwSDB2246Erm0FaSCdkJvxcn3yqOmF90+EO Qk6fPZfzGx9sJTav3gasLLfiyTWvi5fipLafEav8djFgCyGpfFtNVhE74OkNsLpSgBsxia +edxfz0Kl8oAfQr8yrAmL8klXzSAAyYbsVarJ33MbhvbN8ZJIIx75kw+85NF8UqqganQeQ Ir6hkch6NuzY7/Qj2tgF5TXM7OrpinbiT11uZr/xHGloPbk3f4M0uAFTBcr7bnLkabKl+i TkYeLUJjRAzdfcNQuRruKNrzGF+3KierzAR+uhqgdT9Lllibd1Il6O8Yn4xBLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759187845; 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=jmE7RlD4dJSGy/Tow2xL61Q9U28GQJlNSi9UD8uCJ5A=; b=APXjFG8QHEpwZtn7MfOjOMHyB2s7a0ERvGewsPdrtEq9tnRcs7DPP2fDWhZjPmKzORAOkb P3cFjFnZx8lUvSPjHDKDzg90dYTesmvOWIlxyhoDA/SEYJKnI2uaLVxG7zxJHbN+bikZND zuiT6Ki04hY25DAdG1XhG0Hk8XSsB/7d07BaK+8mhb0mPcYZrkdHMnG5ItK/d4dt2OAzmQ L2C/ZLE5Bf5JN6AAlBQ4oTGkd7SgFSM6O2068pVkN1kJCbz8urwhga2omO8Fj/rutl572U beR+1O3Mf7W3Oz8SSrgrVH3URVK0JOdiO/V4yL2vW3BpI4Zb24T1iEUDlAWu2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759187845; a=rsa-sha256; cv=none; b=ZyeXcO1CQM2kwQ7Ci72QpD21vqvIXx1WaFB1TPRi8K2WTkU10wjGSjA10Li21bP8ScGPdn snKwzxwTJ7cgCpbkUa21dZs3U9/0R2jNDUD7S5hX975nx7opNjVqo1/VLQOlpCf/BKd86C QhLLqlkHgDwSe5XvFV58I8Xku1RmGo/WoCRTZ8E7cQj7N87hNBIiy4aSZO7Ak4dkP5eIiW WLL+Viw4J+SyHF2woJoJSJbWMI9qevqno/7We+M1AbghqMMNQckUMfkKK9zrUD9R+3EhYw xfgn+n6gocME5eNCkVea8e3sNj1Zhf/DTZPEm9Ykdc3BHRIpgIPjx/ChkippVw== 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 4cbHCT4l2Xz1PJP; Mon, 29 Sep 2025 23:17:25 +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 58TNHPho004587; Mon, 29 Sep 2025 23:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TNHPr9004584; Mon, 29 Sep 2025 23:17:25 GMT (envelope-from git) Date: Mon, 29 Sep 2025 23:17:25 GMT Message-Id: <202509292317.58TNHPr9004584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 123c2dc6e15a - main - Reapply "LinuxKPI: pci: allocate entire pci_dev hiereachy up to root port on attach" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 123c2dc6e15a62ceba3469caf0f1a6801214a7d3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=123c2dc6e15a62ceba3469caf0f1a6801214a7d3 commit 123c2dc6e15a62ceba3469caf0f1a6801214a7d3 Author: Bjoern A. Zeeb AuthorDate: 2025-09-29 21:29:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-29 23:16:18 +0000 Reapply "LinuxKPI: pci: allocate entire pci_dev hiereachy up to root port on attach" In linux_pci_attach_device() allocate a LinuxKPI pci_dev for each device in the hierarchy up to the root port[1] as we cannot do that later on demand as we may be in a context where we may not sleep. Take special care of DRM as there is a non-PCI device in the chain which needs to be skipped. iwlwifi(4) can hit this case called from a callout. While here leave a comment sa the cleanup order of linux_pci_attach_device() needs correction seperately. This reverts commit 3860afe99ec39b9942967941181f28f27f3fc548. Sponsored by: The FreeBSD Foundation (initially) PR: 283027 PR: 289647 Suggested by: jhb [1] MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52069 --- sys/compat/linuxkpi/common/src/linux_pci.c | 47 +++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 43fd6ad28ac4..d0f1d5e3f9c5 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -342,6 +342,7 @@ lkpi_pci_dev_release(struct device *dev) static int lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) { + struct pci_devinfo *dinfo; int error; error = kobject_init_and_add(&pdev->dev.kobj, &linux_dev_ktype, @@ -362,15 +363,24 @@ lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) pdev->path_name = kasprintf(GFP_KERNEL, "%04d:%02d:%02d.%d", pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)); + pdev->bus = malloc(sizeof(*pdev->bus), M_DEVBUF, M_WAITOK | M_ZERO); - /* - * This should be the upstream bridge; pci_upstream_bridge() - * handles that case on demand as otherwise we'll shadow the - * entire PCI hierarchy. - */ - pdev->bus->self = pdev; pdev->bus->number = pci_get_bus(dev); pdev->bus->domain = pci_get_domain(dev); + + /* Check if we have reached the root to satisfy pci_is_root_bus() */ + dinfo = device_get_ivars(dev); + if (dinfo->cfg.pcie.pcie_location != 0 && + dinfo->cfg.pcie.pcie_type == PCIEM_TYPE_ROOT_PORT) { + pdev->bus->self = NULL; + } else { + /* + * This should be the upstream bridge; pci_upstream_bridge() + * handles that case on demand as otherwise we'll shadow the + * entire PCI hierarchy. + */ + pdev->bus->self = pdev; + } pdev->dev.bsddev = dev; pdev->dev.parent = &linux_root_device; pdev->dev.release = lkpi_pci_dev_release; @@ -395,7 +405,7 @@ lkpinew_pci_dev_release(struct device *dev) pdev = to_pci_dev(dev); if (pdev->root != NULL) pci_dev_put(pdev->root); - if (pdev->bus->self != pdev) + if (pdev->bus->self != pdev && pdev->bus->self != NULL) pci_dev_put(pdev->bus->self); free(pdev->bus, M_DEVBUF); if (pdev->msi_desc != NULL) { @@ -551,6 +561,7 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, { struct resource_list_entry *rle; device_t parent; + struct pci_dev *pbus, *ppbus; uintptr_t rid; int error; bool isdrm; @@ -594,6 +605,27 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, list_add(&pdev->links, &pci_devices); spin_unlock(&pci_lock); + /* + * Create the hierarchy now as we cannot on demand later. + * Take special care of DRM as there is a non-PCI device in the chain. + */ + pbus = pdev; + if (isdrm) { + pbus = lkpinew_pci_dev(parent); + if (pbus == NULL) { + error = ENXIO; + goto out_dma_init; + } + } + pcie_find_root_port(pbus); + if (isdrm) + pdev->root = pbus->root; + ppbus = pci_upstream_bridge(pbus); + while (ppbus != NULL && ppbus != pbus) { + pbus = ppbus; + ppbus = pci_upstream_bridge(pbus); + } + if (pdrv != NULL) { error = pdrv->probe(pdev, id); if (error) @@ -601,6 +633,7 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, } return (0); +/* XXX the cleanup does not match the allocation up there. */ out_probe: free(pdev->bus, M_DEVBUF); spin_lock_destroy(&pdev->pcie_cap_lock);