summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknakahara <knakahara@NetBSD.org>2022-09-08 06:57:44 +0000
committerknakahara <knakahara@NetBSD.org>2022-09-08 06:57:44 +0000
commitbb121b2c73ecc45ecca2faae6cf9510573f271cc (patch)
tree79fa708e20a97f36ba5250f59e2e54198774f92e
parent6319e0c663233bd2d061e8d1b25e51e0d9065e34 (diff)
Fix PR port-i386/57000 (boot failure on qemu).
-rw-r--r--sys/arch/i386/i386/lock_stubs.S10
-rw-r--r--sys/arch/i386/i386/spl.S10
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/i386/i386/lock_stubs.S b/sys/arch/i386/i386/lock_stubs.S
index 34adfeedc98..2d863ea3995 100644
--- a/sys/arch/i386/i386/lock_stubs.S
+++ b/sys/arch/i386/i386/lock_stubs.S
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.37 2022/09/07 00:40:18 knakahara Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.38 2022/09/08 06:57:44 knakahara Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.37 2022/09/07 00:40:18 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.38 2022/09/08 06:57:44 knakahara Exp $");
#include "opt_lockdebug.h"
@@ -255,10 +255,10 @@ END(mutex_spin_enter)
#ifndef XENPV
/*
- * Release a spin mutex and post a store fence. Must occupy 96 bytes.
+ * Release a spin mutex and post a store fence. Must occupy 128 bytes.
*/
ENTRY(mutex_spin_exit)
- HOTPATCH(HP_NAME_MUTEX_EXIT, 96)
+ HOTPATCH(HP_NAME_MUTEX_EXIT, 128)
movl 4(%esp), %edx
movl CPUVAR(MTX_OLDSPL), %ecx
incl CPUVAR(MTX_COUNT)
@@ -284,7 +284,7 @@ STRONG_ALIAS(mutex_spin_exit, i686_mutex_spin_exit)
/*
* Patch for i686 CPUs where cli/sti is prohibitively expensive.
- * Must be the same size as mutex_spin_exit(), that is, 96 bytes.
+ * Must be the same size as mutex_spin_exit(), that is, 128 bytes.
*/
ENTRY(i686_mutex_spin_exit)
mov 4(%esp),%edx
diff --git a/sys/arch/i386/i386/spl.S b/sys/arch/i386/i386/spl.S
index e5caf1770ba..02465e95940 100644
--- a/sys/arch/i386/i386/spl.S
+++ b/sys/arch/i386/i386/spl.S
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.56 2022/09/07 00:40:18 knakahara Exp $ */
+/* $NetBSD: spl.S,v 1.57 2022/09/08 06:57:44 knakahara Exp $ */
/*
* Copyright (c) 1998, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.56 2022/09/07 00:40:18 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.57 2022/09/08 06:57:44 knakahara Exp $");
#include "opt_ddb.h"
#include "opt_spldebug.h"
@@ -72,11 +72,11 @@ END(splraise)
* void spllower(int s);
*
* spllower() for i486 and Pentium. Must be the same size as cx8_spllower(),
- * that is, 64 bytes. This must use pushf/cli/popf as it is used early in boot
+ * that is, 96 bytes. This must use pushf/cli/popf as it is used early in boot
* where interrupts are disabled via eflags/IE.
*/
ENTRY(spllower)
- HOTPATCH(HP_NAME_SPLLOWER, 64)
+ HOTPATCH(HP_NAME_SPLLOWER, 96)
#ifdef SPLDEBUG
movl 4(%esp),%ecx
pushl %ebp
@@ -115,7 +115,7 @@ STRONG_ALIAS(spllower, cx8_spllower)
*
* spllower() optimized for Pentium Pro and later, which have long pipelines
* that will be stalled by pushf/cli/popf. Must be the same size as
- * spllower(), ie 64 bytes. Does not need to restore eflags/IE as is patched
+ * spllower(), ie 96 bytes. Does not need to restore eflags/IE as is patched
* in once autoconf is underway.
*
* For cmpxchg8b, edx/ecx are the high words and eax/ebx the low.