From nobody Tue Apr 05 05:10:04 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 50A651AA386E; Tue, 5 Apr 2022 05:10:06 +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 4KXbLP30V4z3hRM; Tue, 5 Apr 2022 05:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649135405; 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=kJA9CCoxJnBfCPDzurpsM4rP2t9YFcu02d3d8JAL2Es=; b=dQ6Fx2O1qMjhfSw+xEZmA4QXb6j8nhzJKUQ7s/BrNkIdPG53TTq+orddKjQ7D4WalgnVOO e8KQRGE595vMC8pCqpfnsPtvBvEnxFImHVASQPYgejCjudz1TxfertoUL1DirpV4zIGhzG 5WOlrs6qnYuEDnoKMbyPJrwkKt3kStvm+Yef5sdZJy0NuAwQaqTTjmshlxsi2D8i1wC+x8 OnImp2vHl2jFMj/92kJ4tuqid9NGzqxz9Xhw3ULYKYN0dVtyVAvU0jdH7t+GibJetkG0ed zenCc9279QN+hj+YxgAkfqbCP0v3gSpGokPD73Pnis5s0VUYEcL1q5PenQkDjA== 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 BEAF7203A9; Tue, 5 Apr 2022 05:10:04 +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 2355A4mq053715; Tue, 5 Apr 2022 05:10:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2355A43O053712; Tue, 5 Apr 2022 05:10:04 GMT (envelope-from git) Date: Tue, 5 Apr 2022 05:10:04 GMT Message-Id: <202204050510.2355A43O053712@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: 3ea682e21eed - main - linuxkpi: Move lkpi_pci_devres_get_alloc into .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: 3ea682e21eed92f31dcfb8a34409580d36c452f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649135405; 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=kJA9CCoxJnBfCPDzurpsM4rP2t9YFcu02d3d8JAL2Es=; b=kZpD5L3qDBxObYfnqWiMf4/z1kTwqzQofAzEGO3zi50I9aLWmhyXPNVymnHs3lo+x/SHKF Is5r9Jc4ey5tQH+pEFmGWy0yDiVvVWuTDOD8EG/CyHqqahyGYRDbtMJ/+P3j25f3wvOZyJ vkUyVedDZoIgWLFhE7HhBelbrA6UNvLG7ztkSef/E75XUgWx4LgGOnghyOQkk0lja3Bd7v fUA/vlDkS8MoK9fmdRBndK0ecVCUTGYtViY9ZZJigBehBKGwrNerAoB5wtj4qwBMDJGZMi /k+oC6iivG8wZGRB3kxtT3fNTc0CDYxy1YsqWrsn3io7i7cr3fkoaV2qrONLuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649135405; a=rsa-sha256; cv=none; b=uG/Nhz6LWVgHgKCBU/0qL1By5a9NErVhdZF85AM9XEg60+IXSRhA2hxcBHShN5K3p2xDqA oX0vlAz0gAQiC3XvXWuv+rqy1mbIN2NxgL6TK+pErX2TdPd+DS3y8NmPwMa9m7PWmfMji0 xHcjn//I80BUmIh7OFeFETcir+JS6/UTlH4+ubxOOK/2jXc1hWpy5e4MlxzhYIq3TCGxEH oFRpnhK4hyPKKQ9/d2qoHwVtJCD1TcDUcS+aTEXfgX6BsvQTwF/UNzBB/91Ks+/0oQ0D/2 4Mj2KOe7FI/CsfmjrzniKKeg0tnEHayjkN+IaDgx1rFEV5aqpnW1tL1PGdBHtg== 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=3ea682e21eed92f31dcfb8a34409580d36c452f7 commit 3ea682e21eed92f31dcfb8a34409580d36c452f7 Author: Warner Losh AuthorDate: 2022-04-05 05:06:06 +0000 Commit: Warner Losh CommitDate: 2022-04-05 05:06:06 +0000 linuxkpi: Move lkpi_pci_devres_get_alloc into .c file lkpi_pci_devres_get_alloc encodes the struct pci_devres into its code. Move from .h file to .c file to move this knowledge into linuxkpi module. Sponsored by: Netflix Reviewed by: hselasky, emaste Differential Revision: https://reviews.freebsd.org/D34772 --- sys/compat/linuxkpi/common/include/linux/pci.h | 16 +--------------- sys/compat/linuxkpi/common/src/linux_pci.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 0b4cee0f8dc2..ed653361b6af 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -318,6 +318,7 @@ struct pcim_iomap_devres { /* Internal helper function(s). */ 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 *); void lkpi_pcim_iomap_table_release(struct device *, void *); @@ -520,21 +521,6 @@ done: return (pdev->bus->self); } -static inline struct pci_devres * -lkpi_pci_devres_get_alloc(struct pci_dev *pdev) -{ - struct pci_devres *dr; - - dr = lkpi_devres_find(&pdev->dev, lkpi_pci_devres_release, NULL, NULL); - if (dr == NULL) { - dr = lkpi_devres_alloc(lkpi_pci_devres_release, sizeof(*dr), - GFP_KERNEL | __GFP_ZERO); - if (dr != NULL) - lkpi_devres_add(&pdev->dev, dr); - } - - return (dr); -} static inline struct pci_devres * lkpi_pci_devres_find(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 34bac3843378..5c94f4691a1d 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -509,6 +509,22 @@ lkpi_pci_disable_dev(struct device *dev) return (0); } +struct pci_devres * +lkpi_pci_devres_get_alloc(struct pci_dev *pdev) +{ + struct pci_devres *dr; + + dr = lkpi_devres_find(&pdev->dev, lkpi_pci_devres_release, NULL, NULL); + if (dr == NULL) { + dr = lkpi_devres_alloc(lkpi_pci_devres_release, sizeof(*dr), + GFP_KERNEL | __GFP_ZERO); + if (dr != NULL) + lkpi_devres_add(&pdev->dev, dr); + } + + return (dr); +} + void lkpi_pci_devres_release(struct device *dev, void *p) {