From 0bec3a85b003343a82f4d892def6771cf83bd02c Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 6 Jul 2020 18:27:29 +0200
Subject: [PATCH] linux-5.4.46: Build IPMI MSG handler into Linux kernel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Building ipmi_msghandler as a module causes – as always – problems with
the proprietary Nvidia driver. For whatever reasons, it depends on
functions from the module, and is unable to load the module itself –
probably because of our mxgfx indirection.

    2020-06-17T13:56:09.272068+02:00 sigchld kernel: [    0.000000] Linux version 5.4.46.mx64.337 (root@invidia.molgen.mpg.de) (gcc version 7.5.0 (GCC)) #1 SMP Tue Jun 16 23:32:15 CEST 2020
    […]
    2020-06-17T13:56:09.322119+02:00 sigchld kernel: [    3.907200] nvidia: loading out-of-tree module taints kernel.
    2020-06-17T13:56:09.322140+02:00 sigchld kernel: [    3.911716] nvidia: module license 'NVIDIA' taints kernel.
    2020-06-17T13:56:09.333611+02:00 sigchld kernel: [    3.923028] nvidia: module verification failed: signature and/or required key missing - tainting kernel
    2020-06-17T13:56:09.333620+02:00 sigchld kernel: [    3.926029] nvidia: Unknown symbol ipmi_create_user (err -2)
    2020-06-17T13:56:09.335472+02:00 sigchld kernel: [    3.927879] nvidia: Unknown symbol ipmi_destroy_user (err -2)
    2020-06-17T13:56:09.337338+02:00 sigchld kernel: [    3.929720] nvidia: Unknown symbol ipmi_validate_addr (err -2)
    2020-06-17T13:56:09.337342+02:00 sigchld kernel: [    3.931552] nvidia: Unknown symbol ipmi_free_recv_msg (err -2)
    2020-06-17T13:56:09.339180+02:00 sigchld kernel: [    3.933377] nvidia: Unknown symbol ipmi_set_my_address (err -2)
    2020-06-17T13:56:09.341000+02:00 sigchld kernel: [    3.935221] nvidia: Unknown symbol ipmi_request_settime (err -2)
    2020-06-17T13:56:09.342899+02:00 sigchld kernel: [    3.937102] nvidia: Unknown symbol ipmi_set_gets_events (err -2)
    2020-06-17T13:56:09.385602+02:00 sigchld kernel: [    3.975577] nvidia_uvm: Unknown symbol nvUvmInterfaceDisableAccessCntr (err -2)
    2020-06-17T13:56:09.385614+02:00 sigchld kernel: [    3.977740] nvidia_uvm: Unknown symbol nvUvmInterfaceChannelDestroy (err -2)
    2020-06-17T13:56:09.385615+02:00 sigchld kernel: [    3.979796] nvidia_uvm: Unknown symbol nvUvmInterfaceQueryCaps (err -2)
    2020-06-17T13:56:09.387549+02:00 sigchld kernel: [    3.981756] nvidia_uvm: Unknown symbol nvUvmInterfaceUnsetPageDirectory (err -2)
    2020-06-17T13:56:09.389361+02:00 sigchld kernel: [    3.983558] nvidia_uvm: Unknown symbol nvUvmInterfaceInitAccessCntrInfo (err -2)
    2020-06-17T13:56:09.391153+02:00 sigchld kernel: [    3.985352] nvidia_uvm: Unknown symbol nvUvmInterfaceReleaseChannel (err -2)
    2020-06-17T13:56:09.392781+02:00 sigchld kernel: [    3.986986] nvidia_uvm: Unknown symbol nvUvmInterfaceMemoryAllocSys (err -2)
    2020-06-17T13:56:09.394816+02:00 sigchld kernel: [    3.989018] nvidia_uvm: Unknown symbol nvUvmInterfaceMemoryCpuMap (err -2)
    2020-06-17T13:56:09.398324+02:00 sigchld kernel: [    3.992539] nvidia_uvm: Unknown symbol nvUvmInterfaceRetainChannelResources (err -2)
    2020-06-17T13:56:09.403240+02:00 sigchld kernel: [    3.997423] nvidia_uvm: Unknown symbol nvUvmInterfacePmaFreePages (err -2)
    […]

So partly revert commit 32c9443e (linux-5.4.46: Build IPMI drivers as
modules), and build impi_msghandler into the Linux kernel.
---
 linux-5.4.46-337.bee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-5.4.46-337.bee b/linux-5.4.46-337.bee
index ff817cfdc..f08f65674 100755
--- a/linux-5.4.46-337.bee
+++ b/linux-5.4.46-337.bee
@@ -607,7 +607,7 @@ mee_configure() {
 	CONFIG_SERIAL_DEV_BUS=m
 	CONFIG_PRINTER=y
 	CONFIG_VIRTIO_CONSOLE=m
-	CONFIG_IPMI_HANDLER=m
+	CONFIG_IPMI_HANDLER=y
 	CONFIG_IPMI_DEVICE_INTERFACE=m
 	CONFIG_IPMI_SI=m
 	CONFIG_IPMI_WATCHDOG=m