Module Name: src
Committed By: thorpej
Date: Tue Apr 27 21:39:40 UTC 2021
Modified Files:
src/sys/arch/shark/conf: GENERIC INSTALL
src/sys/dev/ofisa: files.ofisa ofisa.c
Added Files:
src/sys/dev/ofisa: mcclock_ofisa.c
Log Message:
"ofisa" carried an "ofbus" interface attribute in addition to its own
in order to attach an "ofrtc" instance. This worked prior to the
autconfiguration system enforcing non-ambiguous interface attribute
specificaitons due to how the attach args for ofisa were structured.
But it no longer works, and is a big dodgy barring a formalized "subclassing"
facility for interface atributes in config(5).
So, stop using "ofrtc" on Shark, and replace it with an ofisa driver for
the mc146818 real time clock hardware, and remove "ofbus" from "ofisa".
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ofisa/files.ofisa
cvs rdiff -u -r0 -r1.1 src/sys/dev/ofisa/mcclock_ofisa.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ofisa/ofisa.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/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.136 src/sys/arch/shark/conf/GENERIC:1.137
--- src/sys/arch/shark/conf/GENERIC:1.136 Sun Aug 16 10:27:47 2020
+++ src/sys/arch/shark/conf/GENERIC Tue Apr 27 21:39:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.136 2020/08/16 10:27:47 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.137 2021/04/27 21:39:39 thorpej Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.136 $"
+#ident "GENERIC-$Revision: 1.137 $"
# estimated number of users
maxusers 32
@@ -203,11 +203,9 @@ ofbus* at ofbus?
#ofdisk* at ofbus?
#ofnet* at ofbus? # don't use with cs0
#ofcons* at ofbus? # don't use with pc0
-ofrtc* at ofisa?
ofrom* at ofbus?
ofisa* at ofbus?
-ofbus* at ofisa?
# IDE/ATA disk
wdc* at ofisa?
@@ -240,6 +238,9 @@ wsdisplay* at wsemuldisplaydev?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
+# mc146818 real time clock
+mcclock* at ofisa?
+
# CS8900 Ethernet@OFW
cs* at ofisa?
Index: src/sys/arch/shark/conf/INSTALL
diff -u src/sys/arch/shark/conf/INSTALL:1.65 src/sys/arch/shark/conf/INSTALL:1.66
--- src/sys/arch/shark/conf/INSTALL:1.65 Sat Apr 18 11:00:42 2020
+++ src/sys/arch/shark/conf/INSTALL Tue Apr 27 21:39:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.65 2020/04/18 11:00:42 skrll Exp $
+# $NetBSD: INSTALL,v 1.66 2021/04/27 21:39:40 thorpej Exp $
#
# Shark installation kernel
#
@@ -172,11 +172,9 @@ ofbus* at ofbus?
#ofdisk* at ofbus?
#ofnet* at ofbus? # don't use with cs0
#ofcons* at ofbus? # don't use with pc0
-ofrtc* at ofisa?
ofrom* at ofbus?
ofisa* at ofbus?
-ofbus* at ofisa?
# IDE/ATA disk
wdc* at ofisa?
@@ -204,6 +202,9 @@ wsdisplay* at wsemuldisplaydev?
wskbd* at pckbd? console ?
#wsmouse* at pms? mux 0
+# mc146818 real time clock
+mcclock* at ofisa?
+
# CS8900 Ethernet@OFW
cs* at ofisa?
Index: src/sys/dev/ofisa/files.ofisa
diff -u src/sys/dev/ofisa/files.ofisa:1.14 src/sys/dev/ofisa/files.ofisa:1.15
--- src/sys/dev/ofisa/files.ofisa:1.14 Sun Dec 11 12:22:48 2005
+++ src/sys/dev/ofisa/files.ofisa Tue Apr 27 21:39:39 2021
@@ -1,9 +1,9 @@
-# $NetBSD: files.ofisa,v 1.14 2005/12/11 12:22:48 christos Exp $
+# $NetBSD: files.ofisa,v 1.15 2021/04/27 21:39:39 thorpej Exp $
# OFW ISA bus support
# XXX eventually we should do something with these locators
define ofisa { [i = -1], [it = -1], [iv = -1], [m = -1] }
-device ofisa: ofisa, ofbus
+device ofisa: ofisa
attach ofisa at ofbus
file dev/ofisa/ofisa.c ofisa
@@ -41,3 +41,8 @@ file dev/ofisa/if_cs_ofisa.c cs_ofisa
# attachment of ISA Game port driver
attach joy at ofisa with joy_ofisa
file dev/ofisa/joy_ofisa.c joy_ofisa
+
+# ISA mc146818 RTC driver
+device mcclock: mc146818
+attach mcclock at ofisa with mcclock_ofisa
+file dev/ofisa/mcclock_ofisa.c mcclock_ofisa
Index: src/sys/dev/ofisa/ofisa.c
diff -u src/sys/dev/ofisa/ofisa.c:1.31 src/sys/dev/ofisa/ofisa.c:1.32
--- src/sys/dev/ofisa/ofisa.c:1.31 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/ofisa/ofisa.c Tue Apr 27 21:39:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisa.c,v 1.31 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: ofisa.c,v 1.32 2021/04/27 21:39:39 thorpej Exp $ */
/*
* Copyright 1997, 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.31 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.32 2021/04/27 21:39:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@ ofisaattach(device_t parent, device_t se
memset(&aa, 0, sizeof aa);
- aa.oba.oba_busname = "ofw"; /* XXX */
+ aa.oba.oba_busname = "ofisa";
aa.oba.oba_phandle = child;
aa.iot = iba.iba_iot;
aa.memt = iba.iba_memt;
Added files:
Index: src/sys/dev/ofisa/mcclock_ofisa.c
diff -u /dev/null src/sys/dev/ofisa/mcclock_ofisa.c:1.1
--- /dev/null Tue Apr 27 21:39:40 2021
+++ src/sys/dev/ofisa/mcclock_ofisa.c Tue Apr 27 21:39:39 2021
@@ -0,0 +1,188 @@
+/* $NetBSD: mcclock_ofisa.c,v 1.1 2021/04/27 21:39:39 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+/*
+ * OFW ISA attachment for the mc146818 real time clock.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ofisa.c,v 1.1 2021/04/27 21:39:39 thorpej Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+
+#include <sys/bus.h>
+
+#include <dev/clock_subr.h>
+#include <dev/ic/mc146818var.h>
+
+#include <dev/ofw/openfirm.h>
+#include <dev/isa/isavar.h>
+#include <dev/ofisa/ofisavar.h>
+
+struct mcclock_ofisa_platform_data {
+ int year0;
+ int flags;
+};
+
+static const struct device_compatible_entry compat_data[] = {
+ { .compat = "pnpPNP,b00" },
+ DEVICE_COMPAT_EOL
+};
+
+static const struct mcclock_ofisa_platform_data dec_dnard_data = {
+ .year0 = 1900,
+ .flags = MC146818_BCD,
+};
+
+static const struct device_compatible_entry platform_data[] = {
+ { .compat = "DEC,DNARD", .data = &dec_dnard_data, },
+ DEVICE_COMPAT_EOL
+};
+
+static const struct mcclock_ofisa_platform_data *
+lookup_platform_data(char *model, size_t const size)
+{
+ const struct device_compatible_entry *dce;
+
+ if (OF_getprop(OF_finddevice("/"), "model", model, size) <= 0) {
+ return NULL;
+ }
+
+ /* should be plenty big enough, but never hurts... */
+ model[size - 1] = '\0';
+ const char *cmodel = model;
+
+ dce = device_compatible_lookup(&cmodel, 1, platform_data);
+ if (dce != NULL) {
+ return dce->data;
+ }
+ return NULL;
+}
+
+static u_int
+mcclock_ofisa_read(struct mc146818_softc *sc, u_int reg)
+{
+ bus_space_write_1(sc->sc_bst, sc->sc_bsh, 0, reg);
+ return bus_space_read_1(sc->sc_bst, sc->sc_bsh, 1);
+}
+
+static void
+mcclock_ofisa_write(struct mc146818_softc *sc, u_int reg, u_int datum)
+{
+ bus_space_write_1(sc->sc_bst, sc->sc_bsh, 0, reg);
+ bus_space_write_1(sc->sc_bst, sc->sc_bsh, 1, (uint8_t)datum);
+}
+
+static int
+mcclock_ofisa_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct ofisa_attach_args *aa = aux;
+ int rv;
+
+ rv = of_compatible_match(aa->oba.oba_phandle, compat_data) ? 5 : 0;
+#ifdef _MCCLOCK_OFISA_MD_MATCH
+ if (!rv)
+ rv = mcclock_ofisa_md_match(parent, cf, aux);
+#endif
+ return rv;
+}
+
+static void
+mcclock_ofisa_attach(device_t parent, device_t self, void *aux)
+{
+ struct mc146818_softc *sc = device_private(self);
+ struct ofisa_attach_args *aa = aux;
+ const struct mcclock_ofisa_platform_data *pd;
+ struct ofisa_reg_desc reg;
+ char model[64];
+ int n;
+
+ sc->sc_dev = self;
+
+ n = ofisa_reg_get(aa->oba.oba_phandle, ®, 1);
+#ifdef _MCCLOCK_OFISA_MD_REG_FIXUP
+ n = mcclock_ofisa_md_reg_fixup(parent, self, aux, ®, 1, n);
+#endif
+ if (n != 1) {
+ aprint_error(": error getting register data\n");
+ return;
+ }
+ if (reg.len != 2) {
+ aprint_error(": weird register size (%lu, expected 2)\n",
+ (unsigned long)reg.len);
+ return;
+ }
+
+ /*
+ * We don't configure interrupts here; we're only using this
+ * for the TODR.
+ */
+
+ pd = lookup_platform_data(model, sizeof(model));
+
+ sc->sc_bst = (reg.type == OFISA_REG_TYPE_IO) ? aa->iot : aa->memt;
+ if (bus_space_map(sc->sc_bst, reg.addr, reg.len, 0, &sc->sc_bsh) != 0) {
+ aprint_error(": can't map register space\n");
+ return;
+ }
+
+ /*
+ * These default to 0. We'll warn after attaching if we didn't
+ * find any platform data.
+ */
+ if (pd != NULL) {
+ sc->sc_year0 = pd->year0;
+ sc->sc_flag = pd->flags;
+ }
+ sc->sc_mcread = mcclock_ofisa_read;
+ sc->sc_mcwrite = mcclock_ofisa_write;
+
+ mc146818_attach(sc);
+
+ aprint_normal("\n");
+
+ if (pd == NULL) {
+ /*
+ * We could dynamically compute at least BCD-ness and
+ * base year by comparing against the OFW get-time
+ * call, but it hardly seems worth it right now.
+ */
+ aprint_error_dev(self,
+ "WARNING: no platform data for '%s', using defaults.\n",
+ model);
+ }
+}
+
+CFATTACH_DECL_NEW(mcclock_ofisa, sizeof(struct mc146818_softc),
+ mcclock_ofisa_match, mcclock_ofisa_attach, NULL, NULL);
