Index: head/sys/mips/nlm/dev/uart_pci_xlp.c =================================================================== --- head/sys/mips/nlm/dev/uart_pci_xlp.c (revision 279383) +++ head/sys/mips/nlm/dev/uart_pci_xlp.c (nonexistent) @@ -1,83 +0,0 @@ -/*- - * 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 - -#include -#include - -static int uart_soc_probe(device_t dev); - -static device_method_t uart_soc_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, uart_soc_probe), - DEVMETHOD(device_attach, uart_bus_attach), - DEVMETHOD(device_detach, uart_bus_detach), - - DEVMETHOD_END -}; - -static driver_t uart_soc_driver = { - uart_driver_name, - uart_soc_methods, - sizeof(struct uart_softc), -}; - -static int -uart_soc_probe(device_t dev) -{ - struct uart_softc *sc; - - if (pci_get_vendor(dev) != PCI_VENDOR_NETLOGIC || - pci_get_device(dev) != PCI_DEVICE_ID_NLM_UART) - return (ENXIO); - - sc = device_get_softc(dev); - sc->sc_class = &uart_ns8250_class; - device_set_desc(dev, "Netlogic SoC UART"); - return (uart_bus_probe(dev, 2, XLP_IO_CLK, 0, 0)); -} - -DRIVER_MODULE(uart_soc, pci, uart_soc_driver, uart_devclass, 0, 0); Property changes on: head/sys/mips/nlm/dev/uart_pci_xlp.c ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sys/mips/nlm/dev/cfi_pci_xlp.c =================================================================== --- head/sys/mips/nlm/dev/cfi_pci_xlp.c (revision 279383) +++ head/sys/mips/nlm/dev/cfi_pci_xlp.c (nonexistent) @@ -1,77 +0,0 @@ -/*- - * 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); Property changes on: head/sys/mips/nlm/dev/cfi_pci_xlp.c ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sys/mips/nlm/files.xlp =================================================================== --- head/sys/mips/nlm/files.xlp (revision 279383) +++ head/sys/mips/nlm/files.xlp (revision 279384) @@ -1,42 +1,39 @@ # $FreeBSD$ mips/nlm/hal/nlm_hal.c standard mips/nlm/hal/fmn.c standard mips/nlm/xlp_machdep.c standard mips/nlm/intr_machdep.c standard mips/nlm/tick.c standard mips/nlm/board.c standard mips/nlm/cms.c standard mips/nlm/bus_space_rmi.c standard mips/nlm/bus_space_rmi_pci.c standard mips/nlm/mpreset.S standard mips/nlm/board_eeprom.c standard mips/nlm/board_cpld.c standard +mips/nlm/xlp_simplebus.c optional fdt mips/nlm/xlp_pci.c optional pci mips/nlm/uart_cpu_xlp.c optional uart 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 mips/nlm/dev/net/mdio.c optional xlpge mips/nlm/dev/net/sgmii.c optional xlpge mips/nlm/dev/net/xaui.c optional xlpge mips/nlm/dev/net/xlpge.c optional xlpge ucore_app.bin optional xlpge \ compile-with "${CC} -EB -march=mips32 -mabi=32 -msoft-float -I. -I$S -O3 -funroll-loops -finline-limit=20000 -fno-tree-loop-optimize -fomit-frame-pointer -mno-branch-likely -fno-pic -mno-abicalls -ffunction-sections -fdata-sections -G0 -Wall -Werror -c $S/$M/nlm/dev/net/ucore/crt0_basic.S $S/$M/nlm/dev/net/ucore/ucore_app.c && ${LD} -melf32btsmip_fbsd -d -warn-common -T$S/$M/nlm/dev/net/ucore/ld.ucore.S crt0_basic.o ucore_app.o -o ucore_app && ${OBJCOPY} -S -O binary -R .note -R .comment ucore_app ${.TARGET}" \ no-obj no-implicit-rule before-depend \ clean "crt0_basic.o ucore_app.o ucore_app ucore_app.bin" ucore_app_bin.h optional xlpge \ dependency "ucore_app.bin" \ compile-with "file2c -sx 'static char ucore_app_bin[] = {' '};' < ucore_app.bin > ${.TARGET}" \ no-obj no-implicit-rule before-depend \ clean "ucore_app_bin.h" # # Security Driver # mips/nlm/dev/sec/nlmsec.c optional nlmsec mips/nlm/dev/sec/nlmseclib.c optional nlmsec mips/nlm/dev/sec/nlmrsa.c optional nlmrsa Index: head/sys/mips/nlm/xlp_pci.c =================================================================== --- head/sys/mips/nlm/xlp_pci.c (revision 279383) +++ head/sys/mips/nlm/xlp_pci.c (revision 279384) @@ -1,814 +1,574 @@ /*- * 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 #include #include #include #include #include #include +#include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "pcib_if.h" #include "pci_if.h" -#define EMUL_MEM_START 0x16000000UL -#define EMUL_MEM_END 0x18ffffffUL - -/* Override PCI a bit for SoC devices */ - -enum { - INTERNAL_DEV = 0x1, /* internal device, skip on enumeration */ - MEM_RES_EMUL = 0x2, /* no MEM or IO bar, custom res alloc */ - SHARED_IRQ = 0x4, - DEV_MMIO32 = 0x8, /* byte access not allowed to mmio */ -}; - -struct xlp_devinfo { - struct pci_devinfo pcidev; - int irq; - int flags; - u_long mem_res_start; -}; - -static struct resource * -xlp_pci_alloc_resource(device_t bus, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) -{ - struct resource *r; - struct xlp_devinfo *xlp_devinfo; - int busno; - - /* - * Do custom allocation for MEMORY resource for SoC device if - * MEM_RES_EMUL flag is set - */ - busno = pci_get_bus(child); - if ((type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) && busno == 0) { - xlp_devinfo = (struct xlp_devinfo *)device_get_ivars(child); - if ((xlp_devinfo->flags & MEM_RES_EMUL) != 0) { - /* no emulation for IO ports */ - if (type == SYS_RES_IOPORT) - return (NULL); - - start = xlp_devinfo->mem_res_start; - count = XLP_PCIE_CFG_SIZE - XLP_IO_PCI_HDRSZ; - - /* MMC needs to 2 slots with rids 16 and 20 and a - * fixup for size */ - if (pci_get_device(child) == PCI_DEVICE_ID_NLM_MMC) { - count = 0x100; - if (*rid == 16) - ; /* first slot already setup */ - else if (*rid == 20) - start += 0x100; /* second slot */ - else - return (NULL); - } - - end = start + count - 1; - r = BUS_ALLOC_RESOURCE(device_get_parent(bus), child, - type, rid, start, end, count, flags); - if (r == NULL) - return (NULL); - if ((xlp_devinfo->flags & DEV_MMIO32) != 0) - rman_set_bustag(r, rmi_uart_bus_space); - return (r); - } - } - - /* Not custom alloc, use PCI code */ - return (pci_alloc_resource(bus, child, type, rid, start, end, count, - flags)); -} - static int -xlp_pci_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) +xlp_pci_attach(device_t dev) { - u_long start; - - /* If custom alloc, handle that */ - start = rman_get_start(r); - if (type == SYS_RES_MEMORY && pci_get_bus(child) == 0 && - start >= EMUL_MEM_START && start <= EMUL_MEM_END) - return (BUS_RELEASE_RESOURCE(device_get_parent(bus), child, - type, rid, r)); - - /* use default PCI function */ - return (bus_generic_rl_release_resource(bus, child, type, rid, r)); -} - -static void -xlp_add_soc_child(device_t pcib, device_t dev, int b, int s, int f) -{ struct pci_devinfo *dinfo; - struct xlp_devinfo *xlp_dinfo; - int domain, node, irq, devoffset, flags; + device_t pcib; + int maxslots, s, f, pcifunchigh, irq; + int busno, node, devoffset; uint16_t devid; - - domain = pcib_get_domain(dev); - node = s / 8; - devoffset = XLP_HDR_OFFSET(node, 0, s % 8, f); - if (!nlm_dev_exists(devoffset)) - return; - - /* Find if there is a desc for the SoC device */ - devid = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVICE, 2); - flags = 0; - irq = 0; - switch (devid) { - case PCI_DEVICE_ID_NLM_UART: - irq = PIC_UART_0_IRQ + f; - flags = MEM_RES_EMUL | DEV_MMIO32; - break; - case PCI_DEVICE_ID_NLM_I2C: - flags = MEM_RES_EMUL | DEV_MMIO32; - break; - case PCI_DEVICE_ID_NLM_NOR: - flags = MEM_RES_EMUL; - break; - case PCI_DEVICE_ID_NLM_MMC: - irq = PIC_MMC_IRQ; - flags = MEM_RES_EMUL; - break; - case PCI_DEVICE_ID_NLM_EHCI: - irq = PIC_USB_0_IRQ + f; - break; - case PCI_DEVICE_ID_NLM_PCIE: - break; - case PCI_DEVICE_ID_NLM_ICI: - case PCI_DEVICE_ID_NLM_PIC: - case PCI_DEVICE_ID_NLM_FMN: - default: - return; - } - - dinfo = pci_read_device(pcib, domain, b, s, f, sizeof(*xlp_dinfo)); - if (dinfo == NULL) - return; - xlp_dinfo = (struct xlp_devinfo *)dinfo; - xlp_dinfo->irq = irq; - xlp_dinfo->flags = flags; - - /* SoC device with interrupts need fixup (except PCIe controllers) */ - if (irq != 0 && devid != PCI_DEVICE_ID_NLM_PCIE) - PCIB_WRITE_CONFIG(pcib, b, s, f, XLP_PCI_DEVSCRATCH_REG0 << 2, - (1 << 8) | irq, 4); - - /* memory resource from ecfg space, if MEM_RES_EMUL is set */ - if ((flags & MEM_RES_EMUL) != 0) - xlp_dinfo->mem_res_start = XLP_DEFAULT_IO_BASE + devoffset + - XLP_IO_PCI_HDRSZ; - pci_add_child(dev, dinfo); -} - -static int -xlp_pci_attach(device_t dev) -{ - device_t pcib = device_get_parent(dev); - int maxslots, s, f, pcifunchigh; - int busno; uint8_t hdrtype; /* * The on-chip devices are on a bus that is almost, but not * quite, completely like PCI. Add those things by hand. */ + pcib = device_get_parent(dev); busno = pcib_get_bus(dev); maxslots = PCIB_MAXSLOTS(pcib); for (s = 0; s <= maxslots; s++) { pcifunchigh = 0; f = 0; hdrtype = PCIB_READ_CONFIG(pcib, busno, s, f, PCIR_HDRTYPE, 1); if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) continue; if (hdrtype & PCIM_MFDEV) pcifunchigh = PCI_FUNCMAX; - for (f = 0; f <= pcifunchigh; f++) - xlp_add_soc_child(pcib, dev, busno, s, f); + node = s / 8; + for (f = 0; f <= pcifunchigh; f++) { + devoffset = XLP_HDR_OFFSET(node, 0, s % 8, f); + if (!nlm_dev_exists(devoffset)) + continue; + + /* Find if there is a desc for the SoC device */ + devid = PCIB_READ_CONFIG(pcib, busno, s, f, PCIR_DEVICE, 2); + + /* Skip devices that don't have a proper PCI header */ + switch (devid) { + case PCI_DEVICE_ID_NLM_ICI: + case PCI_DEVICE_ID_NLM_PIC: + case PCI_DEVICE_ID_NLM_FMN: + case PCI_DEVICE_ID_NLM_UART: + case PCI_DEVICE_ID_NLM_I2C: + case PCI_DEVICE_ID_NLM_NOR: + case PCI_DEVICE_ID_NLM_MMC: + continue; + case PCI_DEVICE_ID_NLM_EHCI: + irq = PIC_USB_IRQ(f); + PCIB_WRITE_CONFIG(pcib, busno, s, f, + XLP_PCI_DEVSCRATCH_REG0 << 2, + (1 << 8) | irq, 4); + } + dinfo = pci_read_device(pcib, pcib_get_domain(dev), + busno, s, f, sizeof(*dinfo)); + pci_add_child(dev, dinfo); + } } return (bus_generic_attach(dev)); } static int xlp_pci_probe(device_t dev) { device_t pcib; pcib = device_get_parent(dev); /* * Only the top level bus has SoC devices, leave the rest to * Generic PCI code */ if (strcmp(device_get_nameunit(pcib), "pcib0") != 0) return (ENXIO); device_set_desc(dev, "XLP SoCbus"); return (BUS_PROBE_DEFAULT); } static devclass_t pci_devclass; static device_method_t xlp_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, xlp_pci_probe), DEVMETHOD(device_attach, xlp_pci_attach), - DEVMETHOD(bus_alloc_resource, xlp_pci_alloc_resource), - DEVMETHOD(bus_release_resource, xlp_pci_release_resource), - DEVMETHOD_END }; DEFINE_CLASS_1(pci, xlp_pci_driver, xlp_pci_methods, sizeof(struct pci_softc), pci_driver); DRIVER_MODULE(xlp_pci, pcib, xlp_pci_driver, pci_devclass, 0, 0); -static struct rman irq_rman, port_rman, mem_rman, emul_rman; - -static void -xlp_pcib_init_resources(void) -{ - irq_rman.rm_start = 0; - irq_rman.rm_end = 255; - irq_rman.rm_type = RMAN_ARRAY; - irq_rman.rm_descr = "PCI Mapped Interrupts"; - if (rman_init(&irq_rman) - || rman_manage_region(&irq_rman, 0, 255)) - panic("pci_init_resources irq_rman"); - - port_rman.rm_start = 0; - port_rman.rm_end = ~0ul; - port_rman.rm_type = RMAN_ARRAY; - port_rman.rm_descr = "I/O ports"; - if (rman_init(&port_rman) - || rman_manage_region(&port_rman, PCIE_IO_BASE, PCIE_IO_LIMIT)) - panic("pci_init_resources port_rman"); - - mem_rman.rm_start = 0; - mem_rman.rm_end = ~0ul; - mem_rman.rm_type = RMAN_ARRAY; - mem_rman.rm_descr = "I/O memory"; - if (rman_init(&mem_rman) - || rman_manage_region(&mem_rman, PCIE_MEM_BASE, PCIE_MEM_LIMIT)) - panic("pci_init_resources mem_rman"); - - /* - * This includes the GBU (nor flash) memory range and the PCIe - * memory area. - */ - emul_rman.rm_start = 0; - emul_rman.rm_end = ~0ul; - emul_rman.rm_type = RMAN_ARRAY; - emul_rman.rm_descr = "Emulated MEMIO"; - if (rman_init(&emul_rman) - || rman_manage_region(&emul_rman, EMUL_MEM_START, EMUL_MEM_END)) - panic("pci_init_resources emul_rman"); -} - static int xlp_pcib_probe(device_t dev) { if (ofw_bus_is_compatible(dev, "netlogic,xlp-pci")) { device_set_desc(dev, "XLP PCI bus"); return (BUS_PROBE_DEFAULT); } return (ENXIO); } static int xlp_pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { switch (which) { case PCIB_IVAR_DOMAIN: *result = 0; return (0); case PCIB_IVAR_BUS: *result = 0; return (0); } return (ENOENT); } static int xlp_pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t result) { switch (which) { case PCIB_IVAR_DOMAIN: return (EINVAL); case PCIB_IVAR_BUS: return (EINVAL); } return (ENOENT); } static int xlp_pcib_maxslots(device_t dev) { return (PCI_SLOTMAX); } static u_int32_t xlp_pcib_read_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, int width) { uint32_t data = 0; uint64_t cfgaddr; int regindex = reg/sizeof(uint32_t); cfgaddr = nlm_pcicfg_base(XLP_HDR_OFFSET(0, b, s, f)); if ((width == 2) && (reg & 1)) return 0xFFFFFFFF; else if ((width == 4) && (reg & 3)) return 0xFFFFFFFF; /* * The intline and int pin of SoC devices are DOA, except * for bridges (slot %8 == 1). * use the values we stashed in a writable PCI scratch reg. */ if (b == 0 && regindex == 0xf && s % 8 > 1) regindex = XLP_PCI_DEVSCRATCH_REG0; data = nlm_read_pci_reg(cfgaddr, regindex); if (width == 1) return ((data >> ((reg & 3) << 3)) & 0xff); else if (width == 2) return ((data >> ((reg & 3) << 3)) & 0xffff); else return (data); } static void xlp_pcib_write_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, u_int32_t val, int width) { uint64_t cfgaddr; uint32_t data = 0; int regindex = reg / sizeof(uint32_t); cfgaddr = nlm_pcicfg_base(XLP_HDR_OFFSET(0, b, s, f)); if ((width == 2) && (reg & 1)) return; else if ((width == 4) && (reg & 3)) return; if (width == 1) { data = nlm_read_pci_reg(cfgaddr, regindex); data = (data & ~(0xff << ((reg & 3) << 3))) | (val << ((reg & 3) << 3)); } else if (width == 2) { data = nlm_read_pci_reg(cfgaddr, regindex); data = (data & ~(0xffff << ((reg & 3) << 3))) | (val << ((reg & 3) << 3)); } else { data = val; } /* * use shadow reg for intpin/intline which are dead */ if (b == 0 && regindex == 0xf && s % 8 > 1) regindex = XLP_PCI_DEVSCRATCH_REG0; nlm_write_pci_reg(cfgaddr, regindex, data); } /* * Enable byte swap in hardware when compiled big-endian. * Programs a link's PCIe SWAP regions from the link's IO and MEM address * ranges. */ static void xlp_pcib_hardware_swap_enable(int node, int link) { #if BYTE_ORDER == BIG_ENDIAN uint64_t bbase, linkpcibase; uint32_t bar; int pcieoffset; pcieoffset = XLP_IO_PCIE_OFFSET(node, link); if (!nlm_dev_exists(pcieoffset)) return; bbase = nlm_get_bridge_regbase(node); linkpcibase = nlm_pcicfg_base(pcieoffset); bar = nlm_read_bridge_reg(bbase, BRIDGE_PCIEMEM_BASE0 + link); nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_MEM_BASE, bar); bar = nlm_read_bridge_reg(bbase, BRIDGE_PCIEMEM_LIMIT0 + link); nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_MEM_LIM, bar | 0xFFF); bar = nlm_read_bridge_reg(bbase, BRIDGE_PCIEIO_BASE0 + link); nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_IO_BASE, bar); bar = nlm_read_bridge_reg(bbase, BRIDGE_PCIEIO_LIMIT0 + link); nlm_write_pci_reg(linkpcibase, PCIE_BYTE_SWAP_IO_LIM, bar | 0xFFF); #endif } static int xlp_pcib_attach(device_t dev) { int node, link; - xlp_pcib_init_resources(); - /* enable hardware swap on all nodes/links */ for (node = 0; node < XLP_MAX_NODES; node++) for (link = 0; link < 4; link++) xlp_pcib_hardware_swap_enable(node, link); device_add_child(dev, "pci", 0); bus_generic_attach(dev); return (0); } /* * XLS PCIe can have upto 4 links, and each link has its on IRQ * Find the link on which the device is on */ static int xlp_pcie_link(device_t pcib, device_t dev) { device_t parent, tmp; /* find the lane on which the slot is connected to */ tmp = dev; while (1) { parent = device_get_parent(tmp); if (parent == NULL || parent == pcib) { device_printf(dev, "Cannot find parent bus\n"); return (-1); } if (strcmp(device_get_nameunit(parent), "pci0") == 0) break; tmp = parent; } return (pci_get_function(tmp)); } static int xlp_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs) { int i, link; /* * Each link has 32 MSIs that can be allocated, but for now * we only support one device per link. * msi_alloc() equivalent is needed when we start supporting * bridges on the PCIe link. */ link = xlp_pcie_link(pcib, dev); if (link == -1) return (ENXIO); /* * encode the irq so that we know it is a MSI interrupt when we * setup interrupts */ for (i = 0; i < count; i++) irqs[i] = 64 + link * 32 + i; return (0); } static int xlp_release_msi(device_t pcib, device_t dev, int count, int *irqs) { return (0); } static int xlp_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr, uint32_t *data) { int link; if (irq < 64) { device_printf(dev, "%s: map_msi for irq %d - ignored", device_get_nameunit(pcib), irq); return (ENXIO); } link = (irq - 64) / 32; *addr = MIPS_MSI_ADDR(0); *data = MIPS_MSI_DATA(PIC_PCIE_IRQ(link)); return (0); } static void bridge_pcie_ack(int irq, void *arg) { uint32_t node,reg; uint64_t base; node = nlm_nodeid(); reg = PCIE_MSI_STATUS; switch (irq) { case PIC_PCIE_0_IRQ: base = nlm_pcicfg_base(XLP_IO_PCIE0_OFFSET(node)); break; case PIC_PCIE_1_IRQ: base = nlm_pcicfg_base(XLP_IO_PCIE1_OFFSET(node)); break; case PIC_PCIE_2_IRQ: base = nlm_pcicfg_base(XLP_IO_PCIE2_OFFSET(node)); break; case PIC_PCIE_3_IRQ: base = nlm_pcicfg_base(XLP_IO_PCIE3_OFFSET(node)); break; default: return; } nlm_write_pci_reg(base, reg, 0xFFFFFFFF); return; } static int mips_platform_pcib_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { int error = 0; int xlpirq; error = rman_activate_resource(irq); if (error) return error; if (rman_get_start(irq) != rman_get_end(irq)) { device_printf(dev, "Interrupt allocation %lu != %lu\n", rman_get_start(irq), rman_get_end(irq)); return (EINVAL); } xlpirq = rman_get_start(irq); if (xlpirq == 0) return (0); if (strcmp(device_get_name(dev), "pcib") != 0) return (0); /* * temporary hack for MSI, we support just one device per * link, and assign the link interrupt to the device interrupt */ if (xlpirq >= 64) { int node, val, link; uint64_t base; xlpirq -= 64; if (xlpirq % 32 != 0) return (0); node = nlm_nodeid(); link = xlpirq / 32; base = nlm_pcicfg_base(XLP_IO_PCIE_OFFSET(node,link)); /* MSI Interrupt Vector enable at bridge's configuration */ nlm_write_pci_reg(base, PCIE_MSI_EN, PCIE_MSI_VECTOR_INT_EN); val = nlm_read_pci_reg(base, PCIE_INT_EN0); /* MSI Interrupt enable at bridge's configuration */ nlm_write_pci_reg(base, PCIE_INT_EN0, (val | PCIE_MSI_INT_EN)); /* legacy interrupt disable at bridge */ val = nlm_read_pci_reg(base, PCIE_BRIDGE_CMD); nlm_write_pci_reg(base, PCIE_BRIDGE_CMD, (val | PCIM_CMD_INTxDIS)); /* MSI address update at bridge */ nlm_write_pci_reg(base, PCIE_BRIDGE_MSI_ADDRL, MSI_MIPS_ADDR_BASE); nlm_write_pci_reg(base, PCIE_BRIDGE_MSI_ADDRH, 0); val = nlm_read_pci_reg(base, PCIE_BRIDGE_MSI_CAP); /* MSI capability enable at bridge */ nlm_write_pci_reg(base, PCIE_BRIDGE_MSI_CAP, (val | (PCIM_MSICTRL_MSI_ENABLE << 16) | (PCIM_MSICTRL_MMC_32 << 16))); xlpirq = PIC_PCIE_IRQ(link); } /* if it is for real PCIe, we need to ack at bridge too */ if (xlpirq >= PIC_PCIE_IRQ(0) && xlpirq <= PIC_PCIE_IRQ(3)) xlp_set_bus_ack(xlpirq, bridge_pcie_ack, NULL); cpu_establish_hardintr(device_get_name(child), filt, intr, arg, xlpirq, flags, cookiep); return (0); } static int mips_platform_pcib_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie) { if (strcmp(device_get_name(child), "pci") == 0) { /* if needed reprogram the pic to clear pcix related entry */ device_printf(dev, "teardown intr\n"); } return (bus_generic_teardown_intr(dev, child, irq, cookie)); } -static struct resource * -xlp_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) -{ - struct rman *rm = NULL; - struct resource *rv; - void *va; - int needactivate = flags & RF_ACTIVE; - - switch (type) { - case SYS_RES_IRQ: - rm = &irq_rman; - break; - - case SYS_RES_IOPORT: - rm = &port_rman; - break; - - case SYS_RES_MEMORY: - if (start >= EMUL_MEM_START && start <= EMUL_MEM_END) - rm = &emul_rman; - else - rm = &mem_rman; - break; - - default: - return (0); - } - - rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == NULL) - return (NULL); - - rman_set_rid(rv, *rid); - - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - va = pmap_mapdev(start, count); - rman_set_bushandle(rv, (bus_space_handle_t)va); - rman_set_bustag(rv, rmi_bus_space); - } - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv)) { - rman_release_resource(rv); - return (NULL); - } - } - return (rv); -} - static int -xlp_pcib_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - - return (rman_release_resource(r)); -} - -static int -xlp_pcib_activate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - - return (rman_activate_resource(r)); -} - -static int -xlp_pcib_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - - return (rman_deactivate_resource(r)); -} - -static int mips_pcib_route_interrupt(device_t bus, device_t dev, int pin) { int f, d; /* * Validate requested pin number. */ if ((pin < 1) || (pin > 4)) return (255); if (pci_get_bus(dev) == 0 && pci_get_vendor(dev) == PCI_VENDOR_NETLOGIC) { f = pci_get_function(dev); d = pci_get_slot(dev) % 8; /* * For PCIe links, return link IRT, for other SoC devices * get the IRT from its PCIe header */ if (d == 1) return (PIC_PCIE_IRQ(f)); else return (255); /* use intline, don't reroute */ } else { /* Regular PCI devices */ return (PIC_PCIE_IRQ(xlp_pcie_link(bus, dev))); } } static device_method_t xlp_pcib_methods[] = { /* Device interface */ DEVMETHOD(device_probe, xlp_pcib_probe), DEVMETHOD(device_attach, xlp_pcib_attach), /* Bus interface */ DEVMETHOD(bus_read_ivar, xlp_pcib_read_ivar), DEVMETHOD(bus_write_ivar, xlp_pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, xlp_pcib_alloc_resource), - DEVMETHOD(bus_release_resource, xlp_pcib_release_resource), - DEVMETHOD(bus_activate_resource, xlp_pcib_activate_resource), - DEVMETHOD(bus_deactivate_resource, xlp_pcib_deactivate_resource), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, mips_platform_pcib_setup_intr), DEVMETHOD(bus_teardown_intr, mips_platform_pcib_teardown_intr), /* pcib interface */ DEVMETHOD(pcib_maxslots, xlp_pcib_maxslots), DEVMETHOD(pcib_read_config, xlp_pcib_read_config), DEVMETHOD(pcib_write_config, xlp_pcib_write_config), DEVMETHOD(pcib_route_interrupt, mips_pcib_route_interrupt), DEVMETHOD(pcib_alloc_msi, xlp_alloc_msi), DEVMETHOD(pcib_release_msi, xlp_release_msi), DEVMETHOD(pcib_map_msi, xlp_map_msi), DEVMETHOD_END }; static driver_t xlp_pcib_driver = { "pcib", xlp_pcib_methods, 1, /* no softc */ }; static devclass_t pcib_devclass; DRIVER_MODULE(xlp_pcib, simplebus, xlp_pcib_driver, pcib_devclass, 0, 0); Index: head/sys/mips/nlm/xlp_simplebus.c =================================================================== --- head/sys/mips/nlm/xlp_simplebus.c (nonexistent) +++ head/sys/mips/nlm/xlp_simplebus.c (revision 279384) @@ -0,0 +1,323 @@ +/*- + * Copyright (c) 2015 Broadcom Corporation + * (based on sys/dev/fdt/simplebus.c) + * Copyright (c) 2013 Nathan Whitehorn + * 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 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 AUTHOR 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 + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +/* flash memory region for chipselects */ +#define GBU_MEM_BASE 0x16000000UL +#define GBU_MEM_LIMIT 0x17ffffffUL + +/* + * Device registers in pci ecfg memory region for devices without regular PCI BARs + */ +#define PCI_ECFG_BASE XLP_DEFAULT_IO_BASE +#define PCI_ECFG_LIMIT (XLP_DEFAULT_IO_BASE + 0x0fffffff) + +/* + * Bus interface. + */ +static int xlp_simplebus_probe(device_t dev); +static struct resource *xlp_simplebus_alloc_resource(device_t, device_t, int, + int *, u_long, u_long, u_long, u_int); +static int xlp_simplebus_activate_resource(device_t, device_t, int, + int, struct resource *); +static int xlp_simplebus_setup_intr(device_t, device_t, + struct resource *, int, driver_filter_t *, driver_intr_t *, void *, void **); + +/* + * ofw_bus interface + */ +static int xlp_simplebus_ofw_map_intr(device_t, device_t, phandle_t, + int, pcell_t *); + +static devclass_t simplebus_devclass; +static device_method_t xlp_simplebus_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, xlp_simplebus_probe), + + DEVMETHOD(bus_alloc_resource, xlp_simplebus_alloc_resource), + DEVMETHOD(bus_activate_resource, xlp_simplebus_activate_resource), + DEVMETHOD(bus_setup_intr, xlp_simplebus_setup_intr), + + DEVMETHOD(ofw_bus_map_intr, xlp_simplebus_ofw_map_intr), + DEVMETHOD_END +}; + +DEFINE_CLASS_1(simplebus, xlp_simplebus_driver, xlp_simplebus_methods, + sizeof(struct simplebus_softc), simplebus_driver); +DRIVER_MODULE(xlp_simplebus, ofwbus, xlp_simplebus_driver, simplebus_devclass, + 0, 0); + +static struct rman irq_rman, port_rman, mem_rman, pci_ecfg_rman, gbu_rman; + +static void +xlp_simplebus_init_resources(void) +{ + irq_rman.rm_start = 0; + irq_rman.rm_end = 255; + irq_rman.rm_type = RMAN_ARRAY; + irq_rman.rm_descr = "PCI Mapped Interrupts"; + if (rman_init(&irq_rman) + || rman_manage_region(&irq_rman, 0, 255)) + panic("xlp_simplebus_init_resources irq_rman"); + + port_rman.rm_start = 0; + port_rman.rm_end = ~0ul; + port_rman.rm_type = RMAN_ARRAY; + port_rman.rm_descr = "I/O ports"; + if (rman_init(&port_rman) + || rman_manage_region(&port_rman, PCIE_IO_BASE, PCIE_IO_LIMIT)) + panic("xlp_simplebus_init_resources port_rman"); + + mem_rman.rm_start = 0; + mem_rman.rm_end = ~0ul; + mem_rman.rm_type = RMAN_ARRAY; + mem_rman.rm_descr = "I/O memory"; + if (rman_init(&mem_rman) + || rman_manage_region(&mem_rman, PCIE_MEM_BASE, PCIE_MEM_LIMIT)) + panic("xlp_simplebus_init_resources mem_rman"); + + pci_ecfg_rman.rm_start = 0; + pci_ecfg_rman.rm_end = ~0ul; + pci_ecfg_rman.rm_type = RMAN_ARRAY; + pci_ecfg_rman.rm_descr = "PCI ECFG IO"; + if (rman_init(&pci_ecfg_rman) || rman_manage_region(&pci_ecfg_rman, + PCI_ECFG_BASE, PCI_ECFG_LIMIT)) + panic("xlp_simplebus_init_resources pci_ecfg_rman"); + + gbu_rman.rm_start = 0; + gbu_rman.rm_end = ~0ul; + gbu_rman.rm_type = RMAN_ARRAY; + gbu_rman.rm_descr = "Flash region"; + if (rman_init(&gbu_rman) + || rman_manage_region(&gbu_rman, GBU_MEM_BASE, GBU_MEM_LIMIT)) + panic("xlp_simplebus_init_resources gbu_rman"); +} + +static int +xlp_simplebus_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + /* + * FDT data puts a "simple-bus" compatible string on many things that + * have children but aren't really busses in our world. Without a + * ranges property we will fail to attach, so just fail to probe too. + */ + if (!(ofw_bus_is_compatible(dev, "simple-bus") && + ofw_bus_has_prop(dev, "ranges")) && + (ofw_bus_get_type(dev) == NULL || strcmp(ofw_bus_get_type(dev), + "soc") != 0)) + return (ENXIO); + + xlp_simplebus_init_resources(); + device_set_desc(dev, "XLP SoC bus"); + + return (BUS_PROBE_SPECIFIC); +} + +static struct resource * +xlp_simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + struct rman *rm; + struct resource *rv; + struct resource_list_entry *rle; + struct simplebus_softc *sc; + struct simplebus_devinfo *di; + bus_space_tag_t bustag; + int j, isdefault, passthrough, needsactivate; + + passthrough = (device_get_parent(child) != bus); + needsactivate = flags & RF_ACTIVE; + sc = device_get_softc(bus); + di = device_get_ivars(child); + rle = NULL; + bustag = NULL; + + if (!passthrough) { + isdefault = (start == 0UL && end == ~0UL); + if (isdefault) { + rle = resource_list_find(&di->rl, type, *rid); + if (rle == NULL) + return (NULL); + if (rle->res != NULL) + panic("%s: resource entry is busy", __func__); + start = rle->start; + count = ulmax(count, rle->count); + end = ulmax(rle->end, start + count - 1); + } + if (type == SYS_RES_MEMORY) { + /* Remap through ranges property */ + for (j = 0; j < sc->nranges; j++) { + if (start >= sc->ranges[j].bus && end < + sc->ranges[j].bus + sc->ranges[j].size) { + start -= sc->ranges[j].bus; + start += sc->ranges[j].host; + end -= sc->ranges[j].bus; + end += sc->ranges[j].host; + break; + } + } + if (j == sc->nranges && sc->nranges != 0) { + if (bootverbose) + device_printf(bus, "Could not map resource " + "%#lx-%#lx\n", start, end); + return (NULL); + } + } + } + switch (type) { + case SYS_RES_IRQ: + rm = &irq_rman; + break; + case SYS_RES_IOPORT: + rm = &port_rman; + bustag = rmi_bus_space; + break; + case SYS_RES_MEMORY: + if (start >= GBU_MEM_BASE && end <= GBU_MEM_LIMIT) { + rm = &gbu_rman; + bustag = rmi_bus_space; + } else if (start >= PCI_ECFG_BASE && end <= PCI_ECFG_LIMIT) { + rm = &pci_ecfg_rman; + bustag = rmi_uart_bus_space; + } else if (start >= PCIE_MEM_BASE && end <= PCIE_MEM_LIMIT) { + rm = &mem_rman; + bustag = rmi_bus_space; + } else { + if (bootverbose) + device_printf(bus, "Invalid MEM range" + "%#lx-%#lx\n", start, end); + return (NULL); + } + break; + default: + return (NULL); + } + + rv = rman_reserve_resource(rm, start, end, count, flags, child); + if (rv == 0) { + device_printf(bus, "%s: could not reserve resource for %s\n", + __func__, device_get_nameunit(child)); + return (NULL); + } + + rman_set_rid(rv, *rid); + if (bustag != NULL) + rman_set_bustag(rv, bustag); + + if (needsactivate) { + if (bus_activate_resource(child, type, *rid, rv)) { + device_printf(bus, "%s: could not activate resource\n", + __func__); + rman_release_resource(rv); + return (NULL); + } + } + + return (rv); +} + +static int +xlp_simplebus_activate_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + void *vaddr; + vm_paddr_t paddr; + vm_size_t psize; + + /* + * If this is a memory resource, use pmap_mapdev to map it. + */ + if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { + paddr = rman_get_start(r); + psize = rman_get_size(r); + vaddr = pmap_mapdev(paddr, psize); + + rman_set_virtual(r, vaddr); + rman_set_bushandle(r, (bus_space_handle_t)(uintptr_t)vaddr); + } + + return (rman_activate_resource(r)); +} + +static int +xlp_simplebus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) +{ + register_t s; + int irq; + + /* setup irq */ + s = intr_disable(); + irq = rman_get_start(res); + cpu_establish_hardintr(device_get_nameunit(child), filt, intr, arg, + irq, flags, cookiep); + intr_restore(s); + return (0); +} + +static int +xlp_simplebus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, + pcell_t *irq) +{ + + return ((int)irq[0]); +} Property changes on: head/sys/mips/nlm/xlp_simplebus.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property