Source-Changes-HG archive

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

[src/netbsd-9]: src/sys/dev/ic Pull up following revision(s) (requested by ts...



details:   https://anonhg.NetBSD.org/src/rev/6ea35904ac45
branches:  netbsd-9
changeset: 963888:6ea35904ac45
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 18 17:52:22 2020 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #908):

        sys/dev/ic/stivar.h: revision 1.10
        sys/dev/ic/sti.c: revision 1.21
        sys/arch/hp300/dev/sti_sgc.c: revision 1.3

Add bitmap access ops support for EVRX framebuffer on HP9000/425e.

8bpp Xorg wsfb server and mlterm-wscons (formerly mlterm-fb) work.
No particular comment on port-hp300@ and port-hppa@:
 https://mail-index.netbsd.org/port-hp300/2020/05/02/msg000170.html

Special thanks to Miod Vallat, for his advice about HP-UX implementation
and binutils patches to disassemble old HP-UX a.out-hp300hpux binaries
(and also contributing his 425e back in 2014).

diffstat:

 sys/arch/hp300/dev/sti_sgc.c |  350 ++++++++++++++++++++++++++++++++++++++++--
 sys/dev/ic/sti.c             |   21 +-
 sys/dev/ic/stivar.h          |    5 +-
 3 files changed, 346 insertions(+), 30 deletions(-)

diffs (truncated from 493 to 300 lines):

diff -r 45c5cbf65871 -r 6ea35904ac45 sys/arch/hp300/dev/sti_sgc.c
--- a/sys/arch/hp300/dev/sti_sgc.c      Wed May 13 18:17:31 2020 +0000
+++ b/sys/arch/hp300/dev/sti_sgc.c      Mon May 18 17:52:22 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sti_sgc.c,v 1.2 2014/04/20 04:12:54 tsutsui Exp $      */
+/*     $NetBSD: sti_sgc.c,v 1.2.34.1 2020/05/18 17:52:22 martin Exp $  */
 /*     $OpenBSD: sti_sgc.c,v 1.14 2007/05/26 00:36:03 krw Exp $        */
 
 /*
@@ -27,7 +27,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.2 2014/04/20 04:12:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.2.34.1 2020/05/18 17:52:22 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -35,6 +35,7 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 
 #include <dev/ic/stireg.h>
@@ -44,6 +45,36 @@
 #include <hp300/dev/sti_sgcvar.h>
 #include <machine/autoconf.h>
 
+struct sti_sgc_softc {
+       struct sti_softc sc_sti;
+
+       paddr_t sc_bitmap;
+       bus_space_tag_t sc_bst;
+       bus_space_handle_t sc_ramdach;
+};
+
+/*
+ * 425e EVRX specific hardware
+ */
+#define STI_EVRX_RAMDACOFFSET  0x060000
+#define STI_EVRX_RAMDACSIZE    0x000800
+#define STI_EVRX_FBOFFSET      0x200000
+
+#define EVRX_BT458_ADDR                (0x200 + 2)
+#define EVRX_BT458_CMAP                (0x204 + 2)
+#define EVRX_BT458_CTRL                (0x208 + 2)
+#define EVRX_BT458_OMAP                (0x20C + 2)
+
+/* from HP-UX /usr/lib/libddevrx.a */
+#define EVRX_MAGIC00           0x600
+#define EVRX_MAGIC04           0x604
+#define EVRX_MAGIC08           0x608
+#define EVRX_MAGIC0C           0x60c
+#define EVRX_MAGIC10           0x610
+#define EVRX_MAGIC10_BSY       0x00010000
+#define EVRX_MAGIC18           0x618
+#define EVRX_MAGIC1C           0x61c
+
 static int sticonslot = -1;
 static struct sti_rom sticn_rom;
 static struct sti_screen sticn_scr;
@@ -54,9 +85,25 @@
 
 static int sti_sgc_probe(bus_space_tag_t, int);
 
-CFATTACH_DECL_NEW(sti_sgc, sizeof(struct sti_softc),
+CFATTACH_DECL_NEW(sti_sgc, sizeof(struct sti_sgc_softc),
     sti_sgc_match, sti_sgc_attach, NULL, NULL);
 
+/* 425e EVRX specific access functions */
+static int sti_evrx_setcmap(struct sti_sgc_softc *, struct wsdisplay_cmap *);
+static void sti_evrx_resetramdac(struct sti_sgc_softc *);
+static void sti_evrx_resetcmap(struct sti_sgc_softc *);
+static int sti_evrx_ioctl(void *, void *, u_long, void *, int, struct lwp *);
+static paddr_t sti_evrx_mmap(void *, void *, off_t, int);
+
+static const struct wsdisplay_accessops sti_evrx_accessops = {
+       sti_evrx_ioctl,
+       sti_evrx_mmap,
+       sti_alloc_screen,
+       sti_free_screen,
+       sti_show_screen,
+       sti_load_font
+};
+
 static int
 sti_sgc_match(device_t parent, struct cfdata *cf, void *aux)
 {
@@ -75,24 +122,31 @@
 static void
 sti_sgc_attach(device_t parent, device_t self, void *aux)
 {
-       struct sti_softc *sc = device_private(self);
+       struct sti_sgc_softc *sc = device_private(self);
+       struct sti_softc *ssc = &sc->sc_sti;
        struct sgc_attach_args *saa = aux;
+       struct sti_screen *scr;
        bus_space_handle_t romh;
        bus_addr_t base;
+       struct wsemuldisplaydev_attach_args waa;
        u_int romend;
+       struct sti_dd *rom_dd;
+       uint32_t grid0;
        int i;
 
-       sc->sc_dev = self;
+       ssc->sc_dev = self;
+       base = (bus_addr_t)sgc_slottopa(saa->saa_slot);
 
        if (saa->saa_slot == sticonslot) {
-               sc->sc_flags |= STI_CONSOLE | STI_ATTACHED;
-               sc->sc_rom = &sticn_rom;
-               sc->sc_scr = &sticn_scr;
-               memcpy(sc->bases, sticn_bases, sizeof(sc->bases));
+               ssc->sc_flags |= STI_CONSOLE | STI_ATTACHED;
+               ssc->sc_rom = &sticn_rom;
+               ssc->sc_rom->rom_softc = ssc;
+               ssc->sc_scr = &sticn_scr;
+               ssc->sc_scr->scr_rom = ssc->sc_rom;
+               memcpy(ssc->bases, sticn_bases, sizeof(ssc->bases));
 
-               sti_describe(sc);
+               sti_describe(ssc);
        } else {
-               base = (bus_addr_t)sgc_slottopa(saa->saa_slot);
                if (bus_space_map(saa->saa_iot, base, PAGE_SIZE, 0, &romh)) {
                        aprint_error(": can't map ROM");
                        return;
@@ -109,22 +163,70 @@
                        return;
                }
 
-               sc->bases[0] = romh;
+               ssc->bases[0] = romh;
                for (i = 0; i < STI_REGION_MAX; i++)
-                       sc->bases[i] = base;
+                       ssc->bases[i] = base;
 
-               if (sti_attach_common(sc, saa->saa_iot, saa->saa_iot, romh,
+               if (sti_attach_common(ssc, saa->saa_iot, saa->saa_iot, romh,
                    STI_CODEBASE_ALT) != 0)
                        return;
        }
 
-       /*
-        * Note on 425e sti(4) framebuffer bitmap memory can be accessed at
-        * (sgc_slottopa(saa->saa_slot) + 0x200000)
-        * but the mmap function to map bitmap display is not provided yet.
-        */
+       /* Identify the board model by dd_grid */
+       rom_dd = &ssc->sc_rom->rom_dd;
+       grid0 = rom_dd->dd_grid[0];
+       scr = ssc->sc_scr;
+
+       switch (grid0) {
+       case STI_DD_EVRX:
+               /*
+                * 425e on-board EVRX framebuffer.
+                * bitmap memory can be accessed at offset +0x200000.
+                */
+               sc->sc_bitmap = base + STI_EVRX_FBOFFSET;
+
+               /*
+                * Bt458 RAMDAC can be accessed at offset +0x60200 and
+                * unknown control registers are around +0x60600.
+                */
+               sc->sc_bst = saa->saa_iot;
+               if (bus_space_map(sc->sc_bst, base + STI_EVRX_RAMDACOFFSET,
+                   STI_EVRX_RAMDACSIZE, 0, &sc->sc_ramdach)) {
+                       aprint_error_dev(self, "can't map RAMDAC\n");
+                       return;
+               }
+
+               aprint_normal_dev(self, "Enable mmap support\n");
 
-       sti_end_attach(sc);
+               /*
+                * initialize Bt458 RAMDAC and preserve initial color map
+                */
+               sti_evrx_resetramdac(sc);
+               sti_evrx_resetcmap(sc);
+
+               scr->scr_wsmode = WSDISPLAYIO_MODE_EMUL;
+               waa.console = ssc->sc_flags & STI_CONSOLE ? 1 : 0;
+               waa.scrdata = &scr->scr_screenlist;
+               waa.accessops = &sti_evrx_accessops;
+               waa.accesscookie = scr;
+
+               config_found(ssc->sc_dev, &waa, wsemuldisplaydevprint);
+               break;
+
+       case STI_DD_CRX:
+               /*
+                * HP A1659A CRX on some 425t variants.
+                * Not investigated yet; needs to check HP-UX libddgcrx.a etc.
+                */
+               /* FALLTHROUGH */
+       default:
+               /*
+                * Unsupported variants.
+                * Use default common sti(4) attachment (no bitmap support).
+                */
+               sti_end_attach(ssc);
+               break;
+       }
 }
 
 static int
@@ -153,6 +255,214 @@
        return 1;
 }
 
+static int
+sti_evrx_setcmap(struct sti_sgc_softc *sc, struct wsdisplay_cmap *p)
+{
+       struct sti_softc *ssc = &sc->sc_sti;
+       struct sti_screen *scr = ssc->sc_scr;
+       bus_space_tag_t bst = sc->sc_bst;
+       bus_space_handle_t bsh = sc->sc_ramdach;
+       uint8_t r[STI_NCMAP], g[STI_NCMAP], b[STI_NCMAP];
+       u_int index, count;
+       int i, error;
+
+       index = p->index;
+       count = p->count;
+       if (index >= STI_NCMAP || count > STI_NCMAP - index)
+               return EINVAL;
+
+       error = copyin(p->red, &r[index], count);
+       if (error)
+               return error;
+       error = copyin(p->green, &g[index], count);
+       if (error)
+               return error;
+       error = copyin(p->blue, &b[index], count);
+       if (error)
+               return error;
+
+       memcpy(&scr->scr_rcmap[index], &r[index], count);
+       memcpy(&scr->scr_gcmap[index], &g[index], count);
+       memcpy(&scr->scr_bcmap[index], &b[index], count);
+
+       /* magic setup from HP-UX */
+       bus_space_write_4(bst, bsh, EVRX_MAGIC08, 0x00000001);
+       bus_space_write_4(bst, bsh, EVRX_MAGIC00, 0x00000001);
+       for (i = index; i < index + count; i++) {
+               /* this is what HP-UX woodDownloadCmap() does */
+               while ((bus_space_read_4(bst, bsh, EVRX_MAGIC10) &
+                   EVRX_MAGIC10_BSY) != 0)
+                       continue;
+               bus_space_write_1(bst, bsh, EVRX_BT458_ADDR, i);
+               bus_space_write_1(bst, bsh, EVRX_BT458_CMAP, scr->scr_rcmap[i]);
+               bus_space_write_1(bst, bsh, EVRX_BT458_CMAP, scr->scr_gcmap[i]);
+               bus_space_write_4(bst, bsh, EVRX_MAGIC10,   scr->scr_bcmap[i]);
+       }
+       return 0;
+}
+
+static void
+sti_evrx_resetramdac(struct sti_sgc_softc *sc)
+{
+       bus_space_tag_t bst = sc->sc_bst;
+       bus_space_handle_t bsh = sc->sc_ramdach;
+#if 0
+       int i;
+#endif
+
+       /*
+        * Initialize the Bt458.  When we write to control registers,
+        * the address is not incremented automatically. So we specify
+        * it ourselves for each control register.
+        */
+
+       /* all planes will be read */
+       bus_space_write_1(bst, bsh, EVRX_BT458_ADDR, 0x04);
+       bus_space_write_1(bst, bsh, EVRX_BT458_CTRL, 0xff);
+
+       /* all planes have non-blink */
+       bus_space_write_1(bst, bsh, EVRX_BT458_ADDR, 0x05);
+       bus_space_write_1(bst, bsh, EVRX_BT458_CTRL, 0x00);
+
+       /* pallete enabled, ovly plane disabled */
+       bus_space_write_1(bst, bsh, EVRX_BT458_ADDR, 0x06);
+       bus_space_write_1(bst, bsh, EVRX_BT458_CTRL, 0x40);
+
+       /* no test mode */
+       bus_space_write_1(bst, bsh, EVRX_BT458_ADDR, 0x07);
+       bus_space_write_1(bst, bsh, EVRX_BT458_CTRL, 0x00);
+
+       /* magic initialization from HP-UX woodInitializeHardware() */
+       bus_space_write_4(bst, bsh, EVRX_MAGIC00, 0x00000001);
+       bus_space_write_4(bst, bsh, EVRX_MAGIC04, 0x00000001);
+       bus_space_write_4(bst, bsh, EVRX_MAGIC08, 0x00000001);
+       bus_space_write_4(bst, bsh, EVRX_MAGIC0C, 0x00000001);
+       bus_space_write_4(bst, bsh, EVRX_MAGIC18, 0xFFFFFFFF);
+       bus_space_write_4(bst, bsh, EVRX_MAGIC1C, 0x00000000);
+
+#if 0



Home | Main Index | Thread Index | Old Index