Index: kernel/arch/abs32le/Makefile.inc =================================================================== --- kernel/arch/abs32le/Makefile.inc (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/abs32le/Makefile.inc (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -50,5 +50,4 @@ arch/$(KARCH)/src/userspace.c \ arch/$(KARCH)/src/cpu/cpu.c \ - arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/smp/smp.c \ arch/$(KARCH)/src/smp/ipi.c \ Index: kernel/arch/abs32le/src/ddi/ddi.c =================================================================== --- kernel/arch/abs32le/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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 abs32leddi - * @{ - */ -/** @file - * @brief DDI. - */ - -#include -#include -#include - -/** Enable I/O space range for task. - * - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - return 0; -} - -/** @} - */ Index: kernel/arch/amd64/src/ddi/ddi.c =================================================================== --- kernel/arch/amd64/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/amd64/src/ddi/ddi.c (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -45,67 +45,4 @@ #include #include - -/** Enable I/O space range for task. - * - * Interrupts are disabled and task is locked. - * - * @param task Task. - * @param ioaddr Startign I/O space address. - * @param size Size of the enabled I/O range. - * - * @return 0 on success or an error code from errno.h. - * - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - size_t elements = ioaddr + size; - if (elements > IO_PORTS) - return ENOENT; - - if (task->arch.iomap.elements < elements) { - /* - * The I/O permission bitmap is too small and needs to be grown. - */ - - void *store = malloc(bitmap_size(elements), FRAME_ATOMIC); - if (!store) - return ENOMEM; - - bitmap_t oldiomap; - bitmap_initialize(&oldiomap, task->arch.iomap.elements, - task->arch.iomap.bits); - - bitmap_initialize(&task->arch.iomap, elements, store); - - /* - * Mark the new range inaccessible. - */ - bitmap_set_range(&task->arch.iomap, oldiomap.elements, - elements - oldiomap.elements); - - /* - * In case there really existed smaller iomap, - * copy its contents and deallocate it. - */ - if (oldiomap.bits) { - bitmap_copy(&task->arch.iomap, &oldiomap, - oldiomap.elements); - - free(oldiomap.bits); - } - } - - /* - * Enable the range and we are done. - */ - bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, size); - - /* - * Increment I/O Permission bitmap generation counter. - */ - task->arch.iomapver++; - - return 0; -} /** Install I/O Permission bitmap. Index: kernel/arch/arm32/Makefile.inc =================================================================== --- kernel/arch/arm32/Makefile.inc (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/arm32/Makefile.inc (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -54,5 +54,4 @@ arch/$(KARCH)/src/dummy.S \ arch/$(KARCH)/src/cpu/cpu.c \ - arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/interrupt.c \ arch/$(KARCH)/src/exception.c \ Index: kernel/arch/arm32/src/ddi/ddi.c =================================================================== --- kernel/arch/arm32/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * Copyright (c) 2006 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 arm32ddi - * @{ - */ -/** @file - * @brief DDI. - */ - -#include -#include -#include - -/** Enable I/O space range for task. - * - * Interrupts are disabled and task is locked. - * - * @param task Task. - * @param ioaddr Startign I/O space address. - * @param size Size of the enabled I/O range. - * - * @return 0 on success or an error code from errno.h. - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - return 0; -} - -/** @} - */ Index: kernel/arch/ia32/src/ddi/ddi.c =================================================================== --- kernel/arch/ia32/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/ia32/src/ddi/ddi.c (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -45,67 +45,4 @@ #include #include - -/** Enable I/O space range for task. - * - * Interrupts are disabled and task is locked. - * - * @param task Task. - * @param ioaddr Startign I/O space address. - * @param size Size of the enabled I/O range. - * - * @return 0 on success or an error code from errno.h. - * - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - size_t elements = ioaddr + size; - if (elements > IO_PORTS) - return ENOENT; - - if (task->arch.iomap.elements < elements) { - /* - * The I/O permission bitmap is too small and needs to be grown. - */ - - void *store = malloc(bitmap_size(elements), FRAME_ATOMIC); - if (!store) - return ENOMEM; - - bitmap_t oldiomap; - bitmap_initialize(&oldiomap, task->arch.iomap.elements, - task->arch.iomap.bits); - - bitmap_initialize(&task->arch.iomap, elements, store); - - /* - * Mark the new range inaccessible. - */ - bitmap_set_range(&task->arch.iomap, oldiomap.elements, - elements - oldiomap.elements); - - /* - * In case there really existed smaller iomap, - * copy its contents and deallocate it. - */ - if (oldiomap.bits) { - bitmap_copy(&task->arch.iomap, &oldiomap, - oldiomap.elements); - - free(oldiomap.bits); - } - } - - /* - * Enable the range and we are done. - */ - bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, size); - - /* - * Increment I/O Permission bitmap generation counter. - */ - task->arch.iomapver++; - - return 0; -} /** Install I/O Permission bitmap. Index: kernel/arch/ia64/src/ddi/ddi.c =================================================================== --- kernel/arch/ia64/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/ia64/src/ddi/ddi.c (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -47,9 +47,9 @@ * Interrupts are disabled and task is locked. * - * @param task Task. - * @param ioaddr Starting I/O space address. - * @param size Size of the enabled I/O range. + * @param task Task. + * @param ioaddr Starting I/O space address. + * @param size Size of the enabled I/O range. * - * @return 0 on success or an error code from errno.h. + * @return EOK on success or an error code from errno.h. */ int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) @@ -72,5 +72,27 @@ bitmap_set_range(task->arch.iomap, iopage, size / 4); - return 0; + return EOK; +} + +/** Disable I/O space range for task. + * + * Interrupts are disabled and task is locked. + * + * @param task Task. + * @param ioaddr Starting I/O space address. + * @param size Size of the disabled I/O range. + * + * @return EOK on success or an error code from errno.h. + */ +int ddi_iospace_disable_arch(task_t *task, uintptr_t ioaddr, size_t size) +{ + if (!task->arch.iomap) + return EINVAL; + + uintptr_t iopage = ioaddr / PORTS_PER_PAGE; + size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE); + bitmap_clear_range(task->arch.iomap, iopage, size / 4); + + return EOK; } Index: kernel/arch/mips32/Makefile.inc =================================================================== --- kernel/arch/mips32/Makefile.inc (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/mips32/Makefile.inc (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -70,5 +70,4 @@ arch/$(KARCH)/src/mm/as.c \ arch/$(KARCH)/src/fpu_context.c \ - arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/smp/smp.c \ arch/$(KARCH)/src/machine_func.c Index: kernel/arch/mips32/src/ddi/ddi.c =================================================================== --- kernel/arch/mips32/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ (revision ) @@ -1,58 +1,0 @@ -/* - * Copyright (c) 2006 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 mips32ddi - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include - -/** Enable I/O space range for task. - * - * Interrupts are disabled and task is locked. - * - * @param task Task. - * @param ioaddr Startign I/O space address. - * @param size Size of the enabled I/O range. - * - * @return 0 on success or an error code from errno.h. - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - return 0; -} - -/** @} - */ Index: kernel/arch/ppc32/Makefile.inc =================================================================== --- kernel/arch/ppc32/Makefile.inc (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/ppc32/Makefile.inc (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -51,5 +51,4 @@ arch/$(KARCH)/src/cpu/cpu.c \ arch/$(KARCH)/src/proc/scheduler.c \ - arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/mm/km.c \ arch/$(KARCH)/src/mm/as.c \ Index: kernel/arch/ppc32/src/ddi/ddi.c =================================================================== --- kernel/arch/ppc32/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * Copyright (c) 2006 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 ppc32ddi - * @{ - */ -/** @file - */ - -#include -#include -#include - -/** Enable I/O space range for task. - * - * Interrupts are disabled and task is locked. - * - * @param task Task. - * @param ioaddr Startign I/O space address. - * @param size Size of the enabled I/O range. - * - * @return 0 on success or an error code from errno.h. - * - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - return 0; -} - -/** @} - */ Index: kernel/arch/sparc32/Makefile.inc =================================================================== --- kernel/arch/sparc32/Makefile.inc (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/sparc32/Makefile.inc (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -45,5 +45,4 @@ arch/$(KARCH)/src/exception.c \ arch/$(KARCH)/src/cpu/cpu.c \ - arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/smp/smp.c \ arch/$(KARCH)/src/smp/ipi.c \ Index: kernel/arch/sparc32/src/ddi/ddi.c =================================================================== --- kernel/arch/sparc32/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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 sparc32ddi - * @{ - */ -/** @file - * @brief DDI. - */ - -#include -#include -#include - -/** Enable I/O space range for task. - * - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - return 0; -} - -/** @} - */ Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/arch/sparc64/Makefile.inc (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -81,5 +81,4 @@ arch/$(KARCH)/src/trap/exception.c \ arch/$(KARCH)/src/trap/interrupt.c \ - arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/drivers/tick.c \ arch/$(KARCH)/src/drivers/kbd.c \ Index: kernel/arch/sparc64/src/ddi/ddi.c =================================================================== --- kernel/arch/sparc64/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2006 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 sparc64ddi - * @{ - */ -/** @file - */ - -#include -#include -#include - -/** Enable I/O space range for task. - * - * Interrupts are disabled and task is locked. - * - * @param task Task. - * @param ioaddr Starting I/O space address. - * @param size Size of the enabled I/O range. - * - * @return 0 on success or an error code from errno.h. - */ -int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) -{ - return 0; -} - -/** @} - */ Index: kernel/genarch/Makefile.inc =================================================================== --- kernel/genarch/Makefile.inc (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/genarch/Makefile.inc (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -181,2 +181,13 @@ genarch/src/drivers/ega/ega.c endif + +ifeq ($(CONFIG_IOMAP_BITMAP), y) + GENARCH_SOURCES += \ + genarch/src/ddi/ddi-bitmap.c +endif + +ifeq ($(CONFIG_IOMAP_DUMMY), y) + GENARCH_SOURCES += \ + genarch/src/ddi/ddi-dummy.c +endif + Index: kernel/genarch/src/ddi/ddi-bitmap.c =================================================================== --- kernel/genarch/src/ddi/ddi-bitmap.c (revision a4666a90e38ea07492ac4719916a100afae65c16) +++ kernel/genarch/src/ddi/ddi-bitmap.c (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2006 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 amd64ddi + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** Enable I/O space range for task. + * + * Interrupts are disabled and task is locked. + * + * @param task Task. + * @param ioaddr Starting I/O space address. + * @param size Size of the enabled I/O range. + * + * @return EOK on success or an error code from errno.h. + * + */ +int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) +{ + size_t elements = ioaddr + size; + if (elements > IO_PORTS) + return ENOENT; + + if (task->arch.iomap.elements < elements) { + /* + * The I/O permission bitmap is too small and needs to be grown. + */ + + void *store = malloc(bitmap_size(elements), FRAME_ATOMIC); + if (!store) + return ENOMEM; + + bitmap_t oldiomap; + bitmap_initialize(&oldiomap, task->arch.iomap.elements, + task->arch.iomap.bits); + + bitmap_initialize(&task->arch.iomap, elements, store); + + /* + * Mark the new range inaccessible. + */ + bitmap_set_range(&task->arch.iomap, oldiomap.elements, + elements - oldiomap.elements); + + /* + * In case there really existed smaller iomap, + * copy its contents and deallocate it. + */ + if (oldiomap.bits) { + bitmap_copy(&task->arch.iomap, &oldiomap, + oldiomap.elements); + + free(oldiomap.bits); + } + } + + /* + * Enable the range and we are done. + */ + bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, size); + + /* + * Increment I/O Permission bitmap generation counter. + */ + task->arch.iomapver++; + + return EOK; +} + +/** Disable I/O space range for task. + * + * Interrupts are disabled and task is locked. + * + * @param task Task. + * @param ioaddr Starting I/O space address. + * @param size Size of the enabled I/O range. + * + * @return EOK on success or an error code from errno.h. + * + */ +int ddi_iospace_disable_arch(task_t *task, uintptr_t ioaddr, size_t size) +{ + size_t elements = ioaddr + size; + if (elements > IO_PORTS) + return ENOENT; + + if (ioaddr >= task->arch.iomap.elements) + return EINVAL; + + if (task->arch.iomap.elements < elements) + size -= elements - task->arch.iomap.elements; + + /* + * Disable the range. + */ + bitmap_set_range(&task->arch.iomap, (size_t) ioaddr, size); + + /* + * Increment I/O Permission bitmap generation counter. + */ + task->arch.iomapver++; + + return 0; +} + +/** @} + */ Index: kernel/genarch/src/ddi/ddi-dummy.c =================================================================== --- kernel/genarch/src/ddi/ddi-dummy.c (revision a4666a90e38ea07492ac4719916a100afae65c16) +++ kernel/genarch/src/ddi/ddi-dummy.c (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2006 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 genarch + * @{ + */ +/** @file + * @brief DDI. + */ + +#include +#include +#include + +/** Enable I/O space range for task. + * + * Interrupts are disabled and task is locked. + * + * @param task Task. + * @param ioaddr Starting I/O space address. + * @param size Size of the enabled I/O range. + * + * @return EOK on success or an error code from errno.h. + */ +int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size) +{ + return 0; +} + +/** Disable I/O space range for task. + * + * Interrupts are disabled and task is locked. + * + * @param task Task. + * @param ioaddr Starting I/O space address. + * @param size Size of the disabled I/O range. + * + * @return EOK on success or an error code from errno.h. + */ +int ddi_iospace_disable_arch(task_t *task, uintptr_t ioaddr, size_t size) +{ + return 0; +} + +/** @} + */ Index: kernel/generic/include/ddi/ddi.h =================================================================== --- kernel/generic/include/ddi/ddi.h (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/generic/include/ddi/ddi.h (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -70,4 +70,5 @@ */ extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t); +extern int ddi_iospace_disable_arch(task_t *, uintptr_t, size_t); #endif Index: kernel/generic/src/ddi/ddi.c =================================================================== --- kernel/generic/src/ddi/ddi.c (revision 293703eac83c474ec39de43bd1ee4aa8557d6286) +++ kernel/generic/src/ddi/ddi.c (revision a4666a90e38ea07492ac4719916a100afae65c16) @@ -211,6 +211,7 @@ NO_TRACE static int physmem_unmap(uintptr_t virt) { - // TODO: implement unmap - return EOK; + ASSERT(TASK); + + return as_area_destroy(TASK->as, virt); } @@ -255,7 +256,7 @@ /** Enable range of I/O space for task. * - * @param id Task ID of the destination task. + * @param id Task ID of the destination task. * @param ioaddr Starting I/O address. - * @param size Size of the enabled I/O space.. + * @param size Size of the enabled I/O space. * * @return 0 on success, EPERM if the caller lacks capabilities to use this @@ -290,4 +291,45 @@ int rc = ddi_iospace_enable_arch(task, ioaddr, size); irq_spinlock_unlock(&task->lock, true); + + return rc; +} + +/** Disable range of I/O space for task. + * + * @param id Task ID of the destination task. + * @param ioaddr Starting I/O address. + * @param size Size of the enabled I/O space. + * + * @return 0 on success, EPERM if the caller lacks capabilities to use this + * syscall, ENOENT if there is no task matching the specified ID. + * + */ +NO_TRACE static int iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size) +{ + /* + * Make sure the caller is authorised to make this syscall. + */ + cap_t caps = cap_get(TASK); + if (!(caps & CAP_IO_MANAGER)) + return EPERM; + + irq_spinlock_lock(&tasks_lock, true); + + task_t *task = task_find_by_id(id); + + if ((!task) || (!container_check(CONTAINER, task->container))) { + /* + * There is no task with the specified ID + * or the task belongs to a different security + * context. + */ + irq_spinlock_unlock(&tasks_lock, true); + return ENOENT; + } + + /* Lock the task and release the lock protecting tasks_btree. */ + irq_spinlock_exchange(&tasks_lock, &task->lock); + int rc = ddi_iospace_disable_arch(task, ioaddr, size); + irq_spinlock_unlock(&task->lock, true); return rc; @@ -314,6 +356,11 @@ sysarg_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg) { - // TODO: implement - return ENOTSUP; + ddi_ioarg_t arg; + int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t)); + if (rc != 0) + return (sysarg_t) rc; + + return (sysarg_t) iospace_disable((task_id_t) arg.task_id, + (uintptr_t) arg.ioaddr, (size_t) arg.size); }