From patchwork Fri Jul 17 15:23:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11670583 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 617A113B1 for ; Fri, 17 Jul 2020 15:23:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 475F3207EA for ; Fri, 17 Jul 2020 15:23:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mrjK4d9F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727779AbgGQPXp (ORCPT ); Fri, 17 Jul 2020 11:23:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgGQPXo (ORCPT ); Fri, 17 Jul 2020 11:23:44 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F6E0C0619D2; Fri, 17 Jul 2020 08:23:44 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id z15so11549242wrl.8; Fri, 17 Jul 2020 08:23: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=bPVCDr4im/hPh3ecaLSwEPVliXPN7RfgtalCBE3XxpQ=; b=mrjK4d9Fyc/X5drHE+cgZxtWRsZpGiWvOpOJt0rQri+PHL+J+HGizUX/AKhn8k+7kt owQytKjnNtItblPZ7LtZJldpht/j/tnzpPnFVXjFe/0WegaiTuw4x84npAx0gIlQr22e U+1MKiBv9ArgH0MJeCoqTxCnOD/+Mzt1vf0RjJMBdd+xrshWvpzh6h/0w/4B5ud+Ek/g tmc4OLtJlII+VbwelIgq2nqhhdOneZNw6yh7eijzaGeLMLbane9kMYprQdfXg3XI0tlF QeGirKB7mk0HdYlPGHkm81ZFe/0bB6qCprPzWp1QimrSThGgogGHd+iAduEqbCia1MJ1 D+BA== 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=bPVCDr4im/hPh3ecaLSwEPVliXPN7RfgtalCBE3XxpQ=; b=SvAXJQXHI+lFziMO9g0derT8EzTwrHeIU++Y10McbXmTWp5e4bLV06fw2Yyl8eRcQ+ tPwOlCCF8kJHN/kyZxgqkXHSAwCYRY2ITm/K7hUhYLJKnZE4/nQxeKkDg/60lqCDHXZ5 fdV6Zm26XrjsCYjGrjiH14Zxm/+MvTGCiyCrg0MtLJDMjtgrvkyxrvCBzcy0MNgS/Qp4 ciMtaVL6uNOIZPtgAA8OihQmoeRFGiInWIH5n1lWFSEM4cXBZchFko1DyBLar6OoMgsD yZdwoiTDaP6ZTmTvSy2/JWayJZvrFz2Pr5soHSRXPyFbWHeTkc/PFnxTviwA0yjH+fN1 9IaQ== X-Gm-Message-State: AOAM533iuzfWpFrlm+JCrfj/6zNgiNyeEL/BUlI4TPRyECKiGWhIw7uL ctrfMiRJ2Padm+a7Rzr6ml5+eNSH X-Google-Smtp-Source: ABdhPJz6uhtDSvPKuE35q1b3k4iV1HswM0+93tmJfA9hEQi+3tPqTU/S2xLRGYfQTc8WB6uNrPgl1Q== X-Received: by 2002:a05:6000:cf:: with SMTP id q15mr11105669wrx.203.1594999422622; Fri, 17 Jul 2020 08:23:42 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id a22sm13431051wmb.4.2020.07.17.08.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 08:23:42 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , devicetree@vger.kernel.org, Felipe Balbi , Florian Fainelli , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Rob Herring , Sasi Kumar Subject: [PATCH 1/7] dt-bindings: usb: bdc: Update compatible strings Date: Fri, 17 Jul 2020 11:23:01 -0400 Message-Id: <20200717152307.36705-2-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717152307.36705-1-alcooperx@gmail.com> References: <20200717152307.36705-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Remove "brcm,bdc-v0.16" because it was never used on any system. Add "brcm,bdc-udc-v3.1" which exists for any STB system with BDC. Signed-off-by: Al Cooper --- Documentation/devicetree/bindings/usb/brcm,bdc.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/brcm,bdc.txt b/Documentation/devicetree/bindings/usb/brcm,bdc.txt index 63e63af3bf59..597f3902d857 100644 --- a/Documentation/devicetree/bindings/usb/brcm,bdc.txt +++ b/Documentation/devicetree/bindings/usb/brcm,bdc.txt @@ -4,7 +4,7 @@ Broadcom USB Device Controller (BDC) Required properties: - compatible: must be one of: - "brcm,bdc-v0.16" + "brcm,bdc-udc-v3.1" "brcm,bdc" - reg: the base register address and length - interrupts: the interrupt line for this controller @@ -21,7 +21,7 @@ On Broadcom STB platforms, these properties are required: Example: bdc@f0b02000 { - compatible = "brcm,bdc-v0.16"; + compatible = "brcm,bdc-udc-v3.1"; reg = <0xf0b02000 0xfc4>; interrupts = <0x0 0x60 0x0>; phys = <&usbphy_0 0x0>; From patchwork Fri Jul 17 15:23:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11670595 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 EDD6C6C1 for ; Fri, 17 Jul 2020 15:24:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4E1921741 for ; Fri, 17 Jul 2020 15:24:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iAKFo9wW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727834AbgGQPXt (ORCPT ); Fri, 17 Jul 2020 11:23:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgGQPXr (ORCPT ); Fri, 17 Jul 2020 11:23:47 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31D3CC0619D2; Fri, 17 Jul 2020 08:23:47 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id f18so11619942wrs.0; Fri, 17 Jul 2020 08:23:47 -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=eDUInn53PGUx0+AivLJa/ERiqsHCKn0OmcMLZZkWr94=; b=iAKFo9wWY23qfH4cIb3HsqnAp7+7HOUipi0jN7nDImzSfSiNZkFl9IDdvZ7E1EDpvB v1mg3R+e6SOP7coSLNIKsr/cLI/5zfMm+DAUq6blu/kxPy64ZFicqV/a67QH3EAaR1ZN gm5JEywZfCyL+th4u5w8aFgxVyXmfXWhIcxNZDdnhV1swjNz+R3HQ1ewHf2zELS9asNz +vheSiUb5rw2MMjaQ5zuOx1M56rOLDlX0oN9/rOFXXvrKh5PG++SFNZizb9Vo6DSF1eW ng3bStxj4BNbVpS6hK/Lo6E5la6rHu9swrQbPaJA7HBCziX2l/lyz3Z0SoTGnvrEsRVm fxAQ== 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=eDUInn53PGUx0+AivLJa/ERiqsHCKn0OmcMLZZkWr94=; b=auPdYKj5YDrbOLH6sOxZZiUuIZGuESLE+pxr7A5Gqu+RFXb+UOBHQIb6z4+EYhZo4M 8pbdq02ZNzcB1b0Qe0oUWD/pUHX7rWz7wTqzXdtvve6cy/TGn7m2ZeIGrbWmBskF39pb uf4RKiD5Kf7Hq0jrBfpI3LkRfZEL0MzGOl8wILPfsqguKikV+t6X/F+qbEJK2B5Aeiva xQrrR2S1iXYA6sKzfjS7Rpwzc6/Um0oUkM/hFmRDQEoqGeADVa8k//Cj7zQExVWYj27P 8SgHv6+ZNRxViSvDHy/cZHuqw0Y4ngyxdfgw6hgGdN7ANyuPcU1biBsdm6DxFwvM4RFs qvvA== X-Gm-Message-State: AOAM530yVV3EyWm7ebBvbSPeY208QcFDrFp7ycL7A2/eVoaEhY9NAhRL LyxWVVeSKh8pnC0fOdpsfp6S4/Eh X-Google-Smtp-Source: ABdhPJwIJwBRgUX4sCFwxhKTnxbnMU4Vfpyi/0Jd5ghS3qrniODyaNYrPiZo5G+XPGaUhcV9xklpFQ== X-Received: by 2002:a5d:56d0:: with SMTP id m16mr10478813wrw.194.1594999424545; Fri, 17 Jul 2020 08:23:44 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id a22sm13431051wmb.4.2020.07.17.08.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 08:23:44 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , devicetree@vger.kernel.org, Felipe Balbi , Florian Fainelli , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Rob Herring , Sasi Kumar Subject: [PATCH 2/7] usb: bdc: Add compatible string for new style USB DT nodes Date: Fri, 17 Jul 2020 11:23:02 -0400 Message-Id: <20200717152307.36705-3-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717152307.36705-1-alcooperx@gmail.com> References: <20200717152307.36705-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add compatible string for some newer boards that only have this as there match sting. Signed-off-by: Al Cooper --- drivers/usb/gadget/udc/bdc/bdc_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c index 02a3a774670b..436a734ea0bc 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_core.c +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c @@ -629,6 +629,7 @@ static SIMPLE_DEV_PM_OPS(bdc_pm_ops, bdc_suspend, bdc_resume); static const struct of_device_id bdc_of_match[] = { + { .compatible = "brcm,bdc-udc-v2" }, { .compatible = "brcm,bdc-v0.16" }, { .compatible = "brcm,bdc" }, { /* sentinel */ } From patchwork Fri Jul 17 15:23: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: 11670585 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 7B82A6C1 for ; Fri, 17 Jul 2020 15:23:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D6DB20775 for ; Fri, 17 Jul 2020 15:23:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MXYF5hMJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727861AbgGQPXt (ORCPT ); Fri, 17 Jul 2020 11:23:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727046AbgGQPXs (ORCPT ); Fri, 17 Jul 2020 11:23:48 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D9DAC0619D3; Fri, 17 Jul 2020 08:23:48 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id j18so15437259wmi.3; Fri, 17 Jul 2020 08:23: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=uVV0eDyjWU3YA5bSVqcooIQZQct69gff1izMlpB8JwA=; b=MXYF5hMJ8bkRyAJgNAWmRblYjjqv5UX4iYbz0IreIbDwQtu5lzJ/l9jY/pKUgCo1lo hyfspuBWY7iCGiv3TzcHp3N2FWNuS6x2A/b+N1vH8HMCj09mqF90ozreZpKQmQnuAteo g4s/9YhDgWEzhBrX97R+t9iZZxkvUs3EJWJdMBm1Xn6izG/nW+Jaj3n5uJ7bPanuyT0f qO/yLQMAuzOtcSOirs6UCAcunnSIugjVsLktrqOitH91Iug44E5j+uB7eUTTxQNZRQLa NnQ4UPgLdbgebzRqj8NEjdBLUjCmsLhOfyAiW8w0nGyl/Zjd3XwM67eCrAMIk05jIr6G Uqog== 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=uVV0eDyjWU3YA5bSVqcooIQZQct69gff1izMlpB8JwA=; b=ltXcmR3z7DyenX1plDvi+mzJuD8j269IYg8GYeM0lW8SRnzK4Dv4JlOjgDlhoe3qz+ DaKZ06Pl/IDZKxIXFKdJU7XfF7va3PQLdhPbLs5Ww8H6O7spC3FVYXEU1CZSq5d6Eyem mZKrH53Ii9KBDIox2qIY4mJQHxudZcJcCKs2H+9PY3euP2oVe7G9HTW5C5to19NEFwjr wPpAgH1Qr1jBehRGGQb6hz1y1iapGRXhJV/XyoOHrg9y6FpguvpTAt9Jcvdj2w8qb8ur PeGAJoVzc4RHmmkTrfSzvZGb5hNHhxYFnSHb06zhRpHked1N8awMQ6fko2nkDVGCO5z0 te7w== X-Gm-Message-State: AOAM533PssDcdWxNY2rgkvACfwo7bjiGVDF89r/lS4ENMQQl/v55VHcH cWqY1mqwi6PS/mrrYYxQcff05C0J X-Google-Smtp-Source: ABdhPJwWVnrCMcqmo8PSCXZkDMSE7TSUKK398AYg32tovCq/agVLtkb+arut0uVPkZHauXwUq4wCqA== X-Received: by 2002:a1c:81c8:: with SMTP id c191mr9712938wmd.23.1594999426393; Fri, 17 Jul 2020 08:23:46 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id a22sm13431051wmb.4.2020.07.17.08.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 08:23:46 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Sasi Kumar , Al Cooper , devicetree@vger.kernel.org, Felipe Balbi , Florian Fainelli , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Rob Herring Subject: [PATCH 3/7] bdc: Fix bug causing crash after multiple disconnects Date: Fri, 17 Jul 2020 11:23:03 -0400 Message-Id: <20200717152307.36705-4-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717152307.36705-1-alcooperx@gmail.com> References: <20200717152307.36705-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Sasi Kumar Multiple connects/disconnects can cause a crash on the second disconnect. The driver had a problem where it would try to send endpoint commands after it was disconnected which is not allowed by the hardware. The fix is to only allow the endpoint commands when the endpoint is connected. This will also fix issues that showed up when using configfs to create gadgets. refs #SWLINUX-5477 Signed-off-by: Sasi Kumar Signed-off-by: Al Cooper --- drivers/usb/gadget/udc/bdc/bdc_core.c | 4 ++++ drivers/usb/gadget/udc/bdc/bdc_ep.c | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c index 436a734ea0bc..be833d9e9db2 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_core.c +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c @@ -282,6 +282,7 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) * in that case reinit is passed as 1 */ if (reinit) { + int i; /* Enable interrupts */ temp = bdc_readl(bdc->regs, BDC_BDCSC); temp |= BDC_GIE; @@ -291,6 +292,9 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) /* Initialize SRR to 0 */ memset(bdc->srr.sr_bds, 0, NUM_SR_ENTRIES * sizeof(struct bdc_bd)); + /* clear ep flags to avoid post disconnect stops/deconfigs */ + for (i = 1; i < bdc->num_eps; ++i) + bdc->bdc_ep_array[i]->flags = 0; } else { /* One time initiaization only */ /* Enable status report function pointers */ diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.c b/drivers/usb/gadget/udc/bdc/bdc_ep.c index d49c6dc1082d..9ddc0b4e92c9 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_ep.c +++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c @@ -615,7 +615,6 @@ int bdc_ep_enable(struct bdc_ep *ep) } bdc_dbg_bd_list(bdc, ep); /* only for ep0: config ep is called for ep0 from connect event */ - ep->flags |= BDC_EP_ENABLED; if (ep->ep_num == 1) return ret; @@ -759,10 +758,13 @@ static int ep_dequeue(struct bdc_ep *ep, struct bdc_req *req) __func__, ep->name, start_bdi, end_bdi); dev_dbg(bdc->dev, "ep_dequeue ep=%p ep->desc=%p\n", ep, (void *)ep->usb_ep.desc); - /* Stop the ep to see where the HW is ? */ - ret = bdc_stop_ep(bdc, ep->ep_num); - /* if there is an issue with stopping ep, then no need to go further */ - if (ret) + /* if still connected, stop the ep to see where the HW is ? */ + if (!(bdc_readl(bdc->regs, BDC_USPC) & BDC_PST_MASK)) { + ret = bdc_stop_ep(bdc, ep->ep_num); + /* if there is an issue, then no need to go further */ + if (ret) + return 0; + } else return 0; /* @@ -1911,7 +1913,9 @@ static int bdc_gadget_ep_disable(struct usb_ep *_ep) __func__, ep->name, ep->flags); if (!(ep->flags & BDC_EP_ENABLED)) { - dev_warn(bdc->dev, "%s is already disabled\n", ep->name); + if (bdc->gadget.speed != USB_SPEED_UNKNOWN) + dev_warn(bdc->dev, "%s is already disabled\n", + ep->name); return 0; } spin_lock_irqsave(&bdc->lock, flags); From patchwork Fri Jul 17 15:23: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: 11670593 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 9CCFB6C1 for ; Fri, 17 Jul 2020 15:24:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 850992065D for ; Fri, 17 Jul 2020 15:24:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eYVdCt+P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728022AbgGQPYH (ORCPT ); Fri, 17 Jul 2020 11:24:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgGQPXu (ORCPT ); Fri, 17 Jul 2020 11:23:50 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00354C0619D2; Fri, 17 Jul 2020 08:23:49 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id o8so15432591wmh.4; Fri, 17 Jul 2020 08:23:49 -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=a7K03vVeTa1oCvndzLpmXZwhlsqxNxhP4bPgxia/KT4=; b=eYVdCt+Pt48MD+NU6mravMS4KDlqviK9wTQ3ETXMK18usj5XrG2HcmZ2LcrYx5PVEi 58VTnllnEEK6UYyHlvhjN9kZ+m2dIcBg+lmdLgZ0Yp0Akm2RUSue9IdUyJ5oqn4+12Sq 34FqR8/t3qPh79ggPqUOi4PZshFFvJEBxuvvOkXJ1upHsi3tgDoM88Jj18J+ZLy0gRsI TFADFyjLLdL0vasv5frRQqYy+9HmpYVsUF5oZnOcyHCn3JeXQy6DduD6uf7JEAhT9w+q GrjA4uQ4PXRO8RhZeVQEd7SGfstqJGxgAdoqoU2tnSD8B19LqffutZS8IwbQ5F1IsHUL enmQ== 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=a7K03vVeTa1oCvndzLpmXZwhlsqxNxhP4bPgxia/KT4=; b=I5JyMjzkY9vLM67qeTLtOyp3FJ6+NnsWLISNnKT1uMKLPYHLbs3KngrOH8CNLcb9cl Bo8G3sT+hmYZ9a7xN/ZxyIVYUz6/7UA5X6Bxo5fuH6vOc3IldXlXuVNZzsf81oE8k0Lh aL/4ytya9Ctto3cK4Sm6G/Ig7/N+PYY27M8KshE2d2OkmsrgNNiTgkai8wT0hNZT4ki0 ORyu5IUedDPM/+TszOTngZ3PksWjfzTCcnvUhztdDPX3MqxvGCFpSXRIF1QfyW+bpd0y W+syVhyhTtbi7wV+TqyM7bqbQFTUSrXo9Eq6DcpYm6tc0MA3Dmodegcv1lPfYrbsx7n9 cGsg== X-Gm-Message-State: AOAM533ZxU0F6gHy0wY2jgzEIzHnF79lPoNx7ot9AWUYs984oKrqc7mV E7i7sxA/AXrjZzZaHGQQnBbe7s8i X-Google-Smtp-Source: ABdhPJyz1LpyHbmPrKI/E0YSuYzpNJhQmGtkqM+7O1/Qa4e7Z4xZiIOl8fNgybShuzgI4gu874NxvA== X-Received: by 2002:a1c:4804:: with SMTP id v4mr9828885wma.139.1594999428301; Fri, 17 Jul 2020 08:23:48 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id a22sm13431051wmb.4.2020.07.17.08.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 08:23:47 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , devicetree@vger.kernel.org, Felipe Balbi , Florian Fainelli , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Rob Herring , Sasi Kumar Subject: [PATCH 4/7] usb: bdc: Adb shows offline after resuming from S2 Date: Fri, 17 Jul 2020 11:23:04 -0400 Message-Id: <20200717152307.36705-5-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717152307.36705-1-alcooperx@gmail.com> References: <20200717152307.36705-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org On Android systems, After temporarily putting device to S2 by short pressing the power button on the remote, the display turns off. Then press the power button to turn the display back up. Adb devices would show the devices is offline. It needs a physical disconnect of the usb cable or power cycle to bring the device back online. The device is operational otherwise. The problem is that during S2 resume, the ADB gadget driver could not link back with the BDC driver because the endpoint flags were cleared. The fix is to clear the endpoint flags for the disconnect case only and not for S2 exit. Signed-off-by: Al Cooper --- drivers/usb/gadget/udc/bdc/bdc_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c index be833d9e9db2..47bcc9f6afbd 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_core.c +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c @@ -292,9 +292,13 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) /* Initialize SRR to 0 */ memset(bdc->srr.sr_bds, 0, NUM_SR_ENTRIES * sizeof(struct bdc_bd)); - /* clear ep flags to avoid post disconnect stops/deconfigs */ - for (i = 1; i < bdc->num_eps; ++i) - bdc->bdc_ep_array[i]->flags = 0; + /* + * clear ep flags to avoid post disconnect stops/deconfigs but + * not during S2 exit + */ + if (!bdc->gadget.speed) + for (i = 1; i < bdc->num_eps; ++i) + bdc->bdc_ep_array[i]->flags = 0; } else { /* One time initiaization only */ /* Enable status report function pointers */ From patchwork Fri Jul 17 15:23: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: 11670591 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 4746F13B1 for ; Fri, 17 Jul 2020 15:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F16020775 for ; Fri, 17 Jul 2020 15:24:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mdcOdGCf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727925AbgGQPXx (ORCPT ); Fri, 17 Jul 2020 11:23:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727046AbgGQPXw (ORCPT ); Fri, 17 Jul 2020 11:23:52 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD269C0619D2; Fri, 17 Jul 2020 08:23:51 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id z13so11579033wrw.5; Fri, 17 Jul 2020 08:23: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=Me2WHbUTpgnRM4D8kqx7FmbTflTfMafU7MOjlibIhCA=; b=mdcOdGCftCAR0C1l8D/cd1tWkMlYByjyNrxpQy2kCcTJqYGjZZHJY8Qi716jiVMX7a +PY3w5rcs+7M91IFVWLIqWtGAtxC5aRqAR+aDCmyuf6sXCwKTfaefjlTfeiv68KcMHkp pKOM99e6s7ECI8/wKhamNZYbAgmmRQFpBkRY9zdEPi7dLQpO8MXaXfZp95xqx6Iqu/IP +SM8pGIP33/1LJtPAsL52PyPJLvRm0XkAFup9IKL1rU7uSMg01QEokuTcSUlwZJtHrqn G2dk5kGaY/XT4aZhGvcq2VGprs4V+nSDuVYhUdv0o+2MYQTP8HKMWoDOyttJYyoZCrFv f3Cw== 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=Me2WHbUTpgnRM4D8kqx7FmbTflTfMafU7MOjlibIhCA=; b=UlCMELahOS0gkF6l6YBEwLeZ0bckZghX44LlNXeJuj1kc/D5t525AqYB/5RMmLi9or QEagpKui7OLSBkzDSP7YDy5ojwB4CBrR27wBWXHoJwQkYKviEnRfMxD3Eol2aMvvEVtk 1ewySBou4HA5f5pI9G6yiOO8B1m8j7bhQy88/9nsMpkT/WEieSbxsEpy19HoqkMbbOrG 1embYZhksOuLJzObl9f4zA11ncEYsSaWEFCRTuRYWS59NJqqGIPfwoGuuzayFGBkaYn6 bZR2x/Bi3sfuL29x9Gfgi8retIpRTto2Ifuc5+kfLrk2GenkmQJ2ofMHbNpWa2j7PUCk wVhw== X-Gm-Message-State: AOAM53248FuJHrYFS6JG1VJ/oG8LoanbAk9CtgUV48zBkgz6jvq+ruyp RXID8rt5gWF8aVPTo/3rgtXM9p8y X-Google-Smtp-Source: ABdhPJwQwuHQ0dRfUDPFK85UD+bnKPMNyv73bwn7Ovu78ySabgeDS4V2QzqH3x5xjPBUKxcR1Q/+fA== X-Received: by 2002:adf:dc90:: with SMTP id r16mr10921301wrj.264.1594999430177; Fri, 17 Jul 2020 08:23:50 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id a22sm13431051wmb.4.2020.07.17.08.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 08:23:49 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Florian Fainelli , devicetree@vger.kernel.org, Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Rob Herring , Sasi Kumar Subject: [PATCH 5/7] usb: bdc: driver runs out of buffer descriptors on large ADB transfers Date: Fri, 17 Jul 2020 11:23:05 -0400 Message-Id: <20200717152307.36705-6-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717152307.36705-1-alcooperx@gmail.com> References: <20200717152307.36705-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Version v1.0.40 of the Android host ADB software increased maximum transfer sizes from 256K to 1M. Since the STB ADB gadget driver requests only 16K at a time, the BDC driver ran out of buffer descriptors (BDs) if the queuing happens faster than the incoming 16K transfers. This issue is fixed by doubling the number of BDs that can be queued so that the entire 1M request can be queued without running out of buffers. Signed-off-by: Al Cooper Signed-off-by: Florian Fainelli --- drivers/usb/gadget/udc/bdc/bdc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/bdc/bdc.h b/drivers/usb/gadget/udc/bdc/bdc.h index 6e1e881dc51e..ac75e25c3b6a 100644 --- a/drivers/usb/gadget/udc/bdc/bdc.h +++ b/drivers/usb/gadget/udc/bdc/bdc.h @@ -44,7 +44,7 @@ #define NUM_SR_ENTRIES 64 /* Num of bds per table */ -#define NUM_BDS_PER_TABLE 32 +#define NUM_BDS_PER_TABLE 64 /* Num of tables in bd list for control,bulk and Int ep */ #define NUM_TABLES 2 From patchwork Fri Jul 17 15:23: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: 11670587 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 9DF7B13B1 for ; Fri, 17 Jul 2020 15:23:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83A6C22BEB for ; Fri, 17 Jul 2020 15:23:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EqlhOZ4m" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727955AbgGQPXz (ORCPT ); Fri, 17 Jul 2020 11:23:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727943AbgGQPXy (ORCPT ); Fri, 17 Jul 2020 11:23:54 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14D49C0619D2; Fri, 17 Jul 2020 08:23:54 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id c80so15452437wme.0; Fri, 17 Jul 2020 08:23:54 -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=g3oukpog0b62v9lI3IDsLLWPvqIlVmXh8YL5j5paae4=; b=EqlhOZ4m3OmocVg1SNRRZNHzzjLw43ObsG1DyWI7NNKGZWspM1cNk5ZMRreQ9pexv9 Ur2oqkU8glJnJqgLkYuzR32G8TCdLdWEgtKHBsA4qQj1z7TQKiHiVMRjaoXtZqLdb9OS AW30WDLGT3w1wqARm/QlFmOJ3GTaar3eFm6ur/rURz6XlVykx/eENUCaFUI/YfQSzWx7 HSK46Qd01DaasZKgeymroXPuxOLGk8y70Yij0/cyzFJCR85SjG3/xv+ml28AFsdZHg5S 8+4RgVOzagZWkgJXEvee4DuvPDGbzkLjbdnYANjRlagSJIVK3i8qrCF2iYZ0Mq33iRch CRjQ== 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=g3oukpog0b62v9lI3IDsLLWPvqIlVmXh8YL5j5paae4=; b=mxiNotig+3BdOIMPzGHPBAV1tKo+vvRE/sYhiiKwHGsZB81MmqQ+7p1lIUUbNthH+e fPzNY//wU27t8DOcXLR+cQfRWZwLljD8iLHQhXtiQXqn1TVLk2hhlnNK4sx8z9sWU1xB D+Mk6MMJmwYuaVVoqlN5tf4AWHdI8HZtcxBIADw4/ZXbBM/WW2ezUsOzOJz+Kz6FrbXf 0N9kNEO7dCmBjsqgR3wF7TxndcoGaZS94I5zPNehuu1pINbfMYTfi8DIUpfo2Q3xZV19 MKUloaU5e+EEKRNLgkkNXfnQ5xvSV4ayBR1CYd7yBgJ+EFi9ogumQgJBJyBWXJSoBYeT ffPQ== X-Gm-Message-State: AOAM533wl8Bz1XJ/HR6f5IsodNex7BibBRtMDxYrBxRcEwcDG2K832gF xM7EGZIViLgJLvxfsd13A/2Eyxiu X-Google-Smtp-Source: ABdhPJy0DmNu1GMmYuVEG04cBF6AH4N8Y91Cb8in/00+EnFCi0OlDMfUJ2ylxyaFGbl16ctS9MWXzw== X-Received: by 2002:a7b:ca4c:: with SMTP id m12mr9945788wml.33.1594999432223; Fri, 17 Jul 2020 08:23:52 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id a22sm13431051wmb.4.2020.07.17.08.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 08:23:51 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Danesh Petigara , Al Cooper , Florian Fainelli , devicetree@vger.kernel.org, Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Rob Herring , Sasi Kumar Subject: [PATCH 6/7] usb: bdc: Halt controller on suspend Date: Fri, 17 Jul 2020 11:23:06 -0400 Message-Id: <20200717152307.36705-7-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717152307.36705-1-alcooperx@gmail.com> References: <20200717152307.36705-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Danesh Petigara GISB bus error kernel panics have been observed during S2 transition tests on the 7271t platform. The errors are a result of the BDC interrupt handler trying to access BDC register space after the system's suspend callbacks have completed. Adding a suspend hook to the BDC driver that halts the controller before S2 entry thus preventing unwanted access to the BDC register space during this transition. Signed-off-by: Danesh Petigara Signed-off-by: Al Cooper Signed-off-by: Florian Fainelli --- drivers/usb/gadget/udc/bdc/bdc_core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c index 47bcc9f6afbd..ac989adefe9d 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_core.c +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c @@ -607,9 +607,14 @@ static int bdc_remove(struct platform_device *pdev) static int bdc_suspend(struct device *dev) { struct bdc *bdc = dev_get_drvdata(dev); + int ret; - clk_disable_unprepare(bdc->clk); - return 0; + /* Halt the controller */ + ret = bdc_stop(bdc); + if (!ret) + clk_disable_unprepare(bdc->clk); + + return ret; } static int bdc_resume(struct device *dev) From patchwork Fri Jul 17 15:23:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 11670589 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 F016813B1 for ; Fri, 17 Jul 2020 15:23:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA71322B4B for ; Fri, 17 Jul 2020 15:23:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="q0JS/OC1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727993AbgGQPX5 (ORCPT ); Fri, 17 Jul 2020 11:23:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727982AbgGQPX4 (ORCPT ); Fri, 17 Jul 2020 11:23:56 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16BB5C0619D2; Fri, 17 Jul 2020 08:23:56 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id z15so11549927wrl.8; Fri, 17 Jul 2020 08:23:56 -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=39DVA3zqy37IA1tKd3smKZZk/q+1H0Y80MNeTQy6wDg=; b=q0JS/OC1B255AdaCCWqQNQayVvqv5EUvuPT8M+lfPx36BqKJqgvYV872My5IIL+DUK LjL2zlx5tLK/LAvwMguh9vqy4Ez9gZ8U0/MuEUvVY6Zk6yYF9I288OyGNO45HrW/90ro UvQsfg2DSShKfuUR5iknLsvfL/D7w1jhtr7WMdY6xmU19sm3gv1Bc3Bz+/IFOkB/lkVU 7DHa6nqh4Bpg2KzK1E4pBrss2T9V1QNAVQhw24Z+oWwE6HlM5L2ac1injmC0kv5F4K35 1xBTwWTHB3Qp0kya1kP65sBDWxunJUyd4awg8Ik0RT2Z3GOU5NLZZRwC8MQRUqC3QZQO 49eQ== 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=39DVA3zqy37IA1tKd3smKZZk/q+1H0Y80MNeTQy6wDg=; b=I4xxxvZr1xAITL9noG6ERnugHihdy6WGSSJ0aBZeDQn2rGEghJxdAng9h4L/yvLJRR El6C06mwKINKD77Pul/d+NT1cHmoWSxWCwSGFLHDvFmRPZOuH0I5YHxQxC9+ckIlDda/ NAs/v43cPIceASrwvESQluPehL3e6dp/7E7BaE8h29q/o4SN/zTO4KrQaVs4JdsYXbd7 V/rgT0f75hp8OL9eMMfVnfYG4XDGGxaOpxZS/9P8/tvmmOUafZQ+/P4VMZcLUXOUfpFd N4Zi1PRULh3/iJroEXgVBV1M5ymKUWFt7EvJRcQ2hczcuwrhymZSGuwfR5gxmmierWBF g4JQ== X-Gm-Message-State: AOAM531ruGKuJ8d7nNh3Pe6oPgsfbpBzd3bXSKkyTeYtxTr2G+YX+LCj 6oqKOFmtG+vNUPNTk8EaEejb829U X-Google-Smtp-Source: ABdhPJyDn/SGGx7/ByOEJUVhCesU8Opuj9JlfNcuFNT0Mi1OfvwomuMRL+gAepJHsnl3MtWV4FN12w== X-Received: by 2002:adf:db4d:: with SMTP id f13mr10698179wrj.336.1594999434093; Fri, 17 Jul 2020 08:23:54 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id a22sm13431051wmb.4.2020.07.17.08.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 08:23:53 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Al Cooper , devicetree@vger.kernel.org, Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Rob Herring , Sasi Kumar Subject: [PATCH 7/7] usb: bdc: Use devm_clk_get_optional() Date: Fri, 17 Jul 2020 11:23:07 -0400 Message-Id: <20200717152307.36705-8-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717152307.36705-1-alcooperx@gmail.com> References: <20200717152307.36705-1-alcooperx@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Florian Fainelli The BDC clock is optional and we may get an -EPROBE_DEFER error code which would not be propagated correctly, fix this by using devm_clk_get_optional(). Signed-off-by: Florian Fainelli --- drivers/usb/gadget/udc/bdc/bdc_core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c index ac989adefe9d..5d8bd9129365 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_core.c +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c @@ -497,11 +497,9 @@ static int bdc_probe(struct platform_device *pdev) dev_dbg(dev, "%s()\n", __func__); - clk = devm_clk_get(dev, "sw_usbd"); - if (IS_ERR(clk)) { - dev_info(dev, "Clock not found in Device Tree\n"); - clk = NULL; - } + clk = devm_clk_get_optional(dev, "sw_usbd"); + if (IS_ERR(clk)) + return PTR_ERR(clk); ret = clk_prepare_enable(clk); if (ret) {