[src/trunk]: src/sys/arch/mips CFI NOR support for mips/ralink

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

details:   https://anonhg.NetBSD.org/src/rev/a16d6d52a85d
branches:  trunk
changeset: 767865:a16d6d52a85d
user:      cliff <cliff%NetBSD.org@localhost>
date:      Tue Aug 02 03:38:48 2011 +0000

description:
CFI NOR support for mips/ralink

diffstat:

 sys/arch/mips/conf/files.ralink   |    8 +-
 sys/arch/mips/ralink/ralink_cfi.c |  191 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 198 insertions(+), 1 deletions(-)

diffs (214 lines):

diff -r e023da034b82 -r a16d6d52a85d sys/arch/mips/conf/files.ralink
--- a/sys/arch/mips/conf/files.ralink   Tue Aug 02 03:37:25 2011 +0000
+++ b/sys/arch/mips/conf/files.ralink   Tue Aug 02 03:38:48 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.ralink,v 1.2 2011/07/28 15:38:48 matt Exp $
+#      $NetBSD: files.ralink,v 1.3 2011/08/02 03:40:00 cliff Exp $
 
 file   arch/mips/ralink/ralink_intr.c
 file   arch/mips/ralink/ralink_bus.c
@@ -37,3 +37,9 @@
 device reth: ether, ifnet, arp, mii
 attach reth at mainbus
 file   arch/mips/ralink/ralink_eth.c           reth
+
+# Ralink CFI NOR
+device  cfi: norbus
+attach cfi at mainbus with ralink_cfi
+file   arch/mips/ralink/ralink_cfi.c           ralink_cfi
+
diff -r e023da034b82 -r a16d6d52a85d sys/arch/mips/ralink/ralink_cfi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mips/ralink/ralink_cfi.c Tue Aug 02 03:38:48 2011 +0000
@@ -0,0 +1,191 @@
+/*     $NetBSD: ralink_cfi.c,v 1.1 2011/08/02 03:38:48 cliff Exp $     */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Cliff Neighbors.
+ *
+ * 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.
+ */
+
+/*
+ * NOR CFI driver support for ralink
+ */
+
+#include "opt_flash.h"
+#include "locators.h"
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: ralink_cfi.c,v 1.1 2011/08/02 03:38:48 cliff Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/cdefs.h>
+#include <sys/device.h>
+#include <sys/endian.h>
+
+#include <sys/bus.h>
+
+#include <mips/ralink/ralink_var.h>
+#include <mips/ralink/ralink_reg.h>
+
+#include <dev/nor/nor.h>
+#include <dev/nor/cfi.h>
+
+
+static int  ra_cfi_match(device_t, cfdata_t, void *);
+static void ra_cfi_attach(device_t, device_t, void *);
+static int  ra_cfi_detach(device_t, int);
+
+struct ra_cfi_softc {
+       device_t                sc_dev;
+       device_t                sc_nordev;
+       struct cfi                      sc_cfi;
+       bus_addr_t              sc_addr;
+       bus_size_t              sc_size;
+       struct nor_interface    sc_nor_if;
+};
+
+CFATTACH_DECL_NEW(ralink_cfi, sizeof(struct ra_cfi_softc), ra_cfi_match,
+    ra_cfi_attach, ra_cfi_detach, NULL);
+
+/*
+ * ra_cfi_addr - return bus address for the CFI NOR flash
+ */
+static inline bus_addr_t
+ra_cfi_addr(struct mainbus_attach_args * const ma)
+{
+       return RA_FLASH_BASE;   /* XXX configure TBD */
+}
+
+static int
+ra_cfi_match(device_t parent, cfdata_t match, void *aux)
+{
+       struct mainbus_attach_args * const ma = aux;
+       bus_size_t tmpsize = CFI_QRY_MIN_MAP_SIZE;
+       bus_addr_t addr;
+       struct cfi cfi;
+       int rv;
+
+       KASSERT(ma->ma_memt != NULL);
+
+       addr = ra_cfi_addr(ma);
+#ifdef NOTYET
+       if (addr == MAINBUSCF_ADDR_DEFAULT) {
+               aprint_error("%s: no base address\n", __func__);
+               return 0;
+       }
+#endif
+
+       cfi.cfi_bst = ma->ma_memt;
+       int error = bus_space_map(cfi.cfi_bst, addr, tmpsize, 0, &cfi.cfi_bsh);
+       if (error != 0) {
+               aprint_error("%s: cannot map %#" PRIxBUSSIZE"  at offset %#"
+                   PRIxBUSADDR ", error %d\n", __func__, tmpsize, addr, error);
+               return false;
+       }
+
+       if (! cfi_probe(&cfi)) {
+               aprint_debug("%s: probe addr %#" PRIxBUSADDR
+                   ", CFI not found\n", __func__, addr);
+               rv = 0;
+       } else {
+               rv = 1;
+       }
+
+       bus_space_unmap(cfi.cfi_bst, cfi.cfi_bsh, tmpsize);
+
+       return rv;
+}
+
+static void
+ra_cfi_attach(device_t parent, device_t self, void *aux)
+{
+       struct ra_cfi_softc *sc = device_private(self);
+       struct mainbus_attach_args * const ma = aux;
+       struct cfi_query_data * const qryp = &sc->sc_cfi.cfi_qry_data;
+       const bus_size_t tmpsize = CFI_QRY_MIN_MAP_SIZE;
+       bool found;
+       int error;
+
+       aprint_normal("\n");
+
+       sc->sc_dev = self;
+       sc->sc_cfi.cfi_bst = ma->ma_memt;
+       sc->sc_addr = ra_cfi_addr(ma);
+
+       /* map enough to identify, remap later when size is known */
+       error = bus_space_map(sc->sc_cfi.cfi_bst, sc->sc_addr, tmpsize,
+               0, &sc->sc_cfi.cfi_bsh);
+       if (error != 0) {
+               aprint_error_dev(self, "could not map error %d\n", error);
+               return;
+       }
+
+       found = cfi_identify(&sc->sc_cfi);
+
+       bus_space_unmap(sc->sc_cfi.cfi_bst, sc->sc_cfi.cfi_bsh, tmpsize);
+
+       if (! found) {
+               /* should not happen, we already probed OK in match */
+               aprint_error_dev(self, "could not map error %d\n", error);
+               return;
+       }
+
+       sc->sc_size = 1 << qryp->device_size;
+
+       sc->sc_nor_if = nor_interface_cfi;
+       sc->sc_nor_if.private = &sc->sc_cfi;
+       sc->sc_nor_if.access_width = (1 << sc->sc_cfi.cfi_portwidth);
+
+       cfi_print(self, &sc->sc_cfi);
+
+       error = bus_space_map(sc->sc_cfi.cfi_bst, sc->sc_addr, sc->sc_size,
+               0, &sc->sc_cfi.cfi_bsh);
+       if (error != 0) {
+               aprint_error_dev(self, "could not map error %d\n", error);
+               return;
+       }
+
+       if (! pmf_device_register1(self, NULL, NULL, NULL))
+               aprint_error_dev(self, "couldn't establish power handler\n");
+
+       sc->sc_nordev = nor_attach_mi(&sc->sc_nor_if, self);
+
+}
+
+static int
+ra_cfi_detach(device_t self, int flags)
+{
+       struct ra_cfi_softc *sc = device_private(self);
+       int rv = 0;
+
+       pmf_device_deregister(self);
+
+       if (sc->sc_nordev != NULL)
+               rv = config_detach(sc->sc_nordev, flags);
+
+       bus_space_unmap(sc->sc_cfi.cfi_bst, sc->sc_cfi.cfi_bsh, sc->sc_size);
+
+       return rv;
+}