From owner-svn-src-all@FreeBSD.ORG Tue Mar 27 15:16:39 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33ED2106566C; Tue, 27 Mar 2012 15:16:39 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 130C08FC19; Tue, 27 Mar 2012 15:16:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2RFGcoD091601; Tue, 27 Mar 2012 15:16:38 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2RFGcBv091596; Tue, 27 Mar 2012 15:16:38 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201203271516.q2RFGcBv091596@svn.freebsd.org> From: "Jayachandran C." Date: Tue, 27 Mar 2012 15:16:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233556 - in head/sys/mips: conf nlm nlm/dev X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2012 15:16:39 -0000 Author: jchandra Date: Tue Mar 27 15:16:38 2012 New Revision: 233556 URL: http://svn.freebsd.org/changeset/base/233556 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: head/sys/mips/nlm/dev/cfi_pci_xlp.c (contents, props changed) Modified: head/sys/mips/conf/std.XLP head/sys/mips/nlm/files.xlp head/sys/mips/nlm/xlp_pci.c Modified: head/sys/mips/conf/std.XLP ============================================================================== --- head/sys/mips/conf/std.XLP Tue Mar 27 15:15:30 2012 (r233555) +++ head/sys/mips/conf/std.XLP Tue Mar 27 15:16:38 2012 (r233556) @@ -106,3 +106,7 @@ device nlmrsa # Options that use crypto options IPSEC options GEOM_ELI + +# NOR +device cfi +device cfid Added: head/sys/mips/nlm/dev/cfi_pci_xlp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/nlm/dev/cfi_pci_xlp.c Tue Mar 27 15:16:38 2012 (r233556) @@ -0,0 +1,77 @@ +/*- + * Copyright (c) 2003-2012 Broadcom Corporation + * 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 BROADCOM ``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 BROADCOM 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#include +#include + +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: head/sys/mips/nlm/files.xlp ============================================================================== --- head/sys/mips/nlm/files.xlp Tue Mar 27 15:15:30 2012 (r233555) +++ head/sys/mips/nlm/files.xlp Tue Mar 27 15:16:38 2012 (r233556) @@ -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: head/sys/mips/nlm/xlp_pci.c ============================================================================== --- head/sys/mips/nlm/xlp_pci.c Tue Mar 27 15:15:30 2012 (r233555) +++ head/sys/mips/nlm/xlp_pci.c Tue Mar 27 15:16:38 2012 (r233556) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -479,6 +480,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)