From patchwork Mon May 18 03:31:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hidetoshi Seto X-Patchwork-Id: 24381 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4I3W8Oa031458 for ; Mon, 18 May 2009 03:32:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754104AbZERDcK (ORCPT ); Sun, 17 May 2009 23:32:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751422AbZERDcJ (ORCPT ); Sun, 17 May 2009 23:32:09 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:52667 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754104AbZERDcI (ORCPT ); Sun, 17 May 2009 23:32:08 -0400 Received: from m1.gw.fujitsu.co.jp ([10.0.50.71]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id n4I3W8CE020902 for (envelope-from seto.hidetoshi@jp.fujitsu.com); Mon, 18 May 2009 12:32:08 +0900 Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 099F545DD75 for ; Mon, 18 May 2009 12:32:08 +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 DEDF645DD74 for ; Mon, 18 May 2009 12:32:07 +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 CB0D31DB8018 for ; Mon, 18 May 2009 12:32:07 +0900 (JST) Received: from m105.s.css.fujitsu.com (m105.s.css.fujitsu.com [10.249.87.105]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 3A9C81DB8017 for ; Mon, 18 May 2009 12:32:07 +0900 (JST) Received: from m105.css.fujitsu.com (m105 [127.0.0.1]) by m105.s.css.fujitsu.com (Postfix) with ESMTP id 02A755D8003; Mon, 18 May 2009 12:32:07 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.141]) by m105.s.css.fujitsu.com (Postfix) with ESMTP id 7C55B5D8001; Mon, 18 May 2009 12:32:06 +0900 (JST) Message-ID: <4A10D67F.6050102@jp.fujitsu.com> Date: Mon, 18 May 2009 12:31:11 +0900 From: Hidetoshi Seto User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: linux-pci@vger.kernel.org CC: Michael Ellerman , Matthew Wilcox Subject: [PATCH] pci, msi: Use msix_mask_irq() from msi_free_irqs() Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use msix_mask_irq() instead of direct use of writel, not to clear preserved bits in the Vector Control register [31::01]. Signed-off-by: Hidetoshi Seto --- drivers/pci/msi.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index e751d7b..8e5f8cc 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -664,10 +664,7 @@ static int msi_free_irqs(struct pci_dev* dev) list_for_each_entry_safe(entry, tmp, &dev->msi_list, list) { if (entry->msi_attrib.is_msix) { - writel(1, entry->mask_base + entry->msi_attrib.entry_nr - * PCI_MSIX_ENTRY_SIZE - + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET); - + msix_mask_irq(entry, 1); if (list_is_last(&entry->list, &dev->msi_list)) iounmap(entry->mask_base); }