From patchwork Wed Feb 19 14:18:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 11391603 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 B226D17EF for ; Wed, 19 Feb 2020 14:19:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E830206ED for ; Wed, 19 Feb 2020 14:19:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uGc24Ol5"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="waWdG4Xr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E830206ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1eQ/TBCL/EKJ8n+4R9whNlVkp3TiFef4gw8krPjfCG8=; b=uGc24Ol5pTmLyE //hlXA6Fp9cyD6kMuhTPTSXp5AcO9RUqNAnPQmXN2bNHVZxtT0T7uI9foU2tlh7GOHPNrBasS7+dY VK+36H0CarN6koQx7qNpsSHzIYQDrw0233j3rhxLGHTeLtvxN41cUpNjonlvI5rJ7S0rx5thtmCD0 fISAy+RBXrkSBTPgfmJy2At2/UROrwpinoeO6H5FbkKR5PgWWsM1kWoGjb2/nFY94ruiO3B02pRNL ldtVPdb/Z4iPoOB/dNJs7U8Ajn6p825CBw/QvwCps+nOslMUiSjqYz/Pxw/8mq0pYCt9lECAg4HC7 UWhGT4YJH/W+FqqgxHpg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4QBn-0002QG-5Y; Wed, 19 Feb 2020 14:18:59 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4QBE-0001pR-I1 for linux-arm-kernel@lists.infradead.org; Wed, 19 Feb 2020 14:18:26 +0000 Received: by mail-wr1-x444.google.com with SMTP id g3so689166wrs.12 for ; Wed, 19 Feb 2020 06:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n9xo7c5xIj503yHqM6KupvIMlSgtFtTi88b83o6eSpE=; b=waWdG4XrW/EyuOUHVJ+iPuGlQzQRPMVeiFZmuqt63qawGzIZe7kly2VTbx7nkdw5+r BtzQToiQTyOB4geMLMJMtnUgjMMBgxA7gdQphqDzKy59R1qpzB68bZTi2kbcTK7CJhxO hh4NiDeWbL7WqbqrTlyUZY9G2NZPn6x9mT7nWjCwdOxmqywcONXSVOBgC3H21Bv04sml DxiB+DcCg+O5h61UzJQmuDFJTkj1aDglNEE9cJ+NxPmxBCtPfTTnNIN8mZTlrDd6owxi 55mJiuEAJa+VINDupWca2I8xX0ZZbMc19EdkVX0g41M638AoQy95qSPtsG5H7rIDL3Iz /Xrw== 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:mime-version:content-transfer-encoding; bh=n9xo7c5xIj503yHqM6KupvIMlSgtFtTi88b83o6eSpE=; b=nc3u9qQZSrBIoQDWSkYlhYlVlsfYPZnYG5W1STIhbNYLzjP73EZUAg8GNV44XrPMXs 25+Q9Bs178hoTy30+d8YL0tfjAJ9JwoLaZSKSqZtItUB94ZBxt592jeAotoRHk+t7zGu XAcmpM9RfFIZD3MrSSE3IxEMYWpZAYZXS+2GmIFGNzq7xtBwbRRKPdVvxRUe/l1vpj9T rnrqK+8BpPw69+5ynrxU94Y3pLchuUKb/YSryU/p6DxQgnoc5D9Ok7ZtT/QyHrqi+iM0 qiy75k/rcRPn34u8itdnPsF3+S8+XN2OVNxnxOYntdxVoMMH5uJi9UYALOa6j2Yd6h+N On7Q== X-Gm-Message-State: APjAAAUcBnmTJQScksLKJjSQb7MgZsEIDgVcmUlfDIJKzetIXaDHcU6P 3g1YgqrA0stlrRpDu7e6ldlz6A== X-Google-Smtp-Source: APXvYqxLVGf28xLvfSGn9RNQlEUC9o5LfiGwH9Hro/B8+KLSDPU477rsdTxeZIEGkdiMgYuB0154Ag== X-Received: by 2002:a5d:6406:: with SMTP id z6mr36121815wru.294.1582121903188; Wed, 19 Feb 2020 06:18:23 -0800 (PST) Received: from bender.baylibre.local ([2a01:e35:2ec0:82b0:510e:e29a:93ab:74c3]) by smtp.gmail.com with ESMTPSA id b11sm3337772wrx.89.2020.02.19.06.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 06:18:22 -0800 (PST) From: Neil Armstrong To: balbi@kernel.org, khilman@baylibre.com Subject: [PATCH v3 2/3] usb: dwc3: gadget: Add support for disabling SS instances in park mode Date: Wed, 19 Feb 2020 15:18:16 +0100 Message-Id: <20200219141817.24521-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20200219141817.24521-1-narmstrong@baylibre.com> References: <20200219141817.24521-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200219_061824_598965_65725B5A X-CRM114-Status: GOOD ( 14.65 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jianxin Pan , Neil Armstrong , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Tim , Jun Li , Dongjin Kim , linux-amlogic@lists.infradead.org, Thinh Nguyen , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org In certain circumstances, the XHCI SuperSpeed instance in park mode can fail to recover, thus on Amlogic G12A/G12B/SM1 SoCs when there is high load on the single XHCI SuperSpeed instance, the controller can crash like: xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command. xhci-hcd xhci-hcd.0.auto: Host halt failed, -110 xhci-hcd xhci-hcd.0.auto: xHCI host controller not responding, assume dead xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command. hub 2-1.1:1.0: hub_ext_port_status failed (err = -22) xhci-hcd xhci-hcd.0.auto: HC died; cleaning up usb 2-1.1-port1: cannot reset (err = -22) Setting the PARKMODE_DISABLE_SS bit in the DWC3_USB3_GUCTL1 mitigates the issue. The bit is described as : "When this bit is set to '1' all SS bus instances in park mode are disabled" Synopsys explains in [1]: The GUCTL1.PARKMODE_DISABLE_SS is only available in dwc_usb3 controller running in host mode. This should not be set for other IPs. This can be disabled by default based on IP, but I recommend to have a property to enable this feature for devices that need this. [1] https://lore.kernel.org/linux-usb/45212db9-e366-2669-5c0a-3c5bd06287f6@synopsys.com CC: Dongjin Kim Cc: Jianxin Pan Cc: Thinh Nguyen Cc: Jun Li Reported-by: Tim Signed-off-by: Neil Armstrong --- drivers/usb/dwc3/core.c | 5 +++++ drivers/usb/dwc3/core.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 1d85c42b9c67..43bd5b1ea9e2 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1029,6 +1029,9 @@ static int dwc3_core_init(struct dwc3 *dwc) if (dwc->dis_tx_ipgap_linecheck_quirk) reg |= DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS; + if (dwc->parkmode_disable_ss_quirk) + reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS; + dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); } @@ -1342,6 +1345,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) "snps,dis-del-phy-power-chg-quirk"); dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev, "snps,dis-tx-ipgap-linecheck-quirk"); + dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev, + "snps,parkmode-disable-ss-quirk"); dwc->tx_de_emphasis_quirk = device_property_read_bool(dev, "snps,tx_de_emphasis_quirk"); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 77c4a9abe365..3ecc69c5b150 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -249,6 +249,7 @@ #define DWC3_GUCTL_HSTINAUTORETRY BIT(14) /* Global User Control 1 Register */ +#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) #define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28) #define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24) @@ -1024,6 +1025,8 @@ struct dwc3_scratchpad_array { * change quirk. * @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate * check during HS transmit. + * @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed + * instances in park mode. * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk * @tx_de_emphasis: Tx de-emphasis value * 0 - -6dB de-emphasis @@ -1215,6 +1218,7 @@ struct dwc3 { unsigned dis_u2_freeclk_exists_quirk:1; unsigned dis_del_phy_power_chg_quirk:1; unsigned dis_tx_ipgap_linecheck_quirk:1; + unsigned parkmode_disable_ss_quirk:1; unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2;