Date: Mon, 27 Feb 2012 14:12:49 +0000 (UTC) From: "Jayachandran C." <jchandra@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r232212 - in user/jchandra/xlp-merge/sys/mips: conf nlm nlm/dev Message-ID: <201202271412.q1RECnIR021303@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jchandra Date: Mon Feb 27 14:12:49 2012 New Revision: 232212 URL: http://svn.freebsd.org/changeset/base/232212 Log: NOR flash driver for XLP The NOR interface on the SoC appears on the top level PCI bus. Add a simple driver for this. Added: user/jchandra/xlp-merge/sys/mips/nlm/dev/cfi_pci_xlp.c Modified: user/jchandra/xlp-merge/sys/mips/conf/std.XLP user/jchandra/xlp-merge/sys/mips/nlm/files.xlp user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c Modified: user/jchandra/xlp-merge/sys/mips/conf/std.XLP ============================================================================== --- user/jchandra/xlp-merge/sys/mips/conf/std.XLP Mon Feb 27 14:03:49 2012 (r232211) +++ user/jchandra/xlp-merge/sys/mips/conf/std.XLP Mon Feb 27 14:12:49 2012 (r232212) @@ -106,3 +106,7 @@ device nlmsec device nlmrsa options IPSEC options GEOM_ELI + +# NOR +device cfi +device cfid Added: user/jchandra/xlp-merge/sys/mips/nlm/dev/cfi_pci_xlp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jchandra/xlp-merge/sys/mips/nlm/dev/cfi_pci_xlp.c Mon Feb 27 14:12:49 2012 (r232212) @@ -0,0 +1,78 @@ +/*- + * Copyright (c) 2011 Netlogic Microsystems Inc. + * + * (based on dev/uart/uart_bus_pci.c) + * Copyright (c) 2006 Marcel Moolenaar + * Copyright (c) 2001 M. Warner Losh + * All rights reserved. + * + * 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 AUTHOR ``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 AUTHOR 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> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/conf.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <machine/bus.h> +#include <sys/rman.h> +#include <machine/resource.h> + +#include <dev/pci/pcivar.h> + +#include <dev/cfi/cfi_var.h> + +#include <mips/nlm/hal/haldefs.h> +#include <mips/nlm/hal/iomap.h> + +static int cfi_xlp_probe(device_t dev); + +static device_method_t cfi_xlp_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, cfi_xlp_probe), + DEVMETHOD(device_attach, cfi_attach), + DEVMETHOD(device_detach, cfi_detach), + DEVMETHOD_END +}; + +static driver_t cfi_xlp_driver = { + cfi_driver_name, + cfi_xlp_methods, + sizeof(struct cfi_softc), +}; + +static int +cfi_xlp_probe(device_t dev) +{ + + if (pci_get_vendor(dev) != PCI_VENDOR_NETLOGIC || + pci_get_device(dev) != PCI_DEVICE_ID_NLM_NOR) + return (ENXIO); + + device_set_desc(dev, "Netlogic XLP NOR Bus"); + return (cfi_probe(dev)); +} + +DRIVER_MODULE(cfi_xlp, pci, cfi_xlp_driver, cfi_devclass, 0, 0); Modified: user/jchandra/xlp-merge/sys/mips/nlm/files.xlp ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/files.xlp Mon Feb 27 14:03:49 2012 (r232211) +++ user/jchandra/xlp-merge/sys/mips/nlm/files.xlp Mon Feb 27 14:12:49 2012 (r232212) @@ -18,6 +18,7 @@ mips/nlm/usb_init.c optional usb # # Simple SoC devices mips/nlm/dev/uart_pci_xlp.c optional uart +mips/nlm/dev/cfi_pci_xlp.c optional cfi # # Network driver and micro-core code mips/nlm/dev/net/nae.c optional xlpge Modified: user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c Mon Feb 27 14:03:49 2012 (r232211) +++ user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c Mon Feb 27 14:12:49 2012 (r232212) @@ -59,10 +59,11 @@ __FBSDID("$FreeBSD$"); #include <mips/nlm/hal/haldefs.h> #include <mips/nlm/interrupt.h> #include <mips/nlm/hal/iomap.h> +#include <mips/nlm/hal/bridge.h> +#include <mips/nlm/hal/gbu.h> #include <mips/nlm/hal/i2c.h> #include <mips/nlm/hal/mips-extns.h> #include <mips/nlm/hal/pic.h> -#include <mips/nlm/hal/bridge.h> #include <mips/nlm/hal/pcibus.h> #include <mips/nlm/hal/uart.h> #include <mips/nlm/xlp.h> @@ -480,6 +481,7 @@ assign_soc_resource(device_t child, int u_long *countp, struct rman **rm, bus_space_tag_t *bst, vm_offset_t *va) { int devid, inst, node, unit; + uint32_t val; devid = pci_get_device(child); inst = pci_get_function(child); @@ -506,6 +508,15 @@ assign_soc_resource(device_t child, int *rm = &emul_rman; *bst = uart_bus_space_mem; break; + case PCI_DEVICE_ID_NLM_NOR: + /* XXXJC: support multiple chip selects */ + val = nlm_read_pci_reg(nlm_get_gbu_regbase(node), 0); + *startp = val << 8; + *va = MIPS_PHYS_TO_KSEG1(*startp); + /* XXXJC: count is not correct */ + *countp = 0x100; + *rm = &emul_rman; + break; } /* calculate end if allocated */ if (*rm)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202271412.q1RECnIR021303>