Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp8159613rdb; Thu, 4 Jan 2024 23:50:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IFg3PB0VXRYZO3VsJX5d3/JastGYV0FIEvi03hNe+5lnXi7kqySUHZjNJ1lujArKWcd/J6u X-Received: by 2002:a05:6512:2824:b0:50e:b46f:4383 with SMTP id cf36-20020a056512282400b0050eb46f4383mr144455lfb.133.1704441026541; Thu, 04 Jan 2024 23:50:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704441026; cv=none; d=google.com; s=arc-20160816; b=TiMffoO9fPJXMtdjNDMNHoPB7qyUe/+SmPI7h3PnIc2mjRPbkhX4w+lxcLLSXcv61s yz8eWn3xLDY3/bEAXS3BrA1mtFa67cBjEs+jhlk4oNZmzpPN6adD+YZSNvbeUifi+3l1 /0MvTnLWYDQz9GjgVZCXfWBSWnqedILpI0qSvGInmjJTSuUmbXQXOoIuD1sHxmcgHpHi JwpbUdtN3ChVqU/Iu3DqHQQNx4E9XC4lPKWuZeSW25QlICgIGkiWaQGPS4n81xS24cjx HR0lf9CwUaOUjfejjqJ/EQWxQlEmqbMhxUkCtx5y/xuW+OtX/MewdHwbqPAC2IsrPLT7 jeBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=w+qeV/pcKBiJLUuKOnjNULlJ99CNG2bOfUh8LsiPM9Y=; fh=VOUb63XQILaicmSC75IsrnF30pP9Bp5pc8V1srl0woA=; b=0zV3miW+t1Q7kSEApuyz/aVoxau39A2m6HRcOAVvQM3wWhXwz+234UBhb3umy0HPyd /OdtiaSRqoBVpc1dkL15WeZoZv0BEs1BvgENNv7xsCoPDS5oS4WLSJa7Qb3iE1eMJgEa qn/P+sChT0wFR37MXMBVa99Zra2Qzj1OyLKidjjmRtO/KClcgmjRpllecSyX7zxD4AFJ dyYLc3QQmP8te340xqKoz270Ja8bySLX1ILCi9Q0Px2E18/2zJe4IiDu57u7OjjGF+qX zo8roeLmtTZtP2fCStcJYlGl7MF4G18JXQsCQSftPmBBKsNNfJ/v9mAVl6YTX20Ep6q4 A9Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=mxVuMw8L; spf=pass (google.com: domain of linux-kernel+bounces-17556-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17556-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id k21-20020a170906055500b00a26b42502d0si382073eja.403.2024.01.04.23.50.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 23:50:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17556-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=mxVuMw8L; spf=pass (google.com: domain of linux-kernel+bounces-17556-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17556-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 192FA1F23527 for ; Fri, 5 Jan 2024 07:50:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25EC320306; Fri, 5 Jan 2024 07:50:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="mxVuMw8L" X-Original-To: linux-kernel@vger.kernel.org Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 3CDC31EB3F; Fri, 5 Jan 2024 07:50:11 +0000 (UTC) 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 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 4055Fj02003264; Fri, 5 Jan 2024 07:49:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= message-id:date:mime-version:subject:to:cc:references:from :in-reply-to:content-type:content-transfer-encoding; s= qcppdkim1; bh=w+qeV/pcKBiJLUuKOnjNULlJ99CNG2bOfUh8LsiPM9Y=; b=mx VuMw8L/oAwCokeeHeQrtx/c/xgoCvCOIGepgxjBOetAiYxCjBgskPySZlQ8O1PgK rGdSzRrx8KeSpdtL3LaG7x8y2TPkTgsRHicv9zp5xnXsdS9KBAtbbB7b6Uhv1pS9 bATZrtWGA1nBxw8AyJ+DMxPAqEj+HCGYGdeTdmpIbhK0Rv5xbV/rtOKl61Q2fSWJ wHyIXp6C87xo3pqjyZjjzWcIBi1NRbD4WiZCZJjrlA+nc6Xi6tIquVxaCmqJ3qfx ObWG2At4kuxP5RAYuAr0TjjtoblZBuwlCeCoHKY8Rhhnz9UJ+iAKCVg9Hn53t8iR 41SMBA7/AVvKV4LHh52A== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3ve97r8f36-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Jan 2024 07:49:45 +0000 (GMT) Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 4057niDs006468 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Jan 2024 07:49:44 GMT Received: from [10.239.133.211] (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Thu, 4 Jan 2024 23:49:39 -0800 Message-ID: <616eba43-678c-4bc9-be7e-7b766e8d7c29@quicinc.com> Date: Fri, 5 Jan 2024 15:49:09 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 6/8] coresight-tpdm: Add timestamp control register support for the CMB Content-Language: en-US To: Suzuki K Poulose , Mathieu Poirier , Alexander Shishkin , Konrad Dybcio , Mike Leach , Rob Herring , Krzysztof Kozlowski CC: Jinlong Mao , Greg Kroah-Hartman , , , , , Tingwei Zhang , Yuanfang Zhang , Trilok Soni , Song Chai , , References: <1700533494-19276-1-git-send-email-quic_taozha@quicinc.com> <1700533494-19276-7-git-send-email-quic_taozha@quicinc.com> <797eadf6-2708-47ad-a61f-88bb0d4fcf28@quicinc.com> <4ae81e28-1791-4128-860f-eb6a83ea3742@arm.com> From: Tao Zhang In-Reply-To: <4ae81e28-1791-4128-860f-eb6a83ea3742@arm.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: q_uCBJaiFp3oHGyEEIkGD4cMs_p3bDLm X-Proofpoint-GUID: q_uCBJaiFp3oHGyEEIkGD4cMs_p3bDLm X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-09_02,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 impostorscore=0 spamscore=0 adultscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401050065 On 12/30/2023 5:39 PM, Suzuki K Poulose wrote: > On 25/12/2023 01:55, Tao Zhang wrote: >> >> On 12/20/2023 7:07 PM, Suzuki K Poulose wrote: >>> On 20/12/2023 09:51, Tao Zhang wrote: >>>> >>>> On 12/19/2023 9:51 PM, Suzuki K Poulose wrote: >>>>> On 19/12/2023 02:43, Tao Zhang wrote: >>>>>> >>>>>> On 12/18/2023 6:46 PM, Suzuki K Poulose wrote: >>>>>>> On 21/11/2023 02:24, Tao Zhang wrote: >>>>>>>> CMB_TIER register is CMB subunit timestamp insertion enable >>>>>>>> register. >>>>>>>> Bit 0 is PATT_TSENAB bit. Set this bit to 1 to request a timestamp >>>>>>>> following a CMB interface pattern match. Bit 1 is XTRIG_TSENAB >>>>>>>> bit. >>>>>>>> Set this bit to 1 to request a timestamp following a CMB CTI >>>>>>>> timestamp >>>>>>>> request. Bit 2 is TS_ALL bit. Set this bit to 1 to request >>>>>>>> timestamp >>>>>>>> for all packets. >>>>>>>> >>>>>>>> Reviewed-by: James Clark >>>>>>>> Signed-off-by: Tao Zhang >>>>>>>> Signed-off-by: Jinlong Mao >>>>>>>> --- >>>>>>>>   .../testing/sysfs-bus-coresight-devices-tpdm  | 35 ++++++ >>>>>>>>   drivers/hwtracing/coresight/coresight-tpdm.c  | 116 >>>>>>>> +++++++++++++++++- >>>>>>>>   drivers/hwtracing/coresight/coresight-tpdm.h  | 14 +++ >>>>>>>>   3 files changed, 162 insertions(+), 3 deletions(-) >>>>>>>> >>>>>>>> diff --git >>>>>>>> a/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm >>>>>>>> b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm >>>>>>>> index 53662ce7c2d0..e0b77107be13 100644 >>>>>>>> --- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm >>>>>>>> +++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm >>>>>>>> @@ -214,3 +214,38 @@ KernelVersion    6.7 >>>>>>>>   Contact:    Jinlong Mao (QUIC) , >>>>>>>> Tao Zhang (QUIC) >>>>>>>>   Description: >>>>>>>>           (RW) Set/Get the mask of the pattern for the CMB >>>>>>>> subunit TPDM. >>>>>>>> + >>>>>>>> +What: /sys/bus/coresight/devices//cmb_patt/enable_ts >>>>>>>> +Date:        September 2023 >>>>>>>> +KernelVersion    6.7 >>>>>>>> +Contact:    Jinlong Mao (QUIC) , Tao >>>>>>>> Zhang (QUIC) >>>>>>>> +Description: >>>>>>>> +        (Write) Set the pattern timestamp of CMB tpdm. Read >>>>>>>> +        the pattern timestamp of CMB tpdm. >>>>>>>> + >>>>>>>> +        Accepts only one of the 2 values -  0 or 1. >>>>>>>> +        0 : Disable CMB pattern timestamp. >>>>>>>> +        1 : Enable CMB pattern timestamp. >>>>>>>> + >>>>>>>> +What: /sys/bus/coresight/devices//cmb_trig_ts >>>>>>>> +Date:        September 2023 >>>>>>>> +KernelVersion    6.7 >>>>>>>> +Contact:    Jinlong Mao (QUIC) , Tao >>>>>>>> Zhang (QUIC) >>>>>>>> +Description: >>>>>>>> +        (RW) Set/Get the trigger timestamp of the CMB for tpdm. >>>>>>>> + >>>>>>>> +        Accepts only one of the 2 values -  0 or 1. >>>>>>>> +        0 : Set the CMB trigger type to false >>>>>>>> +        1 : Set the CMB trigger type to true >>>>>>>> + >>>>>>>> +What: /sys/bus/coresight/devices//cmb_ts_all >>>>>>>> +Date:        September 2023 >>>>>>>> +KernelVersion    6.7 >>>>>>>> +Contact:    Jinlong Mao (QUIC) , Tao >>>>>>>> Zhang (QUIC) >>>>>>>> +Description: >>>>>>>> +        (RW) Read or write the status of timestamp upon all >>>>>>>> interface. >>>>>>>> +        Only value 0 and 1  can be written to this node. Set >>>>>>>> this node to 1 to requeset >>>>>>>> +        timestamp to all trace packet. >>>>>>>> +        Accepts only one of the 2 values -  0 or 1. >>>>>>>> +        0 : Disable the timestamp of all trace packets. >>>>>>>> +        1 : Enable the timestamp of all trace packets. >>>>>>>> diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c >>>>>>>> b/drivers/hwtracing/coresight/coresight-tpdm.c >>>>>>>> index 894d4309f1c7..f6cda5616e84 100644 >>>>>>>> --- a/drivers/hwtracing/coresight/coresight-tpdm.c >>>>>>>> +++ b/drivers/hwtracing/coresight/coresight-tpdm.c >>>>>>>> @@ -331,6 +331,36 @@ static void tpdm_enable_dsb(struct >>>>>>>> tpdm_drvdata *drvdata) >>>>>>>>       writel_relaxed(val, drvdata->base + TPDM_DSB_CR); >>>>>>>>   } >>>>>>>>   +static void set_cmb_tier(struct tpdm_drvdata *drvdata) >>>>>>>> +{ >>>>>>>> +    u32 val; >>>>>>>> + >>>>>>>> +    val = readl_relaxed(drvdata->base + TPDM_CMB_TIER); >>>>>>>> + >>>>>>>> +    /* Clear all relevant fields */ >>>>>>>> +    val &= ~(TPDM_CMB_TIER_PATT_TSENAB | TPDM_CMB_TIER_TS_ALL | >>>>>>>> +         TPDM_CMB_TIER_XTRIG_TSENAB); >>>>>>>> + >>>>>>>> +    /* Set pattern timestamp type and enablement */ >>>>>>>> +    if (drvdata->cmb->patt_ts) >>>>>>>> +        val |= TPDM_CMB_TIER_PATT_TSENAB; >>>>>>> >>>>>>>  -- cut -- >>>>>>>> +    else >>>>>>>> +        val &= ~TPDM_CMB_TIER_PATT_TSENAB; >>>>>>> >>>>>>> >>>>>>> All the else cases in this function are superfluous. Please >>>>>>> remove all >>>>>>> of them. >>>>>> I will update this in the next patch. >>>>>>> >>>>>>>> + >>>>>>>> +    /* Set trigger timestamp */ >>>>>>>> +    if (drvdata->cmb->trig_ts) >>>>>>>> +        val |= TPDM_CMB_TIER_XTRIG_TSENAB; >>>>>>>> +    else >>>>>>>> +        val &= ~TPDM_CMB_TIER_XTRIG_TSENAB; >>>>>>>> + >>>>>>>> +    /* Set all timestamp enablement*/ >>>>>>>> +    if (drvdata->cmb->ts_all) >>>>>>>> +        val |= TPDM_CMB_TIER_TS_ALL; >>>>>>>> +    else >>>>>>>> +        val &= ~TPDM_CMB_TIER_TS_ALL; >>>>>>>> +    writel_relaxed(val, drvdata->base + TPDM_CMB_TIER); >>>>>>>> +} >>>>>>>> + >>>>>>>>   static void tpdm_enable_cmb(struct tpdm_drvdata *drvdata) >>>>>>>>   { >>>>>>>>       u32 val, i; >>>>>>>> @@ -347,6 +377,8 @@ static void tpdm_enable_cmb(struct >>>>>>>> tpdm_drvdata *drvdata) >>>>>>>>                   drvdata->base + TPDM_CMB_XPMR(i)); >>>>>>>>       } >>>>>>>>   +    set_cmb_tier(drvdata); >>>>>>>> + >>>>>>>>       val = readl_relaxed(drvdata->base + TPDM_CMB_CR); >>>>>>>>       /* >>>>>>>>        * Set to 0 for continuous CMB collection mode, >>>>>>>> @@ -695,9 +727,17 @@ static ssize_t enable_ts_show(struct >>>>>>>> device *dev, >>>>>>>>                     char *buf) >>>>>>>>   { >>>>>>>>       struct tpdm_drvdata *drvdata = dev_get_drvdata(dev->parent); >>>>>>>> +    ssize_t size = 0; >>>>>>>>   -    return sysfs_emit(buf, "%u\n", >>>>>>>> -             (unsigned int)drvdata->dsb->patt_ts); >>>>>>>> +    if (tpdm_has_dsb_dataset(drvdata)) >>>>>>>> +        size = sysfs_emit(buf, "%u\n", >>>>>>>> +                 (unsigned int)drvdata->dsb->patt_ts); >>>>>>>> + >>>>>>>> +    if (tpdm_has_cmb_dataset(drvdata)) >>>>>>>> +        size = sysfs_emit(buf, "%u\n", >>>>>>>> +                 (unsigned int)drvdata->cmb->patt_ts); >>>>>>> >>>>>>> Why does this need to show two values ? This must only show ONE >>>>>>> value. >>>>>>> How you deduce that might be based on the availability of the >>>>>>> feature >>>>>>> set. Or store the TS value in the drvdata and use that instead for >>>>>>> controlling CMB/DSB. >>>>>> >>>>>> Since both of CMB/DSB need to have "enable_ts" SysFs file, can I >>>>>> separate them >>>>> >>>>> The question really is, do we need fine grained control. i.e., >>>>> >>>>> enable TS for DSB but not for CMB or vice versa. >>>>> >>>>> I am not an expert on the usage scenario of the same. So, if >>>>> you/Qcomm >>>>> thinks the users need separate, fine grained control for timestamp >>>>> for the DSB and CMB, then yes, follow your recommendation below. >>>>> i.e., tpdm.../dsb_patt/enable_ts >>>>> >>>>>> as "enable_dsb_ts" and "enable_cmb_ts"? The path will be like below. >>>>>> >>>>>> tpdm0/dsb_patt/enable_dsb_ts >>>>> >>>>> You don't need enable_dsb_ts. It could be "enable_ts" >>>>> >>>>>> >>>>>> tpdm1/cmb_patt/enable_cmb_ts >>>>>> >>>>>> Is this design appropriate? >>>>> >>>>> >>>>> Otherwise, stick to single enable_ts : which enables the ts for both >>>>> CMB/DSB. And it only ever show one value : 0 (TS is disabled for both >>>>> CMB/DSB) 1 : TS enabled for both. >>>> >>>> We have a very special case, such as the TPDM supporting both CMB and >>>> >>>> DSB datasets. Although this case is very rare, it still exists. >>>> >>>> Can I use the data bit to instruct whether timestamp is enabled for >>>> CMB/DSB or not? For example, >>>> >>>> size = sysfs_emit(buf, "%u\n", >>>>                  (unsigned int)(drvdata->dsb->patt_ts << 1 | >>>> drvdata->cmb->patt_ts)); >>>> >>>> Thus, this value can instruct the following situations. >>>> >>>> 0 - TS is disabled for both CMB/DSB >>>> >>>> 1 - TS is enabled for CMB >>>> >>>> 2 - TS is enabled for DSB >>>> >>>> 3 - TS is enabled for both >>>> >>>> Is this approach acceptable? >>>> >>> >>> No, please stick to separate controls for TS. Do not complicate >>> the user interface. >>> >>> i.e., >>> tpdm0/dsb_patt/enable_ts >>> tpdm0/cmb_patt/enable_ts >> >> We need to be able to control/show dsb and cmb timestamp enablement >> independently. >> >> Can we achieve this requirement if we use a sysfs file with the same >> name? > > They are independent and in their respective directory (group) for CMB > and DSB. What am I missing ? > e.g., if you want to enable TS for DSB, you do : > > $ echo 1 > dsb_patt/enable_ts > > And that only works for DSB not for CMB. We have a special case that the TPDM supports both DSB and CMB dataset. In this special case, when we issue this command to enable timestamp, it will call enable_ts_store API, right?     if (tpdm_has_dsb_dataset(drvdata))         drvdata->dsb->patt_ts = !!val;     if (tpdm_has_cmb_dataset(drvdata))         drvdata->cmb->patt_ts = !!val; Since this special TPDM supports both DSB and CMB dataset, both DSB patt_ts and CMB patt_ts will be set in this case even if I only configure the file in the DSB directory, right? This is the problem we have now. Best, Tao > > Suzuki > >> >> I'm not able to find a good way to achieve it. Do you have any >> suggestions for this? >> > > >> >> Best, >> >> Tao >> >>> >>> Suzuki >>> >>> >>>> >>>> Best, >>>> >>>> Tao >>>> >>>>> >>>>> Suzuki >>>>> >>>>> >>>>>>> >>>>> >>>>>>> Also, the sysfs documentation needs update, if this is going to >>>>>>> control the CMB. >>>>>> >>>>>> Sure. I will update the SysFs documentation according to the >>>>>> modification in the >>>>>> >>>>>> next patch series. >>>>>> >>>>>> >>>>>> Best, >>>>>> >>>>>> Tao >>>>>> >>>>>>> >>>>>>> Suzuki >>>>>>> >>>>>>> >>>>>>>> + >>>>>>>> +    return size; >>>>>>>>   } >>>>>>>>     /* >>>>>>>> @@ -715,8 +755,13 @@ static ssize_t enable_ts_store(struct >>>>>>>> device *dev, >>>>>>>>           return -EINVAL; >>>>>>>>         spin_lock(&drvdata->spinlock); >>>>>>>> -    drvdata->dsb->patt_ts = !!val; >>>>>>>> +    if (tpdm_has_dsb_dataset(drvdata)) >>>>>>>> +        drvdata->dsb->patt_ts = !!val; >>>>>>>> + >>>>>>>> +    if (tpdm_has_cmb_dataset(drvdata)) >>>>>>>> +        drvdata->cmb->patt_ts = !!val; >>>>>>>>       spin_unlock(&drvdata->spinlock); >>>>>>>> + >>>>>>>>       return size; >>>>>>>>   } >>>>>>>>   static DEVICE_ATTR_RW(enable_ts); >>>>>>>> @@ -851,6 +896,68 @@ static ssize_t cmb_mode_store(struct >>>>>>>> device *dev, >>>>>>>>   } >>>>>>>>   static DEVICE_ATTR_RW(cmb_mode); >>>>>>>>   +static ssize_t cmb_ts_all_show(struct device *dev, >>>>>>>> +                   struct device_attribute *attr, >>>>>>>> +                   char *buf) >>>>>>>> +{ >>>>>>>> +    struct tpdm_drvdata *drvdata = dev_get_drvdata(dev->parent); >>>>>>>> + >>>>>>>> +    return sysfs_emit(buf, "%u\n", >>>>>>>> +              (unsigned int)drvdata->cmb->ts_all); >>>>>>>> +} >>>>>>>> + >>>>>>>> +static ssize_t cmb_ts_all_store(struct device *dev, >>>>>>>> +                struct device_attribute *attr, >>>>>>>> +                const char *buf, >>>>>>>> +                size_t size) >>>>>>>> +{ >>>>>>>> +    struct tpdm_drvdata *drvdata = dev_get_drvdata(dev->parent); >>>>>>>> +    unsigned long val; >>>>>>>> + >>>>>>>> +    if ((kstrtoul(buf, 0, &val)) || (val & ~1UL)) >>>>>>>> +        return -EINVAL; >>>>>>>> + >>>>>>>> +    spin_lock(&drvdata->spinlock); >>>>>>>> +    if (val) >>>>>>>> +        drvdata->cmb->ts_all = true; >>>>>>>> +    else >>>>>>>> +        drvdata->cmb->ts_all = false; >>>>>>>> +    spin_unlock(&drvdata->spinlock); >>>>>>>> +    return size; >>>>>>>> +} >>>>>>>> +static DEVICE_ATTR_RW(cmb_ts_all); >>>>>>>> + >>>>>>>> +static ssize_t cmb_trig_ts_show(struct device *dev, >>>>>>>> +                struct device_attribute *attr, >>>>>>>> +                char *buf) >>>>>>>> +{ >>>>>>>> +    struct tpdm_drvdata *drvdata = dev_get_drvdata(dev->parent); >>>>>>>> + >>>>>>>> +    return sysfs_emit(buf, "%u\n", >>>>>>>> +              (unsigned int)drvdata->cmb->trig_ts); >>>>>>>> +} >>>>>>>> + >>>>>>>> +static ssize_t cmb_trig_ts_store(struct device *dev, >>>>>>>> +                 struct device_attribute *attr, >>>>>>>> +                 const char *buf, >>>>>>>> +                 size_t size) >>>>>>>> +{ >>>>>>>> +    struct tpdm_drvdata *drvdata = dev_get_drvdata(dev->parent); >>>>>>>> +    unsigned long val; >>>>>>>> + >>>>>>>> +    if ((kstrtoul(buf, 0, &val)) || (val & ~1UL)) >>>>>>>> +        return -EINVAL; >>>>>>>> + >>>>>>>> +    spin_lock(&drvdata->spinlock); >>>>>>>> +    if (val) >>>>>>>> +        drvdata->cmb->trig_ts = true; >>>>>>>> +    else >>>>>>>> +        drvdata->cmb->trig_ts = false; >>>>>>>> +    spin_unlock(&drvdata->spinlock); >>>>>>>> +    return size; >>>>>>>> +} >>>>>>>> +static DEVICE_ATTR_RW(cmb_trig_ts); >>>>>>>> + >>>>>>>>   static struct attribute *tpdm_dsb_edge_attrs[] = { >>>>>>>>       &dev_attr_ctrl_idx.attr, >>>>>>>>       &dev_attr_ctrl_val.attr, >>>>>>>> @@ -973,6 +1080,7 @@ static struct attribute >>>>>>>> *tpdm_cmb_patt_attrs[] = { >>>>>>>>       CMB_PATT_ATTR(1), >>>>>>>>       CMB_PATT_MASK_ATTR(0), >>>>>>>>       CMB_PATT_MASK_ATTR(1), >>>>>>>> +    &dev_attr_enable_ts.attr, >>>>>>>>       NULL, >>>>>>>>   }; >>>>>>>>   @@ -985,6 +1093,8 @@ static struct attribute >>>>>>>> *tpdm_dsb_attrs[] = { >>>>>>>>     static struct attribute *tpdm_cmb_attrs[] = { >>>>>>>>       &dev_attr_cmb_mode.attr, >>>>>>>> +    &dev_attr_cmb_ts_all.attr, >>>>>>>> +    &dev_attr_cmb_trig_ts.attr, >>>>>>>>       NULL, >>>>>>>>   }; >>>>>>>>   diff --git a/drivers/hwtracing/coresight/coresight-tpdm.h >>>>>>>> b/drivers/hwtracing/coresight/coresight-tpdm.h >>>>>>>> index e90d008c1cb2..65b7ca6c4077 100644 >>>>>>>> --- a/drivers/hwtracing/coresight/coresight-tpdm.h >>>>>>>> +++ b/drivers/hwtracing/coresight/coresight-tpdm.h >>>>>>>> @@ -11,6 +11,8 @@ >>>>>>>>     /* CMB Subunit Registers */ >>>>>>>>   #define TPDM_CMB_CR        (0xA00) >>>>>>>> +/*CMB subunit timestamp insertion enable register*/ >>>>>>>> +#define TPDM_CMB_TIER        (0xA04) >>>>>>>>   /*CMB subunit timestamp pattern registers*/ >>>>>>>>   #define TPDM_CMB_TPR(n)        (0xA08 + (n * 4)) >>>>>>>>   /*CMB subunit timestamp pattern mask registers*/ >>>>>>>> @@ -24,6 +26,12 @@ >>>>>>>>   #define TPDM_CMB_CR_ENA        BIT(0) >>>>>>>>   /* Trace collection mode for CMB subunit */ >>>>>>>>   #define TPDM_CMB_CR_MODE    BIT(1) >>>>>>>> +/* Timestamp control for pattern match */ >>>>>>>> +#define TPDM_CMB_TIER_PATT_TSENAB    BIT(0) >>>>>>>> +/* CMB CTI timestamp request */ >>>>>>>> +#define TPDM_CMB_TIER_XTRIG_TSENAB    BIT(1) >>>>>>>> +/* For timestamp fo all trace */ >>>>>>>> +#define TPDM_CMB_TIER_TS_ALL        BIT(2) >>>>>>>>     /*Patten register number*/ >>>>>>>>   #define TPDM_CMB_MAX_PATT        2 >>>>>>>> @@ -217,6 +225,9 @@ struct dsb_dataset { >>>>>>>>    * @patt_mask:        Save value for pattern mask >>>>>>>>    * @trig_patt:        Save value for trigger pattern >>>>>>>>    * @trig_patt_mask:   Save value for trigger pattern mask >>>>>>>> + * @patt_ts:          Indicates if pattern match for timestamp >>>>>>>> is enabled. >>>>>>>> + * @trig_ts:          Indicates if CTI trigger for timestamp >>>>>>>> is enabled. >>>>>>>> + * @ts_all:           Indicates if timestamp is enabled for >>>>>>>> all packets. >>>>>>>>    */ >>>>>>>>   struct cmb_dataset { >>>>>>>>       u32            trace_mode; >>>>>>>> @@ -224,6 +235,9 @@ struct cmb_dataset { >>>>>>>>       u32            patt_mask[TPDM_CMB_MAX_PATT]; >>>>>>>>       u32            trig_patt[TPDM_CMB_MAX_PATT]; >>>>>>>>       u32 trig_patt_mask[TPDM_CMB_MAX_PATT]; >>>>>>>> +    bool            patt_ts; >>>>>>>> +    bool            trig_ts; >>>>>>>> +    bool            ts_all; >>>>>>>>   }; >>>>>>>>     /** >>>>>>> >>>>> >>>>> _______________________________________________ >>>>> CoreSight mailing list -- coresight@lists.linaro.org >>>>> To unsubscribe send an email to coresight-leave@lists.linaro.org >>> >>> _______________________________________________ >>> CoreSight mailing list -- coresight@lists.linaro.org >>> To unsubscribe send an email to coresight-leave@lists.linaro.org > > _______________________________________________ > CoreSight mailing list -- coresight@lists.linaro.org > To unsubscribe send an email to coresight-leave@lists.linaro.org