From nobody Tue Apr 05 14:42:32 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 4F5A51A8F1F6; Tue, 5 Apr 2022 14:42:33 +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 4KXr2w6RHyz4cXb; Tue, 5 Apr 2022 14:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649169753; 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=kh8eDoWxBzgFXkLxBv6wwFSxSBfH9wK7fBziWuh53sE=; b=lIH8VpRoDwoWoz3WPVSzpfN4sPLXfoleTVAfW1ujGLPPSFah/Zi068UKWTZh8w2lBRI7Qz PYNA8rqcZpWtPY1EubCwr7SXrXAeHkvJOQnSpWo0aUnb82/UIkgLi5lE0NLtlHz1zhC2nB 1aya/TEndGU65Bfa2LmCCX9KsHmVeC4j/1YBrJIwWaalx6FzNC9mJ5D2/MFvZBxD5ZZP+V Xp9DfGr45/YLDZONtZZI6ER44MzAWO1YxE/4KRVxG2U9mqQ8P34oF8CV8/zFlTj8d6/EVX 9olcyoeYkv5tAch5x0vsBJ8rBFhjhnlwUlfYd3apfuOTc5JNhqqMQJ+W9mZwnQ== 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 6459C804; Tue, 5 Apr 2022 14:42:32 +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 235EgWj6032504; Tue, 5 Apr 2022 14:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235EgWLU032497; Tue, 5 Apr 2022 14:42:32 GMT (envelope-from git) Date: Tue, 5 Apr 2022 14:42:32 GMT Message-Id: <202204051442.235EgWLU032497@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: 4859994c4295 - stable/13 - linuxkpi: Move pci_request_region and _lkpi_pci_iomap into .c 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: 4859994c42950600b57e9d2259bd027562eefbe3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649169753; 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=kh8eDoWxBzgFXkLxBv6wwFSxSBfH9wK7fBziWuh53sE=; b=getvuXFkJroKo6yBIDGeNDsSrm4BdGJkxi6CdQQG7hmaGhafXW7lHkHuO7N1TB2whVN6AB /Tw8d7lN4oufld1QkH4xk8Zg7D2ldmr+nPfua7IBRL9Cm7SJ6qyPLx4LHJ+YD2q6ED39nL 0KLAjJc7SbDYNesmY1zRp4M3HC4AwnlpHDXML94xZ05FcJwM2Rx5SrLtvU+9dTi2h5B2N6 5U6VgdkD5tMqg0I8KkyyCi8dEHcQE1h9H98VWNsFzB+T7YkAhtaoIDj0mLd3FnYEJCNfnW cfPkHp2Nj8cGihFN3rloB+r/4pnkMW2NVMQHErZ3/JEcIZdGAsOmdkXG1RV8uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649169753; a=rsa-sha256; cv=none; b=v5xGTunun441kFOMu1SoRCIPfJcMSfx/iFYJuKZzU7XyKePWDxY/WXxp/3FEU9zMq4szG+ ybe81gca4QONUWAhIbstCoXlTqywsu0aitgK2GK7W+3faSDag4v2soNjZv0ED/NF8fIWH6 4Oy90jgt46dTlwACLZ7HndGGnL4xI4c53RSZn4y5xzQMaXaNiEYakVWNYYCytt27CfKy82 pe8PhePYAn4wcLxIU+bAZXd/8SplcxvR0pJP3z+bTpru/6QTnqnIVh+sq/EiATQ/kcvHVn Q2ct+Hrmk3wRBPwO9nD9daPdIeMKIhlIqwABBjEYLOB1GXIEjID9rNKe8wYruA== 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=4859994c42950600b57e9d2259bd027562eefbe3 commit 4859994c42950600b57e9d2259bd027562eefbe3 Author: Warner Losh AuthorDate: 2022-04-05 05:06:14 +0000 Commit: Warner Losh CommitDate: 2022-04-05 14:40:11 +0000 linuxkpi: Move pci_request_region and _lkpi_pci_iomap into .c Both pci_request_region and _lkpi_pci_iomap encode the size of struct pci_mmio_region into their code. Move from .h to .c files to move that knowledge from the client drivers into the linuxkpi module. Sponsored by: Netflix Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D34773 (cherry picked from commit 1cdb25340f8ee5dd145b0dc370cbab1bd7bdca65) --- sys/compat/linuxkpi/common/include/linux/pci.h | 88 ++------------------------ sys/compat/linuxkpi/common/src/linux_pci.c | 84 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 84 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index f655c8f5ccdf..5e4cc1901973 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -338,10 +338,13 @@ struct pcim_iomap_devres { struct resource *res_table[PCIR_MAX_BAR_0 + 1]; }; +int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name); + /* 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 *); +struct resource *_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size); void lkpi_pcim_iomap_table_release(struct device *, void *); static inline int @@ -553,50 +556,6 @@ lkpi_pci_devres_find(struct pci_dev *pdev) return (lkpi_pci_devres_get_alloc(pdev)); } -static inline int -pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) -{ - struct resource *res; - struct pci_devres *dr; - struct pci_mmio_region *mmio; - int rid; - int type; - - type = pci_resource_type(pdev, bar); - if (type < 0) - return (-ENODEV); - rid = PCIR_BAR(bar); - res = bus_alloc_resource_any(pdev->dev.bsddev, type, &rid, - RF_ACTIVE|RF_SHAREABLE); - if (res == NULL) { - device_printf(pdev->dev.bsddev, "%s: failed to alloc " - "bar %d type %d rid %d\n", - __func__, bar, type, PCIR_BAR(bar)); - return (-ENODEV); - } - - /* - * It seems there is an implicit devres tracking on these if the device - * is managed; otherwise the resources are not automatiaclly freed on - * FreeBSD/LinuxKPI tough they should be/are expected to be by Linux - * drivers. - */ - dr = lkpi_pci_devres_find(pdev); - if (dr != NULL) { - dr->region_mask |= (1 << bar); - dr->region_table[bar] = res; - } - - /* Even if the device is not managed we need to track it for iomap. */ - mmio = malloc(sizeof(*mmio), M_DEVBUF, M_WAITOK | M_ZERO); - mmio->rid = PCIR_BAR(bar); - mmio->type = type; - mmio->res = res; - TAILQ_INSERT_TAIL(&pdev->mmio, mmio, next); - - return (0); -} - static inline void pci_release_region(struct pci_dev *pdev, int bar) { @@ -970,48 +929,9 @@ static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn) { return -ENODEV; } -static inline void pci_disable_sriov(struct pci_dev *dev) -{ -} -static inline struct resource * -_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size __unused) +static inline void pci_disable_sriov(struct pci_dev *dev) { - struct pci_mmio_region *mmio, *p; - int type; - - type = pci_resource_type(pdev, bar); - if (type < 0) { - device_printf(pdev->dev.bsddev, "%s: bar %d type %d\n", - __func__, bar, type); - return (NULL); - } - - /* - * Check for duplicate mappings. - * This can happen if a driver calls pci_request_region() first. - */ - TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) { - if (mmio->type == type && mmio->rid == PCIR_BAR(bar)) { - return (mmio->res); - } - } - - mmio = malloc(sizeof(*mmio), M_DEVBUF, M_WAITOK | M_ZERO); - mmio->rid = PCIR_BAR(bar); - mmio->type = type; - mmio->res = bus_alloc_resource_any(pdev->dev.bsddev, mmio->type, - &mmio->rid, RF_ACTIVE|RF_SHAREABLE); - if (mmio->res == NULL) { - device_printf(pdev->dev.bsddev, "%s: failed to alloc " - "bar %d type %d rid %d\n", - __func__, bar, type, PCIR_BAR(bar)); - free(mmio, M_DEVBUF); - return (NULL); - } - TAILQ_INSERT_TAIL(&pdev->mmio, mmio, next); - - return (mmio->res); } static inline void * diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index b396b512e176..fb976346c198 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -747,6 +747,90 @@ pci_resource_len(struct pci_dev *pdev, int bar) return (rle->count); } +int +pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) +{ + struct resource *res; + struct pci_devres *dr; + struct pci_mmio_region *mmio; + int rid; + int type; + + type = pci_resource_type(pdev, bar); + if (type < 0) + return (-ENODEV); + rid = PCIR_BAR(bar); + res = bus_alloc_resource_any(pdev->dev.bsddev, type, &rid, + RF_ACTIVE|RF_SHAREABLE); + if (res == NULL) { + device_printf(pdev->dev.bsddev, "%s: failed to alloc " + "bar %d type %d rid %d\n", + __func__, bar, type, PCIR_BAR(bar)); + return (-ENODEV); + } + + /* + * It seems there is an implicit devres tracking on these if the device + * is managed; otherwise the resources are not automatiaclly freed on + * FreeBSD/LinuxKPI tough they should be/are expected to be by Linux + * drivers. + */ + dr = lkpi_pci_devres_find(pdev); + if (dr != NULL) { + dr->region_mask |= (1 << bar); + dr->region_table[bar] = res; + } + + /* Even if the device is not managed we need to track it for iomap. */ + mmio = malloc(sizeof(*mmio), M_DEVBUF, M_WAITOK | M_ZERO); + mmio->rid = PCIR_BAR(bar); + mmio->type = type; + mmio->res = res; + TAILQ_INSERT_TAIL(&pdev->mmio, mmio, next); + + return (0); +} + +struct resource * +_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size __unused) +{ + struct pci_mmio_region *mmio, *p; + int type; + + type = pci_resource_type(pdev, bar); + if (type < 0) { + device_printf(pdev->dev.bsddev, "%s: bar %d type %d\n", + __func__, bar, type); + return (NULL); + } + + /* + * Check for duplicate mappings. + * This can happen if a driver calls pci_request_region() first. + */ + TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) { + if (mmio->type == type && mmio->rid == PCIR_BAR(bar)) { + return (mmio->res); + } + } + + mmio = malloc(sizeof(*mmio), M_DEVBUF, M_WAITOK | M_ZERO); + mmio->rid = PCIR_BAR(bar); + mmio->type = type; + mmio->res = bus_alloc_resource_any(pdev->dev.bsddev, mmio->type, + &mmio->rid, RF_ACTIVE|RF_SHAREABLE); + if (mmio->res == NULL) { + device_printf(pdev->dev.bsddev, "%s: failed to alloc " + "bar %d type %d rid %d\n", + __func__, bar, type, PCIR_BAR(bar)); + free(mmio, M_DEVBUF); + return (NULL); + } + TAILQ_INSERT_TAIL(&pdev->mmio, mmio, next); + + return (mmio->res); +} + int linux_pci_register_drm_driver(struct pci_driver *pdrv) {