Browse Source

intel_th: Output devices without ports don't need assigning

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>
Alexander Shishkin 8 years ago
parent
commit
5376be63ff
1 changed files with 12 additions and 11 deletions
  1. 12 11
      drivers/hwtracing/intel_th/intel_th.h

+ 12 - 11
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;
 	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
  * intel_th_output_assigned() - if an output device is assigned to a switch port
  * @thdev:	the output device
  * @thdev:	the output device
@@ -106,7 +116,8 @@ static inline bool
 intel_th_output_assigned(struct intel_th_device *thdev)
 intel_th_output_assigned(struct intel_th_device *thdev)
 {
 {
 	return thdev->type == INTEL_TH_OUTPUT &&
 	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,
 	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
  * Scratchpad bits: tell firmware and external debuggers
  * what we are up to.
  * what we are up to.