Upgrade opae fpga module to version 2.0.1-6

We do not build the regmap_mmio module portion of it
as that functionality is already in the kernel.

Change-Id: Ia5c33ae9f72d3a7cdf7b771f353551ae664ccc76
Story: 2006740
Task: 38837
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>

centos_tarball-dl.lst

@@ -43,7 +43,7 @@ lldpd-0.9.0.tar.gz#lldpd-0.9.0#https://media.luffy.cx/files/lldpd/lldpd-0.9.0.ta
 lua-1fce39c6397056db645718b8f5821571d97869a4.tar.gz#lua#https://api.github.com/repos/ceph/lua/tarball/1fce39c6397056db645718b8f5821571d97869a4#https##
 !mariadb-10.1.28.tar.gz#mariadb-10.1.28#https://github.com/MariaDB/server/archive/mariadb-10.1.28.tar.gz#http_script##post-dl-script/mariadb.sh
 !MLNX_OFED_SRC-4.5-1.0.1.0.tgz#MLNX_OFED_SRC-4.5-1.0.1.0#http://content.mellanox.com/ofed/MLNX_OFED-4.5-1.0.1.0/MLNX_OFED_SRC-4.5-1.0.1.0.tgz#http_script##post-dl-script/MLNX_OFEDqat1.7.sh
-opae-intel-fpga-driver-1.3.0-2.tar.gz#opae-intel-fpga-driver-1.3.0-2#https://github.com/OPAE/opae-sdk/releases/download/1.3.0-2/opae-intel-fpga-driver-1.3.0-2.tar.gz#http##
+opae-intel-fpga-driver-2.0.1.tar.gz#opae-intel-fpga-driver-2.0.1#https://github.com/OPAE/opae-sdk/releases/download/1.3.6-4/opae-intel-fpga-driver-2.0.1.tar.gz#http##
 openvswitch-2.11.0.tar.gz#openvswitch-2.11.0#https://github.com/openvswitch/ovs/archive/v2.11.0.tar.gz#http##
 puppet-boolean-22b726dd78b0a60a224cc7054aebbf28e9306f62.tar.gz#puppet-boolean#https://github.com/voxpupuli/puppet-boolean/tarball/22b726dd78b0a60a224cc7054aebbf28e9306f62#http##
 puppet-dnsmasq-cff07e90890662972c97684a2baee964f68ff3ed.tar.gz#packstack/puppet/modules/dnsmasq/#https://github.com/procore/puppet-dnsmasq/tarball/cff07e90890662972c97684a2baee964f68ff3ed#http##

kernel/kernel-modules/intel-opae-fpga/centos/build_srpm.data

@@ -1,3 +1,4 @@
 COPY_LIST=" \
-  $STX_BASE/downloads/opae-intel-fpga-driver-1.3.0-2.tar.gz"
+  $PATCHES_BASE/* \
+  $STX_BASE/downloads/opae-intel-fpga-driver-2.0.1.tar.gz"
 TIS_PATCH_VER=1

kernel/kernel-modules/intel-opae-fpga/centos/fpga-kmod.spec

@@ -6,10 +6,11 @@
 
 # Define the kmod package name here.
 %define kmod_name opae-intel-fpga-driver
-%define iteration 2
+# If a release doesn't have an iteration number, just use 0
+%define iteration 6
 
 Name:    %{kmod_name}-kmod%{?bt_ext}
-Version: 1.3.0
+Version: 2.0.1
 Release: %{iteration}%{?_tis_dist}.%{tis_patch_ver}
 Group:   System Environment/Kernel
 License: GPLv2
@@ -20,7 +21,9 @@ BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
 ExclusiveArch: x86_64
 
 # Sources.
-Source0:  %{kmod_name}-%{version}-%{iteration}.tar.gz
+# The source tarball name may or may not include the iteration number.
+Source0:  %{kmod_name}-%{version}.tar.gz
+Patch01:  Remove-regmap-mmio-as-it-is-built-into-the-kernel.patch
 
 %define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')
 
@@ -78,7 +81,7 @@ It is built to depend upon the specific ABI provided by a range of releases
 of the same variant of the Linux kernel and not on any one specific build.
 
 %prep
-%autosetup -p 1 -n %{kmod_name}-%{version}-%{iteration}
+%autosetup -p 1 -n %{kmod_name}-%{version}
 %{__gzip} %{kmod_name}.7
 echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf
 
@@ -87,7 +90,7 @@ echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.con
 
 %install
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} %{_builddir}/%{kmod_name}-%{version}-%{iteration}/*.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
+%{__install} %{_builddir}/%{kmod_name}-%{version}/*.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/

kernel/kernel-modules/intel-opae-fpga/centos/patches/Remove-regmap-mmio-as-it-is-built-into-the-kernel.patch

@@ -0,0 +1,55 @@
+From 94704d9260d7057549b9f66461f7c2328f6080d3 Mon Sep 17 00:00:00 2001
+Message-Id: <94704d9260d7057549b9f66461f7c2328f6080d3.1578602281.git.Jim.Somerville@windriver.com>
+From: Jim Somerville <Jim.Somerville@windriver.com>
+Date: Thu, 9 Jan 2020 15:36:55 -0500
+Subject: [PATCH 1/1] Remove regmap mmio as it is built into the kernel
+
+Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
+---
+ Makefile | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0dfd0a8..3386289 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,6 @@ ccflags-y += -I$(PWD)/scripts/dtc/libfdt-4-12
+ 
+ ifeq ($(kerval),3.10)
+ 	obj-m += spi-bitbang-mod.o
+-	obj-m += regmap-mmio-mod.o
+ endif
+ 
+ obj-m += i2c-altera.o
+@@ -45,8 +44,6 @@ intel-max10-y += lib-4-12/fdt_sw.o
+ intel-max10-y += lib-4-12/fdt_strerror.o
+ intel-max10-y += lib-4-12/fdt_empty_tree.o
+ 
+-regmap-mmio-mod-y := drivers/base/regmap/regmap-mmio-3-10.o
+-
+ i2c-altera-y := drivers/i2c/busses/i2c-altera.o
+ 
+ intel-generic-qspi-y := drivers/mtd/spi-nor/intel-generic-qspi.o
+@@ -99,9 +96,6 @@ load-drv:
+ 	if ! egrep -q '^intel_generic_qspi ' /proc/modules; then insmod intel-generic-qspi.ko; fi
+ 	if ! egrep -q '^intel_on_chip_flash ' /proc/modules; then insmod intel-on-chip-flash.ko; fi
+ 	if ! egrep -q '^altera_asmip2 ' /proc/modules; then insmod altera-asmip2.ko; fi
+-ifeq ($(kerval),3.10)
+-	if ! egrep -q '^regmap_mmio_mod ' /proc/modules; then insmod regmap-mmio-mod.ko; fi
+-endif
+ 	if ! egrep -q '^i2c_altera ' /proc/modules; then insmod i2c-altera.ko; fi
+ ifeq ($(kerval),3.10)
+ 	if ! egrep -q '^spi_bitbang_mod ' /proc/modules; then insmod spi-bitbang-mod.ko; fi
+@@ -137,9 +131,6 @@ ifeq ($(kerval),3.10)
+ 	if egrep -q '^spi_bitbang_mod ' /proc/modules; then rmmod spi_bitbang_mod; fi
+ endif
+ 	if egrep -q '^i2c_altera ' /proc/modules; then rmmod i2c_altera; fi
+-ifeq ($(kerval),3.10)
+-	if egrep -q '^regmap_mmio_mod ' /proc/modules; then rmmod regmap_mmio_mod; fi
+-endif
+ 	if egrep -q '^altera_asmip2 ' /proc/modules; then rmmod altera_asmip2; fi
+ 	if egrep -q '^intel_on_chip_flash ' /proc/modules; then rmmod intel_on_chip_flash; fi
+ 	if egrep -q '^intel_generic_qspi ' /proc/modules; then rmmod intel_generic_qspi; fi
+-- 
+1.8.3.1
+