Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1734237

[PATCH 10/16] thunderbolt: Move ring descriptor flags to thunderbolt.h

Show all headers | View raw

A Thunderbolt service driver might need to check if there was an error
with the descriptor when in frame mode. We also add two Rx specific
error flags RING_DESC_CRC_ERROR and RING_DESC_BUFFER_OVERRUN.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Michael Jamet <michael.jamet@intel.com>
Reviewed-by: Yehezkel Bernat <yehezkel.bernat@intel.com>
---
 drivers/thunderbolt/nhi_regs.h |  7 -------
 include/linux/thunderbolt.h    | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/drivers/thunderbolt/nhi_regs.h b/drivers/thunderbolt/nhi_regs.h
index 491a4c0c18fc..5ed6934e31e7 100644
--- a/drivers/thunderbolt/nhi_regs.h
+++ b/drivers/thunderbolt/nhi_regs.h
@@ -17,13 +17,6 @@ enum ring_flags {
 	RING_FLAG_ENABLE = 1 << 31,
 };
 
-enum ring_desc_flags {
-	RING_DESC_ISOCH = 0x1, /* TX only? */
-	RING_DESC_COMPLETED = 0x2, /* set by NHI */
-	RING_DESC_POSTED = 0x4, /* always set this */
-	RING_DESC_INTERRUPT = 0x8, /* request an interrupt on completion */
-};
-
 /**
  * struct ring_desc - TX/RX ring entry
  *
diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
index 1a376374c327..fac4ff62c0de 100644
--- a/include/linux/thunderbolt.h
+++ b/include/linux/thunderbolt.h
@@ -479,6 +479,24 @@ struct ring_frame;
 typedef void (*ring_cb)(struct tb_ring *, struct ring_frame *, bool canceled);
 
 /**
+ * enum ring_desc_flags - Flags for DMA ring descriptor
+ * %RING_DESC_ISOCH: Enable isonchronous DMA (Tx only)
+ * %RING_DESC_CRC_ERROR: In frame mode CRC check failed for the frame (Rx only)
+ * %RING_DESC_COMPLETED: Descriptor completed (set by NHI)
+ * %RING_DESC_POSTED: Always set this
+ * %RING_DESC_BUFFER_OVERRUN: RX buffer overrun
+ * %RING_DESC_INTERRUPT: Request an interrupt on compltion
+ */
+enum ring_desc_flags {
+	RING_DESC_ISOCH = 0x1,
+	RING_DESC_CRC_ERROR = 0x1,
+	RING_DESC_COMPLETED = 0x2,
+	RING_DESC_POSTED = 0x4,
+	RING_DESC_BUFFER_OVERRUN = 0x04,
+	RING_DESC_INTERRUPT = 0x8,
+};
+
+/**
  * struct ring_frame - For use with ring_rx/ring_tx
  * @buffer_phy: DMA mapped address of the frame
  * @callback: Callback called when the frame is finished
-- 
2.13.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/16] Thunderbolt networking Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 03/16] thunderbolt: Move enum tb_cfg_pkg_type to thunderbolt.h Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 05/16] thunderbolt: Move tb_switch_phy_port_from_link() to thunderbolt.h Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 14/16] thunderbolt: Add function to retrieve DMA device for the ring Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 09/16] thunderbolt: Export ring handling functions to modules Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 12/16] thunderbolt: Use spinlock in NHI serialization Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 15/16] thunderbolt: Allocate ring HopID automatically if requested Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 10/16] thunderbolt: Move ring descriptor flags to thunderbolt.h Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 13/16] thunderbolt: Add polling mode for rings Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 02/16] thunderbolt: Add support for XDomain properties Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 08/16] thunderbolt: Add support for frame mode Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 11/16] thunderbolt: Use spinlock in ring serialization Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  [PATCH 07/16] thunderbolt: Configure interrupt throttling for all interrupts Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-18 17:40 +0200
  Re: [PATCH 16/16] thunderbolt: Add support for networking over  Thunderbolt cable Andrew Lunn <andrew@lunn.ch> - 2017-09-19 01:30 +0200
    Re: [PATCH 16/16] thunderbolt: Add support for networking over  Thunderbolt cable Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-19 09:20 +0200
  Re: [PATCH 06/16] thunderbolt: Add support for XDomain discovery  protocol Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-09-19 09:50 +0200

csiph-web