Index: uspace/drv/intctl/obio/Makefile =================================================================== --- uspace/drv/intctl/obio/Makefile (revision be1b1e6839cb14854c85b8177b374d75b272007e) +++ uspace/drv/intctl/obio/Makefile (revision be1b1e6839cb14854c85b8177b374d75b272007e) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 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. +# + +USPACE_PREFIX = ../../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = obio + +SOURCES = \ + main.c \ + obio.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/intctl/obio/main.c =================================================================== --- uspace/drv/intctl/obio/main.c (revision be1b1e6839cb14854c85b8177b374d75b272007e) +++ uspace/drv/intctl/obio/main.c (revision be1b1e6839cb14854c85b8177b374d75b272007e) @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2017 Jiri Svoboda + * 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. + */ + +/** @addtogroup genarch + * @{ + */ +/** @file OBIO driver + */ + +#include +#include +#include +#include +#include + +#include "obio.h" + +#define NAME "obio" + +static int obio_dev_add(ddf_dev_t *dev); +static int obio_dev_remove(ddf_dev_t *dev); +static int obio_dev_gone(ddf_dev_t *dev); +static int obio_fun_online(ddf_fun_t *fun); +static int obio_fun_offline(ddf_fun_t *fun); + +static driver_ops_t driver_ops = { + .dev_add = obio_dev_add, + .dev_remove = obio_dev_remove, + .dev_gone = obio_dev_gone, + .fun_online = obio_fun_online, + .fun_offline = obio_fun_offline +}; + +static driver_t obio_driver = { + .name = NAME, + .driver_ops = &driver_ops +}; + +static int obio_get_res(ddf_dev_t *dev, obio_res_t *res) +{ + async_sess_t *parent_sess; + hw_res_list_parsed_t hw_res; + int rc; + + parent_sess = ddf_dev_parent_sess_get(dev); + if (parent_sess == NULL) + return ENOMEM; + + hw_res_list_parsed_init(&hw_res); + rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0); + if (rc != EOK) + return rc; + + if (hw_res.mem_ranges.count != 1) { + rc = EINVAL; + goto error; + } + + res->base = RNGABS(hw_res.mem_ranges.ranges[0]); + + return EOK; +error: + hw_res_list_parsed_clean(&hw_res); + return rc; +} + +static int obio_dev_add(ddf_dev_t *dev) +{ + obio_t *obio; + obio_res_t obio_res; + int rc; + + ddf_msg(LVL_DEBUG, "obio_dev_add(%p)", dev); + obio = ddf_dev_data_alloc(dev, sizeof(obio_t)); + if (obio == NULL) { + ddf_msg(LVL_ERROR, "Failed allocating soft state."); + return ENOMEM; + } + + obio->dev = dev; + + rc = obio_get_res(dev, &obio_res); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Failed getting hardware resource list.\n"); + return EIO; + } + + return obio_add(obio, &obio_res); +} + +static int obio_dev_remove(ddf_dev_t *dev) +{ + obio_t *obio = (obio_t *)ddf_dev_data_get(dev); + + ddf_msg(LVL_DEBUG, "obio_dev_remove(%p)", dev); + + return obio_remove(obio); +} + +static int obio_dev_gone(ddf_dev_t *dev) +{ + obio_t *obio = (obio_t *)ddf_dev_data_get(dev); + + ddf_msg(LVL_DEBUG, "obio_dev_gone(%p)", dev); + + return obio_gone(obio); +} + +static int obio_fun_online(ddf_fun_t *fun) +{ + ddf_msg(LVL_DEBUG, "obio_fun_online()"); + return ddf_fun_online(fun); +} + +static int obio_fun_offline(ddf_fun_t *fun) +{ + ddf_msg(LVL_DEBUG, "obio_fun_offline()"); + return ddf_fun_offline(fun); +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": OBIO driver\n"); + ddf_log_init(NAME); + return ddf_driver_main(&obio_driver); +} + +/** @} + */ Index: uspace/drv/intctl/obio/obio.c =================================================================== --- uspace/drv/intctl/obio/obio.c (revision be1b1e6839cb14854c85b8177b374d75b272007e) +++ uspace/drv/intctl/obio/obio.c (revision be1b1e6839cb14854c85b8177b374d75b272007e) @@ -0,0 +1,177 @@ +/* + * Copyright (c) 2009 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. + */ + +/** @addtogroup obio + * @{ + */ + +/** + * @file obio.c + * @brief OBIO driver. + * + * OBIO is a short for on-board I/O. On UltraSPARC IIi and systems with U2P, + * there is a piece of the root PCI bus controller address space, which + * contains interrupt mapping and clear registers for all on-board devices. + * Although UltraSPARC IIi and U2P are different in general, these registers can + * be found at the same addresses. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "obio.h" + +#define NAME "obio" + +#define OBIO_SIZE 0x1898 + +#define OBIO_IMR_BASE 0x200 +#define OBIO_IMR(ino) (OBIO_IMR_BASE + ((ino) & INO_MASK)) + +#define OBIO_CIR_BASE 0x300 +#define OBIO_CIR(ino) (OBIO_CIR_BASE + ((ino) & INO_MASK)) + +#define INO_MASK 0x1f + +static uintptr_t base_phys; +static volatile uint64_t *base_virt = (volatile uint64_t *) AS_AREA_ANY; + +/** Handle one connection to obio. + * + * @param iid Hash of the request that opened the connection. + * @param icall Call data of the request that opened the connection. + * @param arg Local argument. + */ +static void obio_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + ipc_callid_t callid; + ipc_call_t call; + + /* + * Answer the first IPC_M_CONNECT_ME_TO call. + */ + async_answer_0(iid, EOK); + + while (1) { + int inr; + + callid = async_get_call(&call); + switch (IPC_GET_IMETHOD(call)) { + case IRC_ENABLE_INTERRUPT: + inr = IPC_GET_ARG1(call); + base_virt[OBIO_IMR(inr & INO_MASK)] |= (1UL << 31); + async_answer_0(callid, EOK); + break; + case IRC_DISABLE_INTERRUPT: + /* XXX TODO */ + async_answer_0(callid, EOK); + break; + case IRC_CLEAR_INTERRUPT: + inr = IPC_GET_ARG1(call); + base_virt[OBIO_CIR(inr & INO_MASK)] = 0; + async_answer_0(callid, EOK); + break; + default: + async_answer_0(callid, EINVAL); + break; + } + } +} + +/** Add OBIO device. */ +int obio_add(obio_t *obio, obio_res_t *res) +{ + ddf_fun_t *fun_a = NULL; + int rc; + + base_phys = (uintptr_t) 0x1fe00000000ULL; + + int flags = AS_AREA_READ | AS_AREA_WRITE; + int retval = physmem_map(base_phys, + ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags, + (void *) &base_virt); + + if (retval < 0) { + ddf_msg(LVL_ERROR, "Error mapping OBIO registers"); + rc = EIO; + goto error; + } + + ddf_msg(LVL_NOTE, "OBIO registers with base at 0x%" PRIun, base_phys); + + fun_a = ddf_fun_create(obio->dev, fun_exposed, "a"); + if (fun_a == NULL) { + ddf_msg(LVL_ERROR, "Failed creating function 'a'."); + rc = ENOMEM; + goto error; + } + + ddf_fun_set_conn_handler(fun_a, obio_connection); + + rc = ddf_fun_bind(fun_a); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Failed binding function 'a'. (%d)", rc); + goto error; + } + + rc = ddf_fun_add_to_category(fun_a, "irc"); + if (rc != EOK) + goto error; + + return EOK; +error: + if (fun_a != NULL) + ddf_fun_destroy(fun_a); + return rc; +} + +/** Remove OBIO device */ +int obio_remove(obio_t *obio) +{ + return ENOTSUP; +} + +/** OBIO device gone */ +int obio_gone(obio_t *obio) +{ + return ENOTSUP; +} + + +/** + * @} + */ Index: uspace/drv/intctl/obio/obio.h =================================================================== --- uspace/drv/intctl/obio/obio.h (revision be1b1e6839cb14854c85b8177b374d75b272007e) +++ uspace/drv/intctl/obio/obio.h (revision be1b1e6839cb14854c85b8177b374d75b272007e) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2017 Jiri Svoboda + * 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. + */ + +/** @addtogroup genarch + * @{ + */ +/** @file + */ + +#ifndef OBIO_H_ +#define OBIO_H_ + +#include +#include +#include +#include + +typedef struct { + uintptr_t base; +} obio_res_t; + +/** OBIO */ +typedef struct { + ioport32_t *regs; + uintptr_t phys_base; + ddf_dev_t *dev; +} obio_t; + +extern int obio_add(obio_t *, obio_res_t *); +extern int obio_remove(obio_t *); +extern int obio_gone(obio_t *); + +#endif + +/** @} + */ Index: uspace/drv/intctl/obio/obio.ma =================================================================== --- uspace/drv/intctl/obio/obio.ma (revision be1b1e6839cb14854c85b8177b374d75b272007e) +++ uspace/drv/intctl/obio/obio.ma (revision be1b1e6839cb14854c85b8177b374d75b272007e) @@ -0,0 +1,1 @@ +10 ebus/obio Index: uspace/drv/platform/sun4u/sun4u.c =================================================================== --- uspace/drv/platform/sun4u/sun4u.c (revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc) +++ uspace/drv/platform/sun4u/sun4u.c (revision be1b1e6839cb14854c85b8177b374d75b272007e) @@ -85,4 +85,29 @@ .name = NAME, .driver_ops = &sun4u_ops +}; + +static hw_resource_t obio_res[] = { + { + .type = MEM_RANGE, + .res.mem_range = { + .address = PBM_BASE + PBM_PCI_CONFIG_BASE, + .size = PBM_PCI_CONFIG_SIZE, + .relative = false, + .endianness = LITTLE_ENDIAN + } + } +}; + +static sun4u_fun_t obio_data = { + .hw_resources = { + .count = sizeof(obio_res) / sizeof(obio_res[0]), + .resources = obio_res + }, + .pio_window = { + .mem = { + .base = PBM_BASE + PBM_PCI_MEM_BASE, + .size = PBM_PCI_MEM_SIZE + } + } }; @@ -201,4 +226,7 @@ static bool sun4u_add_functions(ddf_dev_t *dev) { + if (!sun4u_add_fun(dev, "obio", "ebus/obio", &obio_data)) + return false; + return sun4u_add_fun(dev, "pci0", "intel_pci", &pci_data); }