From nobody Mon May 16 12:09:44 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 B86471ADDD55; Mon, 16 May 2022 12:09:46 +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 4L1yjj3bhCz4cYx; Mon, 16 May 2022 12:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702985; 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=laqpsuU260WEOOBdUdf5JySpxwWK8BDvBPe0iOBFZSc=; b=eNQvXiB52NM7oi4Ib0bLU1f7/vMP6Ud3MVwFrW0FsOI6o9nunvoD8rAQ69AagG0oSu5Eg+ ADb+qjAAkL3DudVAFeisaB/PX3iJupQRICSINgRLEJG0UE13h+fTBeAw1+uTV58W2PBHrr +BAUQ7xfs7bxhFvyXp/clxnkNqJneShgJdHWMStW7Onis5wIrY0uyDLvOaxwyWIf/W0yra SRPFzz/cNP6XDvRQ52uX8UFfnbsszKCBE4lZDyrgDBCN+puG+jCzD49Vw8VZEsWTACyBS4 LBx4E8dmdpg+NouazZaTAAJpDumaKT3pC9KcMFGIzRtwWOfNZatxB1tGvcAm6g== 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 0800F1F6F9; Mon, 16 May 2022 12:09:45 +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 24GC9iUL035277; Mon, 16 May 2022 12:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9i61035276; Mon, 16 May 2022 12:09:44 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:44 GMT Message-Id: <202205161209.24GC9i61035276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 0c7209c263fc - stable/13 - usb: Make ext_resources non-optional 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0c7209c263fc309e93f596b7ddb37cb69b8384a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702985; 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=laqpsuU260WEOOBdUdf5JySpxwWK8BDvBPe0iOBFZSc=; b=HteCEuriILNArO/Uk+Lg/nAhxBBvpqvQ1s/audzd5Xi0CcGjj5CnBnUOGO3AnAHqsKXJRV QQw4KNmvE87Yx/RCCx1HRHFm8D45YbRgmSpA0MPCLppXJbaxJPSR0eWpeHWhEhh+ByRa0F fAm5UWt5lgCCEyhlAEkz5/BzDhB7YW95ej0OBdRoN/LL7vaQ1mELvOQ6R8YSajRuA9Zyfq eZUnrJYs6yMjkd9PGqWqulI+I/bWeHIm0/6IZY/yMl2CvDn46ydhOiVjQJIsAmIQ7p2mzE sFjNyWH1NM2eeSMAgO4rlLtdK7cyRGxciLQV878LQEszjdBjLJoD31qjV4ui4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702985; a=rsa-sha256; cv=none; b=hM4uxA7iF46xF7180PkMLNu9G8zdc4NAtz43ph2DUoo5r2e2f/z+vf711jkLUtGFqS8G7o JgdpMCZ4m5H7wlesQPEbFgW9cC1fy08SQDBKWUSZ0A1lvCUznK7y7PWijHKKd1bMW3fX7w a10a4VIMiZ/4AN9mwzalmUG53wDo3VYPZCJ0NFnzQLYiLMdJs+WjscPv/b4M3SgwpAQAS6 AkJP/QCJMyojySa54d58ejxDkoSHhhpZGwM3qWSPAEUfaWGZXtdDZdq5BGXlvUiLVsgHrZ TY3+sPhWIJn/W7yQqNP0GnTcJnQIUDoLsb9rMqDYNGQzV0CEHDstSEc4j+i7iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0c7209c263fc309e93f596b7ddb37cb69b8384a1 commit 0c7209c263fc309e93f596b7ddb37cb69b8384a1 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:45:42 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:36 +0000 usb: Make ext_resources non-optional EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33827 (cherry picked from commit fb6cebd8bdf457444c02e7a30b4b9d24f45568c6) --- sys/dev/usb/controller/generic_ehci_fdt.c | 12 ------------ sys/dev/usb/controller/generic_ohci.c | 14 -------------- sys/dev/usb/controller/generic_xhci_fdt.c | 8 -------- 3 files changed, 34 deletions(-) diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c index a76bec12aab5..a660674cbace 100644 --- a/sys/dev/usb/controller/generic_ehci_fdt.c +++ b/sys/dev/usb/controller/generic_ehci_fdt.c @@ -56,16 +56,13 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include #include #include #include -#endif #include "generic_ehci.h" -#ifdef EXT_RESOURCES struct clk_list { TAILQ_ENTRY(clk_list) next; clk_t clk; @@ -80,16 +77,13 @@ struct phy_list { TAILQ_ENTRY(phy_list) next; phy_t phy; }; -#endif struct generic_ehci_fdt_softc { ehci_softc_t ehci_sc; -#ifdef EXT_RESOURCES TAILQ_HEAD(, clk_list) clk_list; TAILQ_HEAD(, hwrst_list) rst_list; TAILQ_HEAD(, phy_list) phy_list; -#endif }; static device_probe_t generic_ehci_fdt_probe; @@ -114,7 +108,6 @@ static int generic_ehci_fdt_attach(device_t dev) { int err; -#ifdef EXT_RESOURCES struct generic_ehci_fdt_softc *sc; struct clk_list *clkp; clk_t clk; @@ -170,7 +163,6 @@ generic_ehci_fdt_attach(device_t dev) phyp->phy = phy; TAILQ_INSERT_TAIL(&sc->phy_list, phyp, next); } -#endif err = generic_ehci_attach(dev); if (err != 0) @@ -186,19 +178,16 @@ error: static int generic_ehci_fdt_detach(device_t dev) { -#ifdef EXT_RESOURCES struct generic_ehci_fdt_softc *sc; struct clk_list *clk, *clk_tmp; struct hwrst_list *rst, *rst_tmp; struct phy_list *phy, *phy_tmp; -#endif int err; err = generic_ehci_detach(dev); if (err != 0) return (err); -#ifdef EXT_RESOURCES sc = device_get_softc(dev); /* Disable clock */ @@ -232,7 +221,6 @@ generic_ehci_fdt_detach(device_t dev) TAILQ_REMOVE(&sc->phy_list, phy, next); free(phy, M_DEVBUF); } -#endif return (0); } diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c index 4b6c4dd4fcfa..8dd9bc50abc7 100644 --- a/sys/dev/usb/controller/generic_ohci.c +++ b/sys/dev/usb/controller/generic_ohci.c @@ -56,16 +56,13 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include #include #include #include -#endif #include "generic_usb_if.h" -#ifdef EXT_RESOURCES struct clk_list { TAILQ_ENTRY(clk_list) next; clk_t clk; @@ -78,16 +75,13 @@ struct hwrst_list { TAILQ_ENTRY(hwrst_list) next; hwreset_t rst; }; -#endif struct generic_ohci_softc { ohci_softc_t ohci_sc; -#ifdef EXT_RESOURCES TAILQ_HEAD(, clk_list) clk_list; TAILQ_HEAD(, phy_list) phy_list; TAILQ_HEAD(, hwrst_list) rst_list; -#endif }; static int generic_ohci_detach(device_t); @@ -112,7 +106,6 @@ generic_ohci_attach(device_t dev) { struct generic_ohci_softc *sc = device_get_softc(dev); int err, rid; -#ifdef EXT_RESOURCES int off; struct clk_list *clkp; struct phy_list *phyp; @@ -120,7 +113,6 @@ generic_ohci_attach(device_t dev) clk_t clk; phy_t phy; hwreset_t rst; -#endif sc->ohci_sc.sc_bus.parent = dev; sc->ohci_sc.sc_bus.devices = sc->ohci_sc.sc_devices; @@ -170,7 +162,6 @@ generic_ohci_attach(device_t dev) goto error; } -#ifdef EXT_RESOURCES TAILQ_INIT(&sc->clk_list); /* Enable clock */ for (off = 0; clk_get_by_ofw_index(dev, 0, off, &clk) == 0; off++) { @@ -215,7 +206,6 @@ generic_ohci_attach(device_t dev) phyp->phy = phy; TAILQ_INSERT_TAIL(&sc->phy_list, phyp, next); } -#endif if (GENERIC_USB_INIT(dev) != 0) { err = ENXIO; @@ -239,11 +229,9 @@ generic_ohci_detach(device_t dev) { struct generic_ohci_softc *sc = device_get_softc(dev); int err; -#ifdef EXT_RESOURCES struct clk_list *clk, *clk_tmp; struct phy_list *phy, *phy_tmp; struct hwrst_list *rst, *rst_tmp; -#endif /* during module unload there are lots of children leftover */ device_delete_children(dev); @@ -282,7 +270,6 @@ generic_ohci_detach(device_t dev) } usb_bus_mem_free_all(&sc->ohci_sc.sc_bus, &ohci_iterate_hw_softc); -#ifdef EXT_RESOURCES /* Disable phy */ TAILQ_FOREACH_SAFE(phy, &sc->phy_list, next, phy_tmp) { err = phy_disable(phy->phy); @@ -314,7 +301,6 @@ generic_ohci_detach(device_t dev) TAILQ_REMOVE(&sc->clk_list, clk, next); free(clk, M_DEVBUF); } -#endif if (GENERIC_USB_DEINIT(dev) != 0) return (ENXIO); diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c index 1d0fca2ce92b..ea34c2077e43 100644 --- a/sys/dev/usb/controller/generic_xhci_fdt.c +++ b/sys/dev/usb/controller/generic_xhci_fdt.c @@ -53,9 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include -#endif #include "generic_xhci.h" @@ -85,7 +83,6 @@ generic_xhci_fdt_probe(device_t dev) static int generic_xhci_fdt_attach(device_t dev) { -#ifdef EXT_RESOURCES phandle_t node; phy_t phy; @@ -93,7 +90,6 @@ generic_xhci_fdt_attach(device_t dev) if (phy_get_by_ofw_property(dev, node, "usb-phy", &phy) == 0) if (phy_enable(phy) != 0) device_printf(dev, "Cannot enable phy\n"); -#endif return (generic_xhci_attach(dev)); } @@ -101,21 +97,17 @@ generic_xhci_fdt_attach(device_t dev) static int generic_xhci_fdt_detach(device_t dev) { -#ifdef EXT_RESOURCES phandle_t node; phy_t phy; -#endif int err; err = generic_xhci_detach(dev); if (err != 0) return (err); -#ifdef EXT_RESOURCES node = ofw_bus_get_node(dev); if (phy_get_by_ofw_property(dev, node, "usb-phy", &phy) == 0) phy_release(phy); -#endif return (0); }