From patchwork Wed Aug 31 20:49:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 3816 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5162923F26 for ; Wed, 31 Aug 2011 20:49:51 +0000 (UTC) Received: from mail-ew0-f52.google.com (mail-ew0-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 475F0A189E1 for ; Wed, 31 Aug 2011 20:49:51 +0000 (UTC) Received: by ewy28 with SMTP id 28so1088938ewy.11 for ; Wed, 31 Aug 2011 13:49:51 -0700 (PDT) Received: by 10.223.76.201 with SMTP id d9mr505373fak.119.1314823791023; Wed, 31 Aug 2011 13:49:51 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs30695lab; Wed, 31 Aug 2011 13:49:50 -0700 (PDT) Received: by 10.216.229.209 with SMTP id h59mr48804weq.24.1314823790458; Wed, 31 Aug 2011 13:49:50 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id t73si16807803weq.5.2011.08.31.13.49.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Aug 2011 13:49:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QyrjB-00005R-6d; Wed, 31 Aug 2011 21:49:41 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , Riku Voipio , Gerd Hoffmann , patches@linaro.org Subject: [PATCH 3/3] usb-musb: Add reset function Date: Wed, 31 Aug 2011 21:49:41 +0100 Message-Id: <1314823781-304-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1314823781-304-1-git-send-email-peter.maydell@linaro.org> References: <1314823781-304-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 From: Juha Riihimäki Add a separate reset function musb_reset() to the usb-musb interface, so that users who implement a reset function can also reset usb-musb. Use this in tusb6010. Signed-off-by: Juha Riihimäki [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell --- hw/tusb6010.c | 1 + hw/usb-musb.c | 24 ++++++++++++++++++------ hw/usb.h | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hw/tusb6010.c b/hw/tusb6010.c index 57fe804..ce7c81f 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -771,6 +771,7 @@ static void tusb6010_reset(DeviceState *dev) for (i = 0; i < 15; i++) { s->rx_config[i] = s->tx_config[i] = 0; } + musb_reset(s->musb); } static int tusb6010_init(SysBusDevice *dev) diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 640037f..01e2e7c 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -340,16 +340,12 @@ struct MUSBState { MUSBEndPoint ep[16]; }; -struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) +void musb_reset(MUSBState *s) { - MUSBState *s = g_malloc0(sizeof(*s)); int i; - for (i = 0; i < musb_irq_max; i++) { - s->irqs[i] = qdev_get_gpio_in(parent_device, gpio_base + i); - } - s->faddr = 0x00; + s->devctl = 0; s->power = MGC_M_POWER_HSENAB; s->tx_intr = 0x0000; s->rx_intr = 0x0000; @@ -359,6 +355,10 @@ struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) s->mask = 0x06; s->idx = 0; + s->setup_len = 0; + s->session = 0; + memset(s->buf, 0, sizeof(s->buf)); + /* TODO: _DW */ s->ep[0].config = MGC_M_CONFIGDATA_SOFTCONE | MGC_M_CONFIGDATA_DYNFIFO; for (i = 0; i < 16; i ++) { @@ -370,6 +370,18 @@ struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) usb_packet_init(&s->ep[i].packey[0].p); usb_packet_init(&s->ep[i].packey[1].p); } +} + +struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) +{ + MUSBState *s = g_malloc0(sizeof(*s)); + int i; + + for (i = 0; i < musb_irq_max; i++) { + s->irqs[i] = qdev_get_gpio_in(parent_device, gpio_base + i); + } + + musb_reset(s); usb_bus_new(&s->bus, &musb_bus_ops, parent_device); usb_register_port(&s->bus, &s->port, s, 0, &musb_port_ops, diff --git a/hw/usb.h b/hw/usb.h index 6f5b7ee..ee6320f 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -343,6 +343,7 @@ enum musb_irq_source_e { typedef struct MUSBState MUSBState; MUSBState *musb_init(DeviceState *parent_device, int gpio_base); +void musb_reset(MUSBState *s); uint32_t musb_core_intr_get(MUSBState *s); void musb_core_intr_clear(MUSBState *s, uint32_t mask); void musb_set_size(MUSBState *s, int epnum, int size, int is_tx);