Index: uspace/drv/bus/usb/uhci/Makefile =================================================================== --- uspace/drv/bus/usb/uhci/Makefile (revision dcffe95201630b897ab409dd34d42835214b1345) +++ uspace/drv/bus/usb/uhci/Makefile (revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e) @@ -44,5 +44,5 @@ hc.c \ main.c \ - pci.c \ + res.c \ root_hub.c \ transfer_list.c \ Index: pace/drv/bus/usb/uhci/pci.c =================================================================== --- uspace/drv/bus/usb/uhci/pci.c (revision dcffe95201630b897ab409dd34d42835214b1345) +++ (revision ) @@ -1,146 +1,0 @@ -/* - * Copyright (c) 2011 Vojtech Horky - * 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 drvusbuhcihc - * @{ - */ -/** - * @file - * PCI related functions needed by the UHCI driver. - */ - -#include -#include -#include -#include - -#include -#include - -#include "pci.h" - -/** Get I/O address of registers and IRQ for given device. - * - * @param[in] dev Device asking for the addresses. - * @param[out] io_reg_address Base address of the I/O range. - * @param[out] io_reg_size Size of the I/O range. - * @param[out] irq_no IRQ assigned to the device. - * @return Error code. - */ -int pci_get_my_registers(const ddf_dev_t *dev, - uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no) -{ - assert(dev); - assert(io_reg_address); - assert(io_reg_size); - assert(irq_no); - - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle, - IPC_FLAG_BLOCKING); - if (!parent_sess) - return ENOMEM; - - hw_res_list_parsed_t hw_res; - hw_res_list_parsed_init(&hw_res); - const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0); - async_hangup(parent_sess); - if (ret != EOK) { - return ret; - } - - /* We want one irq and one io range. */ - if (hw_res.irqs.count != 1 || hw_res.io_ranges.count != 1) { - hw_res_list_parsed_clean(&hw_res); - return EINVAL; - } - - if (io_reg_address) - *io_reg_address = hw_res.io_ranges.ranges[0].address; - if (io_reg_size) - *io_reg_size = hw_res.io_ranges.ranges[0].size; - if (irq_no) - *irq_no = hw_res.irqs.irqs[0]; - - hw_res_list_parsed_clean(&hw_res); - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** Call the PCI driver with a request to enable interrupts - * - * @param[in] device Device asking for interrupts - * @return Error code. - */ -int pci_enable_interrupts(const ddf_dev_t *device) -{ - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle, - IPC_FLAG_BLOCKING); - if (!parent_sess) - return ENOMEM; - - const bool enabled = hw_res_enable_interrupt(parent_sess); - async_hangup(parent_sess); - - return enabled ? EOK : EIO; -} -/*----------------------------------------------------------------------------*/ -/** Call the PCI driver with a request to clear legacy support register - * - * @param[in] device Device asking to disable interrupts - * @return Error code. - */ -int pci_disable_legacy(const ddf_dev_t *device) -{ - assert(device); - - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle, - IPC_FLAG_BLOCKING); - if (!parent_sess) - return ENOMEM; - - /* See UHCI design guide for these values p.45, - * write all WC bits in USB legacy register */ - const sysarg_t address = 0xc0; - const sysarg_t value = 0xaf00; - - async_exch_t *exch = async_exchange_begin(parent_sess); - - const int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE), - IPC_M_CONFIG_SPACE_WRITE_16, address, value); - - async_exchange_end(exch); - async_hangup(parent_sess); - - return rc; -} - -/** - * @} - */ Index: pace/drv/bus/usb/uhci/pci.h =================================================================== --- uspace/drv/bus/usb/uhci/pci.h (revision dcffe95201630b897ab409dd34d42835214b1345) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2010 Vojtech Horky - * 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 drvusbuhcihc - * @{ - */ -/** @file - * @brief UHCI driver PCI helper functions - */ -#ifndef DRV_UHCI_PCI_H -#define DRV_UHCI_PCI_H - -#include - -int pci_get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *); -int pci_enable_interrupts(const ddf_dev_t *); -int pci_disable_legacy(const ddf_dev_t *); - -#endif -/** - * @} - */ - Index: uspace/drv/bus/usb/uhci/res.c =================================================================== --- uspace/drv/bus/usb/uhci/res.c (revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e) +++ uspace/drv/bus/usb/uhci/res.c (revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e) @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 drvusbuhcihc + * @{ + */ +/** + * @file + * PCI related functions needed by the UHCI driver. + */ + +#include +#include +#include +#include +#include + +#include "res.h" + +/** Get I/O address of registers and IRQ for given device. + * + * @param[in] dev Device asking for the addresses. + * @param[out] io_reg_address Base address of the I/O range. + * @param[out] io_reg_size Size of the I/O range. + * @param[out] irq_no IRQ assigned to the device. + * @return Error code. + */ +int get_my_registers(const ddf_dev_t *dev, + uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no) +{ + assert(dev); + + async_sess_t *parent_sess = + devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle, + IPC_FLAG_BLOCKING); + if (!parent_sess) + return ENOMEM; + + hw_res_list_parsed_t hw_res; + hw_res_list_parsed_init(&hw_res); + const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0); + async_hangup(parent_sess); + if (ret != EOK) { + return ret; + } + + /* We want one irq and one io range. */ + if (hw_res.irqs.count != 1 || hw_res.io_ranges.count != 1) { + hw_res_list_parsed_clean(&hw_res); + return EINVAL; + } + + if (io_reg_address) + *io_reg_address = hw_res.io_ranges.ranges[0].address; + if (io_reg_size) + *io_reg_size = hw_res.io_ranges.ranges[0].size; + if (irq_no) + *irq_no = hw_res.irqs.irqs[0]; + + hw_res_list_parsed_clean(&hw_res); + return EOK; +} +/*----------------------------------------------------------------------------*/ +/** Call the PCI driver with a request to enable interrupts + * + * @param[in] device Device asking for interrupts + * @return Error code. + */ +int enable_interrupts(const ddf_dev_t *device) +{ + async_sess_t *parent_sess = + devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle, + IPC_FLAG_BLOCKING); + if (!parent_sess) + return ENOMEM; + + const bool enabled = hw_res_enable_interrupt(parent_sess); + async_hangup(parent_sess); + + return enabled ? EOK : EIO; +} +/*----------------------------------------------------------------------------*/ +/** Call the PCI driver with a request to clear legacy support register + * + * @param[in] device Device asking to disable interrupts + * @return Error code. + */ +int disable_legacy(const ddf_dev_t *device) +{ + assert(device); + + async_sess_t *parent_sess = devman_parent_device_connect( + EXCHANGE_SERIALIZE, device->handle, IPC_FLAG_BLOCKING); + if (!parent_sess) + return ENOMEM; + + /* See UHCI design guide page 45 for these values. + * Write all WC bits in USB legacy register */ + const int rc = pci_config_space_write_16(parent_sess, 0xc0, 0xaf00); + + async_hangup(parent_sess); + return rc; +} + +/** + * @} + */ Index: uspace/drv/bus/usb/uhci/res.h =================================================================== --- uspace/drv/bus/usb/uhci/res.h (revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e) +++ uspace/drv/bus/usb/uhci/res.h (revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * 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 drvusbuhcihc + * @{ + */ +/** @file + * @brief UHCI driver PCI helper functions + */ +#ifndef DRV_UHCI_PCI_H +#define DRV_UHCI_PCI_H + +#include + +int get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *); +int enable_interrupts(const ddf_dev_t *); +int disable_legacy(const ddf_dev_t *); + +#endif +/** + * @} + */ + Index: uspace/drv/bus/usb/uhci/uhci.c =================================================================== --- uspace/drv/bus/usb/uhci/uhci.c (revision dcffe95201630b897ab409dd34d42835214b1345) +++ uspace/drv/bus/usb/uhci/uhci.c (revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e) @@ -41,6 +41,6 @@ #include "uhci.h" -#include "pci.h" - + +#include "res.h" #include "hc.h" #include "root_hub.h" @@ -49,12 +49,12 @@ * and USB root hub */ typedef struct uhci { - /** Pointer to DDF represenation of UHCI host controller */ + /** Pointer to DDF representation of UHCI host controller */ ddf_fun_t *hc_fun; - /** Pointer to DDF represenation of UHCI root hub */ + /** Pointer to DDF representation of UHCI root hub */ ddf_fun_t *rh_fun; - /** Internal driver's represenation of UHCI host controller */ + /** Internal driver's representation of UHCI host controller */ hc_t hc; - /** Internal driver's represenation of UHCI root hub */ + /** Internal driver's representation of UHCI root hub */ rh_t rh; } uhci_t; @@ -187,5 +187,5 @@ int irq = 0; - ret = pci_get_my_registers(device, ®_base, ®_size, &irq); + ret = get_my_registers(device, ®_base, ®_size, &irq); CHECK_RET_DEST_FREE_RETURN(ret, "Failed to get I/O addresses for %" PRIun ": %s.\n", @@ -194,5 +194,5 @@ (void *) reg_base, reg_size, irq); - ret = pci_disable_legacy(device); + ret = disable_legacy(device); CHECK_RET_DEST_FREE_RETURN(ret, "Failed to disable legacy USB: %s.\n", str_error(ret)); @@ -220,5 +220,5 @@ bool interrupts = false; - ret = pci_enable_interrupts(device); + ret = enable_interrupts(device); if (ret != EOK) { usb_log_warning("Failed to enable interrupts: %s."