[src/trunk]: src/sys/arch Separate the compat code in its own file to facilit...

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

details:   https://anonhg.NetBSD.org/src/rev/878ed6102f2e
branches:  trunk
changeset: 321485:878ed6102f2e
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 18 00:17:17 2018 +0000

description:
Separate the compat code in its own file to facilitate module building.

diffstat:

 sys/arch/x86/conf/files.x86            |   3 +-
 sys/arch/x86/x86/compat_60_cpu_ucode.c |  81 ++++++++++++++++++++++++++++++++++
 sys/arch/x86/x86/cpu_ucode.c           |  39 +---------------
 sys/arch/xen/conf/files.xen            |   4 +-
 4 files changed, 88 insertions(+), 39 deletions(-)

diffs (181 lines):

diff -r 81a04b82da39 -r 878ed6102f2e sys/arch/x86/conf/files.x86
--- a/sys/arch/x86/conf/files.x86       Sat Mar 17 22:27:04 2018 +0000
+++ b/sys/arch/x86/conf/files.x86       Sun Mar 18 00:17:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.x86,v 1.97 2018/03/01 06:36:12 mrg Exp $
+#      $NetBSD: files.x86,v 1.98 2018/03/18 00:17:17 christos Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -111,6 +111,7 @@
 file   arch/x86/x86/cpu_ucode.c        cpu_ucode needs-flag
 file   arch/x86/x86/cpu_ucode_amd.c    cpu_ucode needs-flag
 file   arch/x86/x86/cpu_ucode_intel.c  cpu_ucode needs-flag
+file    arch/x86/x86/compat_60_cpu_ucode.c     compat_60 & cpu_ucode
 
 define lapic
 file   arch/x86/x86/lapic.c            lapic needs-flag
diff -r 81a04b82da39 -r 878ed6102f2e sys/arch/x86/x86/compat_60_cpu_ucode.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x86/x86/compat_60_cpu_ucode.c    Sun Mar 18 00:17:17 2018 +0000
@@ -0,0 +1,81 @@
+/* $NetBSD: compat_60_cpu_ucode.c,v 1.1 2018/03/18 00:17:18 christos Exp $ */
+/*
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christoph Egger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: compat_60_cpu_ucode.c,v 1.1 2018/03/18 00:17:18 christos Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_cpu_ucode.h"
+#include "opt_compat_netbsd.h"
+#endif
+
+#include <sys/param.h>
+#include <sys/cpuio.h>
+#include <sys/cpu.h>
+
+#include <dev/firmload.h>
+
+#include <machine/cpuvar.h>
+#include <machine/cputypes.h>
+
+#include <x86/cpu_ucode.h>
+
+#ifdef COMPAT_60
+int
+compat6_cpu_ucode_get_version(struct compat6_cpu_ucode *data6)
+{
+
+       if (cpu_vendor != CPUVENDOR_AMD)
+               return EOPNOTSUPP;
+
+       struct cpu_ucode_version data;
+
+       data.loader_version = CPU_UCODE_LOADER_AMD;
+       return cpu_ucode_amd_get_version(&data, &data6->version,
+           sizeof(data6->version));
+}
+
+int
+compat6_cpu_ucode_apply(const struct compat6_cpu_ucode *data6)
+{
+
+       if (cpu_vendor != CPUVENDOR_AMD)
+               return EOPNOTSUPP;
+
+       struct cpu_ucode data;
+
+       data.loader_version = CPU_UCODE_LOADER_AMD;
+       data.cpu_nr = CPU_UCODE_ALL_CPUS;
+       strcpy(data.fwname, data6->fwname);
+
+       return cpu_ucode_apply(&data);
+}
+
+#endif /* COMPAT60 */
diff -r 81a04b82da39 -r 878ed6102f2e sys/arch/x86/x86/cpu_ucode.c
--- a/sys/arch/x86/x86/cpu_ucode.c      Sat Mar 17 22:27:04 2018 +0000
+++ b/sys/arch/x86/x86/cpu_ucode.c      Sun Mar 18 00:17:17 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode.c,v 1.7 2018/03/17 20:02:32 christos Exp $ */
+/* $NetBSD: cpu_ucode.c,v 1.8 2018/03/18 00:17:18 christos Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,13 +29,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode.c,v 1.7 2018/03/17 20:02:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode.c,v 1.8 2018/03/18 00:17:18 christos Exp $");
 
 #include "opt_cpu_ucode.h"
 #include "opt_xen.h"
 
-#include "opt_compat_netbsd.h"
-
 #include <sys/param.h>
 #include <sys/cpuio.h>
 #include <sys/cpu.h>
@@ -155,36 +153,3 @@
        return error;
 }
 #endif
-
-#ifdef COMPAT_60
-int
-compat6_cpu_ucode_get_version(struct compat6_cpu_ucode *data)
-{
-       struct cpu_ucode_version ndata;
-
-       switch (cpu_vendor) {
-       case CPUVENDOR_AMD:
-               ndata.loader_version = CPU_UCODE_LOADER_AMD;
-               return cpu_ucode_amd_get_version(&ndata, &data->version,
-                   sizeof(data->version));
-       default:
-               return EOPNOTSUPP;
-       }
-}
-
-int
-compat6_cpu_ucode_apply(const struct compat6_cpu_ucode *data6)
-{
-
-       if (cpu_vendor != CPUVENDOR_AMD)
-               return EOPNOTSUPP;
-
-       struct cpu_ucode data;
-
-       data.loader_version = CPU_UCODE_LOADER_AMD;
-       data.cpu_nr = CPU_UCODE_ALL_CPUS;
-       strcpy(data.fwname, data6->fwname);
-
-       return cpu_ucode_apply(&data);
-}
-#endif /* COMPAT60 */
diff -r 81a04b82da39 -r 878ed6102f2e sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Sat Mar 17 22:27:04 2018 +0000
+++ b/sys/arch/xen/conf/files.xen       Sun Mar 18 00:17:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen,v 1.167 2018/03/17 20:03:01 christos Exp $
+#      $NetBSD: files.xen,v 1.168 2018/03/18 00:17:18 christos Exp $
 #      NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #      NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -95,6 +95,8 @@
 file   arch/x86/x86/cpu_ucode.c        dom0ops & cpu_ucode needs-flag
 file   arch/x86/x86/cpu_ucode_amd.c    dom0ops & cpu_ucode needs-flag
 file   arch/x86/x86/cpu_ucode_intel.c  dom0ops & cpu_ucode needs-flag
+file   arch/x86/x86/compat_60_cpu_ucode.c      compat_60 & dom0ops & cpu_ucode
+
 
 file   arch/xen/xen/xen_machdep.c
 file   arch/xen/xen/xen_debug.c