From nobody Tue Apr 5 05:10:07 2022 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 D013A1AA3B56; Tue, 5 Apr 2022 05:10:08 +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 4KXbLS3dsmz3hjD; Tue, 5 Apr 2022 05:10:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649135408; 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=wSKl08MiBWVROSzRzG7qpY55a72hjzsSmZSgV4CiXMo=; b=JuiLA9I4Nu82pVKCp2+ObSwRJYG/Ja44yLMcEmQ+tfOMjNv1fZOEcCZvHble6M/nmNLFV8 G1RNIUI5AqWjhatO/wAbL5qoZT3L4AduRYVcTZhIMnwmc/93sirBSZ6t06+SoWdWWOp0Cg phhu7J3Sij3T73WtOFc/P25OyWA7cmrppy8FlGqAQXxFEvynbFNL6CLbpLKZl2o6GgzBkg SMOyOT1eH6JiITTri7NbUAKOzz5Ta9iXSDyZ55R8Wqet2+YVU2ZBeBq/lHT7uU7SSxRGWB ldSQwya2+8K0oSB9EDttrXBeTJphT+ONBI7uTVDiVPF6Jptda3/RHT3J/fomqw== 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 05E67203AA; Tue, 5 Apr 2022 05:10:08 +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 2355A78f054355; Tue, 5 Apr 2022 05:10:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2355A755054352; Tue, 5 Apr 2022 05:10:07 GMT (envelope-from git) Date: Tue, 5 Apr 2022 05:10:07 GMT Message-Id: <202204050510.2355A755054352@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: 2bf3361d56f7 - main - linuxkpi: Move lkpi_pcim_iomap_devres_find to .c file 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2bf3361d56f70d87a19f5d2bc8d258d418fb7a24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649135408; 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=wSKl08MiBWVROSzRzG7qpY55a72hjzsSmZSgV4CiXMo=; b=ADtOleqr4QLiWKVL8rbUI1zoK/3UwiDbgFSY/t13qyIJCx3Y0m9bw6R4aROzobpk2Tufd7 4vbX0559PwrQ1NLYabTI/Hk5hRP7FX0lzXWR0te1j2O6PAyQkCGEjnlOfjzYRP7CFQ8ncx yjB88HnGlXUv7B1T+ppUSi1dvfp14F8G0FOdc2+uiNUTdl6LK9QVeDito1LroYH9p6fTvX cae0yKsdxIr//qyEra62AlJWeokPsXIXI1mhzORQw8GmsXgdpDpjyv83de9gC565LUCnnA EtnA73nFzp51aOLQ9g7PI3KXCRuLvjuIgVG6EWzprroRY2qfGPJAjpiMATt7sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649135408; a=rsa-sha256; cv=none; b=Q7KXYaXs3A+Hb5JMss3PWxxUnk366zm7GEoExiCH6nOBIowS9qtSHDLNVHWmdiDUoAZU9i aua7orJjj6tBq9TebgXPI5cDJOnnQCatd7iNfOCeMU3IGdwxGA+2LmJJRkdMWfngWbvmNV svxLl9OItcpdHATjkR/24qCuctRWqd2+HNMQ6Tmn2Y9K5jJ3sJmorENudSHPKd1s/CnyXv IY+caiT6WC+EmmbuY2Vdgg/77Aw+t7hOY9agrd79yNo+u97LjnzN63u2NYp2i/g+2bs8jG M5zaUR+DEcNGijblLvl/Gy82WLRQHu0zIlo/kmUGYdGEow8pBLd5Kaa7I8L3HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2bf3361d56f70d87a19f5d2bc8d258d418fb7a24 commit 2bf3361d56f70d87a19f5d2bc8d258d418fb7a24 Author: Warner Losh AuthorDate: 2022-04-05 05:06:29 +0000 Commit: Warner Losh CommitDate: 2022-04-05 05:06:29 +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 --- 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 f71bee511d75..e130cf54680e 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -325,6 +325,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 @@ -1409,26 +1410,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 8b64cbae0e6a..8a2667ae33c5 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -553,6 +553,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) {