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

Groups > linux.kernel > #1720247

[GIT PULL 04/15] intel_th: Output devices without ports don't need assigning

Show all headers | View raw

Output subdevices that rely on other output subdevices (or otherwise
don't directly talk to an output port on the switch) don't need to be
assigned an output port either.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
 drivers/hwtracing/intel_th/intel_th.h | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h
index 3096e7054f..c03f28ef64 100644
--- a/drivers/hwtracing/intel_th/intel_th.h
+++ b/drivers/hwtracing/intel_th/intel_th.h
@@ -96,6 +96,16 @@ intel_th_device_get_resource(struct intel_th_device *thdev, unsigned int type,
 	return NULL;
 }
 
+/*
+ * GTH, output ports configuration
+ */
+enum {
+	GTH_NONE = 0,
+	GTH_MSU,	/* memory/usb */
+	GTH_CTP,	/* Common Trace Port */
+	GTH_PTI = 4,	/* MIPI-PTI */
+};
+
 /**
  * intel_th_output_assigned() - if an output device is assigned to a switch port
  * @thdev:	the output device
@@ -106,7 +116,8 @@ static inline bool
 intel_th_output_assigned(struct intel_th_device *thdev)
 {
 	return thdev->type == INTEL_TH_OUTPUT &&
-		thdev->output.port >= 0;
+		(thdev->output.port >= 0 ||
+		 thdev->output.type == GTH_NONE);
 }
 
 /**
@@ -249,16 +260,6 @@ enum {
 	REG_DCIH_LENGTH		= REG_MSU_LENGTH,
 };
 
-/*
- * GTH, output ports configuration
- */
-enum {
-	GTH_NONE = 0,
-	GTH_MSU,	/* memory/usb */
-	GTH_CTP,	/* Common Trace Port */
-	GTH_PTI = 4,	/* MIPI-PTI */
-};
-
 /*
  * Scratchpad bits: tell firmware and external debuggers
  * what we are up to.
-- 
2.14.1

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

Thread

[GIT PULL 00/15] stm class/intel_th: Updates for 4.14 Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:20 +0200
  [GIT PULL 04/15] intel_th: Output devices without ports don't need assigning Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:30 +0200
  [GIT PULL 03/15] intel_th: pci: Enable bus mastering Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:30 +0200
  [GIT PULL 05/15] intel_th: Streamline the subdevice tree accessors Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:30 +0200
  [GIT PULL 02/15] stm class: Document the stm_ftrace Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:30 +0200
  [GIT PULL 12/15] intel_th: pci: Add Cannon Lake PCH-LP support Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 10/15] intel_th: pti: Support Low Power Path output port type Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 11/15] intel_th: pci: Add Cannon Lake PCH-H support Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 13/15] intel_th: pci: Use drvdata for quirks Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 07/15] intel_th: Make the switch allocate its subdevices Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 09/15] intel_th: Enumerate Low Power Path output port type Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 15/15] intel_th: Perform time resync on capture start Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 08/15] intel_th: msu: Use the real device in case of IOMMU domain allocation Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 14/15] intel_th: Add global activate/deactivate callbacks for the glue layers Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  [GIT PULL 06/15] intel_th: Make SOURCE devices children of the root device Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2017-08-25 18:40 +0200
  Re: [GIT PULL 00/15] stm class/intel_th: Updates for 4.14 Greg KH <greg@kroah.com> - 2017-08-28 17:00 +0200

csiph-web