Module Name: src
Committed By: jakllsch
Date: Tue Jan 7 22:37:13 UTC 2025
Modified Files:
src/sys/arch/x86/isa: rtc.c
Log Message:
Only use FADT Century byte if it targets a valid 146818 NVRAM location.
Should fix PR 57821.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/isa/rtc.c
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/x86/isa/rtc.c
diff -u src/sys/arch/x86/isa/rtc.c:1.2 src/sys/arch/x86/isa/rtc.c:1.3
--- src/sys/arch/x86/isa/rtc.c:1.2 Fri Dec 30 21:40:20 2022
+++ src/sys/arch/x86/isa/rtc.c Tue Jan 7 22:37:13 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.2 2022/12/30 21:40:20 jakllsch Exp $ */
+/* $NetBSD: rtc.c,v 1.3 2025/01/07 22:37:13 jakllsch Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -121,7 +121,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.2 2022/12/30 21:40:20 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.3 2025/01/07 22:37:13 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -275,7 +275,8 @@ clock_expandyear(int clockyear)
s = splclock();
#if NACPICA > 0
- if (acpi_active)
+ if (acpi_active && AcpiGbl_FADT.Century >= MC_NVRAM_START &&
+ AcpiGbl_FADT.Century < (MC_NVRAM_START + MC_NVRAM_SIZE))
cmoscentury = mc146818_read(NULL,
(centb = AcpiGbl_FADT.Century));
else
