Commit f37e99ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master 

Pull s390 fixes from Heiko Carstens:

 - 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.

* tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  MAINTAINERS: add Matthew for s390 IOMMU
  s390/cpum_cf,perf: change DFLT_CCERROR counter name
parents d15be546 0cfa112b

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14863,6 +14863,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

































arch/s390/kernel/perf_cpum_cf_events.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -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,

































tools/perf/pmu-events/arch/s390/cf_z15/extended.json



+1
−1






























Original line number
Diff line number
Diff line








@@ -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"















	},



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE