From patchwork Mon Nov 15 09:15:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 324822 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 oAF9Ev00001620 for ; Mon, 15 Nov 2010 09:14:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753636Ab0KOJOn (ORCPT ); Mon, 15 Nov 2010 04:14:43 -0500 Received: from mga02.intel.com ([134.134.136.20]:9011 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753277Ab0KOJOl (ORCPT ); Mon, 15 Nov 2010 04:14:41 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 15 Nov 2010 01:14:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,199,1288594800"; d="scan'208";a="573764558" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.14]) by orsmga002.jf.intel.com with ESMTP; 15 Nov 2010 01:14:39 -0800 Received: from yasker by syang10-desktop with local (Exim 4.72) (envelope-from ) id 1PHv9y-0000qX-5f; Mon, 15 Nov 2010 17:15:34 +0800 From: Sheng Yang To: Avi Kivity Cc: Marcelo Tosatti , "Michael S. Tsirkin" , kvm@vger.kernel.org, Sheng Yang , linux-pci@vger.kernel.org Subject: [PATCH 1/6] PCI: MSI: Move MSI-X entry definition to pci_regs.h Date: Mon, 15 Nov 2010 17:15:27 +0800 Message-Id: <1289812532-3227-2-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1289812532-3227-1-git-send-email-sheng@linux.intel.com> References: <1289812532-3227-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]); Mon, 15 Nov 2010 09:14:57 +0000 (UTC) diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h index feff3be..65c42f8 100644 --- a/drivers/pci/msi.h +++ b/drivers/pci/msi.h @@ -6,12 +6,6 @@ #ifndef MSI_H #define MSI_H -#define PCI_MSIX_ENTRY_SIZE 16 -#define PCI_MSIX_ENTRY_LOWER_ADDR 0 -#define PCI_MSIX_ENTRY_UPPER_ADDR 4 -#define PCI_MSIX_ENTRY_DATA 8 -#define PCI_MSIX_ENTRY_VECTOR_CTRL 12 - #define msi_control_reg(base) (base + PCI_MSI_FLAGS) #define msi_lower_address_reg(base) (base + PCI_MSI_ADDRESS_LO) #define msi_upper_address_reg(base) (base + PCI_MSI_ADDRESS_HI) diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h index af83076..b21d33e 100644 --- a/include/linux/pci_regs.h +++ b/include/linux/pci_regs.h @@ -309,6 +309,13 @@ #define PCI_MSIX_PBA 8 #define PCI_MSIX_FLAGS_BIRMASK (7 << 0) +/* MSI-X entry's format */ +#define PCI_MSIX_ENTRY_SIZE 16 +#define PCI_MSIX_ENTRY_LOWER_ADDR 0 +#define PCI_MSIX_ENTRY_UPPER_ADDR 4 +#define PCI_MSIX_ENTRY_DATA 8 +#define PCI_MSIX_ENTRY_VECTOR_CTRL 12 + /* CompactPCI Hotswap Register */ #define PCI_CHSWP_CSR 2 /* Control and Status Register */