From patchwork Wed Apr 8 18:14:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11480607 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1085C1392 for ; Wed, 8 Apr 2020 18:15:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E30A32082F for ; Wed, 8 Apr 2020 18:15:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RYxzKsPQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730629AbgDHSOr (ORCPT ); Wed, 8 Apr 2020 14:14:47 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:34060 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728772AbgDHSOq (ORCPT ); Wed, 8 Apr 2020 14:14:46 -0400 Received: by mail-wm1-f65.google.com with SMTP id c195so599741wme.1; Wed, 08 Apr 2020 11:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0e196N9NUbdplitpkQkJfpaeN0+6myfhv6YB2DCo4aQ=; b=RYxzKsPQI0RrSAlJMp+GdU5mQkQ515lCzrbilXZebOZZ81KBIP+RPpHEwvmpQN1j02 9QwON2l829ZghxUN4/8UZupk/XnJSQk+wwVpvqqObWNEJEFjxI62PYlHbLr5FMLKcM6Y NfZQ4+N9fk9oFDXeiQbJ8y1whumB/twb6A53Hes8WImrtek57vrkUaeUJ5PABEoHJZPQ UecRhJCEgM/Ny2KVRstNF9P49VV9g6ogA5pVFr3Ure2TIpqh4H1D34oKSh1BHViUlAyj 1KldDhDtAzf/dbV7O3kGl/6RcCJe77SE14kgnhQGCJ3MGTpobV1AYt1DG8P3zXY3L13X 4ThQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0e196N9NUbdplitpkQkJfpaeN0+6myfhv6YB2DCo4aQ=; b=gr74rZ1Udm0DoNwFnyzLdB+Fx7wOX/2FVZ8yafqGyt46UfZAzh5Vy8h0S814A9Ri98 V9OW912w4C5PA+rNfXurThLd8FFl2y7xGEjJeNuoXbub0y6C1/0YLYtjctCzyvFGCa3i wFU5N2EF0m7tMNfCDVgW1nSiOKfyfzjFKTZhToVSmDsQCgvQiVCqSZdNAVbNCjh3duIW +fh+r4drznaPQH2vUexUuiW2vyZoFm+dNgyWhQhy9v05jIyt3tBw2ee9/aBsFnoGWgvo HHKDd+H2eGnCAzpWhA6DiBiyTpHLV2kkIHgvzpoHSDU2zWDJM5eEVGWsXYjMUObJTvUR OKcQ== X-Gm-Message-State: AGi0PuYvUaHc+HK6PmPwHJCQx4AWxRO79BvxLtFtGNhfvEW0AYXJ2rNM ahb+86qVpJWBalCwuRMxsVKuXa7I0P0= X-Google-Smtp-Source: APiQypKBQwVsS3bbac+5OD6W9QbH392+bZKgqRHQHXfHvlbW1SBXLgYLVv355wcVgm+pbDQ34mSuAw== X-Received: by 2002:a1c:4e:: with SMTP id 75mr5718681wma.24.1586369683082; Wed, 08 Apr 2020 11:14:43 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id n124sm441700wma.11.2020.04.08.11.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 11:14:42 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, Greg Kroah-Hartman , =?utf-8?q?Jonathan_Neusch?= =?utf-8?q?=C3=A4fer?= , Krzysztof Kozlowski , linux-usb@vger.kernel.org, Mathias Nyman , Rob Herring , Andy Shevchenko Subject: [PATCH v3 1/4] dt-bindings: Add Broadcom STB USB support Date: Wed, 8 Apr 2020 14:14:03 -0400 Message-Id: <20200408181406.40389-2-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200408181406.40389-1-alcooperx@gmail.com> References: <20200408181406.40389-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add DT bindings for Broadcom STB USB EHCI and XHCI drivers. NOTE: The OHCI driver is not included because it uses the generic platform driver. Signed-off-by: Al Cooper --- .../bindings/usb/brcm,bcm7445-ehci.yaml | 60 +++++++++++++++++++ .../devicetree/bindings/usb/usb-xhci.txt | 1 + 2 files changed, 61 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml diff --git a/Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml b/Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml new file mode 100644 index 000000000000..d41710574b5e --- /dev/null +++ b/Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/brcm,bcm7445-ehci.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom STB USB EHCI Controller Device Tree Bindings + +allOf: + - $ref: "usb-hcd.yaml" + +maintainers: + - Al Cooper + +properties: + compatible: + contains: + const: brcm,bcm7445-ehci + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + description: Clock specifier for the EHCI clock + + clock-names: + const: sw_usb + + phys: + description: PHY specifier for the USB PHY + + phy-names: + const: usbphy + +required: + - compatible + - reg + - interrupts + - phys + - clocks + +additionalProperties: false + +examples: + - | + usb@f0b00300 { + compatible = "brcm,bcm7445-ehci"; + reg = <0xf0b00300 0xa8>; + interrupts = <0x0 0x5a 0x0>; + phys = <&usbphy_0 0x0>; + phy-names = "usbphy"; + clocks = <&usb20>; + clock-names = "sw_usb"; + }; + +... diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt index 3f378951d624..aafc316b5a8e 100644 --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt @@ -23,6 +23,7 @@ Required properties: device - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 or RZ/G2 compatible device + - "brcm,bcm7445-xhci" for Broadcom STB SoCs with XHCI - "xhci-platform" (deprecated) When compatible with the generic version, nodes must list the From patchwork Wed Apr 8 18:14:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11480601 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1C27B81 for ; Wed, 8 Apr 2020 18:14:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE651212CC for ; Wed, 8 Apr 2020 18:14:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Pppe01No" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730641AbgDHSOu (ORCPT ); Wed, 8 Apr 2020 14:14:50 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42157 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730638AbgDHSOt (ORCPT ); Wed, 8 Apr 2020 14:14:49 -0400 Received: by mail-wr1-f67.google.com with SMTP id h15so8968362wrx.9; Wed, 08 Apr 2020 11:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8vldV9JJykEkruZKth3hZnteRVICe4AENDSg+Cses34=; b=Pppe01NoQ9wjByFo4RxMIwrmC3PVJTi+a+oJj2ggrC1zqPg5ES5gGVhg3Mo7G4p6Zr O04YuP4l3wGFqLGXf9v/TFEP3Fxm3u7o3k3H/BGhPnJbo3zErCQEF1bi6DpYh+kEkkHv 38IZtuAfSLvaPkbN3fNXOMKxKae9Ue2OgOfI4Fw9AABXsLNueNLltR/RHUpwHvpFCSgI mNu7Qe8sz6THA19V7JwmoZ6BXSbPDNWCseMdZmeljFcFd9As4a6XyB5MT4Ia3M+JIlop lPzimqydfWcpSM7IObt2RLGkp+MbSPv9xr37kcSugsDI7F3K99oywzG5AUKL4zdxEXn0 aHIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8vldV9JJykEkruZKth3hZnteRVICe4AENDSg+Cses34=; b=VxQ+J4Ue3ahyGEM0bH8iso4CbJT/EK7T6RupPlY7TzhVrqah7DHvN4Av8bZyWTAw2K N6OeULmqzwdgvGa1iBVnfnoxFKJDSC7ASi/cyHaTXdZ4i+gbU0bb21DONNLEdCyC5v5T BJGF+UG6SBilEyRuhSLTTQ3A5prRx9834IedsNf7xpKCsidK/moe8QH0lfD7yUknXLFt li35m0poL6I2nyElSRio7uz5NRC2p2+856lhWWnRwRC//Xyvmiwu32U8tiyLaUn7Ju/z GQ+Iv1WqEaUHu5M1/NKpUjSqNk3JCeTCitVY+RXqJ4tNh64pE5NxMVqdE6hT6ReOsApD eB/w== X-Gm-Message-State: AGi0Pubv2qkR/agI77xfs9copMcMTAuFSWKHSYMv+XO4MkfP/ZVl9nL3 dmd9wCvvz03T76crFPJakBto/LwfpKw= X-Google-Smtp-Source: APiQypKFKdouvw1RyMhM0e5AJC7Eaea9Ga/I+TK5C7PlAQvCe7NXQtS6CJXZPOgxPiCQPWl0SbltZw== X-Received: by 2002:a5d:6102:: with SMTP id v2mr9598460wrt.298.1586369685286; Wed, 08 Apr 2020 11:14:45 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id n124sm441700wma.11.2020.04.08.11.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 11:14:44 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, Greg Kroah-Hartman , =?utf-8?q?Jonathan_Neusch?= =?utf-8?q?=C3=A4fer?= , Krzysztof Kozlowski , linux-usb@vger.kernel.org, Mathias Nyman , Rob Herring , Andy Shevchenko Subject: [PATCH v3 2/4] usb: xhci: xhci-plat: Add support for Broadcom STB SoC's Date: Wed, 8 Apr 2020 14:14:04 -0400 Message-Id: <20200408181406.40389-3-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200408181406.40389-1-alcooperx@gmail.com> References: <20200408181406.40389-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add support for Broadcom STB SoC's to the xhci platform driver Signed-off-by: Al Cooper Acked-by: Mathias Nyman --- drivers/usb/host/xhci-plat.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 1d4f6f85f0fe..44406d0eb317 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -112,6 +112,10 @@ static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = { SET_XHCI_PLAT_PRIV_FOR_RCAR(XHCI_RCAR_FIRMWARE_NAME_V3) }; +static const struct xhci_plat_priv xhci_plat_brcm = { + .quirks = XHCI_RESET_ON_RESUME, +}; + static const struct of_device_id usb_xhci_of_match[] = { { .compatible = "generic-xhci", @@ -147,6 +151,12 @@ static const struct of_device_id usb_xhci_of_match[] = { }, { .compatible = "renesas,rcar-gen3-xhci", .data = &xhci_plat_renesas_rcar_gen3, + }, { + .compatible = "brcm,xhci-brcm-v2", + .data = &xhci_plat_brcm, + }, { + .compatible = "brcm,bcm7445-xhci", + .data = &xhci_plat_brcm, }, {}, }; From patchwork Wed Apr 8 18:14:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11480603 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 436871392 for ; Wed, 8 Apr 2020 18:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E3DA20936 for ; Wed, 8 Apr 2020 18:14:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PKmp2BDD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730652AbgDHSOw (ORCPT ); Wed, 8 Apr 2020 14:14:52 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42161 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728772AbgDHSOu (ORCPT ); Wed, 8 Apr 2020 14:14:50 -0400 Received: by mail-wr1-f67.google.com with SMTP id h15so8968510wrx.9; Wed, 08 Apr 2020 11:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1bAKWOlSkMDu/tfAy0DoRT7Hrn8w1RS+eAxVrpX7cog=; b=PKmp2BDDNt0rzTItuDtBZLUBTo4oQQc7qBUtPzpiLQlztBRyVsQGhfAs6Y+u0++V2q h+pvAwkGD4jWzQsEsA3uQVT20tQ0dr4vxh1PehsW8CAbzhsdtgR+Shx0H2e8OPVtA3lD MEa81NHmwSTwO19vtQVwDF0YajODiRNvFwEy9uZ3QDoCL/WJI+4AEUQnpeSb2MuRXUb8 CY/niCRjrQ1kpV7Lbfn1R7EWHw39Yu13mBEnqomclq+HfKcyd9NW/N3cREUamRNClqAB Alqza9E2cUYV4AytHFx7I9eNQ18Ov0/ItATFY8eD1bu9Ld99m0Bj5SvzSJCMbMjENTW/ 9V4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1bAKWOlSkMDu/tfAy0DoRT7Hrn8w1RS+eAxVrpX7cog=; b=QI6FB2rbIvTNA4yE8nlW+Vf/3aDmrXp5R1wZYvUMB0Zv4x3DWeqhqRDV4BTaK1n3ln uwFXL9bXiKVcLatwJBDx0nA1iko0Fm//3xnwomMbY59KLwsrhaKXDepttNtLlwnP7fBM Tdglf3SAHeiCeivQqhhHBjTwn4NDJphXoYMShy6EcQryhkeJTTaMvfXHcQ+udvqdhsvl eYOcE2JNY7pxAeQQYja1wCHYG9lYjOTPU6Kxu9+50KZHPs27DhjoxjGYfVxPt51Yv0IE UWhNQZ/RvTRr9B8Ue/nuI9WX/4EV22UUXyGFe2X1CBFOqiViLjSMurvx01nOC5TDU5+B 2CFA== X-Gm-Message-State: AGi0PuYUq4WZsPFhhVTqRUE+vJgJ9/yIjX4nme4a89Q/+6JURS7y0uWd L+YRnhaNkxvn4/+7ViR2o7K6yVe1kQY= X-Google-Smtp-Source: APiQypI+1ZFazmK1ptxgJmlDnSPdIOkRiBoc2PCAUYHRsHYmKJ9SlFqGpZadteR5XKtTtx/XOic/Qg== X-Received: by 2002:adf:f88b:: with SMTP id u11mr9573490wrp.84.1586369687682; Wed, 08 Apr 2020 11:14:47 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id n124sm441700wma.11.2020.04.08.11.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 11:14:47 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, Greg Kroah-Hartman , =?utf-8?q?Jonathan_Neusch?= =?utf-8?q?=C3=A4fer?= , Krzysztof Kozlowski , linux-usb@vger.kernel.org, Mathias Nyman , Rob Herring , Andy Shevchenko Subject: [PATCH v3 3/4] usb: ehci: Add new EHCI driver for Broadcom STB SoC's Date: Wed, 8 Apr 2020 14:14:05 -0400 Message-Id: <20200408181406.40389-4-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200408181406.40389-1-alcooperx@gmail.com> References: <20200408181406.40389-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add a new EHCI driver for Broadcom STB SoC's. A new EHCI driver was created instead of adding support to the existing ehci platform driver because of the code required to workaround bugs in the EHCI controller. Signed-off-by: Al Cooper --- drivers/usb/host/ehci-brcm.c | 286 +++++++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 drivers/usb/host/ehci-brcm.c diff --git a/drivers/usb/host/ehci-brcm.c b/drivers/usb/host/ehci-brcm.c new file mode 100644 index 000000000000..04c18fe721a5 --- /dev/null +++ b/drivers/usb/host/ehci-brcm.c @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018, Broadcom */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ehci.h" + +#define hcd_to_ehci_priv(h) ((struct brcm_priv *)hcd_to_ehci(h)->priv) + +struct brcm_priv { + struct clk *clk; +}; + +static const char brcm_hcd_name[] = "ehci-brcm"; + +static int (*org_hub_control)(struct usb_hcd *hcd, + u16 typeReq, u16 wValue, u16 wIndex, + char *buf, u16 wLength); + +/* + * ehci_brcm_wait_for_sof + * Wait for start of next microframe, then wait extra delay microseconds + */ +static inline void ehci_brcm_wait_for_sof(struct ehci_hcd *ehci, u32 delay) +{ + u32 frame_idx = ehci_readl(ehci, &ehci->regs->frame_index); + u32 val; + int res; + + /* Wait for next microframe (every 125 usecs) */ + res = readl_relaxed_poll_timeout(&ehci->regs->frame_index, val, + val != frame_idx, 1, 130); + if (res) + dev_err(ehci_to_hcd(ehci)->self.controller, + "Error waiting for SOF\n"); + udelay(delay); +} + +/* + * ehci_brcm_hub_control + * Intercept echi-hcd request to complete RESUME and align it to the start + * of the next microframe. + * If RESUME is complete too late in the microframe, host controller + * detects babble on suspended port and resets the port afterwards. + * This s/w workaround allows to avoid this problem. + * See SWLINUX-1909 for more details + */ +static int ehci_brcm_hub_control( + struct usb_hcd *hcd, + u16 typeReq, + u16 wValue, + u16 wIndex, + char *buf, + u16 wLength) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + int ports = HCS_N_PORTS(ehci->hcs_params); + u32 __iomem *status_reg = &ehci->regs->port_status[ + (wIndex & 0xff) - 1]; + unsigned long flags; + int retval, irq_disabled = 0; + + /* + * RESUME is cleared when GetPortStatus() is called 20ms after start + * of RESUME + */ + if ((typeReq == GetPortStatus) && + (wIndex && wIndex <= ports) && + ehci->reset_done[wIndex-1] && + time_after_eq(jiffies, ehci->reset_done[wIndex-1]) && + (ehci_readl(ehci, status_reg) & PORT_RESUME)) { + + /* + * to make sure we are not interrupted until RESUME bit + * is cleared, disable interrupts on current CPU + */ + ehci_dbg(ehci, "SOF alignment workaround\n"); + irq_disabled = 1; + local_irq_save(flags); + ehci_brcm_wait_for_sof(ehci, 5); + } + retval = (*org_hub_control)(hcd, typeReq, wValue, wIndex, buf, wLength); + if (irq_disabled) + local_irq_restore(flags); + return retval; +} + +static int ehci_brcm_reset(struct usb_hcd *hcd) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + + ehci->big_endian_mmio = 1; + + ehci->caps = (struct ehci_caps *) hcd->regs; + ehci->regs = (struct ehci_regs *) (hcd->regs + + HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase))); + + /* This fixes the lockup during reboot due to prior interrupts */ + ehci_writel(ehci, CMD_RESET, &ehci->regs->command); + mdelay(10); + + /* + * SWLINUX-1705: Avoid OUT packet underflows during high memory + * bus usage + * port_status[0x0f] = Broadcom-proprietary USB_EHCI_INSNREG00 @ 0x90 + */ + ehci_writel(ehci, 0x00800040, &ehci->regs->port_status[0x10]); + ehci_writel(ehci, 0x00000001, &ehci->regs->port_status[0x12]); + + return ehci_setup(hcd); +} + +static struct hc_driver __read_mostly ehci_brcm_hc_driver; + +static const struct ehci_driver_overrides brcm_overrides __initconst = { + + .reset = ehci_brcm_reset, + .extra_priv_size = sizeof(struct brcm_priv), +}; + +static int ehci_brcm_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct resource *res_mem; + struct brcm_priv *priv; + struct usb_hcd *hcd; + int irq; + int err; + + if (usb_disabled()) + return -ENODEV; + + err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); + if (err) + return err; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + + /* Hook the hub control routine to work around a bug */ + if (!org_hub_control) + org_hub_control = ehci_brcm_hc_driver.hub_control; + ehci_brcm_hc_driver.hub_control = ehci_brcm_hub_control; + + /* initialize hcd */ + hcd = usb_create_hcd(&ehci_brcm_hc_driver, dev, dev_name(dev)); + if (!hcd) + return -ENOMEM; + + platform_set_drvdata(pdev, hcd); + priv = hcd_to_ehci_priv(hcd); + + priv->clk = devm_clk_get_optional(dev, NULL); + if (IS_ERR(priv->clk)) { + err = PTR_ERR(priv->clk); + goto err_hcd; + } + + err = clk_prepare_enable(priv->clk); + if (err) + goto err_hcd; + + res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + hcd->regs = devm_ioremap_resource(dev, res_mem); + if (IS_ERR(hcd->regs)) { + err = PTR_ERR(hcd->regs); + goto err_clk; + } + hcd->rsrc_start = res_mem->start; + hcd->rsrc_len = resource_size(res_mem); + err = usb_add_hcd(hcd, irq, IRQF_SHARED); + if (err) + goto err_clk; + + device_wakeup_enable(hcd->self.controller); + device_enable_async_suspend(hcd->self.controller); + platform_set_drvdata(pdev, hcd); + + return 0; + +err_clk: + clk_disable_unprepare(priv->clk); +err_hcd: + usb_put_hcd(hcd); + + return err; +} + +static int ehci_brcm_remove(struct platform_device *dev) +{ + struct usb_hcd *hcd = platform_get_drvdata(dev); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + + usb_remove_hcd(hcd); + clk_disable_unprepare(priv->clk); + usb_put_hcd(hcd); + return 0; +} + +static int __maybe_unused ehci_brcm_suspend(struct device *dev) +{ + int ret; + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + bool do_wakeup = device_may_wakeup(dev); + + ret = ehci_suspend(hcd, do_wakeup); + if (ret) + return ret; + clk_disable_unprepare(priv->clk); + return 0; +} + +static int __maybe_unused ehci_brcm_resume(struct device *dev) +{ + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + int err; + + err = clk_prepare_enable(priv->clk); + if (err) + return err; + /* + * SWLINUX-1705: Avoid OUT packet underflows during high memory + * bus usage + * port_status[0x0f] = Broadcom-proprietary USB_EHCI_INSNREG00 + * @ 0x90 + */ + ehci_writel(ehci, 0x00800040, &ehci->regs->port_status[0x10]); + ehci_writel(ehci, 0x00000001, &ehci->regs->port_status[0x12]); + + ehci_resume(hcd, false); + return 0; +} + +static SIMPLE_DEV_PM_OPS(ehci_brcm_pm_ops, ehci_brcm_suspend, + ehci_brcm_resume); + +static const struct of_device_id brcm_ehci_of_match[] = { + { .compatible = "brcm,ehci-brcm-v2", }, + { .compatible = "brcm,bcm7445-ehci", }, + {} +}; + +static struct platform_driver ehci_brcm_driver = { + .probe = ehci_brcm_probe, + .remove = ehci_brcm_remove, + .shutdown = usb_hcd_platform_shutdown, + .driver = { + .name = "ehci-brcm", + .pm = &ehci_brcm_pm_ops, + .of_match_table = brcm_ehci_of_match, + } +}; + +static int __init ehci_brcm_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + ehci_init_driver(&ehci_brcm_hc_driver, &brcm_overrides); + return platform_driver_register(&ehci_brcm_driver); +} +module_init(ehci_brcm_init); + +static void __exit ehci_brcm_exit(void) +{ + platform_driver_unregister(&ehci_brcm_driver); +} +module_exit(ehci_brcm_exit); + +MODULE_ALIAS("platform:ehci-brcm"); +MODULE_DESCRIPTION("EHCI Broadcom STB driver"); +MODULE_AUTHOR("Al Cooper"); +MODULE_LICENSE("GPL"); From patchwork Wed Apr 8 18:14:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11480605 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 784AD1392 for ; Wed, 8 Apr 2020 18:15:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C0DC2082F for ; Wed, 8 Apr 2020 18:15:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dhkOjge1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730662AbgDHSO5 (ORCPT ); Wed, 8 Apr 2020 14:14:57 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51040 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730638AbgDHSOw (ORCPT ); Wed, 8 Apr 2020 14:14:52 -0400 Received: by mail-wm1-f68.google.com with SMTP id x25so428479wmc.0; Wed, 08 Apr 2020 11:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tx9SuZa4528oyKjVq2QW+3pFwATH8j8hfUgow6U+cVs=; b=dhkOjge1FOcNsiNiZF2yeHjcKsn4vGpV93bOHiT/h3SjgPdPSzjSjrD54wPMXx2E6h te9kAcvQiAdjBV53ViIchEPlDwIGqJmJSQ3fH5ydAeCWSqo5egqg64phJEbq4HFAv2be 39JuQ9ZS0f92uL1tnV7DMN217ElC1G5cauToJ16nIh2mpuF1ych9lkgHB5SXnaNnVLIJ wD1nDLpcGG43drwcmelbnS1aD6q4Fb1V3G8WBdp3XP9EEnKJICIaFFy57xzJQbcA3bLU Mn6HHoN5FZCA5DJUtzXGVSQ9sU74pQvH1nn8z7tgixjN8KVf2Fvho/p0FNKAkMnKaKJm AVJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tx9SuZa4528oyKjVq2QW+3pFwATH8j8hfUgow6U+cVs=; b=SBpdB/DCOJ3tLOFMFitoQ+ez1OH4yO1uUwwMsmEawiJRfj99SkULJhcJXhEJiznrcz 8Z9Rg8h+kpBFAHEmB1mr79+ks0MXcfeK/nSEe227cWDR6FngHaaAlyUzWNj6HuDNMviE 9m8nKikuSsHb6E7raLgFN5ypauISzvwNLptGnd4VjGDcawfPxW37y/h88MvBnS9VwDJP a7b9DFD8+33wxhSS+/DqN7ZemPrYW0ux2X0hjBvakra09VtHYziVcMGezZ1xgsDNCu6I UYNI90M/Pc8I74BGhWbZA3Rf3+QF6gnl0x97nvqdcWgwUtO6CKV/RZNw2SVxYmxVQze+ aTyQ== X-Gm-Message-State: AGi0PuYrBt8yRdjzp7MpxqlW5PR7mMsTK4QLmUBtKZsNRyBkOoDRl3jK Bcc5c0jKJ0xIAgdrmcS9Lism7ZSeD70= X-Google-Smtp-Source: APiQypJ+5IcVPxKY76g09B/HutFLGxlHrHOTeMAmfTQAHNbQddhk2Nx6W7SDc63sGFl/ijyZphTz4A== X-Received: by 2002:a1c:1f96:: with SMTP id f144mr5660370wmf.114.1586369689891; Wed, 08 Apr 2020 11:14:49 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id n124sm441700wma.11.2020.04.08.11.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 11:14:49 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, Greg Kroah-Hartman , =?utf-8?q?Jonathan_Neusch?= =?utf-8?q?=C3=A4fer?= , Krzysztof Kozlowski , linux-usb@vger.kernel.org, Mathias Nyman , Rob Herring , Andy Shevchenko Subject: [PATCH v3 4/4] usb: host: Add ability to build new Broadcom STB USB drivers Date: Wed, 8 Apr 2020 14:14:06 -0400 Message-Id: <20200408181406.40389-5-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200408181406.40389-1-alcooperx@gmail.com> References: <20200408181406.40389-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add the build system changes needed to get the Broadcom STB XHCI, EHCI and OHCI functionality working. The OHCI support does not require anything unique to Broadcom so the standard ohci-platform driver is being used. The link order for XHCI was changed in the Makefile because of the way STB XHCI, EHCI and OHCI controllers share a port which requires that the XHCI driver be initialized first. Also update MAINTAINERS. Signed-off-by: Al Cooper --- MAINTAINERS | 8 ++++++++ drivers/usb/host/Kconfig | 16 ++++++++++++++++ drivers/usb/host/Makefile | 16 ++++++++++------ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 534a8dc4f84a..f6e8ebc8ccfd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3477,6 +3477,14 @@ S: Supported F: drivers/i2c/busses/i2c-brcmstb.c F: Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml +BROADCOM BRCMSTB USB EHCI DRIVER +M: Al Cooper +L: linux-usb@vger.kernel.org +L: bcm-kernel-feedback-list@broadcom.com +S: Maintained +F: drivers/usb/host/ehci-brcm.* +F: Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml + BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER M: Al Cooper L: linux-kernel@vger.kernel.org diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 55bdfdf11e4c..7d58fd66e412 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -97,6 +97,22 @@ config USB_XHCI_TEGRA endif # USB_XHCI_HCD +config USB_EHCI_BRCMSTB + tristate + +config USB_BRCMSTB + tristate "Broadcom STB USB support" + depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD + select USB_EHCI_BRCMSTB if USB_EHCI_HCD + select USB_XHCI_PLATFORM if USB_XHCI_HCD + help + Say Y to enable support for XHCI, EHCI and OHCI host controllers + found in Broadcom STB SoC's. + + Disabling this will keep the controllers and corresponding + PHYs powered down. + config USB_EHCI_HCD tristate "EHCI HCD (USB 2.0) support" depends on HAS_DMA && HAS_IOMEM diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index b191361257cc..85fa6ace552a 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -37,6 +37,15 @@ endif obj-$(CONFIG_USB_PCI) += pci-quirks.o +# NOTE: BRCMSTB systems require that xhci driver be linked before the +# ehci/ohci drivers. +obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o +obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o +obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o +obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o +obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o +obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o + obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o @@ -49,6 +58,7 @@ obj-$(CONFIG_USB_EHCI_HCD_STI) += ehci-st.o obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o +obj-$(CONFIG_USB_EHCI_BRCMSTB) += ehci-brcm.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o @@ -69,12 +79,6 @@ obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_FHCI_HCD) += fhci.o -obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o -obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o -obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o -obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o -obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o -obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o