Date: Wed, 15 Jun 2011 13:36:31 -0700
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
To: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Cc: linux-usb@vger.kernel.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] xhci: Add reset on resume quirk for asrock p67 host
Message-ID: <20110615203631.GF5382@xanatos>
References: <4DF85A1F.1080001@gmail.com>
 <20110615165842.GB5382@xanatos>
 <4DF8EE62.3060407@gmail.com>
 <20110615195928.GD5382@xanatos>
 <4DF9160D.8090109@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4DF9160D.8090109@gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2691
Lines: 77

On Wed, Jun 15, 2011 at 10:29:01PM +0200, Maarten Lankhorst wrote:
> The asrock p67 xhci controller completely dies on resume,
> add a quirk for this, to bring the host back online after a suspend.
> 
> This should be backported to stable kernels as far back as 2.6.34.

Why 2.6.34?  Only kernels as old as 2.6.37 had xHCI suspend and resume
support.  Before 2.6.37, the xHCI driver would prevent the system from
suspending at all.

Otherwise looks fine.

Sarah Sharp

> Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
> Cc: stable@kernel.org
> ---
> I have no idea if the vendor name is correct. lspci didn't list it.
> 
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index 17541d0..cb16de2 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -29,6 +29,9 @@
>  #define PCI_VENDOR_ID_FRESCO_LOGIC	0x1b73
>  #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK	0x1000
>  
> +#define PCI_VENDOR_ID_ETRON		0x1b6f
> +#define PCI_DEVICE_ID_ASROCK_P67	0x7023
> +
>  static const char hcd_name[] = "xhci_hcd";
>  
>  /* called after powerup, by probe or system-pm "wakeup" */
> @@ -134,6 +137,11 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
>  		xhci->quirks |= XHCI_EP_LIMIT_QUIRK;
>  		xhci->limit_active_eps = 64;
>  	}
> +	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
> +			pdev->device == PCI_DEVICE_ID_ASROCK_P67) {
> +		xhci->quirks |= XHCI_RESET_ON_RESUME;
> +		xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
> +	}
>  
>  	/* Make sure the HC is halted. */
>  	retval = xhci_halt(xhci);
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 06e7023..42fd032 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -759,6 +759,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
>  		msleep(100);
>  
>  	spin_lock_irq(&xhci->lock);
> +	if (xhci->quirks & XHCI_RESET_ON_RESUME)
> +		hibernated = 0;
>  
>  	if (!hibernated) {
>  		/* step 1: restore register */
> diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
> index 7d1ea3b..b769a75 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1308,6 +1308,7 @@ struct xhci_hcd {
>   */
>  #define XHCI_EP_LIMIT_QUIRK	(1 << 5)
>  #define XHCI_BROKEN_MSI		(1 << 6)
> +#define XHCI_RESET_ON_RESUME	(1 << 7)
>  	unsigned int		num_active_eps;
>  	unsigned int		limit_active_eps;
>  	/* There are two roothubs to keep track of bus suspend info for */
> 
> 
--
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/