From nobody Sat Nov 30 07:49:26 2024 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5447A18CBE6; Tue, 10 Sep 2024 10:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962512; cv=none; b=Xs3zhQpa+2zorwLz5pjMHhMqPuiQcF7VW3/PY5Ir2IYJn+t/Ehc8KH8zglUYafskcotdtjHCrqFcOWQBNxVV0h25Dx6za0pDfME1/AU3cP1SUWY6zEpW5odyILeME/QFC559tvqcThDDW0Ck6NxsNFCUDZDL4mcmJLqugVqOlkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962512; c=relaxed/simple; bh=s0Z4GqSWEWbzdT7D8dLokJdyc27ZzbCwdC6UJGrUhbI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=N2o9zAAMNAWycg1ZRS6JB27L3ltFnjw26HMWn9+Tx2b4ayKH2gt7ovCBZFsq82NPZhysIpySolCOBd6bdnhHcvXyPMAtMQK81SazT/xBu+ibLe7vN8A+Pv2EQEKQZBqU+b/d6Uqg/JsviQgrGoj/r0tUaouGlsbEb+ft+5tGNPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=g6jwjmbO; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="g6jwjmbO" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48A3Vgc7019866; Tue, 10 Sep 2024 10:01:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= UGmRYO2Hh4rcHDwOaxF7xYo2cbhPH5yXTpxEtcrpBWk=; b=g6jwjmbOHpSlpCZS nqs3buHZm0YrXshZ6HqWbYZhuzVkvwxaoMQ6IwEaC5+Z9jwvKuRVrR2lCmKKtyxX fxzy/zUo3aXdhcpB8Qy5jaWtXkFJoLUop63W1CBVk61672gRRVNFsJOWK0rDR8sH dvKxLW+XO6FmS9w4zQcwoUib/jLfVxx4+GfxxnhtIUBbUUHcFruC7u1AYwSZRbnD gQOQT++S5X/oxcxTf8dB83pXpN59haH8jUPH+9XI3d7Y8dcD5auEMs/j84fW5sKs 122FmUIxvZBO59eNMm8pDA5WCY6Q4oN5C92wvmW7Q7ALQT6aZOFfSwgv8OUuWarQ hlmDkw== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 41gy59whv8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2024 10:01:40 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 48AA1dfN001335 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2024 10:01:39 GMT Received: from hu-jinlmao-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 10 Sep 2024 03:01:38 -0700 From: Mao Jinlong To: Suzuki K Poulose , Mike Leach , James Clark , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mao Jinlong , "Alexander Shishkin" CC: , , , , Subject: [PATCH v4 RESEND 1/3] dt-bindings: arm: Add arm,trace-id for coresight dummy source Date: Tue, 10 Sep 2024 03:01:23 -0700 Message-ID: <20240910100127.8948-2-quic_jinlmao@quicinc.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910100127.8948-1-quic_jinlmao@quicinc.com> References: <20240910100127.8948-1-quic_jinlmao@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: SvYO9UU2oDMUa1HKo3mIayzEx6AtQ5Of X-Proofpoint-ORIG-GUID: SvYO9UU2oDMUa1HKo3mIayzEx6AtQ5Of X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 bulkscore=0 mlxlogscore=907 phishscore=0 impostorscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 adultscore=0 lowpriorityscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2408220000 definitions=main-2409100074 Content-Type: text/plain; charset="utf-8" Some dummy source HW has static trace id which cannot be changed via software programming. Add arm,trace-id for static id support to coresight dummy source. Signed-off-by: Mao Jinlong Reviewed-by: Rob Herring (Arm) --- .../devicetree/bindings/arm/arm,coresight-dummy-source.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/arm,coresight-dummy-sour= ce.yaml b/Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.= yaml index d50a60368e27..bf2a5df72690 100644 --- a/Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.yaml +++ b/Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.yaml @@ -38,6 +38,12 @@ properties: enum: - arm,coresight-dummy-source =20 + arm,static-trace-id: + description: If dummy source needs static id support, use this to set = trace id. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + maximum: 111 + out-ports: $ref: /schemas/graph.yaml#/properties/ports =20 --=20 2.46.0 From nobody Sat Nov 30 07:49:26 2024 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD10B1552FD; Tue, 10 Sep 2024 10:01:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962512; cv=none; b=bnw8G8kWelOsvGTv0lSp8Xv4cyH34N3cc+ufPTPLd9NjK60C1oKVb/3j/Nucf3KmqV+pEQAAqoHCHbz731Ip9VWfspWoyjmgNFMZE8rD701PIbEW/LEzn9bQR8CXnP1oaVBDxBr0jhn4qIOmXpq4My3daCTDyxQMPidVulCgb8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962512; c=relaxed/simple; bh=OCc865r5SpcDW4AtzgjEg7LoC8W9FEsJtR4vfPG3ECo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FERGX/aK/sgowXWw9rTNWciXPkoWWiDZRpCTzx5rlhEZ0hIlxl1ih55240fT51jQ8rk3LvdqjRArMYJozy9EPM8gfPw16C1iWJWs8ln7MZkpdfW0lwiS1bYYg6VfmeIRhH0vyf8vGDk08ueCjEeZp4Vsn42Y8CoIO8CeI3JOQFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=dHDYc/lY; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="dHDYc/lY" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48A388Hv012954; Tue, 10 Sep 2024 10:01:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= gdU7LdN+txEvsLdeaTKRl9tmrsq7YjRRh2ijfB74Ivc=; b=dHDYc/lYpRPgjBpG 7z1D+nbT3nHODj1MHxLjyuIZv8VnEQItR93wHPhD5S7tlC0JLhtEs7MVxKalR8JG xB10p3xpHCO1SaB7fjGnE4P+esYcmHltl6lzS9rLhkv0y20FiOOI0iQlw5m9K9Ml 9R949Ji8fgWKIMtDseN3iGAF2p41FX34is+RmaQkwSsqH6FQNKhSFYQXzBD3VXeM ZuzbvY/YesN6GmK2uOERS11t3Zg/3FD3r3lLfrFiuQWKbzccIBxIWS5zH7dt3TbE zY0pKZWDnyrvXh9NVfZNOwP2Ce1se0QddNlh5B54AwokxnHk883h/ne7m5KkaLqQ rNnsvA== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 41gy6snj94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2024 10:01:40 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 48AA1dV1031682 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2024 10:01:39 GMT Received: from hu-jinlmao-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 10 Sep 2024 03:01:39 -0700 From: Mao Jinlong To: Suzuki K Poulose , Mike Leach , James Clark , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mao Jinlong , "Alexander Shishkin" CC: , , , , Subject: [PATCH v4 RESEND 2/3] coresight: Add support to get static id for system trace sources Date: Tue, 10 Sep 2024 03:01:24 -0700 Message-ID: <20240910100127.8948-3-quic_jinlmao@quicinc.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910100127.8948-1-quic_jinlmao@quicinc.com> References: <20240910100127.8948-1-quic_jinlmao@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: VN8P-bjG2VC9HDbKJf8dtK0ou5AIzTEd X-Proofpoint-ORIG-GUID: VN8P-bjG2VC9HDbKJf8dtK0ou5AIzTEd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 bulkscore=0 adultscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2408220000 definitions=main-2409100075 Content-Type: text/plain; charset="utf-8" Dynamic trace id was introduced in coresight subsystem, so trace id is allocated dynamically. However, some hardware ATB source has static trace id and it cannot be changed via software programming. For such source, it can call coresight_get_static_trace_id to get the fixed trace id from device node and pass id to coresight_trace_id_get_static_system_id to reserve the id. Signed-off-by: Mao Jinlong --- .../hwtracing/coresight/coresight-platform.c | 26 +++++++++++++ .../hwtracing/coresight/coresight-trace-id.c | 38 ++++++++++++++----- .../hwtracing/coresight/coresight-trace-id.h | 9 +++++ include/linux/coresight.h | 1 + 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwt= racing/coresight/coresight-platform.c index 64e171eaad82..703abf0fa3f9 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -183,6 +183,18 @@ static int of_coresight_get_cpu(struct device *dev) return cpu; } =20 +/* + * of_coresight_get_trace_id: Get the atid of a source device. + * + * Returns 0 on success. + */ +static int of_coresight_get_static_trace_id(struct device *dev, u32 *id) +{ + + return of_property_read_u32(dev->of_node, "arm,static-trace-id", id); +} + + /* * of_coresight_parse_endpoint : Parse the given output endpoint @ep * and fill the connection information in @pdata->out_conns @@ -317,6 +329,11 @@ static inline int of_coresight_get_cpu(struct device *= dev) { return -ENODEV; } + +static inline int of_coresight_get_static_trace_id(struct device *dev, u32= *id) +{ + return -ENODEV; +} #endif =20 #ifdef CONFIG_ACPI @@ -796,6 +813,15 @@ int coresight_get_cpu(struct device *dev) } EXPORT_SYMBOL_GPL(coresight_get_cpu); =20 +int coresight_get_static_trace_id(struct device *dev, u32 *id) +{ + if (!is_of_node(dev->fwnode)) + return -EINVAL; + + return of_coresight_get_static_trace_id(dev, id); +} +EXPORT_SYMBOL_GPL(coresight_get_static_trace_id); + struct coresight_platform_data * coresight_get_platform_data(struct device *dev) { diff --git a/drivers/hwtracing/coresight/coresight-trace-id.c b/drivers/hwt= racing/coresight/coresight-trace-id.c index af5b4ef59cea..ca3c3de4683e 100644 --- a/drivers/hwtracing/coresight/coresight-trace-id.c +++ b/drivers/hwtracing/coresight/coresight-trace-id.c @@ -11,6 +11,12 @@ =20 #include "coresight-trace-id.h" =20 +enum trace_id_flags { + TRACE_ID_ANY =3D 0x0, + TRACE_ID_PREFER_ODD =3D 0x1, + TRACE_ID_REQ_STATIC =3D 0x2, +}; + /* Default trace ID map. Used on systems that don't require per sink mappi= ngs */ static struct coresight_trace_id_map id_map_default; =20 @@ -80,16 +86,19 @@ static int coresight_trace_id_find_odd_id(struct coresi= ght_trace_id_map *id_map) * Otherwise allocate next available ID. */ static int coresight_trace_id_alloc_new_id(struct coresight_trace_id_map *= id_map, - int preferred_id, bool prefer_odd_id) + int preferred_id, unsigned int flags) { int id =3D 0; =20 /* for backwards compatibility, cpu IDs may use preferred value */ - if (IS_VALID_CS_TRACE_ID(preferred_id) && - !test_bit(preferred_id, id_map->used_ids)) { - id =3D preferred_id; - goto trace_id_allocated; - } else if (prefer_odd_id) { + if (IS_VALID_CS_TRACE_ID(preferred_id)) { + if (!test_bit(preferred_id, id_map->used_ids)) { + id =3D preferred_id; + goto trace_id_allocated; + } else if (WARN((flags & TRACE_ID_REQ_STATIC), "Trace ID %d is used.\n", + preferred_id)) + return -EINVAL; + } else if (flags & TRACE_ID_PREFER_ODD) { /* may use odd ids to avoid preferred legacy cpu IDs */ id =3D coresight_trace_id_find_odd_id(id_map); if (id) @@ -175,7 +184,7 @@ static int coresight_trace_id_map_get_cpu_id(int cpu, s= truct coresight_trace_id_ */ id =3D coresight_trace_id_alloc_new_id(id_map, CORESIGHT_LEGACY_CPU_TRACE_ID(cpu), - false); + TRACE_ID_ANY); if (!IS_VALID_CS_TRACE_ID(id)) goto get_cpu_id_out_unlock; =20 @@ -222,14 +231,15 @@ static void coresight_trace_id_map_put_cpu_id(int cpu= , struct coresight_trace_id DUMP_ID_MAP(id_map); } =20 -static int coresight_trace_id_map_get_system_id(struct coresight_trace_id_= map *id_map) +static int coresight_trace_id_map_get_system_id(struct coresight_trace_id_= map *id_map, + int preferred_id, unsigned int traceid_flags) { unsigned long flags; int id; =20 spin_lock_irqsave(&id_map_lock, flags); /* prefer odd IDs for system components to avoid legacy CPU IDS */ - id =3D coresight_trace_id_alloc_new_id(id_map, 0, true); + id =3D coresight_trace_id_alloc_new_id(id_map, preferred_id, traceid_flag= s); spin_unlock_irqrestore(&id_map_lock, flags); =20 DUMP_ID(id); @@ -271,10 +281,18 @@ EXPORT_SYMBOL_GPL(coresight_trace_id_read_cpu_id); =20 int coresight_trace_id_get_system_id(void) { - return coresight_trace_id_map_get_system_id(&id_map_default); + return coresight_trace_id_map_get_system_id(&id_map_default, 0, + TRACE_ID_PREFER_ODD); } EXPORT_SYMBOL_GPL(coresight_trace_id_get_system_id); =20 +int coresight_trace_id_get_static_system_id(int trace_id) +{ + return coresight_trace_id_map_get_system_id(&id_map_default, + trace_id, TRACE_ID_REQ_STATIC); +} +EXPORT_SYMBOL_GPL(coresight_trace_id_get_static_system_id); + void coresight_trace_id_put_system_id(int id) { coresight_trace_id_map_put_system_id(&id_map_default, id); diff --git a/drivers/hwtracing/coresight/coresight-trace-id.h b/drivers/hwt= racing/coresight/coresight-trace-id.h index 3797777d367e..ca2fdf31c835 100644 --- a/drivers/hwtracing/coresight/coresight-trace-id.h +++ b/drivers/hwtracing/coresight/coresight-trace-id.h @@ -122,6 +122,15 @@ int coresight_trace_id_read_cpu_id(int cpu); */ int coresight_trace_id_get_system_id(void); =20 +/** + * Allocate a CoreSight static trace ID for a system component. + * + * Used to allocate static IDs for system trace sources such as dummy sour= ce. + * + * return: Trace ID or -EINVAL if allocation is impossible. + */ +int coresight_trace_id_get_static_system_id(int id); + /** * Release an allocated system trace ID. * diff --git a/include/linux/coresight.h b/include/linux/coresight.h index f09ace92176e..2cdc0b1cd536 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -643,6 +643,7 @@ void coresight_relaxed_write64(struct coresight_device = *csdev, void coresight_write64(struct coresight_device *csdev, u64 val, u32 offset= ); =20 extern int coresight_get_cpu(struct device *dev); +extern int coresight_get_static_trace_id(struct device *dev, u32 *id); =20 struct coresight_platform_data *coresight_get_platform_data(struct device = *dev); struct coresight_connection * --=20 2.46.0 From nobody Sat Nov 30 07:49:26 2024 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8E56170A01; Tue, 10 Sep 2024 10:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962513; cv=none; b=pLGeD5k89qCunxAFSQHDD9ARro9K9Z1bfhaHvHkkrIVWakv/603lC9YTyT8w1m7mlXts2+sO8K9QXqWohI+Ijwob7sw5ETEVO/5v6gNGs/pjDUuCIsXJnC9C7tmF+V6UbkgLoRkl3By1DKW6XXmkoOxRv/FIBBOai2hfEII0HaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962513; c=relaxed/simple; bh=DwPT90akjSTs4s6oqdyjDPcFRFMAZXbpI+hn/syX8c4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rYf8QpyLUzbQSvfIl/kZo6PW5knErkUoUQF0dd3rMoZqsHlWESVuUDRC53ERmU0hPoRSqO7ZOagL8Gi2KR9N8b7pO6kD39hp7n+ETpNxjIwc/qGiWEHe07konM0pzLImTyiFDjr2CXwmKXTlNLW9rD/qfyEaH1WdKmUYTj6SevI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=o9FLaqzs; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="o9FLaqzs" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48A3UUnJ023787; Tue, 10 Sep 2024 10:01:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= JTb2IA1fMEiOChrbQgrJAH7QFCFefPBGjfe8rbzylCM=; b=o9FLaqzsWZjID/SL wwOL4eNjVJ7yKe6nOCq5WYFrZuBMT9FxDXKq9R+e4gV5UKOWAf8aUJ3eZsJjL6Lk K3XhO51cLMCIy9HtAw/e7ZSNYf8pKWFWTOMzbbYOoszb7uptI2BnfZl7EQWpZ3up pPref9gw8rdIgAMkGAwaS0Ax2anzODkBVs8IlodKSzdTTKb5oL1IkiED1BdvL/Gg JGJyh9Yai1+6oEKbRDQo14r1QFSV1zltIDDSfoB8OYZMrudsgxZ9W/RtxLdsFVlm YD2fH1xBOKxLI/krqfdfSldwgFHVvkqvWq+9uEbwYHfOVwKsiwzF4/NRepeBxIKz qpIldw== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 41gy6p5f37-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2024 10:01:41 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 48AA1eMc001352 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2024 10:01:40 GMT Received: from hu-jinlmao-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 10 Sep 2024 03:01:39 -0700 From: Mao Jinlong To: Suzuki K Poulose , Mike Leach , James Clark , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mao Jinlong , "Alexander Shishkin" CC: , , , , Subject: [PATCH v4 RESEND 3/3] coresight: dummy: Add static trace id support for dummy source Date: Tue, 10 Sep 2024 03:01:25 -0700 Message-ID: <20240910100127.8948-4-quic_jinlmao@quicinc.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910100127.8948-1-quic_jinlmao@quicinc.com> References: <20240910100127.8948-1-quic_jinlmao@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: xAu96wHFsSeiEdpZ06YflN63pWU38Sek X-Proofpoint-GUID: xAu96wHFsSeiEdpZ06YflN63pWU38Sek X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 bulkscore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 mlxscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2408220000 definitions=main-2409100075 Content-Type: text/plain; charset="utf-8" Some dummy source has static trace id configured in HW and it cannot be changed via software programming. Configure the trace id in device tree and reserve the id when device probe. Signed-off-by: Mao Jinlong --- .../sysfs-bus-coresight-devices-dummy-source | 15 +++++ drivers/hwtracing/coresight/coresight-dummy.c | 59 +++++++++++++++++-- 2 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-d= ummy-source diff --git a/Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-so= urce b/Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source new file mode 100644 index 000000000000..db770bc972d9 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source @@ -0,0 +1,15 @@ +What: /sys/bus/coresight/devices/dummy_source/enable_source +Date: July 2024 +KernelVersion: 6.9 +Contact: Mao Jinlong +Description: (RW) Enable/disable tracing of dummy source. A sink should be= activated + before enabling the source. The path of coresight components linking + the source to the sink is configured and managed automatically by the + coresight framework. + +What: /sys/bus/coresight/devices/dummy_source/traceid +Date: July 2024 +KernelVersion: 6.9 +Contact: Mao Jinlong +Description: (R) Show the trace ID that will appear in the trace stream + coming from this trace entity. diff --git a/drivers/hwtracing/coresight/coresight-dummy.c b/drivers/hwtrac= ing/coresight/coresight-dummy.c index ac70c0b491be..3bf5437cbfb1 100644 --- a/drivers/hwtracing/coresight/coresight-dummy.c +++ b/drivers/hwtracing/coresight/coresight-dummy.c @@ -11,10 +11,12 @@ #include =20 #include "coresight-priv.h" +#include "coresight-trace-id.h" =20 struct dummy_drvdata { struct device *dev; struct coresight_device *csdev; + u8 traceid; }; =20 DEFINE_CORESIGHT_DEVLIST(source_devs, "dummy_source"); @@ -67,6 +69,32 @@ static const struct coresight_ops dummy_sink_cs_ops =3D { .sink_ops =3D &dummy_sink_ops, }; =20 +/* User can get the trace id of dummy source from this node. */ +static ssize_t traceid_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + unsigned long val; + struct dummy_drvdata *drvdata =3D dev_get_drvdata(dev->parent); + + val =3D drvdata->traceid; + return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); +} +static DEVICE_ATTR_RO(traceid); + +static struct attribute *coresight_dummy_attrs[] =3D { + &dev_attr_traceid.attr, + NULL, +}; + +static const struct attribute_group coresight_dummy_group =3D { + .attrs =3D coresight_dummy_attrs, +}; + +static const struct attribute_group *coresight_dummy_groups[] =3D { + &coresight_dummy_group, + NULL, +}; + static int dummy_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; @@ -74,6 +102,11 @@ static int dummy_probe(struct platform_device *pdev) struct coresight_platform_data *pdata; struct dummy_drvdata *drvdata; struct coresight_desc desc =3D { 0 }; + int ret, trace_id; + + drvdata =3D devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; =20 if (of_device_is_compatible(node, "arm,coresight-dummy-source")) { =20 @@ -85,6 +118,25 @@ static int dummy_probe(struct platform_device *pdev) desc.subtype.source_subtype =3D CORESIGHT_DEV_SUBTYPE_SOURCE_OTHERS; desc.ops =3D &dummy_source_cs_ops; + desc.groups =3D coresight_dummy_groups; + + ret =3D coresight_get_static_trace_id(dev, &trace_id); + if (!ret) { + /* Get the static id if id is set in device tree. */ + ret =3D coresight_trace_id_get_static_system_id(trace_id); + if (ret < 0) + return ret; + + } else { + /* Get next available id if id is not set in device tree. */ + trace_id =3D coresight_trace_id_get_system_id(); + if (trace_id < 0) { + ret =3D trace_id; + return ret; + } + } + drvdata->traceid =3D (u8)trace_id; + } else if (of_device_is_compatible(node, "arm,coresight-dummy-sink")) { desc.name =3D coresight_alloc_device_name(&sink_devs, dev); if (!desc.name) @@ -103,10 +155,6 @@ static int dummy_probe(struct platform_device *pdev) return PTR_ERR(pdata); pdev->dev.platform_data =3D pdata; =20 - drvdata =3D devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); - if (!drvdata) - return -ENOMEM; - drvdata->dev =3D &pdev->dev; platform_set_drvdata(pdev, drvdata); =20 @@ -126,7 +174,10 @@ static void dummy_remove(struct platform_device *pdev) { struct dummy_drvdata *drvdata =3D platform_get_drvdata(pdev); struct device *dev =3D &pdev->dev; + struct device_node *node =3D dev->of_node; =20 + if (of_device_is_compatible(node, "arm,coresight-dummy-source")) + coresight_trace_id_put_system_id(drvdata->traceid); pm_runtime_disable(dev); coresight_unregister(drvdata->csdev); } --=20 2.46.0