Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/sys/arch/arm/acpi Pull up following revision(s) (requeste...



details:   https://anonhg.NetBSD.org/src/rev/4b4287b31d57
branches:  netbsd-9
changeset: 963008:4b4287b31d57
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Sep 23 07:06:31 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #231):

        sys/arch/arm/acpi/acpi_platform.c: revision 1.18
        sys/arch/arm/acpi/files.acpi: revision 1.7
        sys/arch/arm/acpi/acpi_simplefb.c: revision 1.1
        sys/arch/arm/acpi/acpi_simplefb.h: revision 1.1

Use vcons for simplefb preattach to speed up early console messages.

diffstat:

 sys/arch/arm/acpi/acpi_platform.c |  129 ++---------------------
 sys/arch/arm/acpi/acpi_simplefb.c |  209 ++++++++++++++++++++++++++++++++++++++
 sys/arch/arm/acpi/acpi_simplefb.h |   37 ++++++
 sys/arch/arm/acpi/files.acpi      |    3 +-
 4 files changed, 261 insertions(+), 117 deletions(-)

diffs (truncated from 442 to 300 lines):

diff -r 2d7ceffa99e7 -r 4b4287b31d57 sys/arch/arm/acpi/acpi_platform.c
--- a/sys/arch/arm/acpi/acpi_platform.c Mon Sep 23 07:04:40 2019 +0000
+++ b/sys/arch/arm/acpi/acpi_platform.c Mon Sep 23 07:06:31 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.15.2.1 2019/08/04 19:24:18 martin Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.15.2.2 2019/09/23 07:06:31 martin Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.15.2.1 2019/08/04 19:24:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.15.2.2 2019/09/23 07:06:31 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -73,12 +73,8 @@
 #include <dev/pci/pucvar.h>
 #endif
 
-#if NWSDISPLAY > 0
-#include <dev/wscons/wsconsio.h>
-#include <dev/wscons/wsdisplayvar.h>
-#include <dev/rasops/rasops.h>
-#include <dev/wsfont/wsfont.h>
-#include <dev/wscons/wsdisplay_vconsvar.h>
+#if NWSDISPLAY > 0 && NGENFB > 0
+#include <arm/acpi/acpi_simplefb.h>
 #endif
 
 #ifdef EFI_RUNTIME
@@ -134,107 +130,6 @@
        acpi_coherent_dma_tag._nranges = __arraycount(acpi_coherent_ranges);
 }
 
-#if NWSDISPLAY > 0 && NGENFB > 0
-static struct wsscreen_descr acpi_platform_stdscreen = {
-       .name = "std",
-       .ncols = 0,
-       .nrows = 0,
-       .textops = NULL,
-       .fontwidth = 0,
-       .fontheight = 0,
-       .capabilities = 0,
-       .modecookie = NULL
-};
-
-static struct vcons_screen acpi_platform_screen;
-
-static int
-acpi_platform_find_simplefb(void)
-{
-       static const char * simplefb_compatible[] = { "simple-framebuffer", NULL };
-       int chosen_phandle, child;
-
-       chosen_phandle = OF_finddevice("/chosen");
-       if (chosen_phandle == -1)
-               return -1;
-
-       for (child = OF_child(chosen_phandle); child; child = OF_peer(child)) {
-               if (!fdtbus_status_okay(child))
-                       continue;
-               if (!of_match_compatible(child, simplefb_compatible))
-                       continue;
-
-               return child;
-       }
-
-       return -1;
-}
-
-static void
-acpi_platform_wsdisplay_preattach(void)
-{
-       struct rasops_info *ri = &acpi_platform_screen.scr_ri;
-       bus_space_tag_t bst = &arm_generic_bs_tag;
-       bus_space_handle_t bsh;
-       uint32_t width, height, stride;
-       const char *format;
-       bus_addr_t addr;
-       bus_size_t size;
-       uint16_t depth;
-       long defattr;
-
-       memset(&acpi_platform_screen, 0, sizeof(acpi_platform_screen));
-
-       const int phandle = acpi_platform_find_simplefb();
-       if (phandle == -1)
-               return;
-
-       if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0 || size == 0)
-               return;
-
-       if (of_getprop_uint32(phandle, "width", &width) != 0 ||
-           of_getprop_uint32(phandle, "height", &height) != 0 ||
-           of_getprop_uint32(phandle, "stride", &stride) != 0 ||
-           (format = fdtbus_get_string(phandle, "format")) == NULL)
-               return;
-
-       if (strcmp(format, "a8b8g8r8") == 0 ||
-           strcmp(format, "x8r8g8b8") == 0) {
-               depth = 32;
-       } else if (strcmp(format, "r5g6b5") == 0) {
-               depth = 16;
-       } else {
-               return;
-       }
-
-       if (bus_space_map(bst, addr, size,
-           BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, &bsh) != 0)
-               return;
-
-       wsfont_init();
-
-       ri->ri_width = width;
-       ri->ri_height = height;
-       ri->ri_depth = depth;
-       ri->ri_stride = stride;
-       ri->ri_bits = bus_space_vaddr(bst, bsh);
-       ri->ri_flg = RI_CENTER | RI_FULLCLEAR | RI_CLEAR;
-       rasops_init(ri, ri->ri_height / 8, ri->ri_width / 8);
-       ri->ri_caps = WSSCREEN_WSCOLORS;
-       rasops_reconfig(ri, ri->ri_height / ri->ri_font->fontheight,
-           ri->ri_width / ri->ri_font->fontwidth);
-
-       acpi_platform_stdscreen.nrows = ri->ri_rows;
-       acpi_platform_stdscreen.ncols = ri->ri_cols;
-       acpi_platform_stdscreen.textops = &ri->ri_ops;
-       acpi_platform_stdscreen.capabilities = ri->ri_caps;
-
-       ri->ri_ops.allocattr(ri, 0, 0, 0, &defattr);
-
-       wsdisplay_preattach(&acpi_platform_stdscreen, ri, 0, 0, defattr);
-}
-#endif
-
 static void
 acpi_platform_startup(void)
 {
@@ -309,13 +204,6 @@
        }
 
        /*
-        * Setup framebuffer console, if present.
-        */
-#if NWSDISPLAY > 0 && NGENFB > 0
-       acpi_platform_wsdisplay_preattach();
-#endif
-
-       /*
         * Initialize PSCI 0.2+ if implemented
         */
        if (ACPI_SUCCESS(acpi_table_find(ACPI_SIG_FADT, (void **)&fadt))) {
@@ -361,6 +249,15 @@
 static void
 acpi_platform_device_register(device_t self, void *aux)
 {
+#if NWSDISPLAY > 0 && NGENFB > 0
+       if (device_is_a(self, "armfdt")) {
+               /*
+                * Setup framebuffer console, if present.
+                */
+               acpi_simplefb_preattach();
+       }
+#endif
+
 #if NCOM > 0
        prop_dictionary_t prop = device_properties(self);
 
diff -r 2d7ceffa99e7 -r 4b4287b31d57 sys/arch/arm/acpi/acpi_simplefb.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/acpi/acpi_simplefb.c Mon Sep 23 07:06:31 2019 +0000
@@ -0,0 +1,209 @@
+/* $NetBSD: acpi_simplefb.c,v 1.1.2.2 2019/09/23 07:06:31 martin Exp $ */
+
+/*-
+ * Copyright (c) 2019 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jared McNeill <jmcneill%invisible.ca@localhost>.
+ *
+ * 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: acpi_simplefb.c,v 1.1.2.2 2019/09/23 07:06:31 martin Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+
+#include <dev/fdt/fdtvar.h>
+#include <arm/fdt/arm_fdtvar.h>
+
+#include <dev/wscons/wsconsio.h>
+#include <dev/wscons/wsdisplayvar.h>
+#include <dev/rasops/rasops.h>
+#include <dev/wsfont/wsfont.h>
+#include <dev/wscons/wsdisplay_vconsvar.h>
+
+#include <arm/acpi/acpi_simplefb.h>
+
+#include <libfdt.h>
+
+extern struct bus_space arm_generic_bs_tag;
+
+static struct acpi_simplefb_softc {
+       uint32_t        sc_width;
+       uint32_t        sc_height;
+       uint32_t        sc_stride;
+       uint16_t        sc_depth;
+       void            *sc_bits;
+} acpi_simplefb_softc;
+
+static struct wsscreen_descr acpi_simplefb_stdscreen = {
+       .name = "std",
+       .ncols = 0,
+       .nrows = 0,
+       .textops = NULL,
+       .fontwidth = 0,
+       .fontheight = 0,
+       .capabilities = 0,
+       .modecookie = NULL
+};
+
+static struct wsdisplay_accessops acpi_simplefb_accessops;
+static struct vcons_data acpi_simplefb_vcons_data;
+static struct vcons_screen acpi_simplefb_screen;
+
+static int
+acpi_simplefb_find_node(void)
+{
+       static const char * simplefb_compatible[] = { "simple-framebuffer", NULL };
+       int chosen_phandle, child;
+
+       chosen_phandle = OF_finddevice("/chosen");
+       if (chosen_phandle == -1)
+               return -1;
+
+       for (child = OF_child(chosen_phandle); child; child = OF_peer(child)) {
+               if (!fdtbus_status_okay(child))
+                       continue;
+               if (!of_match_compatible(child, simplefb_compatible))
+                       continue;
+
+               return child;
+       }
+
+       return -1;
+}
+
+static void
+acpi_simplefb_init_screen(void *cookie, struct vcons_screen *scr,
+    int existing, long *defattr)
+{
+       struct acpi_simplefb_softc * const sc = cookie;
+       struct rasops_info *ri = &scr->scr_ri;
+
+       ri->ri_width = sc->sc_width;
+       ri->ri_height = sc->sc_height;
+       ri->ri_depth = sc->sc_depth;
+       ri->ri_stride = sc->sc_stride;
+       ri->ri_bits = sc->sc_bits;
+       ri->ri_flg = RI_CENTER | RI_FULLCLEAR | RI_CLEAR;
+
+       scr->scr_flags |= VCONS_LOADFONT;
+       scr->scr_flags |= VCONS_DONT_READ;
+
+       rasops_init(ri, ri->ri_height / 8, ri->ri_width / 8);
+       ri->ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE;
+       rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
+           sc->sc_width / ri->ri_font->fontwidth);
+
+       ri->ri_hw = scr;
+}
+
+static int



Home | Main Index | Thread Index | Old Index