From patchwork Wed Feb 16 11:43:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1593644 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=lJVbr5x0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JzGMg6PYFz9sFw for ; Wed, 16 Feb 2022 22:44:30 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nKIjO-0000xY-NQ; Wed, 16 Feb 2022 11:44:22 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nKIjN-0000wm-2D for kernel-team@lists.ubuntu.com; Wed, 16 Feb 2022 11:44:21 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id C43423F1B6 for ; Wed, 16 Feb 2022 11:44:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645011860; bh=t/a1/IWcTR5/Zq8GMc/WbBnCJjo4l7Pc+J07sHtfZ24=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lJVbr5x0fKXWOL5jD+wk6tnu7DMN9y/JmbtS/NSOep90FrLM0rBQvptpCfn682VsW uWXILtoJZndnj/EhnlKT5OcLyeT/l54RnHC/2RoYLIm5+K3TxTawbu4Qz4SHPbZN/w fcny2q98/qKeL+VCxBzxgZ1zSwBKEgl9T4E0heoTfS//LEYaK+6WkpklacELQan73B M0nM0SjOQSii9RwCYoyaD8TvIzpLXe9lMyDEHdMiJ67VFNcMCWVEwUVaxpWGPIdiEu m436V99HHTf30ETvGP2UnIMvpxD55omnYbPcTZXu+4zZhkauoJllQdGp4kRBoh+Vlt rT2us/dXKbGYA== Received: by mail-ej1-f71.google.com with SMTP id q3-20020a17090676c300b006a9453c33b0so708769ejn.13 for ; Wed, 16 Feb 2022 03:44:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t/a1/IWcTR5/Zq8GMc/WbBnCJjo4l7Pc+J07sHtfZ24=; b=rAhLzdB4UUOBwoGXkMnMfshUXC5s5Oo0OaiYeaPZXX85U9f/oKTTzZMzw6AJ8vpn48 9VJCec/wRIMiMoY0AHqJUG5zdIyKXb+BZE8Cs9QvSIHQZWK31HnOu2mcYo8y+DBkePhW lCukFCBx0UfmyC8jK5mX35my7f8uCKpSCj7QT0TsjCm6IPRhJl8nWcZEIQM2Y/nJXBAc iNr8b89jh89EO/exTvuG/xgnA5GpA7Grg8tLWULPyQAYVZggRD7X8F8DZZ28JVA2KW0l DHG5CpmEF3BVdnoeCbrCnp5lxGDP52AJSnZm7KDRIu38ZzI8PD+8q7V0hx+2P+INzr7y KdnA== X-Gm-Message-State: AOAM530Awiqd4j5QLaNIo/0pPgzB67V1591YJkd5u05Jj8z/y7CCIGvX IvkYKZjxWp1bNHl7qjWDZ/M50tM8C4f9Az1gJPTiabKFBt94dOawWdB2SWVZNzHswiYyJiHUL87 WmOyrX6pDsWU19qvm3+fchXJx8bRjmS2FvYuHuUBgBg== X-Received: by 2002:a05:6402:268a:b0:410:a0cd:55a0 with SMTP id w10-20020a056402268a00b00410a0cd55a0mr2432266edd.339.1645011860342; Wed, 16 Feb 2022 03:44:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJztEhfTKNt9qSiyLGbdLSii9QTpjoJ/XaNoJcThBNcjPlT/AoNoBt8OIG4GZf5z8iQmGC54PA== X-Received: by 2002:a05:6402:268a:b0:410:a0cd:55a0 with SMTP id w10-20020a056402268a00b00410a0cd55a0mr2432252edd.339.1645011860172; Wed, 16 Feb 2022 03:44:20 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-168-84.adslplus.ch. [188.155.168.84]) by smtp.gmail.com with ESMTPSA id d13sm1844463ejo.71.2022.02.16.03.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 03:44:19 -0800 (PST) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [SRU][I][J][PATCH 1/2] s390/cpumf: Support for CPU Measurement Facility CSVN 7 Date: Wed, 16 Feb 2022 12:43:37 +0100 Message-Id: <20220216114338.42630-4-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220216114338.42630-1-krzysztof.kozlowski@canonical.com> References: <20220216114338.42630-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Thomas Richter BugLink: https://bugs.launchpad.net/bugs/1960182 Adds support for the CPU Measurement Counter Facility second version number 7. Signed-off-by: Thomas Richter Acked-by: Sumanth Korikkar Signed-off-by: Heiko Carstens (cherry picked from commit a87b0fd4f9003f8521226e226cf92b18147b3519) Signed-off-by: Krzysztof Kozlowski --- arch/s390/kernel/perf_cpum_cf_common.c | 4 ++-- arch/s390/kernel/perf_cpum_cf_events.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/s390/kernel/perf_cpum_cf_common.c b/arch/s390/kernel/perf_cpum_cf_common.c index 6d53215c8484..576b90a6dbef 100644 --- a/arch/s390/kernel/perf_cpum_cf_common.c +++ b/arch/s390/kernel/perf_cpum_cf_common.c @@ -192,7 +192,7 @@ size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset, case CPUMF_CTR_SET_CRYPTO: if (info->csvn >= 1 && info->csvn <= 5) ctrset_size = 16; - else if (info->csvn == 6) + else if (info->csvn == 6 || info->csvn == 7) ctrset_size = 20; break; case CPUMF_CTR_SET_EXT: @@ -202,7 +202,7 @@ size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset, ctrset_size = 48; else if (info->csvn >= 3 && info->csvn <= 5) ctrset_size = 128; - else if (info->csvn == 6) + else if (info->csvn == 6 || info->csvn == 7) ctrset_size = 160; break; case CPUMF_CTR_SET_MT_DIAG: diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c index 37265f551a11..52c1fe23b823 100644 --- a/arch/s390/kernel/perf_cpum_cf_events.c +++ b/arch/s390/kernel/perf_cpum_cf_events.c @@ -344,7 +344,7 @@ static struct attribute *cpumcf_svn_12345_pmu_event_attr[] __initdata = { NULL, }; -static struct attribute *cpumcf_svn_6_pmu_event_attr[] __initdata = { +static struct attribute *cpumcf_svn_67_pmu_event_attr[] __initdata = { CPUMF_EVENT_PTR(cf_svn_12345, PRNG_FUNCTIONS), CPUMF_EVENT_PTR(cf_svn_12345, PRNG_CYCLES), CPUMF_EVENT_PTR(cf_svn_12345, PRNG_BLOCKED_FUNCTIONS), @@ -715,8 +715,8 @@ __init const struct attribute_group **cpumf_cf_event_group(void) case 1 ... 5: csvn = cpumcf_svn_12345_pmu_event_attr; break; - case 6: - csvn = cpumcf_svn_6_pmu_event_attr; + case 6 ... 7: + csvn = cpumcf_svn_67_pmu_event_attr; break; default: csvn = none;