svn commit: r337913 - in head/sys: dev/ipmi modules/ipmi

[Justin Hibbits]

Woops, my fault way back when I made powerpc64's IPMI OPAL buildable as
a module.  Can't believe I had i386 twice in there.

- Justin

On Thu, 16 Aug 2018 09:11:01 -0700
Ravi Pokala <rpokala at freebsd.org> wrote:

> The confluence of these two issues is that on amd64 ipmi.ko loads,
> but doesn't attach to the BMC or create /dev/ipmi, and that the
> kernel panics when trying to unload. Right?
> 
> If so, that's exactly the issue I hit on Monday, but didn't get a
> chance to triage. Thanks!
> 
> -Ravi
> 
> -----Original Message-----
> From: <owner-src-committers at freebsd.org> on behalf of Doug Ambrisko
> <ambrisko at FreeBSD.org> Date: 2018-08-16, Thursday at 08:59
> To: <src-committers at freebsd.org>, <svn-src-all at freebsd.org>,
> <svn-src-head at freebsd.org> Subject: svn commit: r337913 - in
> head/sys: dev/ipmi modules/ipmi
> 
> Author: ambrisko
> Date: Thu Aug 16 15:59:02 2018
> New Revision: 337913
> URL: https://svnweb.freebsd.org/changeset/base/337913
> 
> Log:
>   Fix a module Makefile error on amd64 so the IPMI HW interfaces are
> built. When the module is being unloaded and no HW interfaces were
> created don't clean up.  This was exposed by the amd64 module build
> issue.
> 
> Modified:
>   head/sys/dev/ipmi/ipmi.c
>   head/sys/modules/ipmi/Makefile
> 
> Modified: head/sys/dev/ipmi/ipmi.c
> ==============================================================================
> --- head/sys/dev/ipmi/ipmi.c	Thu Aug 16 15:54:12 2018
> (r337912) +++ head/sys/dev/ipmi/ipmi.c	Thu Aug 16 15:59:02
> 2018	(r337913) @@ -1053,6 +1053,8 @@ ipmi_unload(void *arg)
>  	int		count;
>  	int		i;
>  
> +	if (ipmi_devclass == NULL)
> +		return;
>  	if (devclass_get_devices(ipmi_devclass, &devs, &count) != 0)
>  		return;
>  	for (i = 0; i < count; i++)
> 
> Modified: head/sys/modules/ipmi/Makefile
> ==============================================================================
> --- head/sys/modules/ipmi/Makefile	Thu Aug 16 15:54:12
> 2018	(r337912) +++ head/sys/modules/ipmi/Makefile	Thu
> Aug 16 15:59:02 2018	(r337913) @@ -7,7 +7,7 @@
>  KMOD=	ipmi
>  SRCS=	ipmi.c
>  SRCS+=	bus_if.h device_if.h
> -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "i386"
> +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
>  SRCS+=	ipmi_kcs.c ipmi_smic.c ipmi_smbios.c ipmi_ssif.c
>  SRCS+=	ipmi_acpi.c ipmi_isa.c ipmi_pci.c ipmi_smbus.c
>  SRCS+=	opt_acpi.h
> 
> 
> 
>