From nobody Tue Apr 05 14:42:34 2022 X-Original-To: dev-commits-src-branches@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 96E071A8F340; Tue, 5 Apr 2022 14:42:35 +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 4KXr2y70xXz4cBw; Tue, 5 Apr 2022 14:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649169755; 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=wx22KwqQcvFPjNUs/5jTdYpy9Z2UYZm9pz2DjWIZTBk=; b=RxiXaXlTx3sk/fWLKqjo0FcKs4N5SPcMnk9WfFggCJncL17DNy16lp0JX4LTcAzkSskc22 ScSntHnNeptcvOWREAIVKZtgvhNUZhPYPpv+O+8vLZTdx0lwzAyRP3vHUAsxC9yjVrIhU6 94FxQooown1IbAMcYmgLwBFp/Cv7OP0y6xU5VNM/VW+33/kPRG4E/dO2N+Ft1+W5TtHso6 ECULtNOUvpzt8d8eKSQTbBKn6PjC6pfmH/IeQOBhV54h7m8uI5kIrGzvnih9TUwyP18ngy K9vWWDTLVcsQYRbqf2Hk44ea8EO2Rr1eOVNxeZ9mXtXsT25UVt9Bc4kmAYiYyw== 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 A40174E7; Tue, 5 Apr 2022 14:42:34 +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 235EgYfw033155; Tue, 5 Apr 2022 14:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235EgYdE033154; Tue, 5 Apr 2022 14:42:34 GMT (envelope-from git) Date: Tue, 5 Apr 2022 14:42:34 GMT Message-Id: <202204051442.235EgYdE033154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 211621030e19 - stable/13 - linuxkpi: Move lkpi_pcim_iomap_devres_find to .c file List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 211621030e19553c7bd321b05694418920517736 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649169755; 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=wx22KwqQcvFPjNUs/5jTdYpy9Z2UYZm9pz2DjWIZTBk=; b=w0SUhtijcx5EZmXan4hcuMsoXuvjFpskoCmhjDEDpLbZJJ91i8aaJjJ4dniqtKRlEena0s KuK2nJOG5JR3zoAlHfyhNYo1DTfcQjuk1kxc63WP9HMk00sMHDdKzLiXnD0RNOVCm35164 fQ1NUptOwiYHz+gYERprfGMSK3wCFC0ceI1SNAV1AXYUvLo59eRz4e8czKPtKzAaZpHmG4 hhq1kAZS6XLqFOxDv8zGSLqDVSkm01JisKJeeKbvTniYdrFlDwGdDo13klczdyM6cuSKrm PaaIkRMC0AIn/2VP4qjF4hFpf2ZU3CSoq3aRPBUHsKv8r6z5keTV9558ECVuHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649169755; a=rsa-sha256; cv=none; b=UpaEpGSmgkFnjICXk/bESdtolid2IUMx0XoXwANaWaOECfM1RvujnNMcSnggWky89YsEh/ /U768a1wP2oXiWPKJebYys1oBuaXw2Vo7HwyC9z9vYHMqo97mhbo21/Ezt4lQJlRU0aswy 0rKWIxMu2ELm+Ii619ipLxNj56U/bXXb7C19qTVPyUUVeDwbVFrejk7GOQlqoUm8/ymkum X0b4Lr4SvLzoWcKpPPtT0Um4nOnbEvPJmXXdHMXcfJsOqZ8xnGhDKaL+9N8APCYWLY7Wr4 r5GjYS92Si7zuNtnXM6tnTcyi/XxVMZIsUnZckM4d0lGe1ZqbYETMJnwPcDSKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=211621030e19553c7bd321b05694418920517736 commit 211621030e19553c7bd321b05694418920517736 Author: Warner Losh AuthorDate: 2022-04-05 05:06:29 +0000 Commit: Warner Losh CommitDate: 2022-04-05 14:40:11 +0000 linuxkpi: Move lkpi_pcim_iomap_devres_find to .c file lkpi_pcim_iomap_devres_find encodes the size of struct pcim_iomap_devres in the code, so move from .h to .c to move from client driver to linuxkpi module. Sponsored by: Netflix Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D34775 (cherry picked from commit 2bf3361d56f70d87a19f5d2bc8d258d418fb7a24) --- sys/compat/linuxkpi/common/include/linux/pci.h | 21 +-------------------- sys/compat/linuxkpi/common/src/linux_pci.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index e712477fbe9e..efe0780190b7 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -347,6 +347,7 @@ struct pci_dev *lkpinew_pci_dev(device_t); struct pci_devres *lkpi_pci_devres_get_alloc(struct pci_dev *pdev); void lkpi_pci_devres_release(struct device *, void *); struct resource *_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size); +struct pcim_iomap_devres *lkpi_pcim_iomap_devres_find(struct pci_dev *pdev); void lkpi_pcim_iomap_table_release(struct device *, void *); static inline int @@ -1431,26 +1432,6 @@ pcim_enable_device(struct pci_dev *pdev) return (error); } -static inline struct pcim_iomap_devres * -lkpi_pcim_iomap_devres_find(struct pci_dev *pdev) -{ - struct pcim_iomap_devres *dr; - - dr = lkpi_devres_find(&pdev->dev, lkpi_pcim_iomap_table_release, - NULL, NULL); - if (dr == NULL) { - dr = lkpi_devres_alloc(lkpi_pcim_iomap_table_release, - sizeof(*dr), GFP_KERNEL | __GFP_ZERO); - if (dr != NULL) - lkpi_devres_add(&pdev->dev, dr); - } - - if (dr == NULL) - device_printf(pdev->dev.bsddev, "%s: NULL\n", __func__); - - return (dr); -} - static inline void __iomem ** pcim_iomap_table(struct pci_dev *pdev) { diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 328ca9c74bd1..acfc760f092f 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -550,6 +550,26 @@ lkpi_pci_devres_release(struct device *dev, void *p) } } +struct pcim_iomap_devres * +lkpi_pcim_iomap_devres_find(struct pci_dev *pdev) +{ + struct pcim_iomap_devres *dr; + + dr = lkpi_devres_find(&pdev->dev, lkpi_pcim_iomap_table_release, + NULL, NULL); + if (dr == NULL) { + dr = lkpi_devres_alloc(lkpi_pcim_iomap_table_release, + sizeof(*dr), GFP_KERNEL | __GFP_ZERO); + if (dr != NULL) + lkpi_devres_add(&pdev->dev, dr); + } + + if (dr == NULL) + device_printf(pdev->dev.bsddev, "%s: NULL\n", __func__); + + return (dr); +} + void lkpi_pcim_iomap_table_release(struct device *dev, void *p) {