Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753543AbYJCI03 (ORCPT ); Fri, 3 Oct 2008 04:26:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750901AbYJCI0V (ORCPT ); Fri, 3 Oct 2008 04:26:21 -0400 Received: from mga07.intel.com ([143.182.124.22]:41507 "EHLO azsmga101.ch.intel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750785AbYJCI0U (ORCPT ); Fri, 3 Oct 2008 04:26:20 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.33,355,1220252400"; d="scan'208";a="54548819" Subject: Re: [PATCH] pci-e: ignore unknown capability and continue searching From: "Zhang, Yanmin" To: Greg KH Cc: jbarnes@virtuousgeek.org, LKML , czernecki@gmail.com In-Reply-To: <1222748945.3887.7.camel@ymzhang> References: <1222748945.3887.7.camel@ymzhang> Content-Type: text/plain; charset=UTF-8 Date: Fri, 03 Oct 2008 16:21:43 +0800 Message-Id: <1223022104.16351.2.camel@ymzhang> Mime-Version: 1.0 X-Mailer: Evolution 2.21.5 (2.21.5-2.fc9) Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2682 Lines: 82 Greg, Jesse, Is there any issue with the patch? Tomasz need kernel to have the patch to work on his machine. Thanks, Yanmin On Tue, 2008-09-30 at 12:29 +0800, Zhang, Yanmin wrote: > Subject: pci-e: ignore unknown capability and continue searching > From: "Zhang, Yanmin" > > > Tomasz reported AER driver couldn't work on his machine. With the output > of "lcpsi -vvv", I found the root port's extended capabilities are > Capabilities: [100] Unknown (11) > Capabilities: [150] Advanced Error Reporting > Capabilities: [190] Unknown (13) > Such Unknown capability is not expected. During pci-e initialization,function > get_port_device_capability just returns if it hits an unknown capability when > searching the AER capability. > > I worked out a patch against 2.6.27-rc7. When hitting an unkown capability, > function get_port_device_capability continues the searching. > > Tomasz tested it and the patch does work well. > > Signed-off-by Zhang Yanmin > Reported-by Tomasz Czernecki > > --- > > --- linux-2.6.27-rc7/drivers/pci/pcie/portdrv_core.c 2008-09-27 09:35:32.000000000 +0800 > +++ linux-2.6.27-rc7_aer/drivers/pci/pcie/portdrv_core.c 2008-09-27 10:10:39.000000000 +0800 > @@ -195,23 +195,25 @@ static int get_port_device_capability(st > /* PME Capable - root port capability */ > if (((reg16 >> 4) & PORT_TYPE_MASK) == PCIE_RC_PORT) > services |= PCIE_PORT_SERVICE_PME; > - > + > pos = PCI_CFG_SPACE_SIZE; > while (pos) { > - pci_read_config_dword(dev, pos, ®32); > - switch (reg32 & 0xffff) { > + if (pci_read_config_dword(dev, pos, ®32)) > + break; > + > + /* some broken boards return ~0 */ > + if (reg32 == 0xffffffff) > + break; > + > + switch (PCI_EXT_CAP_ID(reg32)) { > case PCI_EXT_CAP_ID_ERR: > services |= PCIE_PORT_SERVICE_AER; > - pos = reg32 >> 20; > break; > case PCI_EXT_CAP_ID_VC: > services |= PCIE_PORT_SERVICE_VC; > - pos = reg32 >> 20; > - break; > - default: > - pos = 0; > break; > } > + pos = PCI_EXT_CAP_NEXT(reg32); > } > > return services; > > > > -- > 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/ -- 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/