From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1752411AbYI3EdP@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752411AbYI3EdP (ORCPT <rfc822;w@1wt.eu>);
	Tue, 30 Sep 2008 00:33:15 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750994AbYI3EdA
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 30 Sep 2008 00:33:00 -0400
Received: from mga05.intel.com ([192.55.52.89]:1717 "EHLO
	fmsmga101.fm.intel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1750871AbYI3Ec7 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 30 Sep 2008 00:32:59 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.33,335,1220252400"; 
   d="scan'208";a="621792968"
Subject: [PATCH] pci-e: ignore unknown capability and continue searching
From: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
To: Greg KH <greg@kroah.com>, jbarnes@virtuousgeek.org
Cc: LKML <linux-kernel@vger.kernel.org>, czernecki@gmail.com
Content-Type: text/plain; charset=UTF-8
Date: Tue, 30 Sep 2008 12:29:05 +0800
Message-Id: <1222748945.3887.7.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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Subject: pci-e: ignore unknown capability and continue searching
From: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>


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 <yanmin.zhang@linux.intel.com>
Reported-by Tomasz Czernecki <czernecki@gmail.com>

---

--- 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, &reg32);
-		switch (reg32 & 0xffff) {
+		if (pci_read_config_dword(dev, pos, &reg32))
+			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;