From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752560AbdESNpe (ORCPT <rfc822;w@1wt.eu>);
        Fri, 19 May 2017 09:45:34 -0400
Received: from mail.kernel.org ([198.145.29.99]:57328 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750764AbdESNp3 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 19 May 2017 09:45:29 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34B0B2395D
Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org
Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org
Date: Fri, 19 May 2017 09:45:26 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        LKML <linux-kernel@vger.kernel.org>, linux-usb@vger.kernel.org,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Mathias Nyman <mathias.nyman@linux.intel.com>
Subject: Re: [REGRESSION] Failed network caused by: xhci: switch to
 pci_alloc_irq_vectors
Message-ID: <20170519094526.5c98050f@gandalf.local.home>
In-Reply-To: <20170519124625.GA20063@lst.de>
References: <20170518234234.29127245@gandalf.local.home>
        <20170519054223.GA5954@kroah.com>
        <20170519060856.57cf2b76@gandalf.local.home>
        <20170519083721.5a415dc3@gandalf.local.home>
        <20170519124625.GA20063@lst.de>
X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 19 May 2017 14:46:25 +0200
Christoph Hellwig <hch@lst.de> wrote:

> On Fri, May 19, 2017 at 08:37:21AM -0400, Steven Rostedt wrote:
> > ktest config bisect ended with:
> > 
> > ***************************************
> > Found bad config: CONFIG_PCI_MSI
> > ***************************************  
> 
> Oh, that's interesting.  I think there's been a bug in the !CONFIG_PCI_MSI
> fallback for pci_alloc_irq_vectors since the very beginning.  And it
> didn't matter for any driver so far, but xhci has a very odd way
> to set MSI(-X) vs legacy interrupts.
> 
> Can you try the patch below?

Works. Thanks!

Tested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

> 
> 
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 33c2b0b77429..5a7fd3b6a7b9 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1342,7 +1342,7 @@ pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
>  			       unsigned int max_vecs, unsigned int flags,
>  			       const struct irq_affinity *aff_desc)
>  {
> -	if (min_vecs > 1)
> +	if (min_vecs > 1 || !(flags & PCI_IRQ_LEGACY))
>  		return -EINVAL;
>  	return 1;
>  }