Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759521AbXFVRNR (ORCPT ); Fri, 22 Jun 2007 13:13:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753901AbXFVRND (ORCPT ); Fri, 22 Jun 2007 13:13:03 -0400 Received: from mga03.intel.com ([143.182.124.21]:16026 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752225AbXFVRNB (ORCPT ); Fri, 22 Jun 2007 13:13:01 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.16,452,1175497200"; d="scan'208";a="242210208" Message-ID: <467C0317.3000804@intel.com> Date: Fri, 22 Jun 2007 10:12:55 -0700 From: "Kok, Auke" User-Agent: Thunderbird 2.0.0.0 (X11/20070420) MIME-Version: 1.0 To: linux-pci@atrey.karlin.mff.cuni.cz, gregkh@suse.de CC: Grant Grundler , Auke Kok , linux-kernel@vger.kernel.org, davem@davemloft.net Subject: Re: [PATCH] PCI: also read revision ID for sparc64, ppc, read class at the same time References: <20070609201221.5868.31948.stgit@localhost.localdomain> <20070610015412.GA26396@colo.lackof.org> In-Reply-To: <20070610015412.GA26396@colo.lackof.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3327 Lines: 86 Grant Grundler wrote: > 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; Greg, did you end up pulling this patch? If you pulled my first patch, then you *must* pull this one too. Otherwise a lot of drivers will fail on ppc/sparc64. Auke - 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/