From nobody Thu Feb 15 20:28:42 2024 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 4TbRV32LD6z5B7gd; Thu, 15 Feb 2024 20:28:43 +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 4TbRV25bX2z49qM; Thu, 15 Feb 2024 20:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028922; 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=B6fURIxoxAel2JH3/k+P6y4B94q7LivpO43cSa874G0=; b=xeTQeW//6N4mT+olqfOBzng6COaOIScvByJsS2WqFvody8SR6d7EB/jC9V/l6cZxnt/X/Z NPLFruMuJ1gb+hvaPumnftMAzlp13qhXAxRbMfDby64bIm683kEbL0GDHoFAKcDN/XZHZl m+haWmErjBQjbBfO8qj9W7rrUwjiL3dZJ5CMlPNNbQzgN0RPelEBLi8rIAn8t00ap2s3QJ 1GaAAVTkp01hdlcEFMvlGS9ySPx7DD+gmnawKkiP07sIvCtfEIpFtm71W3O6dKh/EePAcZ 3onkNcKlyhVBFRqz5GnrqLZVlffKGOz6R+EmtFWDnD+6k50krxz/6tCdnmTJOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028922; 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=B6fURIxoxAel2JH3/k+P6y4B94q7LivpO43cSa874G0=; b=f38dSDit0wWyMTyVbBiWqS8uM32qEB1WLQziRS0+tgI67hispDRrfRA4ea09s++1HpEudI POLzTv0w22/1HwSuezJTdRLlnJMzgvtEePNitYegBUVAvxyg38mI91GRExZI5nWl+kgv3r z2Qg9vqX08OHc/9chjhXQ0Q839SOXhPr94KQqXdLGjU58jIMiDHt9HlT0FTOQah29AtIgs KTuid9xZRGbMJ1PtvKejdhgZ1bnWV3Ea7NezSyQPMkGvKKZt/LGIpGT3DpbVYInZmX530T fJyEIHCWavUQGCnnMaU9PeSpIZahyk6S3Iot955wmmstEIMNNpJ8r68oO8bN3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708028922; a=rsa-sha256; cv=none; b=WqA99eB//9XZwRtjK91id1QUy0eHgCeLPmdO9prLJgl/9eI7GCPNlMtm4vZ8FughvrmmtF 6PE8y3m751vgThwjNVeYTtsHGDy5kCEyW85d361zMR5ZsRAJbwLVJMmqlmfAZxBZi7RXd3 YBFdKc3if2iSh3S3Suc5/eAo88lfysaj2Tdq29bBTHq08yB9Nsj/X3bPF1jX+Q/F1gQthT Xyzd2flN9DCl+yml6QO/M0qzyujbm1SlWn61WJbn6RMFOPafInIN2JyUapdjx5qImc+R1F zGsRLNh4EY++7G+FHZO+bQFvxWAHrJVOGUWdBVXiUJt96PFhacoWNfwyuCufxQ== 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 4TbRV24j21zwCB; Thu, 15 Feb 2024 20:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FKSg3v053290; Thu, 15 Feb 2024 20:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FKSgbQ053287; Thu, 15 Feb 2024 20:28:42 GMT (envelope-from git) Date: Thu, 15 Feb 2024 20:28:42 GMT Message-Id: <202402152028.41FKSgbQ053287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d714e73f7895 - main - vmd: Use bus_generic_rman_* for PCI bus and memory resources 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d714e73f789515963a22fe64417bf3883cdb599c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d714e73f789515963a22fe64417bf3883cdb599c commit d714e73f789515963a22fe64417bf3883cdb599c Author: John Baldwin AuthorDate: 2024-02-15 20:26:40 +0000 Commit: John Baldwin CommitDate: 2024-02-15 20:26:40 +0000 vmd: Use bus_generic_rman_* for PCI bus and memory resources While here, add custom bus_map/unmap_resource methods to request mappings via the window memory resources allocated from the parent bus. Tested by: emaste Differential Revision: https://reviews.freebsd.org/D43886 --- sys/dev/vmd/vmd.c | 133 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 108 insertions(+), 25 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index d9afe5746421..d885cd15ac26 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -418,47 +418,53 @@ vmd_get_dma_tag(device_t dev, device_t child) return (sc->vmd_dma_tag); } +static struct rman * +vmd_get_rman(device_t dev, int type, u_int flags) +{ + struct vmd_softc *sc = device_get_softc(dev); + + switch (type) { + case SYS_RES_MEMORY: + return (&sc->psc.mem.rman); + case PCI_RES_BUS: + return (&sc->psc.bus.rman); + default: + /* VMD hardware does not support I/O ports. */ + return (NULL); + } +} + static struct resource * vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct vmd_softc *sc = device_get_softc(dev); struct resource *res; - switch (type) { - case SYS_RES_IRQ: + if (type == SYS_RES_IRQ) { /* VMD hardware does not support legacy interrupts. */ if (*rid == 0) return (NULL); return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags | RF_SHAREABLE)); - case SYS_RES_MEMORY: - res = rman_reserve_resource(&sc->psc.mem.rman, start, end, - count, flags, child); - if (res == NULL) - return (NULL); - if (bootverbose) + } + res = bus_generic_rman_alloc_resource(dev, child, type, rid, start, + end, count, flags); + if (bootverbose && res != NULL) { + switch (type) { + case SYS_RES_MEMORY: device_printf(dev, "allocated memory range (%#jx-%#jx) for rid %d of %s\n", rman_get_start(res), rman_get_end(res), *rid, pcib_child_name(child)); - break; - case PCI_RES_BUS: - res = rman_reserve_resource(&sc->psc.bus.rman, start, end, - count, flags, child); - if (res == NULL) - return (NULL); - if (bootverbose) + break; + case PCI_RES_BUS: device_printf(dev, "allocated bus range (%ju-%ju) for rid %d of %s\n", rman_get_start(res), rman_get_end(res), *rid, pcib_child_name(child)); - break; - default: - /* VMD hardware does not support I/O ports. */ - return (NULL); + break; + } } - rman_set_rid(res, *rid); return (res); } @@ -471,7 +477,8 @@ vmd_adjust_resource(device_t dev, device_t child, int type, return (bus_generic_adjust_resource(dev, child, type, r, start, end)); } - return (rman_adjust_resource(r, start, end)); + return (bus_generic_rman_adjust_resource(dev, child, type, r, start, + end)); } static int @@ -483,7 +490,80 @@ vmd_release_resource(device_t dev, device_t child, int type, int rid, return (bus_generic_release_resource(dev, child, type, rid, r)); } - return (rman_release_resource(r)); + return (bus_generic_rman_release_resource(dev, child, type, rid, r)); +} + +static int +vmd_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + if (type == SYS_RES_IRQ) { + return (bus_generic_activate_resource(dev, child, type, rid, + r)); + } + return (bus_generic_rman_activate_resource(dev, child, type, rid, r)); +} + +static int +vmd_deactivate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + if (type == SYS_RES_IRQ) { + return (bus_generic_deactivate_resource(dev, child, type, rid, + r)); + } + return (bus_generic_rman_deactivate_resource(dev, child, type, rid, r)); +} + +static struct resource * +vmd_find_parent_resource(struct vmd_softc *sc, struct resource *r) +{ + for (int i = 1; i < 3; i++) { + if (rman_get_start(sc->vmd_regs_res[i]) <= rman_get_start(r) && + rman_get_end(sc->vmd_regs_res[i]) >= rman_get_end(r)) + return (sc->vmd_regs_res[i]); + } + return (NULL); +} + +static int +vmd_map_resource(device_t dev, device_t child, int type, struct resource *r, + struct resource_map_request *argsp, struct resource_map *map) +{ + struct vmd_softc *sc = device_get_softc(dev); + struct resource_map_request args; + struct resource *pres; + rman_res_t length, start; + int error; + + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + pres = vmd_find_parent_resource(sc, r); + if (pres == NULL) + return (ENOENT); + + args.offset = start - rman_get_start(pres); + args.length = length; + return (bus_generic_map_resource(dev, child, type, pres, &args, map)); +} + +static int +vmd_unmap_resource(device_t dev, device_t child, int type, struct resource *r, + struct resource_map *map) +{ + struct vmd_softc *sc = device_get_softc(dev); + + r = vmd_find_parent_resource(sc, r); + if (r == NULL) + return (ENOENT); + return (bus_generic_unmap_resource(dev, child, type, r, map)); } static int @@ -647,13 +727,16 @@ static device_method_t vmd_pci_methods[] = { /* Bus interface */ DEVMETHOD(bus_get_dma_tag, vmd_get_dma_tag), + DEVMETHOD(bus_get_rman, vmd_get_rman), DEVMETHOD(bus_read_ivar, pcib_read_ivar), DEVMETHOD(bus_write_ivar, pcib_write_ivar), DEVMETHOD(bus_alloc_resource, vmd_alloc_resource), DEVMETHOD(bus_adjust_resource, vmd_adjust_resource), DEVMETHOD(bus_release_resource, vmd_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_activate_resource, vmd_activate_resource), + DEVMETHOD(bus_deactivate_resource, vmd_deactivate_resource), + DEVMETHOD(bus_map_resource, vmd_map_resource), + DEVMETHOD(bus_unmap_resource, vmd_unmap_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),