From patchwork Thu Jan 9 10:15:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 11325421 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 677001398 for ; Thu, 9 Jan 2020 10:15:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45EFC2073A for ; Thu, 9 Jan 2020 10:15:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="MJhbVtfL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730040AbgAIKPo (ORCPT ); Thu, 9 Jan 2020 05:15:44 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39406 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730021AbgAIKPn (ORCPT ); Thu, 9 Jan 2020 05:15:43 -0500 Received: by mail-wm1-f66.google.com with SMTP id 20so2152088wmj.4 for ; Thu, 09 Jan 2020 02:15:41 -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=q5Kvypoa0veV7htnqopebybariu8L8Scoxc+k8wjmRU=; b=MJhbVtfLmq8G7y/0MUMklnkCrlc8+8SHCEhTtVW+awOyJaTS8f0j0SY97P+ymkVI15 EaqOznuGUXP7W4AyLyw4vCkkPEcjUtwXKcSztTI1YMi/ABR6umP5bgFcyUfqnl1b8LvJ K8XDJiEgrGk4F2iMhf/5SunDOQzPqUsgLxJaqAE9qevVTpZvuWfo6PdvpXWxHDszCnp/ sL1QOWSE6SAchIC5tiWz9S0j3EPMud8AaE+iVKy8zfbXlbJfkutlhm7ByJjtgcysMLA9 LwZF1FmH6GjzKfQ2757HBJ+bI4o+bClLkJdYvX5vhnDwsbTTpiFjk+UWCnNqhRfAIj9i xEHQ== 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=q5Kvypoa0veV7htnqopebybariu8L8Scoxc+k8wjmRU=; b=pKGplVzuJcg2/cyPeejLQFB6NUsMOPJOjcm8Tlovqod3QtPE8HWwruO2788r0BYgtj Vt3WI9e0ywO13u9lMmr/XnEBeh4xS41NdMvluCtOCrjzO7Vz46s7VlrCzyonnZrw4nMV dPmJK0qBaE2+zQ2TQ4nzBRtEaFpg7ptL+g9ELO16ph2atkPHNubTpQV6MsPNplxYahVo 2JOKFg83nSR1kTTdDYKF3El3FR4WvK1AMxhX2bPGdSy/dC2La6/yknmcbt9aOwUpf/XZ 4zvy/zrIUZict4CncydxJvTwyvOT7HR9C5NQHBl6cBDdl6irpLfY1P0EK1JpljEWDjF+ Srow== X-Gm-Message-State: APjAAAWrrEGmLZKerrHR9XCbbMzGSYzs4fVAI+vc8KE5WC0AwCfz4uKM +k2rl/e2OetkMmQDa6V7QgHpAg== X-Google-Smtp-Source: APXvYqxQQQD17YSiDseBkpCsjXY2gmrQbVA3E3h9oPtGnrT+oj0cGtu8nJspXYj4aXa77D1D77AAMw== X-Received: by 2002:a7b:c407:: with SMTP id k7mr4011150wmi.46.1578564940134; Thu, 09 Jan 2020 02:15:40 -0800 (PST) Received: from bender.baylibre.local (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id q19sm2250460wmc.12.2020.01.09.02.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 02:15:39 -0800 (PST) From: Neil Armstrong To: balbi@kernel.org, khilman@baylibre.com Cc: Neil Armstrong , linux-usb@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dongjin Kim , Jianxin Pan , Thinh Nguyen , Jun Li , Tim Subject: [PATCH v2 2/3] usb: dwc3: gadget: Add support for disabling SS instances in park mode Date: Thu, 9 Jan 2020 11:15:34 +0100 Message-Id: <20200109101535.26812-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20200109101535.26812-1-narmstrong@baylibre.com> References: <20200109101535.26812-1-narmstrong@baylibre.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.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 2991e5056600..2cb441e2e51b 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1030,6 +1030,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); } @@ -1340,6 +1343,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 1c8b349379af..5fb557f24d38 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) @@ -1022,6 +1023,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 @@ -1213,6 +1216,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;