Changeset 3f03199 in mainline for uspace/drv/bus/usb/uhci


Ignore:
Timestamp:
2013-09-15T06:33:53Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9348862
Parents:
dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Location:
uspace/drv/bus/usb/uhci
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/uhci/hc.c

    rdd7078c r3f03199  
    111111 * @param[out] cmds Commands buffer.
    112112 * @param[in] cmds_size Size of the commands buffer (bytes).
    113  * @param[in] regs Physical address of device's registers.
    114  * @param[in] reg_size Size of the register area (bytes).
     113 * @param[in] regs Device's register range.
    115114 *
    116115 * @return Error code.
    … …  
    118117int
    119118hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[],
    120     size_t cmds_size, uintptr_t regs, size_t reg_size)
     119    size_t cmds_size, addr_range_t *regs)
    121120{
    122121        if ((ranges_size < sizeof(uhci_irq_pio_ranges)) ||
    123122            (cmds_size < sizeof(uhci_irq_commands)) ||
    124             (reg_size < sizeof(uhci_regs_t)))
     123            (RNGSZ(*regs) < sizeof(uhci_regs_t)))
    125124                return EOVERFLOW;
    126125
    127126        memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
    128         ranges[0].base = regs;
     127        ranges[0].base = RNGABS(*regs);
    129128
    130129        memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
    131         uhci_regs_t *registers = (uhci_regs_t *) regs;
     130        uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(*regs);
    132131        cmds[0].addr = (void*)&registers->usbsts;
    133132        cmds[3].addr = (void*)&registers->usbsts;
     133
     134        return EOK;
     135}
     136
     137/** Register interrupt handler.
     138 *
     139 * @param[in] device Host controller DDF device
     140 * @param[in] regs Register range
     141 * @param[in] irq Interrupt number
     142 * @paran[in] handler Interrupt handler
     143 *
     144 * @return EOK on success or negative error code
     145 */
     146int hc_register_irq_handler(ddf_dev_t *device, addr_range_t *regs, int irq,
     147    interrupt_handler_t handler)
     148{
     149        assert(device);
     150        irq_pio_range_t irq_ranges[hc_irq_pio_range_count()];
     151        irq_cmd_t irq_cmds[hc_irq_cmd_count()];
     152
     153        int ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
     154            sizeof(irq_cmds), regs);
     155        if (ret != EOK) {
     156                usb_log_error("Failed to generate IRQ commands: %s.\n",
     157                    str_error(ret));
     158                return ret;
     159        }
     160
     161        irq_code_t irq_code = {
     162                .rangecount = hc_irq_pio_range_count(),
     163                .ranges = irq_ranges,
     164                .cmdcount = hc_irq_cmd_count(),
     165                .cmds = irq_cmds
     166        };
     167
     168        /* Register handler to avoid interrupt lockup */
     169        ret = register_interrupt_handler(device, irq, handler, &irq_code);
     170        if (ret != EOK) {
     171                usb_log_error("Failed to register interrupt handler: %s.\n",
     172                    str_error(ret));
     173                return ret;
     174        }
    134175
    135176        return EOK;
    … …  
    196237 *
    197238 * @param[in] instance Memory place to initialize.
    198  * @param[in] regs Address of I/O control registers.
    199  * @param[in] reg_size Size of I/O control registers.
     239 * @param[in] regs Range of device's I/O control registers.
    200240 * @param[in] interrupts True if hw interrupts should be used.
    201241 * @return Error code.
    … …  
    205245 * interrupt fibrils.
    206246 */
    207 int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interrupts)
    208 {
    209         assert(reg_size >= sizeof(uhci_regs_t));
     247int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
     248{
     249        assert(instance);
     250        assert(regs);
     251        assert(regs->size >= sizeof(uhci_regs_t));
    210252
    211253        instance->hw_interrupts = interrupts;
    … …  
    214256        /* allow access to hc control registers */
    215257        uhci_regs_t *io;
    216         int ret = pio_enable(regs, reg_size, (void **)&io);
     258        int ret = pio_enable_range(regs, (void **) &io);
    217259        if (ret != EOK) {
    218260                usb_log_error("Failed to gain access to registers at %p: %s.\n",
    … …  
    223265
    224266        usb_log_debug(
    225             "Device registers at %p (%zuB) accessible.\n", io, reg_size);
     267            "Device registers at %p (%zuB) accessible.\n", io, regs->size);
    226268
    227269        ret = hc_init_mem_structures(instance);

  • uspace/drv/bus/usb/uhci/hc.h

    rdd7078c r3f03199  
    3636#define DRV_UHCI_HC_H
    3737
     38#include <ddf/interrupt.h>
     39#include <device/hw_res_parsed.h>
    3840#include <fibril.h>
    3941#include <macros.h>
    … …  
    124126size_t hc_irq_pio_range_count(void);
    125127size_t hc_irq_cmd_count(void);
    126 int hc_get_irq_code(irq_pio_range_t [], size_t, irq_cmd_t [], size_t, uintptr_t,
    127     size_t);
     128int hc_register_irq_handler(ddf_dev_t *, addr_range_t *, int,
     129    interrupt_handler_t);
     130int hc_get_irq_code(irq_pio_range_t [], size_t, irq_cmd_t [], size_t,
     131    addr_range_t *);
    128132void hc_interrupt(hc_t *instance, uint16_t status);
    129 int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interupts);
     133int hc_init(hc_t *instance, addr_range_t *regs, bool interupts);
    130134int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
    131135
    … …  
    136140static inline void hc_fini(hc_t *instance) {} /* TODO: implement*/
    137141#endif
     142
    138143/**
    139144 * @}

  • uspace/drv/bus/usb/uhci/res.c

    rdd7078c r3f03199  
    4646 *
    4747 * @param[in] dev Device asking for the addresses.
    48  * @param[out] io_reg_address Base address of the I/O range.
    49  * @param[out] io_reg_size Size of the I/O range.
     48 * @param[out] io_regs_p Pointer to register I/O range.
    5049 * @param[out] irq_no IRQ assigned to the device.
    5150 * @return Error code.
    5251 */
    53 int get_my_registers(ddf_dev_t *dev,
    54     uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no)
     52int get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs_p, int *irq_no)
    5553{
    5654        assert(dev);
    … …  
    7674        }
    7775
    78         if (io_reg_address)
    79                 *io_reg_address = hw_res.io_ranges.ranges[0].address;
    80         if (io_reg_size)
    81                 *io_reg_size = hw_res.io_ranges.ranges[0].size;
     76        if (io_regs_p)
     77                *io_regs_p = hw_res.io_ranges.ranges[0];
    8278        if (irq_no)
    8379                *irq_no = hw_res.irqs.irqs[0];

  • uspace/drv/bus/usb/uhci/res.h

    rdd7078c r3f03199  
    3737
    3838#include <ddf/driver.h>
     39#include <device/hw_res_parsed.h>
    3940
    40 int get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
     41int get_my_registers(ddf_dev_t *, addr_range_t *, int *);
    4142int enable_interrupts(ddf_dev_t *);
    4243int disable_legacy(ddf_dev_t *);

  • uspace/drv/bus/usb/uhci/uhci.c

    rdd7078c r3f03199  
    8080                return EBADMEM;
    8181
    82 #define CHECK_RET_RETURN(ret, message...) \
    83 if (ret != EOK) { \
    84         usb_log_error(message); \
    85         return ret; \
    86 } else (void)0
    87 
    88         uintptr_t reg_base = 0;
    89         size_t reg_size = 0;
     82        addr_range_t regs;
    9083        int irq = 0;
    9184
    92         int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
    93         CHECK_RET_RETURN(ret, "Failed to get I/O region for %" PRIun ": %s.\n",
    94             ddf_dev_get_handle(device), str_error(ret));
    95         usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
    96             (void *) reg_base, reg_size, irq);
     85        int ret = get_my_registers(device, &regs, &irq);
     86        if (ret != EOK) {
     87                usb_log_error("Failed to get I/O addresses for %" PRIun ": %s.\n",
     88                    ddf_dev_get_handle(device), str_error(ret));
     89                return ret;
     90        }
     91        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
     92            RNGABSPTR(regs), RNGSZ(regs), irq);
    9793
    98         const size_t ranges_count = hc_irq_pio_range_count();
    99         const size_t cmds_count = hc_irq_cmd_count();
    100         irq_pio_range_t irq_ranges[ranges_count];
    101         irq_cmd_t irq_cmds[cmds_count];
    102         ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
    103             sizeof(irq_cmds), reg_base, reg_size);
    104         CHECK_RET_RETURN(ret, "Failed to generate IRQ commands: %s.\n",
    105             str_error(ret));
     94        ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
     95            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
     96        if (ret != EOK) {
     97                usb_log_error("Failed to setup generic HCD.\n");
     98                return ret;
     99        }
    106100
    107         irq_code_t irq_code = {
    108                 .rangecount = ranges_count,
    109                 .ranges = irq_ranges,
    110                 .cmdcount = cmds_count,
    111                 .cmds = irq_cmds
    112         };
     101        hc_t *hc = malloc(sizeof(hc_t));
     102        if (!hc) {
     103                usb_log_error("Failed to allocate UHCI HC structure.\n");
     104                hcd_ddf_clean_hc(device);
     105                return ENOMEM;
     106        }
    113107
    114         /* Register handler to avoid interrupt lockup */
    115         ret = register_interrupt_handler(device, irq, irq_handler, &irq_code);
    116         CHECK_RET_RETURN(ret, "Failed to register interrupt handler: %s.\n",
    117             str_error(ret));
    118        
    119         ret = disable_legacy(device);
    120         CHECK_RET_RETURN(ret, "Failed to disable legacy USB: %s.\n",
    121             str_error(ret));
     108        ret = hc_register_irq_handler(device, &regs, irq, irq_handler);
     109        if (ret != EOK) {
     110                usb_log_error("Failed to register interrupt handler: %s.\n",
     111                    str_error(ret));
     112                hcd_ddf_clean_hc(device);
     113                return ret;
     114        }
    122115
    123116        bool interrupts = false;
    … …  
    131124        }
    132125
    133         ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
    134             BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
    135         CHECK_RET_RETURN(ret, "Failed to setup UHCI HCD.\n");
    136        
    137         hc_t *hc = malloc(sizeof(hc_t));
    138         ret = hc ? EOK : ENOMEM;
    139         CHECK_RET_RETURN(ret, "Failed to allocate UHCI HC structure.\n");
     126        ret = disable_legacy(device);
     127        if (ret != EOK) {
     128                usb_log_error("Failed to disable legacy USB: %s.\n",
     129                    str_error(ret));
     130                hcd_ddf_clean_hc(device);
     131                return ret;
     132        }
    140133
    141         ret = hc_init(hc, (void*)reg_base, reg_size, interrupts);
    142         CHECK_RET_RETURN(ret,
    143             "Failed to init uhci_hcd: %s.\n", str_error(ret));
     134        ret = hc_init(hc, &regs, interrupts);
     135        if (ret != EOK) {
     136                usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
     137                hcd_ddf_clean_hc(device);
     138                // TODO unregister interrupt handler
     139                return ret;
     140        }
    144141
    145142        hcd_set_implementation(dev_to_hcd(device), hc, hc_schedule, NULL, NULL);
    … …  
    151148        ret = hcd_ddf_setup_root_hub(device);
    152149        if (ret != EOK) {
    153                 // TODO: Undo hcd_setup_device
    154150                hc_fini(hc);
    155                 CHECK_RET_RETURN(ret, "Failed to setup UHCI root hub: %s.\n",
     151                hcd_ddf_clean_hc(device);
     152                // TODO unregister interrupt handler
     153                usb_log_error("Failed to setup UHCI root hub: %s.\n",
    156154                    str_error(ret));
    157155                return ret;

  • uspace/drv/bus/usb/uhci/utils/malloc32.h

    rdd7078c r3f03199  
    9292 */
    9393static inline void free32(void *addr)
    94         { free(addr); }
     94{
     95        free(addr);
     96}
    9597
    9698/** Create 4KB page mapping
    … …  
    98100 * @return Address of the mapped page, NULL on failure.
    99101 */
    100 static inline void * get_page(void)
     102static inline void *get_page(void)
    101103{
    102         void *address, *phys;
     104        uintptr_t phys;
     105        void *address;
     106       
    103107        const int ret = dmamem_map_anonymous(UHCI_REQUIRED_PAGE_SIZE,
    104             AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &address);
    105         return ret == EOK ? address : NULL;
     108            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
     109            &address);
     110       
     111        return ((ret == EOK) ? address : NULL);
    106112}
    107113
Note: See TracChangeset for help on using the changeset viewer.