From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7F46C00A89 for ; Fri, 30 Oct 2020 17:58:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D99620724 for ; Fri, 30 Oct 2020 17:58:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CfSGScQy"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yiPtjc70" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D99620724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Z0JLae5v1Ha8VLN7GrA+pc7LUBR+JWs42HxkmyEbzkk=; b=CfSGScQy6D3JIG42Wswsc5OsiV fFPB8BR5H5haAEgnfezdrF5QznVv28Ob7KBaYvVnBdDS/Ig1lndOGpuNdoiEy+ifEyQyQizunhGlD mSbBrGL37IRBW+yhKlkNQUn//OHuDR3ByPNR0BTa+QvY2EMBdeRCy6sFM2leR5HN6day8qaTxSBaS dviOdQHYhEKnrThut9PKJTZ0+ncnRDhdM6XzOxsfvDlwHYcWVAWSBsfV1cmwulxTPTwUD10rlCyhF /CuwWQTl3vd6CIkdK++yW4+xFyUpyAcwiCrB3GjrzwpAjaN4NULMnZ9WhddLeCBf8qFosPwpAnKeS dQv27s0w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYYf4-000420-M1; Fri, 30 Oct 2020 17:58:02 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYYe9-0003m8-KB for linux-arm-kernel@lists.infradead.org; Fri, 30 Oct 2020 17:57:14 +0000 Received: by mail-wr1-x443.google.com with SMTP id n15so7441457wrq.2 for ; Fri, 30 Oct 2020 10:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yYqsuyi7DaOO7uWNEXcL2jXvZXiIWT42P3sP82JQVt4=; b=yiPtjc70iMviCFZN2uJQt2DtGp/UcNDfl7ExeHo9D6EBb/u8a5M9h+qqKzMNeEGmP7 CEqyZzk+FpvzdH1Vbed2kcjgjZmrMZDAACV67WA/S+vsV740sd3MmlAbya5vG9YP+cBT HWbZsnxEw4bkLYT7EdnGwgf/v6rDFTAIIW1Na9IMcGtgQWPCCFiEJ9Nr6HRSxh5ZrgbH fnFUn0IMw3ZEYlRY06Nkse4MEFHazlwKLua2pGLqR3Te27UrMGk6752OEjW1ooScmdMr x/GQTpml9XV18+CRibzFI7SWQYGk4IpzCpU1eU3Y26LcrvBgViQtvhDOvYJRlDRggPa0 yQNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yYqsuyi7DaOO7uWNEXcL2jXvZXiIWT42P3sP82JQVt4=; b=fAFs7y9vk+g7hzDLi/dXLKrJcFRzyHqafVMz8/xa+IRKPLg4jGyVIbN5yiUU7OiOCE WuodLj6PmhdKw84/0ybE44H0bDZHgDd72PGJPw9G9/+cGZBn+/hYGrDDHEH5DcxBYWP2 2rBBp0OqmQNJprt4m61XeCZXs/cxcK/LTAVvi9p/wZWqwl7K4UlNFR/+8XsMoAVASygg yQcXh31U+VnW1z+Z+v5Xg27Lhc1EC5BQEUoHxN0VbLzLJVSCb1i51gl2mcRfOHf5YtZ5 i6UgQGGxJtq3uBr0GJ9l2FYPPmLHqSpgtbAA4VRk+rR7oRsQZJDUYTycGsEeT5tzrIrJ i1xQ== X-Gm-Message-State: AOAM5303sUpdXOjFYxcalJLdmZbvGyWYxrI319KsgIOIeiHjedLR9vEx bHCK7/4J8PJ7RloniF6V2fH06Z25A/+apQ== X-Google-Smtp-Source: ABdhPJx8ritAG5pI3o4C+XM4YqGlQ4/b8tGGbRvuKkb1pJSoGyoVboh4o7W6tJXBUhAxvSdlwun2dQ== X-Received: by 2002:adf:ce91:: with SMTP id r17mr4862580wrn.326.1604080624372; Fri, 30 Oct 2020 10:57:04 -0700 (PDT) Received: from linaro.org ([2a00:23c5:6801:1801:4964:83f8:d2e7:f2c9]) by smtp.gmail.com with ESMTPSA id o129sm5615563wmb.25.2020.10.30.10.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 10:57:03 -0700 (PDT) From: Mike Leach To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, mathieu.poirier@linaro.org Subject: [RFC PATCH v3 6/9] coresight: config: Add preloaded configurations Date: Fri, 30 Oct 2020 17:56:52 +0000 Message-Id: <20201030175655.30126-7-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201030175655.30126-1-mike.leach@linaro.org> References: <20201030175655.30126-1-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201030_135705_761048_2EBF3CDD X-CRM114-Status: GOOD ( 24.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yabinc@google.com, Mike Leach , suzuki.poulose@arm.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Preload set of configurations. This patch creates a small set of preloaded configurations and features that are available immediately after coresight has been initialised. The current set provides a strobing feature for ETMv4, that creates a periodic sampling of trace by switching trace generation on and off using counters in the ETM. A configuration called "autofdo" is also provided that uses the 'strobing' feature and provides a couple of preset values, selectable on the perf command line. Signed-off-by: Mike Leach --- drivers/hwtracing/coresight/Makefile | 3 +- .../coresight/coresight-cfg-preload.c | 160 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-core.c | 6 + .../hwtracing/coresight/coresight-syscfg.h | 1 + 4 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 drivers/hwtracing/coresight/coresight-cfg-preload.c diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile index ea544206204d..9de5586cfd1a 100644 --- a/drivers/hwtracing/coresight/Makefile +++ b/drivers/hwtracing/coresight/Makefile @@ -4,7 +4,8 @@ # obj-$(CONFIG_CORESIGHT) += coresight.o coresight-y := coresight-core.o coresight-etm-perf.o coresight-platform.o \ - coresight-sysfs.o coresight-syscfg.o coresight-config.o + coresight-sysfs.o coresight-syscfg.o coresight-config.o \ + coresight-cfg-preload.o obj-$(CONFIG_CORESIGHT_LINK_AND_SINK_TMC) += coresight-tmc.o coresight-tmc-y := coresight-tmc-core.o coresight-tmc-etf.o \ coresight-tmc-etr.o diff --git a/drivers/hwtracing/coresight/coresight-cfg-preload.c b/drivers/hwtracing/coresight/coresight-cfg-preload.c new file mode 100644 index 000000000000..0975d64a1d9e --- /dev/null +++ b/drivers/hwtracing/coresight/coresight-cfg-preload.c @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright(C) 2020 Linaro Limited. All rights reserved. + * Author: Mike Leach + */ + +#include "coresight-config.h" +#include "coresight-syscfg.h" +#include "coresight-etm4x-cfg.h" + +/* preload configurations and features */ + +/* preload in features for ETMv4 */ + +/* strobe feature */ + +/* register defines */ +#define STRB_REG_CTR (CS_CFG_REG_RESOURCE | ETM4_CFG_RES_CTR) +#define STRB_REG_CTR_RB (STRB_REG_CTR | CS_CFG_REG_VAL_SAVE) +#define STRB_REG_CTR_PRM (STRB_REG_CTR | CS_CFG_REG_VAL_PARAM) +#define STRB_REG_SEQ (CS_CFG_REG_RESOURCE | ETM4_CFG_RES_SEQ) +#define STRB_REG_SEL (CS_CFG_REG_RESOURCE | ETM4_CFG_RES_SEL) +#define STRB_REG_VI (CS_CFG_REG_STD | CS_CFG_REG_VAL_MASK) + +static struct cscfg_parameter_desc strobe_params[] = { + { + .name = "window", + .value = 5000, + }, + { + .name = "period", + .value = 10000, + }, +}; + +static struct cscfg_regval strobe_regs[] = { + /* resource selectors */ + { + .flags = STRB_REG_SEL | TRCRSCTLRn(2), + .val32 = 0x20001, + }, + { + .flags = STRB_REG_SEQ | TRCRSCTLRn(3), + .val32 = 0x20002, + }, + /* strobe window counter 0 - reload from param 0 */ + { + .flags = STRB_REG_CTR_RB | TRCCNTVRn(0), + }, + { + .flags = STRB_REG_CTR_PRM | TRCCNTRLDVRn(0), + .val32 = 0, + }, + { + .flags = STRB_REG_CTR | TRCCNTCTLRn(0), + .val32 = 0x10001, + }, + /* strobe period counter 1 - reload from param 1 */ + { + .flags = STRB_REG_CTR_RB | TRCCNTVRn(1), + }, + { + .flags = STRB_REG_CTR_PRM | TRCCNTRLDVRn(1), + .val32 = 1, + }, + { + .flags = STRB_REG_CTR | TRCCNTCTLRn(1), + .val32 = 0x8102, + }, + /* sequencer */ + { + .flags = STRB_REG_SEQ | TRCSEQEVRn(0), + .val32 = 0x0081, + }, + { + .flags = STRB_REG_SEQ | TRCSEQEVRn(1), + .val32 = 0x0000, + }, + /* view-inst */ + { + .flags = STRB_REG_VI | TRCVICTLR, + .val32 = 0x0003, + .mask32 = 0x0003, + }, + /* end of regs */ +}; + +static struct cscfg_feature_desc strobe = { + .name = "strobing", + .brief = "Generate periodic trace capture windows.\n" + "parameter \'window\': a number of CPU cycles (W)\n" + "parameter \'period\': trace enabled for W cycles every period x W cycles\n", + .match_flags = CS_CFG_MATCH_CLASS_SRC_ETM4, + .nr_params = ARRAY_SIZE(strobe_params), + .params = strobe_params, + .nr_regs = ARRAY_SIZE(strobe_regs), + .regs = strobe_regs, +}; + +static struct cscfg_feature_desc *preload_feats[] = { + &strobe, + 0 +}; + +/* create an autofdo configuration */ + +/* we will provide 9 sets of preset parameter values */ +#define AFDO_NR_PRESETS 9 +/* the total number of parameters in used features */ +#define AFDO_NR_PARAM_SUM ARRAY_SIZE(strobe_params) + +#define AFDO_MATCH_STROBING (CS_CFG_MATCH_INST_ANY | CS_CFG_MATCH_CLASS_SRC_ETM4) + +static struct cscfg_config_feat_ref afdo_refs[] = { + { + .name = "strobing", + .nr_params = ARRAY_SIZE(strobe_params), + .match = { + .match_flags = AFDO_MATCH_STROBING, + }, + }, +}; + +/* + * set of presets leaves strobing window constant while varying period to allow + * experimentation with mark / space ratios for various workloads + */ +static u64 afdo_presets[AFDO_NR_PRESETS][AFDO_NR_PARAM_SUM] = { + { 5000, 2 }, + { 5000, 4 }, + { 5000, 8 }, + { 5000, 16 }, + { 5000, 64 }, + { 5000, 128 }, + { 5000, 512 }, + { 5000, 1024 }, + { 5000, 4096 }, +}; + +static struct cscfg_config_desc afdo = { + .name = "autofdo", + .brief = "Setup ETMs with strobing for autofdo\n" + "Supplied presets allow experimentation with mark-space ratio for various loads\n", + .nr_refs = ARRAY_SIZE(afdo_refs), + .refs = afdo_refs, + .nr_presets = AFDO_NR_PRESETS, + .nr_total_params = AFDO_NR_PARAM_SUM, + .presets = &afdo_presets[0][0], +}; + +static struct cscfg_config_desc *preload_cfgs[] = { + &afdo, + 0 +}; + +/* preload called with mutex locked */ +int cscfg_preload(void) +{ + return cscfg_load_config_sets(preload_cfgs, preload_feats); +} diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 481d2b7b6b6f..dca84b3f5fca 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -1680,9 +1680,15 @@ static int __init coresight_init(void) /* initialise the coresight syscfg API */ ret = cscfg_init(); + if (ret) + goto exit_perf_close; + + /* preload builtin configurations */ + ret = cscfg_preload(); if (!ret) return 0; +exit_perf_close: etm_perf_exit(); exit_bus_unregister: bus_unregister(&coresight_bustype); diff --git a/drivers/hwtracing/coresight/coresight-syscfg.h b/drivers/hwtracing/coresight/coresight-syscfg.h index ecf4aac7d712..e8f352599dd7 100644 --- a/drivers/hwtracing/coresight/coresight-syscfg.h +++ b/drivers/hwtracing/coresight/coresight-syscfg.h @@ -45,6 +45,7 @@ struct cscfg_csdev_register { /* internal core operations for cscfg */ int __init cscfg_init(void); void __exit cscfg_exit(void); +int cscfg_preload(void); /* syscfg external API */ int cscfg_load_config_sets(struct cscfg_config_desc **cfg_descs, -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel