Index: uspace/drv/bus/usb/ohci/hc.c =================================================================== --- uspace/drv/bus/usb/ohci/hc.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/bus/usb/ohci/hc.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -47,10 +47,16 @@ (I_SO | I_WDH | I_UE | I_RHSC) -static const irq_cmd_t ohci_irq_commands[] = -{ - { .cmd = CMD_MEM_READ_32, .dstarg = 1, .addr = NULL /*filled later*/ }, - { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = 0 /*filled later*/}, +static const irq_pio_range_t ohci_pio_ranges[] = { + { + .base = 0, /* filled later */ + .size = sizeof(ohci_regs_t) + } +}; + +static const irq_cmd_t ohci_irq_commands[] = { + { .cmd = CMD_PIO_READ_32, .dstarg = 1, .addr = NULL /* filled later */ }, + { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = OHCI_USED_INTERRUPTS }, { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 }, - { .cmd = CMD_MEM_WRITE_A_32, .srcarg = 1, .addr = NULL /*filled later*/ }, + { .cmd = CMD_PIO_WRITE_A_32, .srcarg = 1, .addr = NULL /* filled later */ }, { .cmd = CMD_ACCEPT }, }; @@ -63,4 +69,13 @@ static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch); /*----------------------------------------------------------------------------*/ +/** Get number of PIO ranges used in IRQ code. + * @return Number of ranges. + */ +size_t hc_irq_pio_range_count(void) +{ + return sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t); +} +/*----------------------------------------------------------------------------*/ +/*----------------------------------------------------------------------------*/ /** Get number of commands used in IRQ code. * @return Number of commands. @@ -71,7 +86,9 @@ } /*----------------------------------------------------------------------------*/ -/** Generate IRQ code commands. - * @param[out] cmds Place to store the commands. - * @param[in] cmd_size Size of the place (bytes). +/** Generate IRQ code. + * @param[out] ranges PIO ranges buffer. + * @param[in] ranges_size Size of the ranges buffer (bytes). + * @param[out] cmds Commands buffer. + * @param[in] cmds_size Size of the commands buffer (bytes). * @param[in] regs Physical address of device's registers. * @param[in] reg_size Size of the register area (bytes). @@ -79,39 +96,22 @@ * @return Error code. */ -int hc_get_irq_commands( - irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size) -{ - if (cmd_size < sizeof(ohci_irq_commands) - || reg_size < sizeof(ohci_regs_t)) +int +hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[], + size_t cmds_size, uintptr_t regs, size_t reg_size) +{ + if ((ranges_size < sizeof(ohci_pio_ranges)) || + (cmds_size < sizeof(ohci_irq_commands)) || + (reg_size < sizeof(ohci_regs_t))) return EOVERFLOW; - /* Create register mapping to use in IRQ handler. - * This mapping should be present in kernel only. - * Remove it from here when kernel knows how to create mappings - * and accepts physical addresses in IRQ code. - * TODO: remove */ - ohci_regs_t *registers; - const int ret = pio_enable((void*)regs, reg_size, (void**)®isters); - if (ret != EOK) - return ret; - - /* Some bogus access to force create mapping. DO NOT remove, - * unless whole virtual addresses in irq is replaced - * NOTE: Compiler won't remove this as ohci_regs_t members - * are declared volatile. - * - * Introducing CMD_MEM set of IRQ code commands broke - * assumption that IRQ code does not cause page faults. - * If this happens during idling (THREAD == NULL) - * it causes kernel panic. - */ - registers->revision; + memcpy(ranges, ohci_pio_ranges, sizeof(ohci_pio_ranges)); + ranges[0].base = regs; memcpy(cmds, ohci_irq_commands, sizeof(ohci_irq_commands)); - - void *address = (void*)®isters->interrupt_status; - cmds[0].addr = address; + ohci_regs_t *registers = (ohci_regs_t *) regs; + cmds[0].addr = (void *) ®isters->interrupt_status; cmds[1].value = OHCI_USED_INTERRUPTS; - cmds[3].addr = address; + cmds[3].addr = (void *) ®isters->interrupt_status; + return EOK; } Index: uspace/drv/bus/usb/ohci/hc.h =================================================================== --- uspace/drv/bus/usb/ohci/hc.h (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/bus/usb/ohci/hc.h (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -74,7 +74,8 @@ } hc_t; +size_t hc_irq_pio_range_count(void); size_t hc_irq_cmd_count(void); -int hc_get_irq_commands( - irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size); +int hc_get_irq_code(irq_pio_range_t [], size_t, irq_cmd_t [], size_t, uintptr_t, + size_t); int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun); int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts); Index: uspace/drv/bus/usb/ohci/ohci.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/bus/usb/ohci/ohci.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -187,12 +187,19 @@ (void *) reg_base, reg_size, irq); - const size_t cmd_count = hc_irq_cmd_count(); - irq_cmd_t irq_cmds[cmd_count]; - irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds }; - - ret = - hc_get_irq_commands(irq_cmds, sizeof(irq_cmds), reg_base, reg_size); - CHECK_RET_DEST_FREE_RETURN(ret, - "Failed to generate IRQ commands: %s.\n", str_error(ret)); + const size_t ranges_count = hc_irq_pio_range_count(); + const size_t cmds_count = hc_irq_cmd_count(); + irq_pio_range_t irq_ranges[ranges_count]; + irq_cmd_t irq_cmds[cmds_count]; + irq_code_t irq_code = { + .rangecount = ranges_count, + .ranges = irq_ranges, + .cmdcount = cmds_count, + .cmds = irq_cmds + }; + + ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds, + sizeof(irq_cmds), reg_base, reg_size); + CHECK_RET_DEST_FREE_RETURN(ret, + "Failed to generate IRQ code: %s.\n", str_error(ret)); Index: uspace/drv/bus/usb/uhci/hc.c =================================================================== --- uspace/drv/bus/usb/uhci/hc.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/bus/usb/uhci/hc.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -48,7 +48,12 @@ (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT) - -static const irq_cmd_t uhci_irq_commands[] = -{ +static const irq_pio_range_t uhci_irq_pio_ranges[] = { + { + .base = 0, /* filled later */ + .size = sizeof(uhci_regs_t) + } +}; + +static const irq_cmd_t uhci_irq_commands[] = { { .cmd = CMD_PIO_READ_16, .dstarg = 1, .addr = NULL/*filled later*/}, { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, @@ -68,4 +73,12 @@ /*----------------------------------------------------------------------------*/ +/** Get number of PIO ranges used in IRQ code. + * @return Number of ranges. + */ +size_t hc_irq_pio_range_count(void) +{ + return sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t); +} +/*----------------------------------------------------------------------------*/ /** Get number of commands used in IRQ code. * @return Number of commands. @@ -76,7 +89,9 @@ } /*----------------------------------------------------------------------------*/ -/** Generate IRQ code commands. - * @param[out] cmds Place to store the commands. - * @param[in] cmd_size Size of the place (bytes). +/** Generate IRQ code. + * @param[out] ranges PIO ranges buffer. + * @param[in] ranges_size Size of the ranges buffer (bytes). + * @param[out] cmds Commands buffer. + * @param[in] cmds_size Size of the commands buffer (bytes). * @param[in] regs Physical address of device's registers. * @param[in] reg_size Size of the register area (bytes). @@ -84,17 +99,21 @@ * @return Error code. */ -int hc_get_irq_commands( - irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size) -{ - if (cmd_size < sizeof(uhci_irq_commands) - || reg_size < sizeof(uhci_regs_t)) +int +hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[], + size_t cmds_size, uintptr_t regs, size_t reg_size) +{ + if ((ranges_size < sizeof(uhci_irq_pio_ranges)) || + (cmds_size < sizeof(uhci_irq_commands)) || + (reg_size < sizeof(uhci_regs_t))) return EOVERFLOW; - uhci_regs_t *registers = (uhci_regs_t*)regs; + memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges)); + ranges[0].base = regs; memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands)); - - cmds[0].addr = (void*)®isters->usbsts; - cmds[3].addr = (void*)®isters->usbsts; + uhci_regs_t *registers = (uhci_regs_t *) regs; + cmds[0].addr = ®isters->usbsts; + cmds[3].addr = ®isters->usbsts; + return EOK; } Index: uspace/drv/bus/usb/uhci/hc.h =================================================================== --- uspace/drv/bus/usb/uhci/hc.h (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/bus/usb/uhci/hc.h (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -121,7 +121,8 @@ } hc_t; +size_t hc_irq_pio_range_count(void); size_t hc_irq_cmd_count(void); -int hc_get_irq_commands( - irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size); +int hc_get_irq_code(irq_pio_range_t [], size_t, irq_cmd_t [], size_t, uintptr_t, + size_t); void hc_interrupt(hc_t *instance, uint16_t status); int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interupts); Index: uspace/drv/bus/usb/uhci/uhci.c =================================================================== --- uspace/drv/bus/usb/uhci/uhci.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/bus/usb/uhci/uhci.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -198,12 +198,19 @@ "Failed to disable legacy USB: %s.\n", str_error(ret)); - const size_t cmd_count = hc_irq_cmd_count(); - irq_cmd_t irq_cmds[cmd_count]; - ret = - hc_get_irq_commands(irq_cmds, sizeof(irq_cmds), reg_base, reg_size); + const size_t ranges_count = hc_irq_pio_range_count(); + const size_t cmds_count = hc_irq_cmd_count(); + irq_pio_range_t irq_ranges[ranges_count]; + irq_cmd_t irq_cmds[cmds_count]; + ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds, + sizeof(irq_cmds), reg_base, reg_size); CHECK_RET_DEST_FREE_RETURN(ret, "Failed to generate IRQ commands: %s.\n", str_error(ret)); - irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds }; + irq_code_t irq_code = { + .rangecount = ranges_count, + .ranges = irq_ranges, + .cmdcount = cmds_count, + .cmds = irq_cmds + }; /* Register handler to avoid interrupt lockup */ Index: uspace/drv/char/i8042/i8042.c =================================================================== --- uspace/drv/char/i8042/i8042.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/char/i8042/i8042.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -105,4 +105,11 @@ }; +static const irq_pio_range_t i8042_ranges[] = { + { + .base = 0, + .size = sizeof(i8042_regs_t) + } +}; + /** i8042 Interrupt pseudo-code. */ static const irq_cmd_t i8042_cmds[] = { @@ -239,12 +246,20 @@ while (pio_read_8(&dev->regs->status) & i8042_OUTPUT_FULL) (void) pio_read_8(&dev->regs->data); - + + const size_t range_count = sizeof(i8042_ranges) / + sizeof(irq_pio_range_t); + irq_pio_range_t ranges[range_count]; + memcpy(ranges, i8042_ranges, sizeof(i8042_ranges)); + ranges[0].base = (uintptr_t) regs; + const size_t cmd_count = sizeof(i8042_cmds) / sizeof(irq_cmd_t); irq_cmd_t cmds[cmd_count]; memcpy(cmds, i8042_cmds, sizeof(i8042_cmds)); - cmds[0].addr = (void *) &dev->regs->status; - cmds[3].addr = (void *) &dev->regs->data; - + cmds[0].addr = (void *) &(((i8042_regs_t *) regs)->status); + cmds[3].addr = (void *) &(((i8042_regs_t *) regs)->data); + irq_code_t irq_code = { + .rangecount = range_count, + .ranges = ranges, .cmdcount = cmd_count, .cmds = cmds Index: uspace/drv/infrastructure/root/root.c =================================================================== --- uspace/drv/infrastructure/root/root.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/infrastructure/root/root.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -158,6 +158,9 @@ if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) { ddf_msg(LVL_ERROR, "Memory allocation failed."); - return ENOMEM; - } + free(platform); + return ENOMEM; + } + + free(platform); /* Add function. */ @@ -169,4 +172,5 @@ if (fun == NULL) { ddf_msg(LVL_ERROR, "Error creating function %s", name); + free(match_id); return ENOMEM; } @@ -176,4 +180,5 @@ ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s", name); + free(match_id); ddf_fun_destroy(fun); return rc; @@ -208,5 +213,5 @@ * vital for the system. */ - add_virtual_root_fun(dev); + (void) add_virtual_root_fun(dev); /* Register root device's children. */ Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/nic/e1k/e1k.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -228,4 +228,12 @@ static void e1000_send_frame(nic_t *, void *, size_t); +/** PIO ranges used in the IRQ code. */ +irq_pio_range_t e1000_irq_pio_ranges[] = { + { + .base = 0, + .size = PAGE_SIZE, /* XXX */ + } +}; + /** Commands to deal with interrupt * @@ -256,4 +264,7 @@ /** Interrupt code definition */ irq_code_t e1000_irq_code = { + .rangecount = sizeof(e1000_irq_pio_ranges) / + sizeof(irq_pio_range_t), + .ranges = e1000_irq_pio_ranges, .cmdcount = sizeof(e1000_irq_commands) / sizeof(irq_cmd_t), .cmds = e1000_irq_commands @@ -1252,6 +1263,7 @@ fibril_mutex_lock(&irq_reg_mutex); - e1000_irq_code.cmds[0].addr = e1000->reg_base_virt + E1000_ICR; - e1000_irq_code.cmds[2].addr = e1000->reg_base_virt + E1000_IMC; + e1000_irq_code.ranges[0].base = (uintptr_t) e1000->reg_base_phys; + e1000_irq_code.cmds[0].addr = e1000->reg_base_phys + E1000_ICR; + e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC; int rc = register_interrupt_handler(nic_get_ddf_dev(nic), Index: uspace/drv/nic/ne2k/ne2k.c =================================================================== --- uspace/drv/nic/ne2k/ne2k.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/nic/ne2k/ne2k.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -64,4 +64,11 @@ #define NE2K(device) ((ne2k_t *) nic_get_specific(DRIVER_DATA(device))) +static irq_pio_range_t ne2k_ranges_prototype[] = { + { + .base = 0, + .size = NE2K_IO_SIZE, + } +}; + /** NE2000 kernel interrupt command sequence. * @@ -122,15 +129,32 @@ if (ne2k->code.cmdcount == 0) { - irq_cmd_t *ne2k_cmds = malloc(sizeof(ne2k_cmds_prototype)); - if (ne2k_cmds == NULL) { + irq_pio_range_t *ne2k_ranges; + irq_cmd_t *ne2k_cmds; + + ne2k_ranges = malloc(sizeof(ne2k_ranges_prototype)); + if (!ne2k_ranges) + return ENOMEM; + memcpy(ne2k_ranges, ne2k_ranges_prototype, + sizeof(ne2k_ranges_prototype)); + ne2k_ranges[0].base = (uintptr_t) ne2k->base_port; + + ne2k_cmds = malloc(sizeof(ne2k_cmds_prototype)); + if (!ne2k_cmds) { + free(ne2k_ranges); return ENOMEM; } - memcpy(ne2k_cmds, ne2k_cmds_prototype, sizeof (ne2k_cmds_prototype)); - ne2k_cmds[0].addr = ne2k->port + DP_ISR; - ne2k_cmds[3].addr = ne2k->port + DP_IMR; + memcpy(ne2k_cmds, ne2k_cmds_prototype, + sizeof(ne2k_cmds_prototype)); + ne2k_cmds[0].addr = ne2k->base_port + DP_ISR; + ne2k_cmds[3].addr = ne2k->base_port + DP_IMR; ne2k_cmds[4].addr = ne2k_cmds[0].addr; - ne2k_cmds[5].addr = ne2k->port + DP_TSR; - - ne2k->code.cmdcount = sizeof(ne2k_cmds_prototype) / sizeof(irq_cmd_t); + ne2k_cmds[5].addr = ne2k->base_port + DP_TSR; + + ne2k->code.rangecount = sizeof(ne2k_ranges_prototype) / + sizeof(irq_pio_range_t); + ne2k->code.ranges = ne2k_ranges; + + ne2k->code.cmdcount = sizeof(ne2k_cmds_prototype) / + sizeof(irq_cmd_t); ne2k->code.cmds = ne2k_cmds; } @@ -148,4 +172,5 @@ ne2k_t *ne2k = NE2K(dev); if (ne2k) { + free(ne2k->code.ranges); free(ne2k->code.cmds); } Index: uspace/drv/nic/rtl8139/driver.c =================================================================== --- uspace/drv/nic/rtl8139/driver.c (revision 65e6fe3994c5b7a7157e63d8c8d95673c29c8d8a) +++ uspace/drv/nic/rtl8139/driver.c (revision 0a208110cba0d6fad99eb3113730a71b314eefdc) @@ -661,4 +661,10 @@ +irq_pio_range_t rtl8139_irq_pio_ranges[] = { + { + .base = 0, + .size = RTL8139_IO_SIZE + } +}; /** Commands to deal with interrupt @@ -670,35 +676,37 @@ */ irq_cmd_t rtl8139_irq_commands[] = { - { - /* Get the interrupt status */ - .cmd = CMD_PIO_READ_16, - .addr = NULL, - .dstarg = 2 - }, - { - .cmd = CMD_PREDICATE, - .value = 3, - .srcarg = 2 - }, - { - /* Mark interrupts as solved */ - .cmd = CMD_PIO_WRITE_16, - .addr = NULL, - .value = 0xFFFF - }, - { - /* Disable interrupts until interrupt routine is finished */ - .cmd = CMD_PIO_WRITE_16, - .addr = NULL, - .value = 0x0000 - }, - { - .cmd = CMD_ACCEPT - } + { + /* Get the interrupt status */ + .cmd = CMD_PIO_READ_16, + .addr = NULL, + .dstarg = 2 + }, + { + .cmd = CMD_PREDICATE, + .value = 3, + .srcarg = 2 + }, + { + /* Mark interrupts as solved */ + .cmd = CMD_PIO_WRITE_16, + .addr = NULL, + .value = 0xFFFF + }, + { + /* Disable interrupts until interrupt routine is finished */ + .cmd = CMD_PIO_WRITE_16, + .addr = NULL, + .value = 0x0000 + }, + { + .cmd = CMD_ACCEPT + } }; /** Interrupt code definition */ irq_code_t rtl8139_irq_code = { - .cmdcount = sizeof(rtl8139_irq_commands)/sizeof(irq_cmd_t), + .rangecount = sizeof(rtl8139_irq_pio_ranges) / sizeof(irq_pio_range_t), + .ranges = rtl8139_irq_pio_ranges, + .cmdcount = sizeof(rtl8139_irq_commands) / sizeof(irq_cmd_t), .cmds = rtl8139_irq_commands }; @@ -890,9 +898,10 @@ RTL8139_IRQ_STRUCT_LOCK(); - rtl8139_irq_code.cmds[0].addr = rtl8139->io_port + ISR; - rtl8139_irq_code.cmds[2].addr = rtl8139->io_port + ISR; - rtl8139_irq_code.cmds[3].addr = rtl8139->io_port + IMR; + rtl8139_irq_code.ranges[0].base = (uintptr_t) rtl8139->io_addr; + rtl8139_irq_code.cmds[0].addr = rtl8139->io_addr + ISR; + rtl8139_irq_code.cmds[2].addr = rtl8139->io_addr + ISR; + rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR; int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data), - rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code); + rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code); RTL8139_IRQ_STRUCT_UNLOCK();