Accepting request 723469 from devel:libraries:c_c++

- Add provides/obsoletes wrt bsc#1145710 to avoid file conflict

- Add more patches for s390 fate#327911 bsc#1145464:
  * 0001-s390-cpumf-add-IBM-z14-ZR1-support.patch
  * 0001-s390-cpumf-add-support-for-counter-second-version-nu.patch
  * 0001-s390-cpumf-add-support-for-machine-type-8561.patch

OBS-URL: https://build.opensuse.org/request/show/723469
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libpfm?expand=0&rev=21

0001-s390-cpumf-add-IBM-z14-ZR1-support.patch

@@ -0,0 +1,27 @@
+From dc643f4a460063a628b4bfba57dbbb36673a0789 Mon Sep 17 00:00:00 2001
+From: Thomas Richter <tmricht@linux.ibm.com>
+Date: Thu, 11 Jul 2019 17:48:03 -0700
+Subject: [PATCH] s390/cpumf: add IBM z14 ZR1 support
+
+Add support for machine type 0x3907.
+
+Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
+---
+ lib/pfmlib_s390x_cpumf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/pfmlib_s390x_cpumf.c b/lib/pfmlib_s390x_cpumf.c
+index 4e03fc4..7566aa0 100644
+--- a/lib/pfmlib_s390x_cpumf.c
++++ b/lib/pfmlib_s390x_cpumf.c
+@@ -192,6 +192,7 @@ static int pfm_cpumcf_init(void *this)
+ 		ext_set_count = LIBPFM_ARRAY_SIZE(cpumcf_z13_counters);
+ 		break;
+ 	case 3906:  /* IBM z14  */
++	case 3907:  /* IBM z14 ZR1  */
+ 		ext_set = cpumcf_z14_counters;
+ 		ext_set_count = LIBPFM_ARRAY_SIZE(cpumcf_z14_counters);
+ 		break;
+-- 
+2.22.0
+

0001-s390-cpumf-add-support-for-counter-second-version-nu.patch

@@ -0,0 +1,88 @@
+From c08003fb085e23f2229e58cc176fcfcf58a3b238 Mon Sep 17 00:00:00 2001
+From: Thomas Richter <tmricht@linux.ibm.com>
+Date: Thu, 11 Jul 2019 17:49:42 -0700
+Subject: [PATCH] s390/cpumf: add support for counter second version number 6
+
+IBM added secound version number 6 in the CPU Measurement
+Counter facility to indicate additional counters in the
+crypto counter set.
+
+Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
+---
+ lib/events/s390x_cpumf_events.h | 39 +++++++++++++++++++++++++++++++++
+ lib/pfmlib_s390x_cpumf.c        |  2 ++
+ 2 files changed, 41 insertions(+)
+
+diff --git a/lib/events/s390x_cpumf_events.h b/lib/events/s390x_cpumf_events.h
+index 8be1d55..8587a3b 100644
+--- a/lib/events/s390x_cpumf_events.h
++++ b/lib/events/s390x_cpumf_events.h
+@@ -13,6 +13,8 @@
+ #define CPUMF_CTRSET_EXTENDED           1
+ #define CPUMF_CTRSET_MT_DIAG            32
+ 
++#define CPUMF_SVN6_ECC			4
++
+ 
+ static const pme_cpumf_ctr_t cpumcf_fvn1_counters[] = {
+ 	{
+@@ -270,6 +272,43 @@ static const pme_cpumf_ctr_t cpumcf_svn_generic_counters[] = {
+ 			" coprocessor is busy performing a function issued by"
+ 			" another CPU",
+ 	},
++	{
++		.ctrnum = 80,
++		.ctrset = CPUMF_CTRSET_CRYPTO,
++		.name = "ECC_FUNCTION_COUNT",
++		.desc = "This counter counts the"
++			" total number of the elliptic-curve cryptography (ECC)"
++			" functions issued by the CPU.",
++	},
++	{
++		.ctrnum = 81,
++		.ctrset = CPUMF_CTRSET_CRYPTO,
++		.name = "ECC_CYCLES_COUNT",
++		.desc = "This counter counts the total"
++			" number of CPU cycles when the ECC coprocessor is"
++			" busy performing the elliptic-curve cryptography"
++			" (ECC) functions issued by the CPU.",
++	},
++	{
++		.ctrnum = 82,
++		.ctrset = CPUMF_CTRSET_CRYPTO,
++		.name = "ECC_BLOCKED_FUNCTION_COUNT",
++		.desc = "This counter counts the total number of the"
++			" elliptic-curve cryptography (ECC) functions that are"
++			" issued by the CPU and are blocked because the ECC"
++			" coprocessor is busy performing a function issued by"
++			" another CPU.",
++	},
++	{
++		.ctrnum = 83,
++		.ctrset = CPUMF_CTRSET_CRYPTO,
++		.name = "ECC_BLOCKED_CYCLES_COUNT",
++		.desc = "This counter counts the total number of CPU cycles "
++			" blocked for the elliptic-curve cryptography (ECC) "
++			" functions issued by the CPU because the ECC"
++			" coprocessor is busy perform ing a function issued"
++			" by another CPU.",
++	},
+ };
+ 
+ static const pme_cpumf_ctr_t cpumcf_z10_counters[] = {
+diff --git a/lib/pfmlib_s390x_cpumf.c b/lib/pfmlib_s390x_cpumf.c
+index 7566aa0..e68b000 100644
+--- a/lib/pfmlib_s390x_cpumf.c
++++ b/lib/pfmlib_s390x_cpumf.c
+@@ -168,6 +168,8 @@ static int pfm_cpumcf_init(void *this)
+ 	/* counters based on second version number */
+ 	csvn_set = cpumcf_svn_generic_counters;
+ 	csvn_set_count = LIBPFM_ARRAY_SIZE(cpumcf_svn_generic_counters);
++	if (csvn < 6)	/* Crypto counter set enlarged for SVN == 6 */
++		csvn_set_count -= CPUMF_SVN6_ECC;
+ 
+ 	/* check and assign a machine-specific extended counter set */
+ 	switch (get_machine_type()) {
+-- 
+2.22.0
+

0001-s390-cpumf-add-support-for-machine-type-8561.patch

@@ -0,0 +1,29 @@
+From b831b04254ac7fd1700b20b349799810952ff66e Mon Sep 17 00:00:00 2001
+From: Thomas Richter <tmricht@linux.ibm.com>
+Date: Thu, 11 Jul 2019 17:51:03 -0700
+Subject: [PATCH] s390/cpumf: add support for machine type 8561
+
+Add extended counter set support for s390 machine types
+8561 and 8562.
+
+Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
+---
+ lib/pfmlib_s390x_cpumf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/pfmlib_s390x_cpumf.c b/lib/pfmlib_s390x_cpumf.c
+index e68b000..c11f9d9 100644
+--- a/lib/pfmlib_s390x_cpumf.c
++++ b/lib/pfmlib_s390x_cpumf.c
+@@ -195,6 +195,8 @@ static int pfm_cpumcf_init(void *this)
+ 		break;
+ 	case 3906:  /* IBM z14  */
+ 	case 3907:  /* IBM z14 ZR1  */
++	case 8561:  /* IBM Machine types 8561 and 8562 */
++	case 8562:
+ 		ext_set = cpumcf_z14_counters;
+ 		ext_set_count = LIBPFM_ARRAY_SIZE(cpumcf_z14_counters);
+ 		break;
+-- 
+2.22.0
+

libpfm.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Aug 15 08:25:29 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add provides/obsoletes wrt bsc#1145710 to avoid file conflict
+
+-------------------------------------------------------------------
+Wed Aug 14 09:44:49 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add more patches for s390 fate#327911 bsc#1145464:
+  * 0001-s390-cpumf-add-IBM-z14-ZR1-support.patch
+  * 0001-s390-cpumf-add-support-for-counter-second-version-nu.patch
+  * 0001-s390-cpumf-add-support-for-machine-type-8561.patch
+
 -------------------------------------------------------------------
 Thu Jul  4 06:35:27 UTC 2019 - Martin Liška <mliska@suse.cz>
 

libpfm.spec

@@ -17,18 +17,21 @@
 
 
 %global python_config CONFIG_PFMLIB_NOPYTHON=y
-%bcond_without python2
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define vname   libpfm4
+%bcond_without python2
 Name:           libpfm
 Version:        4.10.1
 Release:        0
 Summary:        Library to encode performance events
 License:        MIT
 Group:          Development/Libraries/C and C++
-Url:            http://perfmon2.sourceforge.net/
+URL:            http://perfmon2.sourceforge.net/
 Source:         http://downloads.sourceforge.net/project/perfmon2/libpfm4/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
+Patch0:         0001-s390-cpumf-add-IBM-z14-ZR1-support.patch
+Patch1:         0001-s390-cpumf-add-support-for-counter-second-version-nu.patch
+Patch2:         0001-s390-cpumf-add-support-for-machine-type-8561.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
@@ -72,6 +75,8 @@ This package contains the static variant of libpfm.
 %package -n     python2-%{name}
 Summary:        Python bindings for libpfm and perf_event_open system call
 Group:          Development/Libraries/Python
+Provides:       python-%{name}
+Obsoletes:      python-%{name}
 Requires:       %{vname} = %{version}
 
 %description -n python2-%{name}
@@ -85,13 +90,13 @@ Requires:       %{vname} = %{version}
 %description -n python3-%{name}
 This package provides python3 bindings for the libpfm4 package and the perf_event_open system call.
 
-
 %prep
 %setup -q
 # disable werror
 sed -i \
     -e 's:-Werror::g' \
     config.mk
+%autopatch -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects