Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755250AbXFJBy1 (ORCPT ); Sat, 9 Jun 2007 21:54:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751637AbXFJByU (ORCPT ); Sat, 9 Jun 2007 21:54:20 -0400 Received: from colo.lackof.org ([198.49.126.79]:41194 "EHLO colo.lackof.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751363AbXFJByU (ORCPT ); Sat, 9 Jun 2007 21:54:20 -0400 Date: Sat, 9 Jun 2007 19:54:12 -0600 From: Grant Grundler To: Auke Kok Cc: linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz, gregkh@suse.de, grundler@parisc-linux.org, davem@davemloft.net Subject: Re: [PATCH] PCI: also read revision ID for sparc64, ppc, read class at the same time Message-ID: <20070610015412.GA26396@colo.lackof.org> References: <20070609201221.5868.31948.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070609201221.5868.31948.stgit@localhost.localdomain> X-Home-Page: http://www.parisc-linux.org/ User-Agent: Mutt/1.5.15+20070515 (2007-05-02) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3058 Lines: 79 On Sat, Jun 09, 2007 at 01:12:21PM -0700, Auke Kok wrote: > Since the PCI bus class and revision are in the same dword, we > can fill in both in the same read. > > Other non-x86 arches use different methods to fill in these values, > make sure to adjust those too. Yeah, this looks good to me. I didn't know ppc and sparc had their own methods for device discovery. Acked-by: Grant Grundler thanks, grant > > Signed-off-by: Auke Kok > --- > > arch/powerpc/kernel/pci_64.c | 2 ++ > arch/sparc64/kernel/pci.c | 1 + > drivers/pci/probe.c | 4 +--- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c > index 249cca2..b2c55ca 100644 > --- a/arch/powerpc/kernel/pci_64.c > +++ b/arch/powerpc/kernel/pci_64.c > @@ -367,8 +367,10 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, > sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), > dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); > dev->class = get_int_prop(node, "class-code", 0); > + dev->revision = get_int_prop(node, "revision-id", 0); > > DBG(" class: 0x%x\n", dev->class); > + DBG(" revision: 0x%x\n", dev->revision); > > dev->current_state = 4; /* unknown power state */ > dev->error_state = pci_channel_io_normal; > diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c > index 38a32bc..759cc20 100644 > --- a/arch/sparc64/kernel/pci.c > +++ b/arch/sparc64/kernel/pci.c > @@ -448,6 +448,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, > */ > pci_read_config_dword(dev, PCI_CLASS_REVISION, &class); > dev->class = class >> 8; > + dev->revision = class & 0xff; > > sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), > dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 0fdb71d..a574b7f 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -702,6 +702,7 @@ static int pci_setup_device(struct pci_dev * dev) > dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); > > pci_read_config_dword(dev, PCI_CLASS_REVISION, &class); > + dev->revision = class & 0xff; > class >>= 8; /* upper 3 bytes */ > dev->class = class; > class >>= 8; > @@ -918,9 +919,6 @@ pci_scan_device(struct pci_bus *bus, int devfn) > dev->cfg_size = pci_cfg_space_size(dev); > dev->error_state = pci_channel_io_normal; > > - /* read the PCI revision: 1 byte */ > - pci_read_config_byte(dev, PCI_REVISION_ID, &dev->revision); > - > /* Assume 32-bit PCI; let 64-bit PCI cards (which are far rarer) > set this higher, assuming the system even supports it. */ > dev->dma_mask = 0xffffffff; - 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/