From patchwork Tue Nov 13 09:08:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takao Indoh X-Patchwork-Id: 198577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 136FD2C00B0 for ; Tue, 13 Nov 2012 20:08:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754497Ab2KMJIg (ORCPT ); Tue, 13 Nov 2012 04:08:36 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:53137 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979Ab2KMJId (ORCPT ); Tue, 13 Nov 2012 04:08:33 -0500 Received: from m4.gw.fujitsu.co.jp (unknown [10.0.50.74]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id DB07D3EE0BC; Tue, 13 Nov 2012 18:08:32 +0900 (JST) Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id BF2A045DE51; Tue, 13 Nov 2012 18:08:32 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id A68F245DE4D; Tue, 13 Nov 2012 18:08:32 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 997131DB803F; Tue, 13 Nov 2012 18:08:32 +0900 (JST) Received: from m1000.s.css.fujitsu.com (m1000.s.css.fujitsu.com [10.240.81.136]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 513851DB803B; Tue, 13 Nov 2012 18:08:32 +0900 (JST) Received: from m1000.css.fujitsu.com (m1000 [127.0.0.1]) by m1000.s.css.fujitsu.com (Postfix) with ESMTP id 2E21E611CA; Tue, 13 Nov 2012 18:08:32 +0900 (JST) Received: from [10.124.101.134] (unknown [10.124.101.134]) by m1000.s.css.fujitsu.com (Postfix) with ESMTP id 952DD61150; Tue, 13 Nov 2012 18:08:31 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 From: Takao Indoh To: linux-pci@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org Cc: tokunaga.keiich@jp.fujitsu.com, kexec@lists.infradead.org, hbabu@us.ibm.com, andi@firstfloor.org, ddutile@redhat.com, Takao Indoh , ishii.hironobu@jp.fujitsu.com, hpa@zytor.com, bhelgaas@google.com, tglx@linutronix.de, yinghai@kernel.org, mingo@redhat.com, vgoyal@redhat.com, khalid@gonehiking.org Message-Id: <20121113090301.1180.93781.sendpatchset@indoh> In-Reply-To: <20121113090212.1180.12233.sendpatchset@indoh> References: <20121113090212.1180.12233.sendpatchset@indoh> Subject: [PATCH v6 5/5] x86, pci: Enable PCI INTx when MSI is disabled Date: Tue, 13 Nov 2012 18:08:32 +0900 (JST) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch enables INTx if MSI is disabled in pcibios_enable_device(). In normal case interrupt disable bit in command register is 0b on boot time, but in case of kdump, this bit may be 1b. It causes problems of some drivers. At leaset I confirmed mptsas driver does not work in such a case. This patch fix this problem. Signed-off-by: Takao Indoh --- arch/x86/pci/common.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 720e973..2bb7ecc 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -615,8 +615,10 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) if ((err = pci_enable_resources(dev, mask)) < 0) return err; - if (!pci_dev_msi_enabled(dev)) + if (!pci_dev_msi_enabled(dev)) { + pci_intx(dev, true); return pcibios_enable_irq(dev); + } return 0; }