From mboxrd@z Thu Jan 1 00:00:00 1970 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 0F4171CFBA for ; Wed, 15 Apr 2026 12:17:16 +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=1776255438; cv=none; b=SNN1qCCiEBFcM0s7dTnkl219hgtWwLdVJ3DT4klnBFHvBsvO8TQBl1wK37s+XJTQS4IeLggJSRwN2SoMyEC2uBXv2CYsvVNysFXXu9zTO3uBAU3GbdDiLpCJItBhcbtgJx82SmWhftQxjb0tVkkXyaw8b+zB7zM5HJpVsyxBQT0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776255438; c=relaxed/simple; bh=63+zWvXqgwKzeGswepTst9nP6+1bvcAnX13yx+m0fmI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=XMpRcNfmGlTqvXgiIIt4s26x3zhvNofcC9hf2cxiMo208YIZt9oHu84o2KxTGBRD2iMlpiWryC4wVrjTrhKxohEPO+LHn1RDMDBB00GyaveLuhhMEaeTq1ylCKuuVChD6Xye02Zj/GSmi/3/JVhqezPIs++FWXcduSuHyxuufss= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=EOxEasfa; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=B88RXdEF; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="EOxEasfa"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="B88RXdEF" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63F8uAsx731025 for ; Wed, 15 Apr 2026 12:17:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= V5bGj8dg6sWT/8Qx4G1y0lgYu9LMndadv5vBd8WeOPM=; b=EOxEasfaNj7VvZkG mYZM6izf6UyR1dYdzUHfnc85APL/PX8t3veCcBSnlqyOF+z2qV3MgnHhViy5+7eJ 1Zn0nqublNuzOfar7inslLPd1w5vnX4ZoZjIwyKraK1AQRflyPv/G8zUaxc1Ze4t 1UfgSv11Hx4f/2w081Qjt3OrA6MV/TEu3SZrFsVQOSx1G8WMC2GaHAl8b63WoEOL Rn0yYJAAEiFs7hjziwuz9ga5B2wk7M1fmroUzDFNT0cSDoixtTHP8bdpKt3R6qbg XOcCr+6I0DbRt2IKmQJghxaL56kxPyf4jN+OAGlE+RXTvVNYMsFJw0uPJiEqQQEH mu4tyQ== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dhruubpd8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 15 Apr 2026 12:17:16 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2b465bf993cso28076635ad.1 for ; Wed, 15 Apr 2026 05:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1776255436; x=1776860236; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=V5bGj8dg6sWT/8Qx4G1y0lgYu9LMndadv5vBd8WeOPM=; b=B88RXdEFYT9MZ+V/8z1cP+bp+cztpMZf7mjduLLGr7NGLFerxRkwCOY8ld0lWi1Pd6 yvrZFP8aeUtmmG+OTN8122LOQPw/gQbbebOu6B4KAq7Anncv9eZHcbSQR1ezbkN4ZuzV PX39k3MyPd/tXck9n3DgpGE8qP6w3YBeZtzVvaITZEc9Dt17/6Ne1slK6SgeqSzLzbnV s3ha1vFmtqZSVKsHLjjzZOCN52oYEj/rJuBEhjZThYiUhP0wa6vR4UBIqIWAa6qHzk51 Ggzb0r158hJNu2fUIRVfmig92CBAlnffCxktpWinsl6Yqd2E4PKN2LUVZ5WNLtVHjvyF RyWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776255436; x=1776860236; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=V5bGj8dg6sWT/8Qx4G1y0lgYu9LMndadv5vBd8WeOPM=; b=HC4njFSK7qGWSSHYWJoH/an9WQUNbnxXF1pe+a3bp0m///9H5+D40P1Gt+2VDBCm3Z X/o6Opu+YpDbE2F0f0Tqv7FOp2dyuoGFV8PhvxJYfJKFVwuOUoeVYwBaFjbAJojrb3pm BEfQaVc58/68w0WKJGCUjfQ6Gkycbznl93vXhmJApUBPDFbsNXkmhChKavhVE6LMWAMZ 6oKberMbW+7VQEietqTnbnOJNAFm9rZLYZhXnZIThihu1uChzvoJwbpCfk7uFPCDymJl 7ZD4ziRT3Ld4jEih3son//8XZTmx2sb29UDGqKbwjFjZeUHSEczY2PcGJDWswOBJlMmh y/6w== X-Forwarded-Encrypted: i=1; AFNElJ/N0QZRRuT9QZIy2YA+QCm7DTiMHsTjQowFXXTKBSAfDrOJq0lKdRn4Vj42hsSoKzxDG3Pj2QMehjlQtJE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1ruwUmEPgExiFkIHLZty3av9wSZT0/OyokWfg904Ebe1SyNDE +OURChhcOnt4hs+tl3kBi7KBNAsbd0qXX/0/NoRC390rB/SqBNAAaZaL/45cOcfEc59sdhWkXDK fI1DQnBd/Dya65qgkD/w1VVs8HNDoBC/IgH7JIXlTslyq8BeD4aqnQtuEEh6i4ZWVnY4= X-Gm-Gg: AeBDiesoDpR+FIfyJ/CI+UpuAoZi/WPjt2O/OnupFKWmbkkHvKRmIG2d5rK6TNNjMKX rH/u9I2FRVMZeGlCAjTqD2Xf8eP5zoSbjxVctqdrDJqKtouM1ST5X+m0MzDVPrxTjfMHYNB9rva RIlgQfLpqq73qg+0FCMmxEAN3Rf2NwCGge1Ux+B6eAFJcskyL/kpV1Givna9tIk9KSkPH3BI4Kc Rjoq8XOTaMSj7aUQa5/dnFe6R19xxDzifs4eSIgJkIjfYPZ97l0thJgS+Ca7gk38EpkLNEGU0hC gps0V3Y/7sUrXNqKQtWJ1Ad4ItCmXMG7krpqlr9pQwWcn8RBgR1s+BwrmzV4iTXX+PgyRFf5+2v PjXBL11mDSdOADgOZ8FH46C/fzFwiK4nObOIIfScuiwKrdlc41wQE5Yla/Va7Z8VQCy6krdhUu7 2OFDZZRNebXA== X-Received: by 2002:a17:903:2492:b0:2b2:45b7:307f with SMTP id d9443c01a7336-2b2d59434admr163728085ad.9.1776255435460; Wed, 15 Apr 2026 05:17:15 -0700 (PDT) X-Received: by 2002:a17:903:2492:b0:2b2:45b7:307f with SMTP id d9443c01a7336-2b2d59434admr163727795ad.9.1776255434820; Wed, 15 Apr 2026 05:17:14 -0700 (PDT) Received: from [10.133.33.81] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b4782b6704sm29299375ad.75.2026.04.15.05.17.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Apr 2026 05:17:14 -0700 (PDT) Message-ID: <585280ea-8395-482a-8a3e-7527fce20539@oss.qualcomm.com> Date: Wed, 15 Apr 2026 20:17:08 +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 v4 7/9] coresight: etm3x: introduce struct etm_caps To: Yeoreum Yun , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: suzuki.poulose@arm.com, mike.leach@arm.com, james.clark@linaro.org, alexander.shishkin@linux.intel.com, leo.yan@arm.com References: <20260413142003.3549310-1-yeoreum.yun@arm.com> <20260413142003.3549310-8-yeoreum.yun@arm.com> Content-Language: en-US From: Jie Gan In-Reply-To: <20260413142003.3549310-8-yeoreum.yun@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-ORIG-GUID: kVuPfIuO4HpEMGE1J8Qb30G4sT01oPCv X-Authority-Analysis: v=2.4 cv=dpfrzVg4 c=1 sm=1 tr=0 ts=69df81cc cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=7CQSdrXTAAAA:8 a=QzKTikuh-o1KtyWUvv8A:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE1MDExMyBTYWx0ZWRfX0w7q3frmFIxM hdsutTZPKXfuUS6Tm3kAKHsp+zwk/pm+ah/qMdxCavAN2XkIfHypWLqGz9PnK66NR/amIRawy35 bXRTxmiTlQDnDPSc9KLIDXHx8vvBLDVEmRtqhAYnHE/VYP2zC97BDwqX/jEF1319rK4qOEFTOM8 Kvms1Yw60BaVvotNHVNAmCNJXIyaKxTBzGXc3JQnQXpaAaoiYeUbKSklojruBob0qP56lz6LOI5 jGSEKY+h4PpRjOVPDy8fe1otEexI0sMhwSWhxaABV0A4fgMSQyrS4pNRe+5vepvzzgX+QhDckbB vPKIyI2W10e9sCZ3De+ga/IguoY46h5WB4lJvKOUh9NLpvwZjeh065Xxn5QeUTvGTFCY8d89TBZ kcDlJy4xil6nKYSwtOD/KLgUTpOwjq7NguIQVdIzwwLDn+BIx1L4+8Hlyj4+otzUdyViKaWOaNo uohvRxpmtNmUVmOZ6cA== X-Proofpoint-GUID: kVuPfIuO4HpEMGE1J8Qb30G4sT01oPCv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-14_04,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 spamscore=0 adultscore=0 priorityscore=1501 clxscore=1015 phishscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604150113 On 4/13/2026 10:20 PM, Yeoreum Yun wrote: > Introduce struct etm_caps to describe ETMv3 capabilities > and move capabilities information into it. > > Since drvdata->etmccr and drvdata->etmccer are used to check > whether it supports fifofull logic and timestamping, > remove etmccr and etmccer field from drvdata and add relevant fields > in etm_caps structure. > > Signed-off-by: Yeoreum Yun > --- > drivers/hwtracing/coresight/coresight-etm.h | 42 ++++++++++++------- > .../coresight/coresight-etm3x-core.c | 39 ++++++++++------- > .../coresight/coresight-etm3x-sysfs.c | 29 ++++++++----- > 3 files changed, 67 insertions(+), 43 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h > index 40f20daded4f..8d1a1079b008 100644 > --- a/drivers/hwtracing/coresight/coresight-etm.h > +++ b/drivers/hwtracing/coresight/coresight-etm.h > @@ -140,6 +140,30 @@ > ETM_ADD_COMP_0 | \ > ETM_EVENT_NOT_A) > > +/** > + * struct etmv_caps - specifics ETM capabilities s/etmv_caps/etm_caps Thanks, Jie > + * @port_size: port size as reported by ETMCR bit 4-6 and 21. > + * @nr_addr_cmp:Number of pairs of address comparators as found in ETMCCR. > + * @nr_cntr: Number of counters as found in ETMCCR bit 13-15. > + * @nr_ext_inp: Number of external input as found in ETMCCR bit 17-19. > + * @nr_ext_out: Number of external output as found in ETMCCR bit 20-22. > + * @nr_ctxid_cmp: Number of contextID comparators as found in ETMCCR bit 24-25. > + * @fifofull: FIFOFULL logic is present. > + * @timestamp: Timestamping is implemented. > + * @retstack: Return stack is implemented. > + */ > +struct etm_caps { > + int port_size; > + u8 nr_addr_cmp; > + u8 nr_cntr; > + u8 nr_ext_inp; > + u8 nr_ext_out; > + u8 nr_ctxid_cmp; > + bool fifofull : 1; > + bool timestamp : 1; > + bool retstack : 1; > +}; > + > /** > * struct etm_config - configuration information related to an ETM > * @mode: controls various modes supported by this ETM/PTM. > @@ -212,19 +236,12 @@ struct etm_config { > * @csdev: component vitals needed by the framework. > * @spinlock: only one at a time pls. > * @cpu: the cpu this component is affined to. > - * @port_size: port size as reported by ETMCR bit 4-6 and 21. > * @arch: ETM/PTM version number. > + * @caps: ETM capabilities. > * @use_cpu14: true if management registers need to be accessed via CP14. > * @sticky_enable: true if ETM base configuration has been done. > * @boot_enable:true if we should start tracing at boot time. > * @os_unlock: true if access to management registers is allowed. > - * @nr_addr_cmp:Number of pairs of address comparators as found in ETMCCR. > - * @nr_cntr: Number of counters as found in ETMCCR bit 13-15. > - * @nr_ext_inp: Number of external input as found in ETMCCR bit 17-19. > - * @nr_ext_out: Number of external output as found in ETMCCR bit 20-22. > - * @nr_ctxid_cmp: Number of contextID comparators as found in ETMCCR bit 24-25. > - * @etmccr: value of register ETMCCR. > - * @etmccer: value of register ETMCCER. > * @traceid: value of the current ID for this component. > * @config: structure holding configuration parameters. > */ > @@ -234,19 +251,12 @@ struct etm_drvdata { > struct coresight_device *csdev; > raw_spinlock_t spinlock; > int cpu; > - int port_size; > u8 arch; > + struct etm_caps caps; > bool use_cp14; > bool sticky_enable; > bool boot_enable; > bool os_unlock; > - u8 nr_addr_cmp; > - u8 nr_cntr; > - u8 nr_ext_inp; > - u8 nr_ext_out; > - u8 nr_ctxid_cmp; > - u32 etmccr; > - u32 etmccer; > u32 traceid; > struct etm_config config; > }; > diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c > index 4a702b515733..e42ca346da91 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c > @@ -308,6 +308,7 @@ void etm_config_trace_mode(struct etm_config *config) > static int etm_parse_event_config(struct etm_drvdata *drvdata, > struct perf_event *event) > { > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > struct perf_event_attr *attr = &event->attr; > u8 ts_level; > @@ -356,8 +357,7 @@ static int etm_parse_event_config(struct etm_drvdata *drvdata, > * has ret stack) on the same SoC. So only enable when it can be honored > * - trace will still continue normally otherwise. > */ > - if (ATTR_CFG_GET_FLD(attr, retstack) && > - (drvdata->etmccer & ETMCCER_RETSTACK)) > + if (ATTR_CFG_GET_FLD(attr, retstack) && (caps->retstack)) > config->ctrl |= ETMCR_RETURN_STACK; > > return 0; > @@ -367,6 +367,7 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) > { > int i, rc; > u32 etmcr; > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > struct coresight_device *csdev = drvdata->csdev; > > @@ -388,7 +389,7 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) > etmcr = etm_readl(drvdata, ETMCR); > /* Clear setting from a previous run if need be */ > etmcr &= ~ETM3X_SUPPORTED_OPTIONS; > - etmcr |= drvdata->port_size; > + etmcr |= caps->port_size; > etmcr |= ETMCR_ETM_EN; > etm_writel(drvdata, config->ctrl | etmcr, ETMCR); > etm_writel(drvdata, config->trigger_event, ETMTRIGGER); > @@ -396,11 +397,11 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) > etm_writel(drvdata, config->enable_event, ETMTEEVR); > etm_writel(drvdata, config->enable_ctrl1, ETMTECR1); > etm_writel(drvdata, config->fifofull_level, ETMFFLR); > - for (i = 0; i < drvdata->nr_addr_cmp; i++) { > + for (i = 0; i < caps->nr_addr_cmp; i++) { > etm_writel(drvdata, config->addr_val[i], ETMACVRn(i)); > etm_writel(drvdata, config->addr_acctype[i], ETMACTRn(i)); > } > - for (i = 0; i < drvdata->nr_cntr; i++) { > + for (i = 0; i < caps->nr_cntr; i++) { > etm_writel(drvdata, config->cntr_rld_val[i], ETMCNTRLDVRn(i)); > etm_writel(drvdata, config->cntr_event[i], ETMCNTENRn(i)); > etm_writel(drvdata, config->cntr_rld_event[i], > @@ -414,9 +415,9 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) > etm_writel(drvdata, config->seq_32_event, ETMSQ32EVR); > etm_writel(drvdata, config->seq_13_event, ETMSQ13EVR); > etm_writel(drvdata, config->seq_curr_state, ETMSQR); > - for (i = 0; i < drvdata->nr_ext_out; i++) > + for (i = 0; i < caps->nr_ext_out; i++) > etm_writel(drvdata, ETM_DEFAULT_EVENT_VAL, ETMEXTOUTEVRn(i)); > - for (i = 0; i < drvdata->nr_ctxid_cmp; i++) > + for (i = 0; i < caps->nr_ctxid_cmp; i++) > etm_writel(drvdata, config->ctxid_pid[i], ETMCIDCVRn(i)); > etm_writel(drvdata, config->ctxid_mask, ETMCIDCMR); > etm_writel(drvdata, config->sync_freq, ETMSYNCFR); > @@ -563,6 +564,7 @@ static int etm_enable(struct coresight_device *csdev, struct perf_event *event, > static void etm_disable_hw(struct etm_drvdata *drvdata) > { > int i; > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > struct coresight_device *csdev = drvdata->csdev; > > @@ -572,7 +574,7 @@ static void etm_disable_hw(struct etm_drvdata *drvdata) > /* Read back sequencer and counters for post trace analysis */ > config->seq_curr_state = (etm_readl(drvdata, ETMSQR) & ETM_SQR_MASK); > > - for (i = 0; i < drvdata->nr_cntr; i++) > + for (i = 0; i < caps->nr_cntr; i++) > config->cntr_val[i] = etm_readl(drvdata, ETMCNTVRn(i)); > > etm_set_pwrdwn(drvdata); > @@ -754,7 +756,9 @@ static void etm_init_arch_data(void *info) > { > u32 etmidr; > u32 etmccr; > + u32 etmccer; > struct etm_drvdata *drvdata = info; > + struct etm_caps *caps = &drvdata->caps; > > /* Make sure all registers are accessible */ > etm_os_unlock(drvdata); > @@ -779,16 +783,19 @@ static void etm_init_arch_data(void *info) > /* Find all capabilities */ > etmidr = etm_readl(drvdata, ETMIDR); > drvdata->arch = BMVAL(etmidr, 4, 11); > - drvdata->port_size = etm_readl(drvdata, ETMCR) & PORT_SIZE_MASK; > + caps->port_size = etm_readl(drvdata, ETMCR) & PORT_SIZE_MASK; > + > + etmccer = etm_readl(drvdata, ETMCCER); > + caps->timestamp = !!(etmccer & ETMCCER_TIMESTAMP); > + caps->retstack = !!(etmccer & ETMCCER_RETSTACK); > > - drvdata->etmccer = etm_readl(drvdata, ETMCCER); > etmccr = etm_readl(drvdata, ETMCCR); > - drvdata->etmccr = etmccr; > - drvdata->nr_addr_cmp = BMVAL(etmccr, 0, 3) * 2; > - drvdata->nr_cntr = BMVAL(etmccr, 13, 15); > - drvdata->nr_ext_inp = BMVAL(etmccr, 17, 19); > - drvdata->nr_ext_out = BMVAL(etmccr, 20, 22); > - drvdata->nr_ctxid_cmp = BMVAL(etmccr, 24, 25); > + caps->fifofull = !!(etmccr & ETMCCR_FIFOFULL); > + caps->nr_addr_cmp = BMVAL(etmccr, 0, 3) * 2; > + caps->nr_cntr = BMVAL(etmccr, 13, 15); > + caps->nr_ext_inp = BMVAL(etmccr, 17, 19); > + caps->nr_ext_out = BMVAL(etmccr, 20, 22); > + caps->nr_ctxid_cmp = BMVAL(etmccr, 24, 25); > > coresight_clear_self_claim_tag_unlocked(&drvdata->csa); > etm_set_pwrdwn(drvdata); > diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c > index 42b12c33516b..f7330d830e21 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c > @@ -15,8 +15,9 @@ static ssize_t nr_addr_cmp_show(struct device *dev, > { > unsigned long val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + const struct etm_caps *caps = &drvdata->caps; > > - val = drvdata->nr_addr_cmp; > + val = caps->nr_addr_cmp; > return sprintf(buf, "%#lx\n", val); > } > static DEVICE_ATTR_RO(nr_addr_cmp); > @@ -25,8 +26,9 @@ static ssize_t nr_cntr_show(struct device *dev, > struct device_attribute *attr, char *buf) > { unsigned long val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + const struct etm_caps *caps = &drvdata->caps; > > - val = drvdata->nr_cntr; > + val = caps->nr_cntr; > return sprintf(buf, "%#lx\n", val); > } > static DEVICE_ATTR_RO(nr_cntr); > @@ -37,7 +39,7 @@ static ssize_t nr_ctxid_cmp_show(struct device *dev, > unsigned long val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > > - val = drvdata->nr_ctxid_cmp; > + val = drvdata->caps.nr_ctxid_cmp; > return sprintf(buf, "%#lx\n", val); > } > static DEVICE_ATTR_RO(nr_ctxid_cmp); > @@ -80,7 +82,7 @@ static ssize_t reset_store(struct device *dev, > memset(config, 0, sizeof(struct etm_config)); > config->mode = ETM_MODE_EXCLUDE; > config->trigger_event = ETM_DEFAULT_EVENT_VAL; > - for (i = 0; i < drvdata->nr_addr_cmp; i++) { > + for (i = 0; i < drvdata->caps.nr_addr_cmp; i++) { > config->addr_type[i] = ETM_ADDR_TYPE_NONE; > } > > @@ -111,6 +113,7 @@ static ssize_t mode_store(struct device *dev, > int ret; > unsigned long val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > > ret = kstrtoul(buf, 16, &val); > @@ -131,7 +134,7 @@ static ssize_t mode_store(struct device *dev, > config->ctrl &= ~ETMCR_CYC_ACC; > > if (config->mode & ETM_MODE_STALL) { > - if (!(drvdata->etmccr & ETMCCR_FIFOFULL)) { > + if (!caps->fifofull) { > dev_warn(dev, "stall mode not supported\n"); > ret = -EINVAL; > goto err_unlock; > @@ -141,7 +144,7 @@ static ssize_t mode_store(struct device *dev, > config->ctrl &= ~ETMCR_STALL_MODE; > > if (config->mode & ETM_MODE_TIMESTAMP) { > - if (!(drvdata->etmccer & ETMCCER_TIMESTAMP)) { > + if (!caps->timestamp) { > dev_warn(dev, "timestamp not supported\n"); > ret = -EINVAL; > goto err_unlock; > @@ -286,13 +289,14 @@ static ssize_t addr_idx_store(struct device *dev, > int ret; > unsigned long val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > > ret = kstrtoul(buf, 16, &val); > if (ret) > return ret; > > - if (val >= drvdata->nr_addr_cmp) > + if (val >= caps->nr_addr_cmp) > return -EINVAL; > > /* > @@ -589,13 +593,14 @@ static ssize_t cntr_idx_store(struct device *dev, > int ret; > unsigned long val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > > ret = kstrtoul(buf, 16, &val); > if (ret) > return ret; > > - if (val >= drvdata->nr_cntr) > + if (val >= caps->nr_cntr) > return -EINVAL; > /* > * Use spinlock to ensure index doesn't change while it gets > @@ -720,18 +725,19 @@ static ssize_t cntr_val_show(struct device *dev, > int i, ret = 0; > u32 val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > > if (!coresight_get_mode(drvdata->csdev)) { > raw_spin_lock(&drvdata->spinlock); > - for (i = 0; i < drvdata->nr_cntr; i++) > + for (i = 0; i < caps->nr_cntr; i++) > ret += sprintf(buf, "counter %d: %x\n", > i, config->cntr_val[i]); > raw_spin_unlock(&drvdata->spinlock); > return ret; > } > > - for (i = 0; i < drvdata->nr_cntr; i++) { > + for (i = 0; i < caps->nr_cntr; i++) { > val = etm_readl(drvdata, ETMCNTVRn(i)); > ret += sprintf(buf, "counter %d: %x\n", i, val); > } > @@ -999,13 +1005,14 @@ static ssize_t ctxid_idx_store(struct device *dev, > int ret; > unsigned long val; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + const struct etm_caps *caps = &drvdata->caps; > struct etm_config *config = &drvdata->config; > > ret = kstrtoul(buf, 16, &val); > if (ret) > return ret; > > - if (val >= drvdata->nr_ctxid_cmp) > + if (val >= caps->nr_ctxid_cmp) > return -EINVAL; > > /*