linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Michael Ellerman <michael@ellerman.id.au>
To: <linux-kernel@vger.kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>, linuxppc-dev@ozlabs.org
Subject: [RFC/PATCH 2/7] Make some MSIX defines generic
Date: Fri, 29 Sep 2006 07:53:35 +1000	[thread overview]
Message-ID: <20060928215337.A17D767C5B@ozlabs.org> (raw)
In-Reply-To: <1159480412.269240.988552559176.qpush@concordia>

Make some MSIX defines generic

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---

 drivers/pci/msi.h        |    8 --------
 include/linux/pci_regs.h |    8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: to-merge/drivers/pci/msi.h
===================================================================
--- to-merge.orig/drivers/pci/msi.h
+++ to-merge/drivers/pci/msi.h
@@ -8,14 +8,6 @@
 
 #include <asm/msi.h>
 
-/*
- * MSI-X Address Register
- */
-#define PCI_MSIX_FLAGS_QSIZE		0x7FF
-#define PCI_MSIX_FLAGS_ENABLE		(1 << 15)
-#define PCI_MSIX_FLAGS_BIRMASK		(7 << 0)
-#define PCI_MSIX_FLAGS_BITMASK		(1 << 0)
-
 #define PCI_MSIX_ENTRY_SIZE			16
 #define  PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET	0
 #define  PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET	4
Index: to-merge/include/linux/pci_regs.h
===================================================================
--- to-merge.orig/include/linux/pci_regs.h
+++ to-merge/include/linux/pci_regs.h
@@ -287,6 +287,14 @@
 #define PCI_MSI_DATA_64		12	/* 16 bits of data for 64-bit devices */
 #define PCI_MSI_MASK_BIT	16	/* Mask bits register */
 
+/* MSI-X registers */
+#define PCI_MSIX_FLAGS		2	/* Various flags */
+#define  PCI_MSIX_FLAGS_ENABLE	0x8000	/* MSI-X feature enabled */
+#define  PCI_MSIX_FLAGS_FNMASK	0x4000	/* Mask entire function */
+#define  PCI_MSIX_FLAGS_QSIZE	0x07FF	/* Number of MSI-X available */
+#define  PCI_MSIX_FLAGS_BIRMASK	0x0007	/* BIR */
+#define  PCI_MSIX_FLAGS_BITMASK	0x0001	/* ??? */
+
 /* CompactPCI Hotswap Register */
 
 #define PCI_CHSWP_CSR		2	/* Control and Status Register */

  parent reply	other threads:[~2006-09-28 21:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-28 21:53 [RFC/PATCH 0/7] Powerpc MSI stuff Michael Ellerman
2006-09-28 21:53 ` [RFC/PATCH 1/7] Rip out the existing powerpc msi stubs Michael Ellerman
2006-09-28 21:53 ` Michael Ellerman [this message]
2006-09-28 21:53 ` [RFC/PATCH 3/7] Powerpc MSI ops layer Michael Ellerman
2006-10-03 21:54   ` Jake Moilanen
2006-10-24  1:51     ` Michael Ellerman
2006-10-24 13:44       ` Jake Moilanen
2006-09-28 21:53 ` [RFC/PATCH 4/7] Allow for non-Intel MSI implementations Michael Ellerman
2006-09-28 21:53 ` [RFC/PATCH 5/7] Enable MSI on Powerpc Michael Ellerman
2006-09-28 21:53 ` [RFC/PATCH 6/7] RTAS MSI implementation Michael Ellerman
2006-10-03 21:53   ` Jake Moilanen
2006-10-24  2:49     ` Michael Ellerman
2006-09-28 21:53 ` [RFC/PATCH 7/7] Preliminary MPIC MSI backend Michael Ellerman
2006-09-28 23:37   ` Michael Ellerman
2006-09-29  0:16     ` [PATCH] " Michael Ellerman
2006-09-30  8:43       ` Segher Boessenkool
2006-10-24  1:46         ` Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060928215337.A17D767C5B@ozlabs.org \
    --to=michael@ellerman.id.au \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).