From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262088AbVGFGfh (ORCPT ); Wed, 6 Jul 2005 02:35:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262151AbVGFGfg (ORCPT ); Wed, 6 Jul 2005 02:35:36 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:5086 "EHLO fgwmail5.fujitsu.co.jp") by vger.kernel.org with ESMTP id S262088AbVGFFEs (ORCPT ); Wed, 6 Jul 2005 01:04:48 -0400 Message-ID: <42CB671B.5000604@jp.fujitsu.com> Date: Wed, 06 Jul 2005 14:07:39 +0900 From: Hidetoshi Seto User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Linux Kernel list , linux-ia64@vger.kernel.org, "Luck, Tony" CC: Linas Vepstas , Benjamin Herrenschmidt , long , linux-pci@atrey.karlin.mff.cuni.cz, linuxppc64-dev Subject: [PATCH 2.6.13-rc1 04/10] IOCHK interface for I/O error handling/detecting References: <42CB63B2.6000505@jp.fujitsu.com> In-Reply-To: <42CB63B2.6000505@jp.fujitsu.com> 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 [This is 4 of 10 patches, "iochk-04-register_bridge.patch"] - Since there could be a (PCI-)bus-error, some kind of error cannot detected on the device but on its hosting bridge. So, it is also required to check the bridge's register. In other words, to check a bus-error correctly, we need to check both end of the bus, device and its host bridge. OK, but often bridges are shared by multiple devices, right? So we need care to handle it... Yes, see next (5 of 10). Changes from previous one for 2.6.11.11: - trivial coding style fix. Signed-off-by: Hidetoshi Seto --- arch/ia64/lib/iomap_check.c | 20 +++++++++++++++++++- include/asm-ia64/io.h | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) Index: linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c =================================================================== --- linux-2.6.13-rc1.orig/arch/ia64/lib/iomap_check.c +++ linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c @@ -14,6 +14,7 @@ int iochk_read(iocookie *cookie); struct list_head iochk_devices; DEFINE_SPINLOCK(iochk_lock); /* all works are excluded on this lock */ +static struct pci_dev *search_host_bridge(struct pci_dev *dev); static int have_error(struct pci_dev *dev); void iochk_init(void) @@ -29,6 +30,7 @@ void iochk_clear(iocookie *cookie, struc INIT_LIST_HEAD(&(cookie->list)); cookie->dev = dev; + cookie->host = search_host_bridge(dev); spin_lock_irqsave(&iochk_lock, flag); list_add(&cookie->list, &iochk_devices); @@ -43,7 +45,8 @@ int iochk_read(iocookie *cookie) int ret = 0; spin_lock_irqsave(&iochk_lock, flag); - if (cookie->error || have_error(cookie->dev)) + if ( cookie->error || have_error(cookie->dev) + || (cookie->host && have_error(cookie->host)) ) ret = 1; list_del(&cookie->list); spin_unlock_irqrestore(&iochk_lock, flag); @@ -51,6 +54,21 @@ int iochk_read(iocookie *cookie) return ret; } +struct pci_dev *search_host_bridge(struct pci_dev *dev) +{ + struct pci_bus *pbus; + + /* there is no bridge */ + if (!dev->bus->self) + return NULL; + + /* find root bus bridge */ + for (pbus = dev->bus; pbus->parent && pbus->parent->self; + pbus = pbus->parent); + + return pbus->self; +} + static int have_error(struct pci_dev *dev) { u16 status; Index: linux-2.6.13-rc1/include/asm-ia64/io.h =================================================================== --- linux-2.6.13-rc1.orig/include/asm-ia64/io.h +++ linux-2.6.13-rc1/include/asm-ia64/io.h @@ -78,6 +78,7 @@ extern unsigned int num_io_spaces; typedef struct { struct list_head list; struct pci_dev *dev; /* target device */ + struct pci_dev *host; /* hosting bridge */ unsigned long error; /* error flag */ } iocookie;