tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds f37e99ac d15be546

+4 -3
+1
MAINTAINERS
··· 14863 14863 F: include/linux/dasd_mod.h 14864 14864 14865 14865 S390 IOMMU (PCI) 14866 + M: Matthew Rosato <mjrosato@linux.ibm.com> 14866 14867 M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> 14867 14868 L: linux-s390@vger.kernel.org 14868 14869 S: Supported
+2 -2
arch/s390/kernel/perf_cpum_cf_events.c
··· 292 292 CPUMF_EVENT_ATTR(cf_z15, DFLT_ACCESS, 0x00f7); 293 293 CPUMF_EVENT_ATTR(cf_z15, DFLT_CYCLES, 0x00fc); 294 294 CPUMF_EVENT_ATTR(cf_z15, DFLT_CC, 0x00108); 295 - CPUMF_EVENT_ATTR(cf_z15, DFLT_CCERROR, 0x00109); 295 + CPUMF_EVENT_ATTR(cf_z15, DFLT_CCFINISH, 0x00109); 296 296 CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0); 297 297 CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1); 298 298 ··· 629 629 CPUMF_EVENT_PTR(cf_z15, DFLT_ACCESS), 630 630 CPUMF_EVENT_PTR(cf_z15, DFLT_CYCLES), 631 631 CPUMF_EVENT_PTR(cf_z15, DFLT_CC), 632 - CPUMF_EVENT_PTR(cf_z15, DFLT_CCERROR), 632 + CPUMF_EVENT_PTR(cf_z15, DFLT_CCFINISH), 633 633 CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE), 634 634 CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE), 635 635 NULL,
+1 -1
tools/perf/pmu-events/arch/s390/cf_z15/extended.json
··· 380 380 { 381 381 "Unit": "CPU-M-CF", 382 382 "EventCode": "265", 383 - "EventName": "DFLT_CCERROR", 383 + "EventName": "DFLT_CCFINISH", 384 384 "BriefDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2", 385 385 "PublicDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2" 386 386 },