Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp190047pxb; Thu, 26 Aug 2021 00:21:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTPZ4+nLFcLcH9Rr95D9FEvPGwbOiRpf6fBNHSRKZ0O/MKcFg/N66r8BB+U11na1vYusmx X-Received: by 2002:a17:906:d8a8:: with SMTP id qc8mr2713250ejb.368.1629962472126; Thu, 26 Aug 2021 00:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629962472; cv=none; d=google.com; s=arc-20160816; b=bR8PmpiFN6K7TcnhgKVKLjkFbh1nOpj9ry5TkvqZ05eDqma5lbz1JKo0ZV2m4B6bRD 4N0A7XXE08Ls3eW/cgVuQSFJCvKmvH65O+0v1MoaFcPWZDQ14GELgbyTSXIzN+xsvVhv 5R8XKKVjt9rWdQguWWoX1sMyQB4+SMq3G56zlm/eKxMXhxM4gye/VBBJz9a1Lq76Bwa0 tnAs9Kx1k1ZmDuHFGW3e52UxXrqJyZ4GHm02OLCtZc6F5aLKO626+FVGxoEAw3EC3FPJ j2wjoXKBhAP7Mi/UOel2iI9tTfVWPDZPrNm5FpY7cGYBwcUweypnhEWCgRQdawY3fltE 9UPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=sizJwn5ozgrVb6n6jwYge1ttqaKCWs6W8Y6FFVmyAC8=; b=nOTiu8F1nzzf4WzFFGfkumjcleKNx9Qtn+jd7HPKCxYvDKACcxtcRZFjY86MNTQPka xi0cwTXX2oDHVjZV7ZGQsnhwip/e0eDJqTIgaK+gZ3P/C9Hikmmpwo1olLMZjetS3zcH DCIMZju+CI4AreNcqclVRpz0xeMpl8pKidm1Zg/SJ4/V6b7QqbFb1S1OuDgMQBHbm/M9 nImS/wGIWdVvMYx9OukvghyoA8P1nUFVykcSyp5BABMsPNd3g30lIceD+CnffLldY7SS UfTx07JDy6oJqb5auYRowk78cg1PeZFQ0Z6myeJw6zTpFDAuthom5q14qsCCHJnELdW1 xGoQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r2si2368787edy.116.2021.08.26.00.20.47; Thu, 26 Aug 2021 00:21:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240038AbhHZHPh (ORCPT + 99 others); Thu, 26 Aug 2021 03:15:37 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:13666 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238379AbhHZHPg (ORCPT ); Thu, 26 Aug 2021 03:15:36 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 17Q6tdGm063548; Thu, 26 Aug 2021 14:55:39 +0800 (GMT-8) (envelope-from neal_liu@aspeedtech.com) Received: from NealLiu-PC01.aspeed.com (192.168.2.78) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 26 Aug 2021 15:14:19 +0800 From: neal_liu To: Alan Stern , Greg Kroah-Hartman , Tony Prisk , , , CC: , Tao Ren , Subject: [PATCH] usb: host: ehci: skip STS_HALT check for aspeed platform Date: Thu, 26 Aug 2021 15:15:25 +0800 Message-ID: <20210826071525.27651-1-neal_liu@aspeedtech.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.2.78] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 17Q6tdGm063548 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org STS_HALT also depends on ASS/PSS status for apseed. Skip this check on startup. Signed-off-by: neal_liu --- drivers/usb/host/ehci-hcd.c | 10 +++++++++- drivers/usb/host/ehci-platform.c | 6 ++++++ drivers/usb/host/ehci.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 10b0365f3439..a539e11502ef 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -634,7 +634,15 @@ static int ehci_run (struct usb_hcd *hcd) /* Wait until HC become operational */ ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */ msleep(5); - rc = ehci_handshake(ehci, &ehci->regs->status, STS_HALT, 0, 100 * 1000); + + /* For Aspeed, STS_HALT also depends on ASS/PSS status. + * Skip this check on startup. + */ + if (ehci->is_aspeed) + rc = 0; + else + rc = ehci_handshake(ehci, &ehci->regs->status, STS_HALT, + 0, 100 * 1000); up_write(&ehci_cf_port_reset_rwsem); diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index c70f2d0b4aaf..c3dc906274d9 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -297,6 +297,12 @@ static int ehci_platform_probe(struct platform_device *dev) "has-transaction-translator")) hcd->has_tt = 1; + if (of_device_is_compatible(dev->dev.of_node, + "aspeed,ast2500-ehci") || + of_device_is_compatible(dev->dev.of_node, + "aspeed,ast2600-ehci")) + ehci->is_aspeed = 1; + if (soc_device_match(quirk_poll_match)) priv->quirk_poll = true; diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 80bb823aa9fe..fdd073cc053b 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -219,6 +219,7 @@ struct ehci_hcd { /* one per controller */ unsigned need_oc_pp_cycle:1; /* MPC834X port power */ unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ unsigned spurious_oc:1; + unsigned is_aspeed:1; /* required for usb32 quirk */ #define OHCI_CTRL_HCFS (3 << 6) -- 2.17.1