From patchwork Thu Nov 11 07:46:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 316662 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAB7lFJS032145 for ; Thu, 11 Nov 2010 07:47:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757815Ab0KKHrG (ORCPT ); Thu, 11 Nov 2010 02:47:06 -0500 Received: from mga09.intel.com ([134.134.136.24]:53771 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757795Ab0KKHrC (ORCPT ); Thu, 11 Nov 2010 02:47:02 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 10 Nov 2010 23:47:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,181,1288594800"; d="scan'208";a="572448973" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.14]) by orsmga002.jf.intel.com with ESMTP; 10 Nov 2010 23:46:59 -0800 Received: from yasker by syang10-desktop with local (Exim 4.72) (envelope-from ) id 1PGRs6-0001qK-2G; Thu, 11 Nov 2010 15:47:02 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti , "Michael S. Tsirkin" Cc: kvm@vger.kernel.org, Sheng Yang , Matthew Wilcox , Jesse Barnes , linux-pci@vger.kernel.org Subject: [PATCH 2/7] PCI: Add mask bit definition for MSI-X table Date: Thu, 11 Nov 2010 15:46:55 +0800 Message-Id: <1289461620-7055-3-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1289461620-7055-1-git-send-email-sheng@linux.intel.com> References: <1289461620-7055-1-git-send-email-sheng@linux.intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 11 Nov 2010 07:47:15 +0000 (UTC) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 69b7be3..095634e 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -158,8 +158,9 @@ static u32 __msix_mask_irq(struct msi_desc *desc, u32 flag) u32 mask_bits = desc->masked; unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + PCI_MSIX_ENTRY_VECTOR_CTRL; - mask_bits &= ~1; - mask_bits |= flag; + mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT; + if (flag) + mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT; writel(mask_bits, desc->mask_base + offset); return mask_bits; diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h index acfc224..ff51632 100644 --- a/include/linux/pci_regs.h +++ b/include/linux/pci_regs.h @@ -313,6 +313,7 @@ #define PCI_MSIX_ENTRY_UPPER_ADDR 4 #define PCI_MSIX_ENTRY_DATA 8 #define PCI_MSIX_ENTRY_VECTOR_CTRL 12 +#define PCI_MSIX_ENTRY_CTRL_MASKBIT 1 /* CompactPCI Hotswap Register */