From nobody Mon Apr 24 11:34:11 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 4Q4jhP3tHWz46j8f; Mon, 24 Apr 2023 11:34:13 +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 4Q4jhP1GcNz4Tbs; Mon, 24 Apr 2023 11:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682336053; 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=f5MryLPT0AUyvlORzbC2fAvD4r9tPLLK3HQ2VNn56s0=; b=CgjAE6bGAwAsE6O9+2o/+u1GdqEGCGwycxe17v21bOLpZpueB5faXrZL58LNcug+RgAyvn rWsijP79sXkjojrimFeLpCJvvCn/+bg1fnrQ8zjI3b9zzB8bnyNEnerj+3UfmBfbTCFOFG 3VvC79bf9LD5VTiQ7q2h8pHhE6cu+dlUwMpRI5WnSeo4W/NH9oMr1l9HRkqIrWcEUykw1U 08AKCJJ4FxDF7Kwwe5snj4C7/3/ETBLCUkS1LkXf0zuf1twTgjsM8khdldF9u0v/O9HhBW +ucs42K/rCbVpUhutjnP6LkHeu4/Ypq4cU3xRLdp/dbJuad+nMv6LVLO/htB7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682336053; 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=f5MryLPT0AUyvlORzbC2fAvD4r9tPLLK3HQ2VNn56s0=; b=fjjZ3HDN8An8XelT2GLkpX9gx4p721YIgxI9AqcWyvv4Z0xTwM2XLHHRyFglzvVN1JtcQU GewImJktbRqxocuY8JKLORViYhfq0lyoFNlw/optx5BM8ZWcNZoSEwS5ECj9Bl7C98fuu+ +aVuu4xLiZ9/L7wSFiyxQMiO2MT8+Xc5VhJhCGqKD8X6Fx14B0xYfznt0ZPlqlMCoL105F r3IzSNOhJ/ba+jdBXKhJx5m6g48V6p3XQxO8tB1pObEStKQgsBsIXUWvsiACTthrBC/08B 1fPExlp3GZIY32S/D/iByCY+O5V5ZPCfAH3F15tGuEFDpFmb27bUwvO961YUTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682336053; a=rsa-sha256; cv=none; b=j3/kPQKnltA9rx67xVPa/hqxncsIl0tEsx3A2ZMvLc0nkePzVG5o0dgKqnx+2GVMzyqQlh 2cUfhnf3QNxtYlPPxHErb2ZCxkAxM0299oixx+4JCKSRoZEyTkQON78BURfrhM4Jtbt4+t pYPa00G8uRxUle+I7MRPe+mdZj3u+yxQLXCUpOtOq/x8sLg1HAAdIAR4uMsD5h2hIcGW3P tpnc218GaaGjTgpsTCfggL7wU/2vIgtsU5E4MRgWfjMsjC9zTyw5kNTmTIEbYmXZfMrX3I fEqzAHmmv8drMeQQZOgNWrpnDWVkm1QsGH/ix5FndaS0ygOETIgLcXG2SbQkNg== 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 4Q4jhN13G9zNpn; Mon, 24 Apr 2023 11:34:12 +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 33OBYBK8071124; Mon, 24 Apr 2023 11:34:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OBYBwu071123; Mon, 24 Apr 2023 11:34:11 GMT (envelope-from git) Date: Mon, 24 Apr 2023 11:34:11 GMT Message-Id: <202304241134.33OBYBwu071123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7029f2c887a1 - main - Allow pci_host_generic attachments to manage registers 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7029f2c887a16c823faf08e8a79dc0d3887989ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7029f2c887a16c823faf08e8a79dc0d3887989ab commit 7029f2c887a16c823faf08e8a79dc0d3887989ab Author: Andrew Turner AuthorDate: 2022-06-04 10:59:46 +0000 Commit: Andrew Turner CommitDate: 2023-04-24 11:33:50 +0000 Allow pci_host_generic attachments to manage registers To allow for attachments that don't use memory mapped registers add a flag they can set when the base driver shouldn't map them. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39227 --- sys/dev/pci/pci_host_generic.c | 45 +++++++++++++++++++++++------------------- sys/dev/pci/pci_host_generic.h | 2 ++ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 986318548eab..ca74b0c650c3 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -106,27 +106,30 @@ pci_host_generic_core_attach(device_t dev) if (error != 0) return (error); - rid = 0; - sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - PCI_RF_FLAGS | RF_ACTIVE); - if (sc->res == NULL) { - device_printf(dev, "could not allocate memory.\n"); - error = ENXIO; - goto err_resource; - } + if ((sc->quirks & PCIE_CUSTOM_CONFIG_SPACE_QUIRK) == 0) { + rid = 0; + sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + PCI_RF_FLAGS | RF_ACTIVE); + if (sc->res == NULL) { + device_printf(dev, "could not allocate memory.\n"); + error = ENXIO; + goto err_resource; + } #ifdef PCI_UNMAPPED - resource_init_map_request(&req); - req.memattr = VM_MEMATTR_DEVICE_NP; - error = bus_map_resource(dev, SYS_RES_MEMORY, sc->res, &req, &map); - if (error != 0) { - device_printf(dev, "could not map memory.\n"); - return (error); - } - rman_set_mapping(sc->res, &map); + resource_init_map_request(&req); + req.memattr = VM_MEMATTR_DEVICE_NP; + error = bus_map_resource(dev, SYS_RES_MEMORY, sc->res, &req, + &map); + if (error != 0) { + device_printf(dev, "could not map memory.\n"); + return (error); + } + rman_set_mapping(sc->res, &map); #endif - sc->bst = rman_get_bustag(sc->res); - sc->bsh = rman_get_bushandle(sc->res); + sc->bst = rman_get_bustag(sc->res); + sc->bsh = rman_get_bushandle(sc->res); + } sc->has_pmem = false; sc->pmem_rman.rm_type = RMAN_ARRAY; @@ -196,7 +199,8 @@ err_io_rman: err_mem_rman: rman_fini(&sc->pmem_rman); err_pmem_rman: - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); + if (sc->res != NULL) + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); err_resource: bus_dma_tag_destroy(sc->dmat); return (error); @@ -217,7 +221,8 @@ pci_host_generic_core_detach(device_t dev) rman_fini(&sc->io_rman); rman_fini(&sc->mem_rman); rman_fini(&sc->pmem_rman); - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); + if (sc->res != NULL) + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); bus_dma_tag_destroy(sc->dmat); return (0); diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h index 80da4f523165..b3242c8bdaf5 100644 --- a/sys/dev/pci/pci_host_generic.h +++ b/sys/dev/pci/pci_host_generic.h @@ -90,6 +90,8 @@ struct generic_pcie_core_softc { /* Quirks */ #define PCIE_ECAM_DESIGNWARE_QUIRK (1 << 0) +/* Child will map resources to access config registers */ +#define PCIE_CUSTOM_CONFIG_SPACE_QUIRK (1 << 1) DECLARE_CLASS(generic_pcie_core_driver);