Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp1718641imm; Thu, 21 Jun 2018 01:06:24 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJxJIeScVocGLXP4wOzQl/8ueCig1PCpq2PrF9vewAsfVsEVBYvdIwSIcJ7caAjeplxI9KJ X-Received: by 2002:a63:6741:: with SMTP id b62-v6mr21854783pgc.5.1529568384656; Thu, 21 Jun 2018 01:06:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529568384; cv=none; d=google.com; s=arc-20160816; b=ZHwX3QS+/d2N2U7lc8KneDwRiY8n75zgxYYOXzirKvluRO39z9krFs7QDv3AH30HJ7 j4MX/xjj7H5hAxUDJoJrqxT4DZYM3VaJbGkDX7vxyQYM5raw3G1/AKkURdWt1SqX/gJj geBn5in6QxQiY3IdEVrsZunig+GeZ8me1wr7UKnwAM7Uiiocyuq4NFkSUsNG/miJWt9q +AhaBNrpkAiDT7/eli/Tiy6Djlh8+cCUBBnDGTfGIDZ1kdbCrNgqGb8pCjO45M3lalek q4X1VB1HgIOjKhLO8H6peSAWQTOnJAl7/AYmGtAe8w9YZqwru6pC+sL3wGk0qATNM7g+ iQ+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Wrky9dwBoIQfiq+LMBrDNWGiHsPX/HwhqPEo/2Pi4H4=; b=RK0AeCMx5RD0+jS9/srQIaFJaVzFOt/cc1h9JSJfzLLbF5HRNR8e17e5CdLx8fBGMX uhSer6aRKRUrC8xfifQRz+yej3wgBmWhDDCjXbhiyEG3hDwnwsiMMBH6kupD1iICBaXB IenUMZwehALmxSClCpokpw6/HMHatSqazo4HccC9+UW6nVX9QZnA/Dksn8R2Hlh7wrjp XLSPIKg5l4LdmqRJDczFWBeqj0FDWsAyaKnVWCFL+0FzRVb0S6l6J0ToxX5OwhSRJQAt ttRQNENIrxb+QjJfZASL/NCsUR4n6MVrtX0eV7NKTVr10agVTdZmqaf42OuCDXk5z+Cy 6UVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x184-v6si1107576pgd.497.2018.06.21.01.06.09; Thu, 21 Jun 2018 01:06:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754245AbeFUIFH (ORCPT + 99 others); Thu, 21 Jun 2018 04:05:07 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:59932 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754201AbeFUIFF (ORCPT ); Thu, 21 Jun 2018 04:05:05 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w5L84wQD003414 for ; Thu, 21 Jun 2018 04:05:04 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0b-001b2d01.pphosted.com with ESMTP id 2jr77vthww-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 21 Jun 2018 04:05:04 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 21 Jun 2018 09:05:02 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 21 Jun 2018 09:05:00 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w5L84xf226345666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 21 Jun 2018 08:04:59 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1393611C054; Thu, 21 Jun 2018 08:55:22 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C325511C05B; Thu, 21 Jun 2018 08:55:21 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 21 Jun 2018 08:55:21 +0100 (BST) From: Thomas Richter To: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org Cc: brueckner@linux.vnet.ibm.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, Thomas Richter Subject: [PATCH 1/4] Revert "perf list: Add s390 support for detailed/verbose PMU event description" Date: Thu, 21 Jun 2018 10:04:49 +0200 X-Mailer: git-send-email 2.16.4 X-TM-AS-GCONF: 00 x-cbid: 18062108-0016-0000-0000-000001DE6811 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18062108-0017-0000-0000-000032328135 Message-Id: <20180621080452.61012-1-tmricht@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-06-21_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806210091 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 038586c34301578e538f6c5aa79ca82bce1b9152. Fix the support of detailed/verbose PMU event description by using the "Unit": keyword in the json files to address event names refering to the /sys/devices/cpum_[cs]f devices. Signed-off-by: Thomas Richter Reviewed-by: Hendrik Brueckner --- tools/perf/util/pmu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index d2fb597c9a8c..7878934ebb23 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -557,12 +557,6 @@ static int is_arm_pmu_core(const char *name) if (stat(path, &st) == 0) return 1; - /* Look for cpu sysfs (specific to s390) */ - scnprintf(path, PATH_MAX, "%s/bus/event_source/devices/%s", - sysfs, name); - if (stat(path, &st) == 0 && !strncmp(name, "cpum_", 5)) - return 1; - return 0; } -- 2.14.3