From patchwork Fri Mar 15 14:34:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15382 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 1751123E14 for ; Fri, 15 Mar 2013 14:34:34 +0000 (UTC) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by fiordland.canonical.com (Postfix) with ESMTP id C6D84A1901E for ; Fri, 15 Mar 2013 14:34:33 +0000 (UTC) Received: by mail-ve0-f173.google.com with SMTP id oz10so2647530veb.4 for ; Fri, 15 Mar 2013 07:34:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=FA2FnsdaXqk1aacXYsKkhPISjBpklPy405LIvEHDfeU=; b=eVfoV8oXvDATtJ2jmAxtzhVGqU4ms9FBZPoiD0IY73BgRXDBSOYmcfriPT494OepWh cf3GDIg+SXtuJUdV0aXwyYdy6YxbBf3qyB4EdNHZXCxO7k7Fyv/vHurZ3g9tyH0GQQxl gehhkwKP9ayQZYxkhnTxswvcsO5G1oT4laOAg1sfe0npOJINLNBkXlsErj123E1g82uT xwbuAYBFOBc0aeMe6ZQterk1FzF53AYQSq8dM9RxpbnulZnuYekahRKzA9S+UGCykoKj qvXfMPD9pHwl2tLPhtkkpeKOuEZSxF131OpgD8aYYjvSQ8uGrfetxqFnKm0xm59I7XBB 8Q/g== X-Received: by 10.52.177.163 with SMTP id cr3mr6270554vdc.94.1363358073180; Fri, 15 Mar 2013 07:34:33 -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.58.127.98 with SMTP id nf2csp123177veb; Fri, 15 Mar 2013 07:34:32 -0700 (PDT) X-Received: by 10.15.43.132 with SMTP id x4mr18787421eev.31.1363358067981; Fri, 15 Mar 2013 07:34:27 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id i43si11645748eem.242.2013.03.15.07.34.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 15 Mar 2013 07:34:27 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UGViB-0006FC-Jo; Fri, 15 Mar 2013 14:34:23 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Michael Walle , Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini Subject: [PATCH v3 3/5] milkymist-minimac2: Just expose buffers as a sysbus mmio region Date: Fri, 15 Mar 2013 14:34:21 +0000 Message-Id: <1363358063-23973-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1363358063-23973-1-git-send-email-peter.maydell@linaro.org> References: <1363358063-23973-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQk30Fwrrp0Fi6egPE4ojIvOLAmboMQIca/fLdUFzwujoI3OK6gvTwNN1PFFiDIfpcL5WL2Q Just expose the register buffers memory as a standard sysbus mmio region which the creator of the device can map, rather than providing a qdev property which the creator has to set to the base address and then doing the mapping in the device's own init function. Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber Acked-by: Michael Walle --- hw/milkymist-hw.h | 2 +- hw/milkymist-minimac2.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h index ced1c5f..aa0865f 100644 --- a/hw/milkymist-hw.h +++ b/hw/milkymist-hw.h @@ -177,10 +177,10 @@ static inline DeviceState *milkymist_minimac2_create(hwaddr base, qemu_check_nic_model(&nd_table[0], "minimac2"); dev = qdev_create(NULL, "milkymist-minimac2"); - qdev_prop_set_taddr(dev, "buffers_base", buffers_base); qdev_set_nic_properties(dev, &nd_table[0]); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, buffers_base); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq); diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c index c20ff90..29618e8 100644 --- a/hw/milkymist-minimac2.c +++ b/hw/milkymist-minimac2.c @@ -96,7 +96,6 @@ struct MilkymistMinimac2State { NICState *nic; NICConf conf; char *phy_model; - hwaddr buffers_base; MemoryRegion buffers; MemoryRegion regs_region; @@ -475,7 +474,7 @@ static int milkymist_minimac2_init(SysBusDevice *dev) s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE; s->tx_buf = s->rx1_buf + MINIMAC2_BUFFER_SIZE; - sysbus_add_memory(dev, s->buffers_base, &s->buffers); + sysbus_init_mmio(dev, &s->buffers); qemu_macaddr_default_if_unset(&s->conf.macaddr); s->nic = qemu_new_nic(&net_milkymist_minimac2_info, &s->conf, @@ -517,8 +516,6 @@ static const VMStateDescription vmstate_milkymist_minimac2 = { }; static Property milkymist_minimac2_properties[] = { - DEFINE_PROP_TADDR("buffers_base", MilkymistMinimac2State, - buffers_base, 0), DEFINE_NIC_PROPERTIES(MilkymistMinimac2State, conf), DEFINE_PROP_STRING("phy_model", MilkymistMinimac2State, phy_model), DEFINE_PROP_END_OF_LIST(),