DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org;
	h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User;
	b=H+uLfb5d5x3d4vfjBAMm3aD7q/MuWRuus7iZBLS7lsBMmjdrif/mSCA/OkYBI+D/Dq68IiuTPaeYLiph7Z5O52apWM6yTcN3sdFCWAX8K0Juv+SwT7KEIKfFH2ed5jZr;
Date: Wed, 16 Dec 2009 11:22:09 -0800
From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Csaba Henk <csaba@gluster.com>
Cc: Tejun Heo <tj@kernel.org>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] PCI: Handle case when no pci device can provide
 cache line size hint
Message-ID: <20091216112209.4468ee53@jbarnes-piketon>
In-Reply-To: <20091215122525.GA21846@foogalware.zresearch.com>
References: <20091215122525.GA21846@foogalware.zresearch.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1416
Lines: 41

On Tue, 15 Dec 2009 17:55:25 +0530
Csaba Henk <csaba@gluster.com> wrote:

> Prior to this patch, if pci_read_config_byte(dev,
> PCI_CACHE_LINE_SIZE, ...) returns 0 for all dev, pci_cache_line_size
> ends up set to zero (instead of pci_dfl_cache_line_size).
> 
> This patch ensures the pci_cache_line_size = pci_dfl_cache_line_size
> setting in the above scenario.
> 
> This happens in case of a kvm-88 guest (where, consequently, the
> rtl8139 NIC failed to initialize).
> 
> Signed-off-by: Csaba Henk <csaba@gluster.com>
> ---
>  drivers/pci/quirks.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 7cfa7c3..f70f4e2 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2629,7 +2629,7 @@ static int __init pci_apply_final_quirks(void)
>  	if (!pci_cache_line_size) {
>  		printk(KERN_DEBUG "PCI: CLS %u bytes, default %u\n",
>  		       cls << 2, pci_dfl_cache_line_size << 2);
> -		pci_cache_line_size = cls;
> +		pci_cache_line_size = cls ? cls :
> pci_dfl_cache_line_size; }
>  
>  	return 0;

Applied, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center
--
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/