From patchwork Tue Sep 9 07:54:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 37042 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7E85D20491 for ; Tue, 9 Sep 2014 07:54:46 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf81916593oac.9 for ; Tue, 09 Sep 2014 00:54:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=HFdI5gGsJa9CQR1OuekvR3YLxPXJxHhGpA5HKHW546Y=; b=e6BOxpIsPjjiZejrQXHNNa6eBankLdzVRarh007Bg5+cH5/eGekm3vKA30MvbPh5Ir w1QzONwMky9oYm49V5I3y1dlZ54CnKX4NKc1M2t0SMDgHANiK9dj/q9VjkhjkH/4NiCv PKDvOdWRuqqf6IlT98mpm/MHzrJE4BLKeDh732DvJ76HIBijewMv05A+pDurPNYmnycA 0ZnGqR9N8Ehz1w7euJuDRBcGm971mlqA8yB90f11Z5mvx+oNj07PwTLOFu3arX1/Cmr1 CYDCinmBE70jtyp3Ao+nBiOtQY3SW6rJSzRFyFhXzoU1K1PIyKUVnucLCjcIYNDGCvp0 h6xw== X-Gm-Message-State: ALoCoQn8GPevk/MA0z6g8YNNgHEs7E/A1u0l6tTPcvIu+EUxQ0qbedDF/JsJoQE/nqM9E2KSPaXZ X-Received: by 10.50.92.104 with SMTP id cl8mr15907703igb.1.1410249286119; Tue, 09 Sep 2014 00:54:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.34 with SMTP id c31ls1983047qge.92.gmail; Tue, 09 Sep 2014 00:54:46 -0700 (PDT) X-Received: by 10.52.35.105 with SMTP id g9mr658329vdj.61.1410249286006; Tue, 09 Sep 2014 00:54:46 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id ci16si5491340vdb.93.2014.09.09.00.54.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id im17so2213536vcb.24 for ; Tue, 09 Sep 2014 00:54:45 -0700 (PDT) X-Received: by 10.52.138.210 with SMTP id qs18mr24706923vdb.18.1410249285927; Tue, 09 Sep 2014 00:54:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp246164vcb; Tue, 9 Sep 2014 00:54:45 -0700 (PDT) X-Received: by 10.194.203.8 with SMTP id km8mr40872263wjc.51.1410249284824; Tue, 09 Sep 2014 00:54:44 -0700 (PDT) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by mx.google.com with ESMTPS id s4si16164918wjw.122.2014.09.09.00.54.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:44 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.180 as permitted sender) client-ip=209.85.212.180; Received: by mail-wi0-f180.google.com with SMTP id ex7so3936222wid.7 for ; Tue, 09 Sep 2014 00:54:44 -0700 (PDT) X-Received: by 10.180.19.103 with SMTP id d7mr28945874wie.9.1410249284428; Tue, 09 Sep 2014 00:54:44 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id xt6sm13873858wjc.14.2014.09.09.00.54.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:54:43 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, alex.williamson@redhat.com Subject: [PATCH v3 1/6] hw/misc/dyn_sysbus_binding: helpers for sysbus device dynamic binding Date: Tue, 9 Sep 2014 08:54:28 +0100 Message-Id: <1410249273-6063-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> References: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This new module implements routines which help in dynamic device binding (mmio regions, irq). They are supposed to be used by machine files that support dynamic sysbus instantiation. Signed-off-by: Alexander Graf Signed-off-by: Eric Auger --- v1 -> v2: - platform_devices renamed into dyn_sysbus_binding - PlatformParams renamed into DynSysbusParams - PlatformBusNotifier renamed into DynSysbusNotifier - platform_bus_map_irq, platform_bus_map_mmio, sysbus_device_check, platform_bus_init become static - PlatformBusInitData becomes private to the module - page_shift becomes a member of DynSysbusParams v1: Dynamic sysbus device allocation fully written by Alex Graf. Those functions were initially in ppc e500 machine file. Now moved to a separate module. PPCE500Params is replaced by a generic struct named PlatformParams --- hw/misc/Makefile.objs | 1 + hw/misc/dyn_sysbus_binding.c | 163 +++++++++++++++++++++++++++++++++++ include/hw/misc/dyn_sysbus_binding.h | 24 ++++++ 3 files changed, 188 insertions(+) create mode 100644 hw/misc/dyn_sysbus_binding.c create mode 100644 include/hw/misc/dyn_sysbus_binding.h diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 979e532..86f6243 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -41,3 +41,4 @@ obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o obj-$(CONFIG_PVPANIC) += pvpanic.o +obj-y += dyn_sysbus_binding.o diff --git a/hw/misc/dyn_sysbus_binding.c b/hw/misc/dyn_sysbus_binding.c new file mode 100644 index 0000000..0f34f0b --- /dev/null +++ b/hw/misc/dyn_sysbus_binding.c @@ -0,0 +1,163 @@ +#include "hw/misc/dyn_sysbus_binding.h" +#include "qemu/error-report.h" + +typedef struct PlatformBusInitData { + unsigned long *used_irqs; + unsigned long *used_mem; + MemoryRegion *mem; + qemu_irq *irqs; + int device_count; + DynSysbusParams *params; +} PlatformBusInitData; + + +static int platform_bus_map_irq(DynSysbusParams *params, + SysBusDevice *sbdev, + int n, unsigned long *used_irqs, + qemu_irq *platform_irqs) +{ + int max_irqs = params->platform_bus_num_irqs; + char *prop = g_strdup_printf("irq[%d]", n); + int irqn = object_property_get_int(OBJECT(sbdev), prop, NULL); + + if (irqn == SYSBUS_DYNAMIC) { + /* Find the first available IRQ */ + irqn = find_first_zero_bit(used_irqs, max_irqs); + } + + if ((irqn >= max_irqs) || test_and_set_bit(irqn, used_irqs)) { + hw_error("IRQ %d is already allocated or no free IRQ left", irqn); + } + + sysbus_connect_irq(sbdev, n, platform_irqs[irqn]); + object_property_set_int(OBJECT(sbdev), irqn, prop, NULL); + + g_free(prop); + return 0; +} + +static int platform_bus_map_mmio(DynSysbusParams *params, + SysBusDevice *sbdev, + int n, unsigned long *used_mem, + MemoryRegion *pmem) +{ + MemoryRegion *device_mem = sbdev->mmio[n].memory; + uint64_t size = memory_region_size(device_mem); + uint64_t page_size = (1 << params->page_shift); + uint64_t page_mask = page_size - 1; + uint64_t size_pages = (size + page_mask) >> params->page_shift; + uint64_t max_size = params->platform_bus_size; + uint64_t max_pages = max_size >> params->page_shift; + char *prop = g_strdup_printf("mmio[%d]", n); + hwaddr addr = object_property_get_int(OBJECT(sbdev), prop, NULL); + int page; + int i; + + page = addr >> params->page_shift; + if (addr == SYSBUS_DYNAMIC) { + uint64_t size_pages_align; + + /* Align the region to at least its own size granularity */ + if (is_power_of_2(size_pages)) { + size_pages_align = size_pages; + } else { + size_pages_align = pow2floor(size_pages) << 1; + } + + /* Find the first available region that fits */ + page = bitmap_find_next_zero_area(used_mem, max_pages, 0, size_pages, + size_pages_align); + + addr = (uint64_t)page << params->page_shift; + } + + if (page >= max_pages || test_bit(page, used_mem) || + (find_next_bit(used_mem, max_pages, page) < size_pages)) { + hw_error("Memory [%"PRIx64":%"PRIx64" is already allocated or " + "no slot left", addr, size); + } + + for (i = page; i < (page + size_pages); i++) { + set_bit(i, used_mem); + } + + memory_region_add_subregion(pmem, addr, device_mem); + sbdev->mmio[n].addr = addr; + object_property_set_int(OBJECT(sbdev), addr, prop, NULL); + + g_free(prop); + return 0; +} + +static int sysbus_device_check(Object *obj, void *opaque) +{ + PlatformBusInitData *init = opaque; + Object *dev; + SysBusDevice *sbdev; + int i; + + dev = object_dynamic_cast(obj, TYPE_SYS_BUS_DEVICE); + sbdev = (SysBusDevice *)dev; + + if (!sbdev) { + /* Container, traverse it for children */ + return object_child_foreach(obj, sysbus_device_check, opaque); + } + + /* Connect sysbus device to virtual platform bus */ + for (i = 0; i < sbdev->num_irq; i++) { + if (!sbdev->irqp[i]) { + /* This IRQ is an incoming IRQ, we can't wire those here */ + continue; + } + platform_bus_map_irq(init->params, sbdev, i, + init->used_irqs, init->irqs); + } + + for (i = 0; i < sbdev->num_mmio; i++) { + platform_bus_map_mmio(init->params, sbdev, i, + init->used_mem, init->mem); + } + + return 0; +} + +static void platform_bus_init(DynSysbusParams *params, + MemoryRegion *address_space_mem, + qemu_irq *mpic) +{ + uint64_t max_size = params->platform_bus_size; + uint64_t max_pages = max_size >> params->page_shift; + DECLARE_BITMAP(used_irqs, params->platform_bus_num_irqs); + DECLARE_BITMAP(used_mem, max_pages); + MemoryRegion *platform_region = g_new(MemoryRegion, 1); + Object *container; + PlatformBusInitData init = { + .used_irqs = used_irqs, + .used_mem = used_mem, + .mem = platform_region, + .irqs = &mpic[params->platform_bus_first_irq], + .params = params, + }; + + memory_region_init(platform_region, NULL, "platform devices", + params->platform_bus_size); + + bitmap_clear(used_irqs, 0, params->platform_bus_num_irqs); + bitmap_clear(used_mem, 0, max_pages); + + /* Loop through all sysbus devices that were spawened outside the machine */ + container = container_get(qdev_get_machine(), "/peripheral"); + sysbus_device_check(container, &init); + container = container_get(qdev_get_machine(), "/peripheral-anon"); + sysbus_device_check(container, &init); + + memory_region_add_subregion(address_space_mem, params->platform_bus_base, + platform_region); +} + +void platform_bus_init_notify(Notifier *notifier, void *data) +{ + DynSysbusNotifier *pn = (DynSysbusNotifier *)notifier; + platform_bus_init(&pn->params, pn->address_space_mem, pn->mpic); +} diff --git a/include/hw/misc/dyn_sysbus_binding.h b/include/hw/misc/dyn_sysbus_binding.h new file mode 100644 index 0000000..961c9c7 --- /dev/null +++ b/include/hw/misc/dyn_sysbus_binding.h @@ -0,0 +1,24 @@ +#ifndef HW_MISC_PLATFORM_DEVICES_H +#define HW_MISC_PLATFORM_DEVICES_H + +#include "qemu-common.h" +#include "hw/sysbus.h" + +typedef struct { + bool has_platform_bus; + hwaddr platform_bus_base; + hwaddr platform_bus_size; + int platform_bus_first_irq; + int platform_bus_num_irqs; + int page_shift; +} DynSysbusParams; + +typedef struct DynSysbusNotifier { + Notifier notifier; + MemoryRegion *address_space_mem; + qemu_irq *mpic; + DynSysbusParams params; +} DynSysbusNotifier; + +void platform_bus_init_notify(Notifier *notifier, void *data); +#endif