From patchwork Wed Feb 16 11:43:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1593647 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=rAx04zZU; 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 4JzGMg5HH3z9sFk 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 1nKIjM-0000wW-Bc; Wed, 16 Feb 2022 11:44:20 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nKIjL-0000w2-9j for kernel-team@lists.ubuntu.com; Wed, 16 Feb 2022 11:44:19 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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-1.canonical.com (Postfix) with ESMTPS id DCC9C40610 for ; Wed, 16 Feb 2022 11:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645011858; bh=HgQ5b9mW7yMuC1L4/yoUAUsGYBxDs2+yjXm+fc7RIHg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rAx04zZU3dzC60VtB6GsqVeQnkqMPu6q7gb9KITdcsK5fbHLoRyFzBmvSSi4fwlz0 6vQhOh67F9esp6rp014/EieGvWokrXrG0Lfd2WdTM9R9hiVdaldlum7iUg6qVtzkUx cjTlaNubSfw9/Eu34tbF4affZYHj7oVB/ahy4pNNcAKruzlvSIlIgqEWWi6SbrouJe axsaswf6HY1f6vlpsFVrKL4M8diSKPHOxrayAfH8lyFvD+fFSJwyNfws8KFDaym+V2 Bob40u6tF9VBP1C2UPg3O1kUKSpJ7a4r1WKSARlGhkZuB/DBqT3t/pDuu9gW4+8SKG HsMlZfMqTIOog== Received: by mail-ed1-f70.google.com with SMTP id n7-20020a05640205c700b0040b7be76147so1388601edx.10 for ; Wed, 16 Feb 2022 03:44:18 -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=HgQ5b9mW7yMuC1L4/yoUAUsGYBxDs2+yjXm+fc7RIHg=; b=G5WiR6OOQJ1J/2JdmoCzhOICHDY/z9+XaTYZe70U/+zQtuDFFo3AK1kVgyEy8z+RT+ VbT5DvF8mlJFfK24ZNRAkyDaU9iOwIzArITryxSHhEH051LQ95lTVZHiwwdez4qdejFQ IflwXM5wQ6UQqVnhhLQpFS1axsCSzrsfuv/YisJYnVr0jHtQdy47dhlN3sINGUx2s0af ACvlssKItxsfLCRM1Xs/DV7gtoA/UT/CIAmZ+T0nrWy6usY4YZ0R9wSCdXLd0k5uZNLW 486WEerPVGZikl93mjb4SGXhovvrZBorQcITnecJtGIVW7hJP72rtzK/ZjZ/fG7tFw3G 00xw== X-Gm-Message-State: AOAM533IO3lgT6E2CQGKnwuQYQZbzbJgZQOBEzBUQIYWND72yaJAHjTz ONLl3MYbk+PL0ajntWWs62hNTqK4or5k8qTV1k3rRchiW3Ctp24bUVc/q43IN3aQeHYeU1smuoF +aI6yhCZjdtF6BzPn2NQHlAee4emTtYBIAW0riMIZiQ== X-Received: by 2002:a17:906:2a11:b0:69f:286a:66a7 with SMTP id j17-20020a1709062a1100b0069f286a66a7mr1981022eje.680.1645011858085; Wed, 16 Feb 2022 03:44:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKLvUwRxz+ebjDpT/ArZqsic1aKG3yZGDv9uXToidJYh+Gk0dY8PNn19yD1kXExzgzRMJJtA== X-Received: by 2002:a17:906:2a11:b0:69f:286a:66a7 with SMTP id j17-20020a1709062a1100b0069f286a66a7mr1981008eje.680.1645011857839; Wed, 16 Feb 2022 03:44:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 03:44:17 -0800 (PST) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/2] s390/cpumf: Support for CPU Measurement Facility CSVN 7 Date: Wed, 16 Feb 2022 12:43:35 +0100 Message-Id: <20220216114338.42630-2-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 (backported from commit a87b0fd4f9003f8521226e226cf92b18147b3519) [krzysztof: Backport provided by Thomas Richter] Signed-off-by: Krzysztof Kozlowski --- arch/s390/kernel/perf_cpum_cf_diag.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_diag.c b/arch/s390/kernel/perf_cpum_cf_diag.c index e949ab832ed7..bfe55a07239d 100644 --- a/arch/s390/kernel/perf_cpum_cf_diag.c +++ b/arch/s390/kernel/perf_cpum_cf_diag.c @@ -308,7 +308,7 @@ static size_t cf_diag_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: @@ -318,7 +318,7 @@ static size_t cf_diag_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;