1. Patchew
  2. linux
  3. [PATCH v4 0/4] source filtering for multi-port output
  4. View patch

[PATCH v4 3/4] coresight: Add a helper to check if a device is source

Tao Zhang posted 4 patches 1 month ago
There is a newer version of this series
[PATCH v4 3/4] coresight: Add a helper to check if a device is source
Posted by Tao Zhang 1 month ago 
Since there are a lot of places in the code to check whether the
device is source, add a helper to check it.

Signed-off-by: Tao Zhang <quic_taozha@quicinc.com>
---
 drivers/hwtracing/coresight/coresight-core.c     | 9 ++++-----
 drivers/hwtracing/coresight/coresight-platform.c | 4 ++--
 drivers/hwtracing/coresight/coresight-tpda.c     | 2 +-
 include/linux/coresight.h                        | 7 ++++++-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index d9d256b3e8aa..e205a21f7078 100644
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -83,7 +83,7 @@ static struct coresight_device *coresight_get_source(struct list_head *path)
 		return NULL;
 
 	csdev = list_first_entry(path, struct coresight_node, link)->csdev;
-	if (csdev->type != CORESIGHT_DEV_TYPE_SOURCE)
+	if (!coresight_is_device_source(csdev))
 		return NULL;
 
 	return csdev;
@@ -976,9 +976,8 @@ static int coresight_orphan_match(struct device *dev, void *data)
 		/* Fix filter source device before skip the port */
 		if (conn->filter_src_fwnode && !conn->filter_src_dev) {
 			if (dst_csdev && (conn->filter_src_fwnode
-			    == dst_csdev->dev.fwnode)
-			    && !WARN_ON_ONCE(dst_csdev->type
-			    != CORESIGHT_DEV_TYPE_SOURCE))
+			    == dst_csdev->dev.fwnode) && !WARN_ON_ONCE(
+			    !coresight_is_device_source(dst_csdev)))
 				conn->filter_src_dev = dst_csdev;
 			else
 				still_orphan = true;
@@ -1053,7 +1052,7 @@ static void coresight_remove_conns(struct coresight_device *csdev)
 	int i, j;
 	struct coresight_connection *conn;
 
-	if (csdev->type == CORESIGHT_DEV_TYPE_SOURCE)
+	if (coresight_is_device_source(csdev))
 		bus_for_each_dev(&coresight_bustype, NULL, csdev,
 				 coresight_clear_filter_source);
 
diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
index 6ef4b26f04bb..b6fec0c498dc 100644
--- a/drivers/hwtracing/coresight/coresight-platform.c
+++ b/drivers/hwtracing/coresight/coresight-platform.c
@@ -255,8 +255,8 @@ static int of_coresight_parse_endpoint(struct device *dev,
 		else {
 			conn.filter_src_dev =
 			 coresight_find_csdev_by_fwnode(conn.filter_src_fwnode);
-			if (conn.filter_src_dev && (conn.filter_src_dev->type
-			    != CORESIGHT_DEV_TYPE_SOURCE))
+			if (conn.filter_src_dev &&
+				  !coresight_is_device_source(conn.filter_src_dev))
 				dev_warn(&conn.filter_src_dev->dev,
 				  "Filter source is not a source device\n");
 		}
diff --git a/drivers/hwtracing/coresight/coresight-tpda.c b/drivers/hwtracing/coresight/coresight-tpda.c
index bfca103f9f84..ad023a2a99d1 100644
--- a/drivers/hwtracing/coresight/coresight-tpda.c
+++ b/drivers/hwtracing/coresight/coresight-tpda.c
@@ -24,7 +24,7 @@ DEFINE_CORESIGHT_DEVLIST(tpda_devs, "tpda");
 
 static bool coresight_device_is_tpdm(struct coresight_device *csdev)
 {
-	return (csdev->type == CORESIGHT_DEV_TYPE_SOURCE) &&
+	return (coresight_is_device_source(csdev)) &&
 	       (csdev->subtype.source_subtype ==
 			CORESIGHT_DEV_SUBTYPE_SOURCE_TPDM);
 }
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 52f05f01b287..f372c01ae2fc 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -593,9 +593,14 @@ static inline void csdev_access_write64(struct csdev_access *csa, u64 val, u32 o
 }
 #endif	/* CONFIG_64BIT */
 
+static inline bool coresight_is_device_source(struct coresight_device *csdev)
+{
+	return csdev && (csdev->type == CORESIGHT_DEV_TYPE_SOURCE);
+}
+
 static inline bool coresight_is_percpu_source(struct coresight_device *csdev)
 {
-	return csdev && (csdev->type == CORESIGHT_DEV_TYPE_SOURCE) &&
+	return csdev && coresight_is_device_source(csdev) &&
 	       (csdev->subtype.source_subtype == CORESIGHT_DEV_SUBTYPE_SOURCE_PROC);
 }
 
-- 
2.17.1
Re: [PATCH v4 3/4] coresight: Add a helper to check if a device is source
Posted by Suzuki K Poulose 1 month ago 
On 24/10/2024 07:53, Tao Zhang wrote:
> Since there are a lot of places in the code to check whether the
> device is source, add a helper to check it.
> 
> Signed-off-by: Tao Zhang <quic_taozha@quicinc.com>

You have introduced a similar check in PATCH 2. So why not move this 
patch up in the series and use this helper where you needed in patch2 ?


> ---
>   drivers/hwtracing/coresight/coresight-core.c     | 9 ++++-----
>   drivers/hwtracing/coresight/coresight-platform.c | 4 ++--
>   drivers/hwtracing/coresight/coresight-tpda.c     | 2 +-
>   include/linux/coresight.h                        | 7 ++++++-
>   4 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
> index d9d256b3e8aa..e205a21f7078 100644
> --- a/drivers/hwtracing/coresight/coresight-core.c
> +++ b/drivers/hwtracing/coresight/coresight-core.c
> @@ -83,7 +83,7 @@ static struct coresight_device *coresight_get_source(struct list_head *path)
>   		return NULL;
>   
>   	csdev = list_first_entry(path, struct coresight_node, link)->csdev;
> -	if (csdev->type != CORESIGHT_DEV_TYPE_SOURCE)
> +	if (!coresight_is_device_source(csdev))
>   		return NULL;
>   
>   	return csdev;
> @@ -976,9 +976,8 @@ static int coresight_orphan_match(struct device *dev, void *data)
>   		/* Fix filter source device before skip the port */
>   		if (conn->filter_src_fwnode && !conn->filter_src_dev) {
>   			if (dst_csdev && (conn->filter_src_fwnode
> -			    == dst_csdev->dev.fwnode)
> -			    && !WARN_ON_ONCE(dst_csdev->type
> -			    != CORESIGHT_DEV_TYPE_SOURCE))
> +			    == dst_csdev->dev.fwnode) && !WARN_ON_ONCE(

Please don't split it like that. Keep them in one line, it is OK for 
such lines to go beyond the limit.


Rest looks fine to me

Suzuki

> +			    !coresight_is_device_source(dst_csdev)))
>   				conn->filter_src_dev = dst_csdev;
>   			else
>   				still_orphan = true;
> @@ -1053,7 +1052,7 @@ static void coresight_remove_conns(struct coresight_device *csdev)
>   	int i, j;
>   	struct coresight_connection *conn;
>   
> -	if (csdev->type == CORESIGHT_DEV_TYPE_SOURCE)
> +	if (coresight_is_device_source(csdev))
>   		bus_for_each_dev(&coresight_bustype, NULL, csdev,
>   				 coresight_clear_filter_source);
>   
> diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
> index 6ef4b26f04bb..b6fec0c498dc 100644
> --- a/drivers/hwtracing/coresight/coresight-platform.c
> +++ b/drivers/hwtracing/coresight/coresight-platform.c
> @@ -255,8 +255,8 @@ static int of_coresight_parse_endpoint(struct device *dev,
>   		else {
>   			conn.filter_src_dev =
>   			 coresight_find_csdev_by_fwnode(conn.filter_src_fwnode);
> -			if (conn.filter_src_dev && (conn.filter_src_dev->type
> -			    != CORESIGHT_DEV_TYPE_SOURCE))
> +			if (conn.filter_src_dev &&
> +				  !coresight_is_device_source(conn.filter_src_dev))
			    ^^align here

>   				dev_warn(&conn.filter_src_dev->dev,
>   				  "Filter source is not a source device\n");
>   		}
> diff --git a/drivers/hwtracing/coresight/coresight-tpda.c b/drivers/hwtracing/coresight/coresight-tpda.c
> index bfca103f9f84..ad023a2a99d1 100644
> --- a/drivers/hwtracing/coresight/coresight-tpda.c
> +++ b/drivers/hwtracing/coresight/coresight-tpda.c
> @@ -24,7 +24,7 @@ DEFINE_CORESIGHT_DEVLIST(tpda_devs, "tpda");
>   
>   static bool coresight_device_is_tpdm(struct coresight_device *csdev)
>   {
> -	return (csdev->type == CORESIGHT_DEV_TYPE_SOURCE) &&
> +	return (coresight_is_device_source(csdev)) &&
>   	       (csdev->subtype.source_subtype ==
>   			CORESIGHT_DEV_SUBTYPE_SOURCE_TPDM);
>   }
> diff --git a/include/linux/coresight.h b/include/linux/coresight.h
> index 52f05f01b287..f372c01ae2fc 100644
> --- a/include/linux/coresight.h
> +++ b/include/linux/coresight.h
> @@ -593,9 +593,14 @@ static inline void csdev_access_write64(struct csdev_access *csa, u64 val, u32 o
>   }
>   #endif	/* CONFIG_64BIT */
>   
> +static inline bool coresight_is_device_source(struct coresight_device *csdev)
> +{
> +	return csdev && (csdev->type == CORESIGHT_DEV_TYPE_SOURCE);
> +}
> +
>   static inline bool coresight_is_percpu_source(struct coresight_device *csdev)
>   {
> -	return csdev && (csdev->type == CORESIGHT_DEV_TYPE_SOURCE) &&
> +	return csdev && coresight_is_device_source(csdev) &&
>   	       (csdev->subtype.source_subtype == CORESIGHT_DEV_SUBTYPE_SOURCE_PROC);
>   }
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.