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
Unified · Split
| @@ -14863,6 +14863,7 @@ F: drivers/s390/block/dasd* · 14862 unmodified lines | |||
| 14863 | F: include/linux/dasd_mod.h | 14863 | F: include/linux/dasd_mod.h |
| 14864 | 14864 | ||
| 14865 | S390 IOMMU (PCI) | 14865 | S390 IOMMU (PCI) |
| 14866 | M: Matthew Rosato <mjrosato@linux.ibm.com> | ||
| 14866 | M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> | 14867 | M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> |
| 14867 | L: linux-s390@vger.kernel.org | 14868 | L: linux-s390@vger.kernel.org |
| 14868 | S: Supported | 14869 | S: Supported |
| @@ -292,7 +292,7 @@ CPUMF_EVENT_ATTR(cf_z15, TX_C_TABORT_SPECIAL, 0x00f5); · 291 unmodified lines | |||
| 292 | CPUMF_EVENT_ATTR(cf_z15, DFLT_ACCESS, 0x00f7); | 292 | CPUMF_EVENT_ATTR(cf_z15, DFLT_ACCESS, 0x00f7); |
| 293 | CPUMF_EVENT_ATTR(cf_z15, DFLT_CYCLES, 0x00fc); | 293 | CPUMF_EVENT_ATTR(cf_z15, DFLT_CYCLES, 0x00fc); |
| 294 | CPUMF_EVENT_ATTR(cf_z15, DFLT_CC, 0x00108); | 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 | CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0); | 296 | CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0); |
| 297 | CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1); | 297 | CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1); |
| 298 | 298 | ||
| @@ -629,7 +629,7 @@ static struct attribute *cpumcf_z15_pmu_event_attr[] __initdata = { · 330 unmodified lines | |||
| 629 | CPUMF_EVENT_PTR(cf_z15, DFLT_ACCESS), | 629 | CPUMF_EVENT_PTR(cf_z15, DFLT_ACCESS), |
| 630 | CPUMF_EVENT_PTR(cf_z15, DFLT_CYCLES), | 630 | CPUMF_EVENT_PTR(cf_z15, DFLT_CYCLES), |
| 631 | CPUMF_EVENT_PTR(cf_z15, DFLT_CC), | 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 | CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE), | 633 | CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE), |
| 634 | CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE), | 634 | CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE), |
| 635 | NULL, | 635 | NULL, |
| @@ -380,7 +380,7 @@ · 379 unmodified lines | |||
| 380 | { | 380 | { |
| 381 | "Unit": "CPU-M-CF", | 381 | "Unit": "CPU-M-CF", |
| 382 | "EventCode": "265", | 382 | "EventCode": "265", |
| 383 | "EventName": "DFLT_CCERROR", | 383 | "EventName": "DFLT_CCFINISH", |
| 384 | "BriefDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2", | 384 | "BriefDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2", |
| 385 | "PublicDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2" | 385 | "PublicDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2" |
| 386 | }, | 386 | }, |