Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758837Ab3DZHu5 (ORCPT ); Fri, 26 Apr 2013 03:50:57 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:17846 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755516Ab3DZHuz (ORCPT ); Fri, 26 Apr 2013 03:50:55 -0400 Message-ID: <517A31A9.5070504@hp.com> Date: Fri, 26 Apr 2013 15:50:01 +0800 From: ZhenHua User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:19.0) Gecko/20130117 Thunderbird/19.0 MIME-Version: 1.0 To: "Li, Zhen-Hua" , stern@rowland.harvard.edu, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/1] driver,usb: Fix a warning in uhci-hcd driver References: <1366961884-14238-1-git-send-email-zhen-hual@hp.com> In-Reply-To: <1366961884-14238-1-git-send-email-zhen-hual@hp.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3070 Lines: 83 There is a function wait_for_HP() in uhci-hub.c. In this patch, it is used in suspend_rh(), I think this can be a solution. And I have tested this patch, it can fix the bug. I think there is another patch needed. As Alan said in another mail, in the UHCI_RH_RUNNING_NODEVS case, it should not be stopped if the uhci device is HP iLo virtual usb. Thanks Zhen-Hua On 04/26/2013 03:38 PM, Li, Zhen-Hua wrote: > This patch is trying to fix this bug on SLES11 SP2: > https://bugzilla.novell.com/show_bug.cgi?id=817035 > > On a large HP system with 64T memory and 60 logical cpus, when usb > driver inits the iLo Virtual USB Controller, there comes a warning > "Controller not stopped yet!". It is because the HP iLo virtual usb > device requires a longer delay. > > Signed-off-by: Li, Zhen-Hua > --- > drivers/usb/host/uhci-hcd.c | 5 +++++ > drivers/usb/host/uhci-hub.c | 12 +++++++----- > 2 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c > index 4a86b63..af30517 100644 > --- a/drivers/usb/host/uhci-hcd.c > +++ b/drivers/usb/host/uhci-hcd.c > @@ -355,6 +355,11 @@ __acquires(uhci->lock) > if (uhci->dead) > return; > } > + > + /* HP's iLo Virtual USB Controller requires a longer delay. */ > + if (uhci->wait_for_hp) > + wait_for_HP(uhci, USBSTS, USBSTS_HCH, 1000); > + > if (!(uhci_readw(uhci, USBSTS) & USBSTS_HCH)) > dev_warn(uhci_dev(uhci), "Controller not stopped yet!\n"); > > diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c > index f87bee6..c3f772c 100644 > --- a/drivers/usb/host/uhci-hub.c > +++ b/drivers/usb/host/uhci-hub.c > @@ -120,14 +120,15 @@ static void uhci_finish_suspend(struct uhci_hcd *uhci, int port, > } > > /* Wait for the UHCI controller in HP's iLO2 server management chip. > - * It can take up to 250 us to finish a reset and set the CSC bit. > + * It can take up to max_wait us to finish the operation. > */ > -static void wait_for_HP(struct uhci_hcd *uhci, unsigned long port_addr) > +static void wait_for_HP(struct uhci_hcd *uhci, unsigned long port_addr, > + u16 status, int max_wait) > { > int i; > > - for (i = 10; i < 250; i += 10) { > - if (uhci_readw(uhci, port_addr) & USBPORTSC_CSC) > + for (i = 10; i < max_wait; i += 10) { > + if (uhci_readw(uhci, port_addr) & status) > return; > udelay(10); > } > @@ -151,7 +152,8 @@ static void uhci_check_ports(struct uhci_hcd *uhci) > /* HP's server management chip requires > * a longer delay. */ > if (uhci->wait_for_hp) > - wait_for_HP(uhci, port_addr); > + wait_for_HP(uhci, port_addr, > + USBPORTSC_CSC, 250); > > /* If the port was enabled before, turning > * reset on caused a port enable change. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/