From nobody Sun May 21 00:31:57 2023 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 4QP1jn29F4z4BlHH; Sun, 21 May 2023 00:31:57 +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 4QP1jn1VT9z4RC5; Sun, 21 May 2023 00:31:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684629117; 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=3INFTuNjDd4yDjiUVElNJ3FF6D7XgW8IjFAQW21GBUo=; b=LDbgQbWoDeW/4UuCCVQ7JIsYSSt4ix9hO+IvYP6ak9DA6IQUY7u2qastsrC3DTWL8Mn/Yq 8hTzBDTNpOlh2dVGO8ozOx4Y9lrRWcihHGbATfn9D8yV6i20NyhMP1fJ6Sl+F1+W2Fw+zA RQpDhcrImsQ/ivdRPerpBsALvZbplDn3iRust2xb8UNkKuWVdXuPnaFUeozk5AH2R4gxOQ prD/Is+A0XYWJsGJNasNwjkE/LehZZaFciqjSLNU6dFS+v98RYzVfKW2jFqWs6Yp/zcr79 Goe6j+MKgvpmRaxBktiHoolVFcmNirCRy19i1Y6jxQHw5g7PVUGshsilYkgBxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684629117; 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=3INFTuNjDd4yDjiUVElNJ3FF6D7XgW8IjFAQW21GBUo=; b=Ziq6abyCRijqOQi+Nkp2gprrFS+/fhSQtHJ9eCSbiauUzW8ZNI2KJ/H/o0dQ6SjEjhA7vl gc8RHb/Y1pP02CwOhBqC9/aGYwNl4ma14y8ovn5+FTwMFMz1MbC3FhYZz/L+SWMnfcKr/v dg3ai4GLKlxGXU973Pw9J3BBfQmqUy9Nr1w6CvjiE05HvzJhnz7DxRpnMdcrMUtFM0GW+x 7FQq3xrRMLYdg2czWnhw50NvQ71jHOQsj4vw6aCtZI9Q2F20Cc7ZupMGzYcCEIq3pVWttd 3WFYVAyrskXubtZDZavSOdHU5TC0XBbn1qdrjJvwP8adBA5aapKadTsrJ5NcOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684629117; a=rsa-sha256; cv=none; b=aMqfWQU2GEsK7BfwQWsViEk+bj6Bi+yM7C0pUj3YoywgoHhM299raGzgh9iKb1sQa+yEhM H7Z0imHq0sYtmIbTicJuCYPwtnMtEY+gnJDC+GgF9kgYksZ7h7sHntPPzgy9PfZMIrYGyo bkv7x6bk3/dQVj5Hkzkga2OT0TtH7zmWOYVQ8f04FIaMtEDzoXP0liWGmlznkmArWzy2s+ sOhkMXuhwLUErFZxF3yuavkGOR0yqCxGTIBqRf9q4DrIqTtSG0qL1z9U38kYswz8tNryZN 7iBKWUuohzq8EcsrjnekyyB8GqYcssSgCbr5AkmQP1+//E/AvnaluZrhqQgosA== 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 4QP1jn0YNGzWRV; Sun, 21 May 2023 00:31:57 +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 34L0VvHi095205; Sun, 21 May 2023 00:31:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34L0Vv2m095204; Sun, 21 May 2023 00:31:57 GMT (envelope-from git) Date: Sun, 21 May 2023 00:31:57 GMT Message-Id: <202305210031.34L0Vv2m095204@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: 525dd4acaacc - main - LinuxKPI: implement pci_rescan_bus() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 525dd4acaacc59b815131caccfdebc905d4d7bff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=525dd4acaacc59b815131caccfdebc905d4d7bff commit 525dd4acaacc59b815131caccfdebc905d4d7bff Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 20:59:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-21 00:31:25 +0000 LinuxKPI: implement pci_rescan_bus() Try to implement pci_rescan_bus(). pci_rescan_method() is already doing most of the job. We only have to do the count for the return value again ourselves. Sponsored by: The FreeBSD Foundation MFC after: 10 days Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D40122 --- sys/compat/linuxkpi/common/include/linux/pci.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 9b2e9269d4d4..cc8dbe2fef11 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -260,6 +260,7 @@ struct pci_driver { struct pci_bus { struct pci_dev *self; + /* struct pci_bus *parent */ int domain; int number; }; @@ -1411,6 +1412,29 @@ pci_stop_and_remove_bus_device(struct pci_dev *pdev) { } +static inline int +pci_rescan_bus(struct pci_bus *pbus) +{ + device_t *devlist, parent; + int devcount, error; + + if (!device_is_attached(pbus->self->dev.bsddev)) + return (0); + /* pci_rescan_method() will work on the pcib (parent). */ + error = BUS_RESCAN(pbus->self->dev.bsddev); + if (error != 0) + return (0); + + parent = device_get_parent(pbus->self->dev.bsddev); + error = device_get_children(parent, &devlist, &devcount); + if (error != 0) + return (0); + if (devcount != 0) + free(devlist, M_TEMP); + + return (devcount); +} + /* * The following functions can be used to attach/detach the LinuxKPI's * PCI device runtime. The pci_driver and pci_device_id pointer is