Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 82721f53a8a40d533716c30cbb5a4661d886bef6) +++ uspace/Makefile (revision c501bc4364ecfead182958bc0b7c059b09e5cf4e) @@ -188,4 +188,11 @@ endif +ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb)) + DIRS += \ + drv/infrastructure/rootmalta \ + drv/bus/pci/pciintel \ + drv/bus/isa +endif + ifeq ($(UARCH),ppc32) DIRS += \ Index: uspace/drv/infrastructure/rootmalta/Makefile =================================================================== --- uspace/drv/infrastructure/rootmalta/Makefile (revision c501bc4364ecfead182958bc0b7c059b09e5cf4e) +++ uspace/drv/infrastructure/rootmalta/Makefile (revision c501bc4364ecfead182958bc0b7c059b09e5cf4e) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Lenka Trochtova +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - 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. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# 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. +# + +USPACE_PREFIX = ../../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = rootmalta + +SOURCES = \ + rootmalta.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/infrastructure/rootmalta/rootmalta.c =================================================================== --- uspace/drv/infrastructure/rootmalta/rootmalta.c (revision c501bc4364ecfead182958bc0b7c059b09e5cf4e) +++ uspace/drv/infrastructure/rootmalta/rootmalta.c (revision c501bc4364ecfead182958bc0b7c059b09e5cf4e) @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2010 Lenka Trochtova + * Copyright (c) 2013 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * 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. + */ + +/** + * @defgroup root_malta Malta board platform driver. + * @brief HelenOS Malta board platform driver. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#define NAME "rootmalta" + +#define GT_BASE UINT32_C(0x1be00000) +#define GT_SIZE (2 * 1024 * 1024) + +#define GT_PCI_CMD 0xc00 +#define GT_PCI_CONFADDR 0xcf8 +#define GT_PCI_CONFDATA 0xcfc + +#define GT_PCI_CMD_MBYTESWAP 0x1 + +typedef struct rootmalta_fun { + hw_resource_list_t hw_resources; +} rootmalta_fun_t; + +static int rootmalta_dev_add(ddf_dev_t *dev); +static void root_malta_init(void); + +/** The root device driver's standard operations. */ +static driver_ops_t rootmalta_ops = { + .dev_add = &rootmalta_dev_add +}; + +/** The root device driver structure. */ +static driver_t rootmalta_driver = { + .name = NAME, + .driver_ops = &rootmalta_ops +}; + +static hw_resource_t pci_conf_regs[] = { + { + .type = IO_RANGE, + .res.io_range = { + .address = GT_BASE + GT_PCI_CONFADDR, + .size = 4, + .endianness = LITTLE_ENDIAN + } + }, + { + .type = IO_RANGE, + .res.io_range = { + .address = GT_BASE + GT_PCI_CONFDATA, + .size = 4, + .endianness = LITTLE_ENDIAN + } + } +}; + +static rootmalta_fun_t pci_data = { + .hw_resources = { + sizeof(pci_conf_regs) / sizeof(pci_conf_regs[0]), + pci_conf_regs + } +}; + +/** Obtain function soft-state from DDF function node */ +static rootmalta_fun_t *rootmalta_fun(ddf_fun_t *fnode) +{ + return ddf_fun_data_get(fnode); +} + +static hw_resource_list_t *rootmalta_get_resources(ddf_fun_t *fnode) +{ + rootmalta_fun_t *fun = rootmalta_fun(fnode); + + assert(fun != NULL); + return &fun->hw_resources; +} + +static bool rootmalta_enable_interrupt(ddf_fun_t *fun) +{ + /* TODO */ + + return false; +} + +static hw_res_ops_t fun_hw_res_ops = { + .get_resource_list = &rootmalta_get_resources, + .enable_interrupt = &rootmalta_enable_interrupt, +}; + +/* Initialized in root_malta_init() function. */ +static ddf_dev_ops_t rootmalta_fun_ops; + +static bool +rootmalta_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id, + rootmalta_fun_t *fun_proto) +{ + ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); + + ddf_fun_t *fnode = NULL; + int rc; + + /* Create new device. */ + fnode = ddf_fun_create(dev, fun_inner, name); + if (fnode == NULL) + goto failure; + + rootmalta_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(rootmalta_fun_t)); + *fun = *fun_proto; + + /* Add match ID */ + rc = ddf_fun_add_match_id(fnode, str_match_id, 100); + if (rc != EOK) + goto failure; + + /* Set provided operations to the device. */ + ddf_fun_set_ops(fnode, &rootmalta_fun_ops); + + /* Register function. */ + if (ddf_fun_bind(fnode) != EOK) { + ddf_msg(LVL_ERROR, "Failed binding function %s.", name); + goto failure; + } + + return true; + +failure: + if (fnode != NULL) + ddf_fun_destroy(fnode); + + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); + + return false; +} + +static bool rootmalta_add_functions(ddf_dev_t *dev) +{ + return rootmalta_add_fun(dev, "pci0", "intel_pci", &pci_data); +} + +/** Get the root device. + * + * @param dev The device which is root of the whole device tree (both + * of HW and pseudo devices). + * @return Zero on success, negative error number otherwise. + */ +static int rootmalta_dev_add(ddf_dev_t *dev) +{ + ioport32_t *gt; + uint32_t val; + int ret; + + ddf_msg(LVL_DEBUG, "rootmalta_dev_add, device handle = %d", + (int)ddf_dev_get_handle(dev)); + + /* + * We need to disable byte swapping of the outgoing and incoming + * PCI data, because the PCI driver assumes no byte swapping behind + * the scenes and takes care of it itself. + */ + ret = pio_enable((void *) GT_BASE, GT_SIZE, (void **) >); + if (ret != EOK) + return ret; + val = uint32_t_le2host(pio_read_32( + >[GT_PCI_CMD / sizeof(ioport32_t)])); + val |= GT_PCI_CMD_MBYTESWAP; + pio_write_32( + >[GT_PCI_CMD / sizeof(ioport32_t)], host2uint32_t_le(val)); + + + /* Register functions. */ + if (!rootmalta_add_functions(dev)) { + ddf_msg(LVL_ERROR, "Failed to add functions for the Malta platform."); + } + + return EOK; +} + +static void root_malta_init(void) +{ + ddf_log_init(NAME); + rootmalta_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops; +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": HelenOS Malta platform driver\n"); + root_malta_init(); + return ddf_driver_main(&rootmalta_driver); +} + +/** + * @} + */ Index: uspace/drv/infrastructure/rootmalta/rootmalta.ma =================================================================== --- uspace/drv/infrastructure/rootmalta/rootmalta.ma (revision c501bc4364ecfead182958bc0b7c059b09e5cf4e) +++ uspace/drv/infrastructure/rootmalta/rootmalta.ma (revision c501bc4364ecfead182958bc0b7c059b09e5cf4e) @@ -0,0 +1,1 @@ +10 platform/malta