Merge branch 'stability-monitor-kmod-rpi3' into tizen

This commit integrates previously standalone stability-monitor-kmod-rpi3
into this repository.

Source commit 901f4d0ec2 ("Support Linux kernel v5.10") has been downloaded by:

   git fetch ssh://klewandowski@review.tizen.org:29418/platform/core/system/stability-monitor-kmod-rpi3 refs/changes/90/253890/1 && git checkout FETCH_HEAD

Change-Id: I3ee19411f8c2af86776e9796491857ff88e3baed

diff --cc conf/modprobe.conf
index 0000000,0000000..b65f476
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/conf/modprobe.conf
@@@ -1,0 -1,0 +1,1 @@@
++options proc-tsm blacklist=System::TEF

diff --cc kernel/Makefile
index acfc978,dc4784b..16b724f
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -1,9 -1,8 +1,12 @@@
  PWD := $(shell pwd)
  LD = ${CROSS_COMPILE}ld
  
- obj-m += logger.o
 +# See commit 0b999ae3614d0 ("Merge tag 'compiler-attributes-for-linus-v5.0-rc7'"[..]) for rationale
- CFLAGS_logger.o += -Wno-error=missing-attributes
++CFLAGS_logger.o   += -Wno-error=missing-attributes
++CFLAGS_proc-tsm.o += -Wno-error=missing-attributes
++
++obj-m += logger.o
+ obj-m += proc-tsm.o
 -proc-tsm_SOURCES = proc-tsm.c
  
  all:
        make -C $(KERNELDIR) M=$(PWD) modules

diff --cc packaging/baselibs.conf
index 79011f6,0000000..126c8ea
mode 100644,000000..100644
--- 1/packaging/baselibs.conf
--- /dev/null
+++ b/packaging/baselibs.conf
@@@ -1,12 -1,0 +1,13 @@@
 +arch aarch64 targets armv7l:aarch64
 +
 +linux-tizen-modules-tw3
 +  +/
 +  requires "bash"
 +  requires "coreutils"
 +  requires "findutils"
 +  requires "kmod-compat"
++  provides "stability-monitor-kernel-module"
 +  post "/bin/cp -r /aarch64/modules/* /lib/modules/"
 +  post "/bin/rm -rf /aarch64"
 +  post "RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`))"
 +  post "/sbin/depmod -a $RELEASEVERSION"

diff --cc packaging/linux-tizen-modules.spec
index 70ffc4d,0000000..e99dc12
mode 100644,000000..100644
--- 1/packaging/linux-tizen-modules.spec
--- /dev/null
+++ b/packaging/linux-tizen-modules.spec
@@@ -1,118 -1,0 +1,127 @@@
 +%define KMOD_PATH /lib/modules/
 +
 +%ifarch aarch64
 +%define buildarch arm64
 +%else
 +%define buildarch arm
 +%endif
 +
 +Name:           linux-tizen-modules
 +Version:        6.5.0
 +Release:        0
 +License:        GPL-2.0+
 +Source0:        %{name}-%{version}.tar.xz
 +Source1:        %{name}.manifest
 +Summary:        Tizen-specific kernel modules
 +Group:          System/Kernel
 +ExclusiveArch:  armv7l aarch64
 +BuildRequires:  kmod
 +BuildRequires:  %{buildarch}-rpi3-linux-kernel-devel
 +BuildRequires:  %{buildarch}-rpi4-linux-kernel-devel
 +%ifarch aarch64
 +BuildRequires:  kernel-devel-exynos9110-tw3
 +%endif
 +%description
 +
 +%package        rpi3
 +Summary:        Tizen modules for RaspberryPI 3
 +AutoReqProv:    no
 +Requires:       %{buildarch}-rpi3-linux-kernel-modules
 +Requires(post): bash
 +Requires(post): coreutils
 +Requires(post): findutils
 +Requires(post): kmod-compat
++Provides:       stability-monitor-kernel-module
 +%description    rpi3
 +
 +%package        rpi4
 +Summary:        Tizen modules for RaspberryPI 4
 +AutoReqProv:    no
 +Requires:       %{buildarch}-rpi4-linux-kernel-modules
 +Requires(post): bash
 +Requires(post): coreutils
 +Requires(post): findutils
 +Requires(post): kmod-compat
++Provides:       stability-monitor-kernel-module
 +%description    rpi4
 +
 +%ifarch aarch64
 +%package        tw3
 +Summary:        Tizen modules for TW3
 +AutoReqProv:    no
++Provides:       stability-monitor-kernel-module
 +%description    tw3
 +%endif
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1} ./%{name}.manifest
 +
 +%build
 +make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3
 +make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3/
 +make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3 INSTALL_MOD_STRIP=1
 +
 +make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi4
 +make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi4
 +make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi4 INSTALL_MOD_STRIP=1
 +
 +%ifarch aarch64
 +make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-tw3
 +make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-tw3
 +make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 INSTALL_MOD_STRIP=1
 +%endif
 +
 +%install
 +mkdir -p %{buildroot}/%{KMOD_PATH}
 +
 +pushd lib/modules
 +find -name "*.ko" -exec cp -a --parents {} %{buildroot}/%{KMOD_PATH}/ \;
 +popd
 +
 +# module load config
 +install -D -m 644 conf/logger.conf %{buildroot}/%{KMOD_PATH}/modules-load.d/logger.conf
++mkdir -p %{buildroot}/%{KMOD_PATH}/modprobe.d
++install -D conf/modprobe.conf %{buildroot}/%{KMOD_PATH}/modprobe.d/linux-tizen-modules.conf
 +
 +%ifarch aarch64
 +mkdir -p %{buildroot}/aarch64/modules
 +mv %{buildroot}/%{KMOD_PATH}/4.9.59 %{buildroot}/aarch64/modules/
 +cp -r %{buildroot}/%{KMOD_PATH}/modules-load.d %{buildroot}/aarch64/modules/
++cp -r %{buildroot}/%{KMOD_PATH}/modprobe.d %{buildroot}/aarch64/modules/
 +%endif
 +
 +%clean
 +rm -rf %{buildroot}
 +rm -rf %{_builddir}/%{name}-%{version}/lib
 +
 +%post rpi3
 +RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`))
 +/sbin/depmod -a $RELEASEVERSION
 +
 +%post rpi4
 +RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`))
 +/sbin/depmod -a $RELEASEVERSION
 +
 +%files rpi3
 +%manifest %{name}.manifest
 +%license COPYING
 +%{KMOD_PATH}/*rpi3*/extra
 +%{KMOD_PATH}/modules-load.d/logger.conf
++%{KMOD_PATH}/modprobe.d/*.conf
 +
 +%files rpi4
 +%manifest %{name}.manifest
 +%license COPYING
 +%{KMOD_PATH}/*rpi4*/extra
 +%{KMOD_PATH}/modules-load.d/logger.conf
++%{KMOD_PATH}/modprobe.d/*.conf
 +
 +%ifarch aarch64
 +%files tw3
 +%manifest %{name}.manifest
 +%license COPYING
 +/aarch64/modules/4.9.59/extra
 +/aarch64/modules/modules-load.d
++/aarch64/modules/modprobe.d/*.conf
 +%endif