[src/netbsd-10]: src/sys/arch/x86/isa Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c507c9e0bb37
branches:  netbsd-10
changeset: 373021:c507c9e0bb37
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 13 19:05:25 2023 +0000

description:
Pull up following revision(s) (requested by jakllsch in ticket #46):

        sys/arch/x86/isa/rtc.c: revision 1.2

Honor ACPI FADT Century byte; should fix many "unknown CMOS layout" messages.

diffstat:

 sys/arch/x86/isa/rtc.c |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 8bb792fcdcd3 -r c507c9e0bb37 sys/arch/x86/isa/rtc.c
--- a/sys/arch/x86/isa/rtc.c    Fri Jan 13 19:00:20 2023 +0000
+++ b/sys/arch/x86/isa/rtc.c    Fri Jan 13 19:05:25 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtc.c,v 1.1 2009/06/16 21:05:34 bouyer Exp $   */
+/*     $NetBSD: rtc.c,v 1.1.102.1 2023/01/13 19:05:25 martin Exp $     */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -121,7 +121,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.1 2009/06/16 21:05:34 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.1.102.1 2023/01/13 19:05:25 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -145,6 +145,11 @@
 #include <machine/mca_machdep.h>       /* for MCA_system */
 #endif
 
+#include "acpica.h"
+#if NACPICA > 0
+#include <dev/acpi/acpivar.h>
+#endif
+
 static void    rtcinit(void);
 static int     rtcget(mc_todregs *);
 static void    rtcput(mc_todregs *);
@@ -269,6 +274,12 @@
                return (clockyear);
 
        s = splclock();
+#if NACPICA > 0
+       if (acpi_active)
+               cmoscentury = mc146818_read(NULL,
+                   (centb = AcpiGbl_FADT.Century));
+       else
+#endif
        if (cmoscheck())
                cmoscentury = mc146818_read(NULL, NVRAM_CENTURY);
 #if NMCA > 0