From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757400AbZKDRIw (ORCPT ); Wed, 4 Nov 2009 12:08:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757314AbZKDRIv (ORCPT ); Wed, 4 Nov 2009 12:08:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7933 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757125AbZKDRIv (ORCPT ); Wed, 4 Nov 2009 12:08:51 -0500 Date: Wed, 4 Nov 2009 19:06:19 +0200 From: "Michael S. Tsirkin" To: Jesse Barnes Cc: Alex Chiang , Yu Zhao , Matthew Wilcox , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, gleb@redhat.com Subject: Re: [PATCH] pci: fix nit in ROM BAR size probing Message-ID: <20091104170550.GA506@redhat.com> References: <20091029152459.GA5480@redhat.com> <20091104090409.496540a1@jbarnes-piketon> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091104090409.496540a1@jbarnes-piketon> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 04, 2009 at 09:04:09AM -0800, Jesse Barnes wrote: > On Thu, 29 Oct 2009 17:24:59 +0200 > "Michael S. Tsirkin" wrote: > > > When probing for ROM BAR size, we should not > > change bits 1:10 in this BAR, because these > > bits are marked as "reserved for future use" in PCI spec, > > so changing them might have side effects. > > > > No such issue for I/O or memory, as there is > > an implementation note in PCI spec which explicitly allows > > writing 0xfffffffff there. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > drivers/pci/probe.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > > index 8105e32..d65aae4 100644 > > --- a/drivers/pci/probe.c > > +++ b/drivers/pci/probe.c > > @@ -163,12 +163,12 @@ int __pci_read_base(struct pci_dev *dev, enum > > pci_bar_type type, { > > u32 l, sz, mask; > > > > - mask = type ? ~PCI_ROM_ADDRESS_ENABLE : ~0; > > + mask = type ? PCI_ROM_ADDRESS_MASK : ~0; > > > > res->name = pci_name(dev); > > > > pci_read_config_dword(dev, pos, &l); > > - pci_write_config_dword(dev, pos, mask); > > + pci_write_config_dword(dev, pos, l | mask); > > pci_read_config_dword(dev, pos, &sz); > > pci_write_config_dword(dev, pos, l); > > Applied to linux-next, thanks. Another possible enhancement here would > be to make the mask into a switch based on the type, since mem32 and > mem64 "BARs" (added by willy for doing BAR-like stuff) could probably > use ~0 as well. > > Jesse Where can I find the patch by willy that adds these? -- MST