From patchwork Thu Apr 20 11:14:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weitao Wang X-Patchwork-Id: 85702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp42131vqo; Wed, 19 Apr 2023 20:25:05 -0700 (PDT) X-Google-Smtp-Source: AKy350be1QFwjRtxNiSRK8fc/w4JkpbT5fUO7uIJqMXGnbA9NlxXBTwaI0A+Wkp3vTd0XZBVu6JM X-Received: by 2002:a17:902:c951:b0:1a9:317a:dab6 with SMTP id i17-20020a170902c95100b001a9317adab6mr461265pla.31.1681961104866; Wed, 19 Apr 2023 20:25:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681961104; cv=none; d=google.com; s=arc-20160816; b=BIeHwrx3Pb86+CGoL7sZDeFjiLYHPQ0qTu95c0sBWWzpHmCq0cDu57xYbzKiAly6kE IczB4bwwpUnB9isGip4/ql2pWsk8UlDsbvYQh9HXiiKc+k6DaRglIDuq1unZGZ1jjD8V EWCCAtb19npuxkPp9JjZBtDA5FExT9klBBmROn28pzqFyalNiqJABWQ5/aRoO4DT49Z5 jvyVa+vQPhbyRIh2HeBamBODiSPbQQdmZZiqkSJ8f5LxYrEQl91DQRqK3vZTM+EpHWVk jLadjsFXOUloo/kMKB74e/riZBdFpXfv1EMLKyOw//ojpNc8VmCt/rmbHy5ANcTPIlAu gc+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=kZbaMjcPAbr+B/KjnM2do1QFv/cAfFwpA3JKSWyuwCY=; b=ceqDvrt6Mw/fpO7ZC/mTyQgGwb2Q1Ox4zfNb/LiGg7r+bwcEh+FiYFP9e5J/8ny/SL zCy2LaYTy51H8mAoZ4FPXof3GTVTwwhubpkWsJi7xdbEs7kmip65YOZ0ajDX9l1VnEGh bms/RlIwk1C2l+L7EF/uNOlIhqwJu+hKDLesAUCFzMb8rAEtsoCCUnKYwYupLB0bSgc5 FFTZ9iJ1kkmUl6eU3vxRkeynFkmQsWCAYJmARqFyaw+yTer7bdG9WEhdDTBymoXBQ1vT xqZ3UZDGyAocJmG6HHswzmHkZZTAxLU2/7QHOnG1qpqxfj+FrTr1JIIYnZ06sKzNsWN1 EcpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y2-20020a17090264c200b001a6f0e81eccsi594166pli.233.2023.04.19.20.24.48; Wed, 19 Apr 2023 20:25:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232414AbjDTDPA (ORCPT + 99 others); Wed, 19 Apr 2023 23:15:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232367AbjDTDOv (ORCPT ); Wed, 19 Apr 2023 23:14:51 -0400 Received: from mx2.zhaoxin.com (mx2.zhaoxin.com [203.110.167.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA9182103 for ; Wed, 19 Apr 2023 20:14:49 -0700 (PDT) X-ASG-Debug-ID: 1681960486-1eb14e63872b340001-xx1T2L Received: from ZXSHMBX2.zhaoxin.com (ZXSHMBX2.zhaoxin.com [10.28.252.164]) by mx2.zhaoxin.com with ESMTP id KWBNUDq3hfWgjigh (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Thu, 20 Apr 2023 11:14:46 +0800 (CST) X-Barracuda-Envelope-From: WeitaoWang-oc@zhaoxin.com X-Barracuda-RBL-Trusted-Forwarder: 10.28.252.164 Received: from zxbjmbx1.zhaoxin.com (10.29.252.163) by ZXSHMBX2.zhaoxin.com (10.28.252.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 20 Apr 2023 11:14:46 +0800 Received: from L440.zhaoxin.com (10.29.8.21) by zxbjmbx1.zhaoxin.com (10.29.252.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 20 Apr 2023 11:14:46 +0800 X-Barracuda-RBL-Trusted-Forwarder: 10.28.252.164 From: Weitao Wang X-Barracuda-RBL-Trusted-Forwarder: 10.29.252.163 To: , , , CC: , Subject: [PATCH] =?utf-8?q?UHCI=EF=BC=9Aadjust_zhaoxin_UHCI_controllers_Over?= =?utf-8?q?Current_bit_value?= Date: Thu, 20 Apr 2023 19:14:45 +0800 X-ASG-Orig-Subj: [PATCH] =?utf-8?q?UHCI=EF=BC=9Aadjust_zhaoxin_UHCI_controll?= =?utf-8?q?ers_OverCurrent_bit_value?= Message-ID: <20230420111445.5028-1-WeitaoWang-oc@zhaoxin.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Originating-IP: [10.29.8.21] X-ClientProxiedBy: zxbjmbx1.zhaoxin.com (10.29.252.163) To zxbjmbx1.zhaoxin.com (10.29.252.163) X-Barracuda-Connect: ZXSHMBX2.zhaoxin.com[10.28.252.164] X-Barracuda-Start-Time: 1681960486 X-Barracuda-Encrypted: ECDHE-RSA-AES128-GCM-SHA256 X-Barracuda-URL: https://10.28.252.36:4443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at zhaoxin.com X-Barracuda-Scan-Msg-Size: 1007 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.0103 1.0000 -1.9535 X-Barracuda-Spam-Score: 1.16 X-Barracuda-Spam-Status: No, SCORE=1.16 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests=DATE_IN_FUTURE_06_12, DATE_IN_FUTURE_06_12_2 X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.107661 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 DATE_IN_FUTURE_06_12 Date: is 6 to 12 hours after Received: date 3.10 DATE_IN_FUTURE_06_12_2 DATE_IN_FUTURE_06_12_2 X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763664047070737799?= X-GMAIL-MSGID: =?utf-8?q?1763664047070737799?= Over Current condition is not standardized in the UHCI spec. Zhaoxin UHCI controllers report OverCurrent bit active off. Intel controllers report it active on, so we'll adjust the bit value. Signed-off-by: Weitao Wang --- drivers/usb/host/uhci-pci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c index 3592f757fe05..177e3c2aa287 100644 --- a/drivers/usb/host/uhci-pci.c +++ b/drivers/usb/host/uhci-pci.c @@ -126,6 +126,10 @@ static int uhci_pci_init(struct usb_hcd *hcd) if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_VIA) uhci->oc_low = 1; + /* ZHAOXIN controllers report OverCurrent bit active off. */ + if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_ZHAOXIN) + uhci->oc_low = 1; + /* HP's server management chip requires a longer port reset delay. */ if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_HP) uhci->wait_for_hp = 1;