From patchwork Tue Nov 27 00:43:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takao Indoh X-Patchwork-Id: 202053 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 3ABE42C0085 for ; Tue, 27 Nov 2012 11:43:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757671Ab2K0Ane (ORCPT ); Mon, 26 Nov 2012 19:43:34 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:42271 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757600Ab2K0Anc (ORCPT ); Mon, 26 Nov 2012 19:43:32 -0500 Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id E73E63EE0C7; Tue, 27 Nov 2012 09:43:31 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id CE73D45DE55; Tue, 27 Nov 2012 09:43:31 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id B549545DE5D; Tue, 27 Nov 2012 09:43:31 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id A7FDB1DB804C; Tue, 27 Nov 2012 09:43:31 +0900 (JST) Received: from ml14.s.css.fujitsu.com (ml14.s.css.fujitsu.com [10.240.81.134]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 4F5C6E38005; Tue, 27 Nov 2012 09:43:31 +0900 (JST) Received: from ml14.css.fujitsu.com (ml14 [127.0.0.1]) by ml14.s.css.fujitsu.com (Postfix) with ESMTP id D1A449F7AF5; Tue, 27 Nov 2012 09:43:30 +0900 (JST) Received: from tindoh.g01.fujitsu.local (tindoh.g01.fujitsu.local [10.124.101.134]) by ml14.s.css.fujitsu.com (Postfix) with ESMTP id 394839F7ADA; Tue, 27 Nov 2012 09:43:21 +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: <20121127004233.3604.33429.sendpatchset@tindoh.g01.fujitsu.local> In-Reply-To: <20121127004144.3604.61708.sendpatchset@tindoh.g01.fujitsu.local> References: <20121127004144.3604.61708.sendpatchset@tindoh.g01.fujitsu.local> Subject: [PATCH v7 5/5] x86, pci: Enable PCI INTx when MSI is disabled Date: Tue, 27 Nov 2012 09:43:21 +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; }