Module Name: src
Committed By: pgoyette
Date: Tue Jan 1 05:38:34 UTC 2019
Modified Files:
src/sys/arch/i386/i386 [pgoyette-compat]: locore.S
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep_16.c
src/sys/dev [pgoyette-compat]: ipmi.c
src/sys/dev/acpi [pgoyette-compat]: ipmi_acpi.c
src/tests/rump/rumpkern [pgoyette-compat]: Makefile
Log Message:
Bring in some fixes from HEAD to address a couple of build breaks (in
i386 ipmi driver and sun2 rump tests). Also fix a 'resolve conflict'
from previous commit in sparc64
With this, I am able to successfully build 66 out of 67 architectures
(the same architectures as handled by the releng build server. The
only exception is evbarm64 which has a strange build failure during
the installcd step - the same failure occurs on HEAD. It seems to be
something in the build itself, perhaps a difference between handling
of -O vs -M (MAKEOBJDIR vs MAKEOBJDIRPREFIX).
To generate a diff of this commit:
cvs rdiff -u -r1.156.2.3 -r1.156.2.4 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/dev/ipmi.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/dev/acpi/ipmi_acpi.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/tests/rump/rumpkern/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.156.2.3 src/sys/arch/i386/i386/locore.S:1.156.2.4
--- src/sys/arch/i386/i386/locore.S:1.156.2.3 Thu Sep 6 06:55:35 2018
+++ src/sys/arch/i386/i386/locore.S Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.156.2.3 2018/09/06 06:55:35 pgoyette Exp $ */
+/* $NetBSD: locore.S,v 1.156.2.4 2019/01/01 05:38:34 pgoyette Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.156.2.3 2018/09/06 06:55:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.156.2.4 2019/01/01 05:38:34 pgoyette Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
@@ -1288,12 +1288,12 @@ IDTVEC(syscall)
movl $.Lsyscall_resume, %esi /* address to resume loop at */
.Lsyscall_resume:
movl %ebx,%eax /* get cpl */
- movl CPUVAR(IUNMASK)(,%eax,4),%eax
- andl CPUVAR(IPENDING),%eax /* any non-masked bits left? */
+ movl CPUVAR(XUNMASK)(,%eax,4),%eax
+ andl CPUVAR(XPENDING),%eax /* any non-masked bits left? */
jz 17f
bsrl %eax,%eax
- btrl %eax,CPUVAR(IPENDING)
- movl CPUVAR(ISOURCES)(,%eax,4),%eax
+ btrl %eax,CPUVAR(XPENDING)
+ movl CPUVAR(XSOURCES)(,%eax,4),%eax
jmp *IS_RESUME(%eax)
17: movl %ebx, CPUVAR(ILEVEL) /* restore cpl */
jmp .Lsyscall_checkast
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.3 src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.4
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.3 Wed Dec 26 14:01:43 2018
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/12/26 14:01:43 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2019/01/01 05:38:34 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/12/26 14:01:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2019/01/01 05:38:34 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -150,7 +150,7 @@ netbsd32_sendsig_sigcontext(const ksigin
* and then copy it out. We probably ought to just build it
* directly in user space....
*/
- memset(&sfs, 0, sizeof(sf));
+ memset(&sf, 0, sizeof(sf));
sf.sf_signo = sig;
sf.sf_code = (u_int)ksi->ksi_trap;
sf.sf_scp = (u_long)&fp->sf_sc;
Index: src/sys/dev/ipmi.c
diff -u src/sys/dev/ipmi.c:1.2.2.2 src/sys/dev/ipmi.c:1.2.2.3
--- src/sys/dev/ipmi.c:1.2.2.2 Wed Dec 26 14:01:47 2018
+++ src/sys/dev/ipmi.c Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.2.2.2 2018/12/26 14:01:47 pgoyette Exp $ */
+/* $NetBSD: ipmi.c,v 1.2.2.3 2019/01/01 05:38:34 pgoyette Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.2.2.2 2018/12/26 14:01:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.2.2.3 2019/01/01 05:38:34 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1851,7 +1851,7 @@ ipmi_map_regs(struct ipmi_softc *sc, str
"ipmi0";
aprint_error("%s: %s:bus_space_map(..., %" PRIx64 ", %x"
", 0, %p) type %c failed %d\n",
- xname, __func__, ia->iaa_if_iobase,
+ xname, __func__, (uint64_t)ia->iaa_if_iobase,
sc->sc_if->nregs * sc->sc_if_iospacing, &sc->sc_ioh,
ia->iaa_if_iotype, error);
return -1;
@@ -2000,7 +2000,8 @@ ipmi_thread(void *cookie)
aprint_verbose_dev(self, "version %d.%d interface %s %sbase "
"0x%" PRIx64 "/%#x spacing %d\n",
ia->iaa_if_rev >> 4, ia->iaa_if_rev & 0xF, sc->sc_if->name,
- ia->iaa_if_iotype == 'i' ? "io" : "mem", ia->iaa_if_iobase,
+ ia->iaa_if_iotype == 'i' ? "io" : "mem",
+ (uint64_t)ia->iaa_if_iobase,
ia->iaa_if_iospacing * sc->sc_if->nregs, ia->iaa_if_iospacing);
if (ia->iaa_if_irq != -1)
aprint_verbose_dev(self, " irq %d\n", ia->iaa_if_irq);
Index: src/sys/dev/acpi/ipmi_acpi.c
diff -u src/sys/dev/acpi/ipmi_acpi.c:1.2.2.2 src/sys/dev/acpi/ipmi_acpi.c:1.2.2.3
--- src/sys/dev/acpi/ipmi_acpi.c:1.2.2.2 Wed Dec 26 14:01:47 2018
+++ src/sys/dev/acpi/ipmi_acpi.c Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi_acpi.c,v 1.2.2.2 2018/12/26 14:01:47 pgoyette Exp $ */
+/* $NetBSD: ipmi_acpi.c,v 1.2.2.3 2019/01/01 05:38:34 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi_acpi.c,v 1.2.2.2 2018/12/26 14:01:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi_acpi.c,v 1.2.2.3 2019/01/01 05:38:34 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -92,6 +92,7 @@ ipmi_acpi_attach(device_t parent, device
#endif
struct ipmi_attach_args IA, *ia = &IA;
bus_addr_t reg2;
+ uint16_t i2caddr;
sc->sc_dev = self;
@@ -173,7 +174,14 @@ ipmi_acpi_attach(device_t parent, device
aprint_error_dev(self, "no resources\n");
return;
}
- aprint_normal(": i2c 0x%lx\n", adr);
+ if (adr > 65535) {
+ aprint_normal("\n");
+ aprint_error_dev(self, "i2c address out of range\n");
+ return;
+ }
+ i2caddr = adr;
+
+ aprint_normal(": i2c 0x%x\n", i2caddr);
break;
default:
aprint_normal("\n");
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.16.2.1 src/tests/rump/rumpkern/Makefile:1.16.2.2
--- src/tests/rump/rumpkern/Makefile:1.16.2.1 Wed Dec 26 14:02:10 2018
+++ src/tests/rump/rumpkern/Makefile Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16.2.1 2018/12/26 14:02:10 pgoyette Exp $
+# $NetBSD: Makefile,v 1.16.2.2 2019/01/01 05:38:34 pgoyette Exp $
.include <bsd.own.mk>
@@ -26,7 +26,7 @@ LDADD.t_modlinkset+= -lrumpfs_cd9660 ${A
LDADD+= ${ADD_TO_LD}
KERNSPACE != cd ${.CURDIR}/../kernspace && ${PRINTOBJDIR}
-LDADD+= -L${KERNSPACE} -lkernspace
+LDADD+= -L${KERNSPACE} -lkernspace -lrump
WARNS= 4
