qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: qemu-devel@nongnu.org
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
	Alex Williamson <alex.williamson@redhat.com>,
	qemu-ppc@nongnu.org, Alexander Graf <agraf@suse.de>,
	David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [RFC PATCH v3 15/18] linux headers update for SPAPR (DDW + EEH)
Date: Fri, 29 Aug 2014 20:12:19 +1000	[thread overview]
Message-ID: <1409307142-2600-16-git-send-email-aik@ozlabs.ru> (raw)
In-Reply-To: <1409307142-2600-1-git-send-email-aik@ozlabs.ru>

Since the changes are not in upstream yet, no tag or branch is specified here.

EEH is included to have a chance of catching problems with some shifted
IOCTL number or other random stuff like that.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 linux-headers/linux/vfio.h | 58 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h
index 26c218e..b3c3e9e 100644
--- a/linux-headers/linux/vfio.h
+++ b/linux-headers/linux/vfio.h
@@ -30,6 +30,9 @@
  */
 #define VFIO_DMA_CC_IOMMU		4
 
+/* Check if EEH is supported */
+#define VFIO_EEH			5
+
 /*
  * The IOCTL interface is designed for extensibility by embedding the
  * structure length (argsz) and flags into structures passed between
@@ -448,13 +451,66 @@ struct vfio_iommu_type1_dma_unmap {
  */
 struct vfio_iommu_spapr_tce_info {
 	__u32 argsz;
-	__u32 flags;			/* reserved for future use */
+	__u32 flags;
+#define VFIO_IOMMU_SPAPR_TCE_FLAG_DDW	1 /* Support dynamic windows */
 	__u32 dma32_window_start;	/* 32 bit window start (bytes) */
 	__u32 dma32_window_size;	/* 32 bit window size (bytes) */
+	__u32 current_windows;
+	__u32 windows_available;
+	__u32 page_size_mask;
 };
 
 #define VFIO_IOMMU_SPAPR_TCE_GET_INFO	_IO(VFIO_TYPE, VFIO_BASE + 12)
 
+/*
+ * EEH PE operation struct provides ways to:
+ * - enable/disable EEH functionality;
+ * - unfreeze IO/DMA for frozen PE;
+ * - read PE state;
+ * - reset PE;
+ * - configure PE.
+ */
+struct vfio_eeh_pe_op {
+	__u32 argsz;
+	__u32 flags;
+	__u32 op;
+};
+
+#define VFIO_EEH_PE_DISABLE		0	/* Disable EEH functionality */
+#define VFIO_EEH_PE_ENABLE		1	/* Enable EEH functionality  */
+#define VFIO_EEH_PE_UNFREEZE_IO		2	/* Enable IO for frozen PE   */
+#define VFIO_EEH_PE_UNFREEZE_DMA	3	/* Enable DMA for frozen PE  */
+#define VFIO_EEH_PE_GET_STATE		4	/* PE state retrieval        */
+#define  VFIO_EEH_PE_STATE_NORMAL	0	/* PE in functional state    */
+#define  VFIO_EEH_PE_STATE_RESET	1	/* PE reset in progress      */
+#define  VFIO_EEH_PE_STATE_STOPPED	2	/* Stopped DMA and IO        */
+#define  VFIO_EEH_PE_STATE_STOPPED_DMA	4	/* Stopped DMA only          */
+#define  VFIO_EEH_PE_STATE_UNAVAIL	5	/* State unavailable         */
+#define VFIO_EEH_PE_RESET_DEACTIVATE	5	/* Deassert PE reset         */
+#define VFIO_EEH_PE_RESET_HOT		6	/* Assert hot reset          */
+#define VFIO_EEH_PE_RESET_FUNDAMENTAL	7	/* Assert fundamental reset  */
+#define VFIO_EEH_PE_CONFIGURE		8	/* PE configuration          */
+
+#define VFIO_EEH_PE_OP			_IO(VFIO_TYPE, VFIO_BASE + 21)
+
+struct vfio_iommu_spapr_tce_create {
+	__u32 argsz;
+	__u32 flags;
+	/* in */
+	__u32 page_shift;
+	__u32 window_shift;
+	/* out */
+	__u64 start_addr;
+};
+#define VFIO_IOMMU_SPAPR_TCE_CREATE	_IO(VFIO_TYPE, VFIO_BASE + 18)
+
+struct vfio_iommu_spapr_tce_remove {
+	__u32 argsz;
+	__u32 flags;
+	/* in */
+	__u64 start_addr;
+};
+#define VFIO_IOMMU_SPAPR_TCE_REMOVE	_IO(VFIO_TYPE, VFIO_BASE + 19)
 /* ***************************************************************** */
 
 #endif /* VFIO_H */
-- 
2.0.0

  parent reply	other threads:[~2014-08-29 10:13 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-29 10:12 [Qemu-devel] [RFC PATCH v3 00/18] spapr: vfio: Enable Dynamic DMA windows (DDW) Alexey Kardashevskiy
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 01/18] spapr: Make machine naming conventions closer to those for PC Alexey Kardashevskiy
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 02/18] qom: Make object_child_foreach safe for objects removal Alexey Kardashevskiy
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 03/18] spapr_iommu: Disable in-kernel IOMMU tables for >4GB windows Alexey Kardashevskiy
2014-09-05 12:40   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 04/18] spapr_pci: Introduce a liobn number generating macros Alexey Kardashevskiy
2014-09-05 12:41   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 05/18] spapr_vio: " Alexey Kardashevskiy
2014-09-05 12:42   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 06/18] spapr_pci: Make find_phb()/find_dev() public Alexey Kardashevskiy
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 07/18] spapr_iommu: Make spapr_tce_find_by_liobn() public Alexey Kardashevskiy
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 08/18] spapr_iommu: Implement free_table() helper Alexey Kardashevskiy
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 09/18] spapr_rtas: Reserve DDW RTAS token numbers Alexey Kardashevskiy
2014-09-06  9:29   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 10/18] spapr_pci: Define DDW callbacks Alexey Kardashevskiy
2014-09-06  9:30   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 11/18] spapr_pci: Add windows counter Alexey Kardashevskiy
2014-09-06  9:31   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 12/18] spapr_rtas: Add Dynamic DMA windows (DDW) RTAS calls support Alexey Kardashevskiy
2014-09-26  5:26   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 13/18] spapr_pci: Enable DDW Alexey Kardashevskiy
2014-09-10 13:01   ` Alexander Graf
2014-09-10 14:58     ` Alexey Kardashevskiy
2014-09-10 21:16       ` Alexander Graf
2014-09-11  2:53         ` Alexey Kardashevskiy
2014-09-26  5:39   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 14/18] spapr_pci_vfio: Call spapr_pci::reset on reset Alexey Kardashevskiy
2014-09-26  5:40   ` David Gibson
2014-08-29 10:12 ` Alexey Kardashevskiy [this message]
2014-09-26  5:40   ` [Qemu-devel] [RFC PATCH v3 15/18] linux headers update for SPAPR (DDW + EEH) David Gibson
2014-09-26  6:55     ` Alexey Kardashevskiy
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 16/18] spapr_pci_vfio: Enable DDW Alexey Kardashevskiy
2014-09-10 13:03   ` Alexander Graf
2014-09-10 15:00     ` Alexey Kardashevskiy
2014-09-10 21:17       ` Alexander Graf
2014-09-11  2:55         ` Alexey Kardashevskiy
2014-09-11  8:34           ` Alexander Graf
2014-09-26  5:47   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 17/18] vfio: Enable DDW ioctls to VFIO IOMMU driver Alexey Kardashevskiy
2014-09-26  5:47   ` David Gibson
2014-08-29 10:12 ` [Qemu-devel] [RFC PATCH v3 18/18] spapr: Add pseries-2.2 machine Alexey Kardashevskiy

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=1409307142-2600-16-git-send-email-aik@ozlabs.ru \
    --to=aik@ozlabs.ru \
    --cc=agraf@suse.de \
    --cc=alex.williamson@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.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).