[GIT,PULL] s390 updates for 5.8-rc7
diff mbox series

Message ID 20200723192643.GA7038@osiris
State Accepted
Commit f37e99aca03f63aa3f2bd13ceaf769455d12c4b0
Headers show
Series
  • [GIT,PULL] s390 updates for 5.8-rc7
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.8-6

Commit Message

Heiko Carstens July 23, 2020, 7:26 p.m. UTC
Hello Linus,

please pull s390 updates for 5.8-rc7.

Thanks,
Heiko

The following changes since commit ba47d845d715a010f7b51f6f89bae32845e6acb7:

  Linux 5.8-rc6 (2020-07-19 15:41:18 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.8-6

for you to fetch changes up to 0cfa112b33aba4473b00151c75b87818a835702a:

  MAINTAINERS: add Matthew for s390 IOMMU (2020-07-22 17:01:23 +0200)

----------------------------------------------------------------
- Change cpum_cf/perf counter name from DFLT_CCERROR to DFLT_CCFINISH
  to reflect reality and avoid further confusion. This is a user space
  visible change therefore the commit has also a stable tag for 5.7,
  where this counter was introduced.

- Add Matthew Rosato as s390 IOMMU maintainer.

----------------------------------------------------------------
Gerald Schaefer (1):
      MAINTAINERS: add Matthew for s390 IOMMU

Thomas Richter (1):
      s390/cpum_cf,perf: change DFLT_CCERROR counter name

 MAINTAINERS                                          | 1 +
 arch/s390/kernel/perf_cpum_cf_events.c               | 4 ++--
 tools/perf/pmu-events/arch/s390/cf_z15/extended.json | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Comments

pr-tracker-bot@kernel.org July 23, 2020, 8:55 p.m. UTC | #1
The pull request you sent on Thu, 23 Jul 2020 21:26:43 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.8-6

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f37e99aca03f63aa3f2bd13ceaf769455d12c4b0

Thank you!

Patch
diff mbox series

diff --git a/MAINTAINERS b/MAINTAINERS
index d53db30d1365..df5fc5625ec8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14862,6 +14862,7 @@  F:	drivers/s390/block/dasd*
 F:	include/linux/dasd_mod.h
 
 S390 IOMMU (PCI)
+M:	Matthew Rosato <mjrosato@linux.ibm.com>
 M:	Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 L:	linux-s390@vger.kernel.org
 S:	Supported
diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c
index 1e3df52b2b65..37265f551a11 100644
--- a/arch/s390/kernel/perf_cpum_cf_events.c
+++ b/arch/s390/kernel/perf_cpum_cf_events.c
@@ -292,7 +292,7 @@  CPUMF_EVENT_ATTR(cf_z15, TX_C_TABORT_SPECIAL, 0x00f5);
 CPUMF_EVENT_ATTR(cf_z15, DFLT_ACCESS, 0x00f7);
 CPUMF_EVENT_ATTR(cf_z15, DFLT_CYCLES, 0x00fc);
 CPUMF_EVENT_ATTR(cf_z15, DFLT_CC, 0x00108);
-CPUMF_EVENT_ATTR(cf_z15, DFLT_CCERROR, 0x00109);
+CPUMF_EVENT_ATTR(cf_z15, DFLT_CCFINISH, 0x00109);
 CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0);
 CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1);
 
@@ -629,7 +629,7 @@  static struct attribute *cpumcf_z15_pmu_event_attr[] __initdata = {
 	CPUMF_EVENT_PTR(cf_z15, DFLT_ACCESS),
 	CPUMF_EVENT_PTR(cf_z15, DFLT_CYCLES),
 	CPUMF_EVENT_PTR(cf_z15, DFLT_CC),
-	CPUMF_EVENT_PTR(cf_z15, DFLT_CCERROR),
+	CPUMF_EVENT_PTR(cf_z15, DFLT_CCFINISH),
 	CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE),
 	CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE),
 	NULL,
diff --git a/tools/perf/pmu-events/arch/s390/cf_z15/extended.json b/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
index 2df2e231e9ee..24c4ba2a9ae5 100644
--- a/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
+++ b/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
@@ -380,7 +380,7 @@ 
 	{
 		"Unit": "CPU-M-CF",
 		"EventCode": "265",
-		"EventName": "DFLT_CCERROR",
+		"EventName": "DFLT_CCFINISH",
 		"BriefDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2",
 		"PublicDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2"
 	},