Date: Wed, 27 Sep 2006 02:08:01 -0700 From: Nick Barkas <snb@threerings.net> To: Michael Graziano <mikeg@bsd-box.net>, "J. Martin Petersen" <jmp.lists@alvorlig.dk> Cc: ports@freebsd.org Subject: Re: FreeBSD Port: ipmi-kmod-20060418_1 Message-ID: <A8A73596-A0CF-4B30-AC6E-E7D63D28DE94@threerings.net> In-Reply-To: <3697C109-11B2-4319-992A-CFC9175DC545@threerings.net> References: <200609191703.k8JH3ZEe088920@ambrisko.com> <3697C109-11B2-4319-992A-CFC9175DC545@threerings.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail-2-652255553 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Doh, forgot to actually attach the patch. Sorry! --Apple-Mail-2-652255553 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name=ipmi-kmod.patch Content-Disposition: attachment; filename=ipmi-kmod.patch diff -urN /usr/ports/sysutils/ipmi-kmod/Makefile ipmi-kmod/Makefile --- /usr/ports/sysutils/ipmi-kmod/Makefile Thu Sep 7 13:33:20 2006 +++ ipmi-kmod/Makefile Wed Sep 27 01:27:23 2006 @@ -2,17 +2,16 @@ # Date created: 18 April 2006 # Whom: Nick Barkas <snb@threerings.net> # -# $FreeBSD: ports/sysutils/ipmi-kmod/Makefile,v 1.4 2006/09/07 20:33:20 ehaupt Exp $ +# $FreeBSD$ # PORTNAME= ipmi-kmod -PORTVERSION= 20060418 -PORTREVISION= 1 +PORTVERSION= 20060926 CATEGORIES= sysutils MASTER_SITES= http://dpw.threerings.net/projects/ipmi-kmod/ MAINTAINER= snb@threerings.net -COMMENT= Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.x/6.x +COMMENT= Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.3 - 6.1 SUB_FILES= pkg-install pkg-deinstall SUB_LIST+= KMODDIR=${KMODDIR} @@ -29,8 +28,7 @@ ONLY_FOR_ARCHS= i386 amd64 -# Don't strip module on amd64 systems to prevent segmentation faults when -# running kldxref +# Don't strip module on amd64 systems .if ${ARCH} == "amd64" STRIP= .endif @@ -39,7 +37,7 @@ IGNORE= requires kernel source to be installed .endif -.if ${OSVERSION} >= 700014 +.if ${OSVERSION} >= 601102 IGNORE= already in the base system .elif ${OSVERSION} < 503000 IGNORE= does not support FreeBSD before 5.3 diff -urN /usr/ports/sysutils/ipmi-kmod/distinfo ipmi-kmod/distinfo --- /usr/ports/sysutils/ipmi-kmod/distinfo Mon May 1 10:24:35 2006 +++ ipmi-kmod/distinfo Wed Sep 27 01:27:23 2006 @@ -1,3 +1,3 @@ -MD5 (ipmi-kmod-20060418.tar.gz) = adefe4ddc9360f1fbc3817e0b031eeef -SHA256 (ipmi-kmod-20060418.tar.gz) = 460a0082139047051bdabea75b4696f9e76139380e33e392ee9d56b02f089cea -SIZE (ipmi-kmod-20060418.tar.gz) = 13597 +MD5 (ipmi-kmod-20060926.tar.gz) = 1fe14087e9f6d616353448fbd6916ba8 +SHA256 (ipmi-kmod-20060926.tar.gz) = bd3c88b5cff906e73ca88aa9bdabee5d8ca3e0b79a4580febbbbe014dd68d4cb +SIZE (ipmi-kmod-20060926.tar.gz) = 22803 diff -urN /usr/ports/sysutils/ipmi-kmod/files/patch-Makefile ipmi-kmod/files/patch-Makefile --- /usr/ports/sysutils/ipmi-kmod/files/patch-Makefile Wed Dec 31 16:00:00 1969 +++ ipmi-kmod/files/patch-Makefile Wed Sep 27 01:27:23 2006 @@ -0,0 +1,12 @@ +Index: Makefile +=================================================================== +--- Makefile (revision 1137) ++++ Makefile (working copy) +@@ -1,6 +1,6 @@ + # $FreeBSD: src/sys/modules/ipmi/Makefile,v 1.2 2006/09/22 22:11:29 jhb Exp $ + +-.PATH: ${.CURDIR}/../../dev/ipmi ++.PATH: ${.CURDIR}/dev/ipmi + + # XXX - ipmi_smbus and ipmi_ssif depend on smbus + # XXX - ipmi_acpi depends on acpi diff -urN /usr/ports/sysutils/ipmi-kmod/files/patch-dev-ipmi-ipmi_ssif.c ipmi-kmod/files/patch-dev-ipmi-ipmi_ssif.c --- /usr/ports/sysutils/ipmi-kmod/files/patch-dev-ipmi-ipmi_ssif.c Wed Dec 31 16:00:00 1969 +++ ipmi-kmod/files/patch-dev-ipmi-ipmi_ssif.c Wed Sep 27 01:27:23 2006 @@ -0,0 +1,20 @@ +--- dev/ipmi/ipmi_ssif.c.orig 2006-09-22 15:11:29.000000000 -0700 ++++ dev/ipmi/ipmi_ssif.c 2006-09-25 19:10:59.000000000 -0700 +@@ -183,7 +183,7 @@ + return (0); + count = SMBUS_DATA_SIZE; + error = smbus_error(smbus_bread(smbus, +- sc->ipmi_ssif_smbus_address, SMBUS_READ_START, &count, ssif_buf)); ++ sc->ipmi_ssif_smbus_address, SMBUS_READ_START, count, ssif_buf)); + if (error == ENXIO || error == EBUSY) { + smbus_release_bus(smbus, dev); + #ifdef SSIF_DEBUG +@@ -259,7 +259,7 @@ + /* Read another packet via READ_CONT. */ + count = SMBUS_DATA_SIZE; + error = smbus_error(smbus_bread(smbus, +- sc->ipmi_ssif_smbus_address, SMBUS_READ_CONT, &count, ++ sc->ipmi_ssif_smbus_address, SMBUS_READ_CONT, count, + ssif_buf)); + if (error) { + #ifdef SSIF_ERROR_DEBUG diff -urN /usr/ports/sysutils/ipmi-kmod/files/pkg-deinstall.in ipmi-kmod/files/pkg-deinstall.in --- /usr/ports/sysutils/ipmi-kmod/files/pkg-deinstall.in Wed May 17 00:15:36 2006 +++ ipmi-kmod/files/pkg-deinstall.in Wed Sep 27 01:27:23 2006 @@ -2,7 +2,7 @@ # # Unload ipmi module if necessary # -# $FreeBSD: ports/sysutils/ipmi-kmod/files/pkg-deinstall.in,v 1.1 2006/05/17 07:15:36 lawrance Exp $ +# $FreeBSD$ # KMODDIR="%%KMODDIR%%" diff -urN /usr/ports/sysutils/ipmi-kmod/files/pkg-install.in ipmi-kmod/files/pkg-install.in --- /usr/ports/sysutils/ipmi-kmod/files/pkg-install.in Wed May 17 00:15:36 2006 +++ ipmi-kmod/files/pkg-install.in Wed Sep 27 01:27:23 2006 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: ports/sysutils/ipmi-kmod/files/pkg-install.in,v 1.1 2006/05/17 07:15:36 lawrance Exp $ +# $FreeBSD$ # KMODDIR="%%KMODDIR%%" diff -urN /usr/ports/sysutils/ipmi-kmod/pkg-descr ipmi-kmod/pkg-descr --- /usr/ports/sysutils/ipmi-kmod/pkg-descr Wed May 17 00:15:35 2006 +++ ipmi-kmod/pkg-descr Wed Sep 27 01:27:23 2006 @@ -1,3 +1,3 @@ -Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.x/6.x. +Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.3 - 6.1. WWW: http://dpw.threerings.net/projects/ipmi-kmod/ --Apple-Mail-2-652255553 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed On Sep 27, 2006, at 2:01 AM, Nick Barkas wrote: > I've updated the sysutils/ipmi-kmod port to contain the new ipmi > code committed to -current the other day. Here's the PR containing > a patch to upgrade the port to pull in the new code: http:// > www.freebsd.org/cgi/query-pr.cgi?pr=103708 (I also attached the > patch to this email). > > The new version of the port seems to work fine on my test amd64 and > i386 machines running 6.1. Both of those have Supermicro > motherboards and IPMI modules. Hopefully it will work with these > newer Dell BIOS releases, too! > > Nick > > On Sep 19, 2006, at 10:03 AM, Doug Ambrisko wrote: > >> Michael Graziano writes: >> | I believe our 2950 is BIOS Rev. A03 as well, I'll reboot it >> tomorrow >> | if I have a chance and get the Dell version ID. >> | >> | dmesg-wise, my first iomem range is the same as for A02, but my >> | second is not. I'm leaning toward the explanation that Dell moved >> | something on us and done went and broke the module :-/ >> | >> | ipmi0: <System Management BIOS> at iomem 0xfd040-0xfd05e, >> | 0xcffbc000-0xcffbcc3a on isa0 >> | ipmi0: SMBIOS Version: 2.04, revision: 2.04 >> | ipmi0: KCS mode found at io 0xca8 alignment 0x4 on isa >> | ipmi0: couldn't configure smbios io res >> >> FYI, this will be fixed in -current soon. jhb has been doing some >> work >> in the area to greatly improve some WIP that I gave him. Dell put >> a hole in the address range via their ACPI so it can't attach the >> range. >> >> Doug A. >> > --Apple-Mail-2-652255553--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A8A73596-A0CF-4B30-AC6E-E7D63D28DE94>