From patchwork Fri Oct 28 01:37:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 688048 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t4nq51QXlz9sR9 for ; Fri, 28 Oct 2016 13:32:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b=Z+WpIen+; dkim-atps=neutral Received: from localhost ([::1]:45795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzwyM-0005TJ-Sn for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2016 22:32:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzw9a-00038M-B1 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:40:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzw9Y-0003h4-SY for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:40:18 -0400 Received: from ozlabs.org ([103.22.144.67]:60347) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzw9Y-0003fs-8w; Thu, 27 Oct 2016 21:40:16 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3t4mcV24FVz9vFL; Fri, 28 Oct 2016 12:38:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1477618714; bh=uz7lYX0A41Wjh/0FR3+A/loWICtDH6HpidB+qLS4LFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z+WpIen+hu4aeotvhGtaLhq2GkEIOkToJPNZ7CTDnH/7ZKk9XRD3LS1WJEdMfAgy8 9fs9j06e/3vtDHZtbpMVJSmPmpUA+v99OqLUP8mCC4VeP+9KypcCCZrw2g9AH+gXq7 CcbaG/BE+FGxBnqSrWfS2qxLslsxhUuvfuxZMk/4= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 28 Oct 2016 12:37:43 +1100 Message-Id: <1477618694-21019-43-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> References: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 42/73] pseries: Move /event-sources construction to spapr_build_fdt() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, clg@kaod.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The /event-sources device tree node is built from spapr_create_fdt_skel(). As part of consolidating device tree construction to reset time, this moves it to spapr_build_fdt(). Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Michael Roth --- hw/ppc/spapr.c | 6 +++--- hw/ppc/spapr_events.c | 21 ++++++++++----------- include/hw/ppc/spapr.h | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 1b61de2..048fb3d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -328,9 +328,6 @@ static void *spapr_create_fdt_skel(sPAPRMachineState *spapr) _FDT((fdt_end_node(fdt))); - /* event-sources */ - spapr_events_fdt_skel(fdt, spapr->check_exception_irq); - /* /hypervisor node */ if (kvm_enabled()) { uint8_t hypercall[16]; @@ -983,6 +980,9 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, } } + /* /event-sources */ + spapr_dt_events(fdt, spapr->check_exception_irq); + /* /rtas */ spapr_dt_rtas(spapr, fdt); diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 6d35345..89aa5a7 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -211,23 +211,22 @@ struct hp_log_full { #define EVENT_MASK_HOTPLUG 0x10000000 #define EVENT_MASK_IO 0x08000000 -void spapr_events_fdt_skel(void *fdt, uint32_t check_exception_irq) +void spapr_dt_events(void *fdt, uint32_t check_exception_irq) { + int event_sources, epow_events; uint32_t irq_ranges[] = {cpu_to_be32(check_exception_irq), cpu_to_be32(1)}; uint32_t interrupts[] = {cpu_to_be32(check_exception_irq), 0}; - _FDT((fdt_begin_node(fdt, "event-sources"))); + _FDT(event_sources = fdt_add_subnode(fdt, 0, "event-sources")); - _FDT((fdt_property(fdt, "interrupt-controller", NULL, 0))); - _FDT((fdt_property_cell(fdt, "#interrupt-cells", 2))); - _FDT((fdt_property(fdt, "interrupt-ranges", - irq_ranges, sizeof(irq_ranges)))); + _FDT(fdt_setprop(fdt, event_sources, "interrupt-controller", NULL, 0)); + _FDT(fdt_setprop_cell(fdt, event_sources, "#interrupt-cells", 2)); + _FDT(fdt_setprop(fdt, event_sources, "interrupt-ranges", + irq_ranges, sizeof(irq_ranges))); - _FDT((fdt_begin_node(fdt, "epow-events"))); - _FDT((fdt_property(fdt, "interrupts", interrupts, sizeof(interrupts)))); - _FDT((fdt_end_node(fdt))); - - _FDT((fdt_end_node(fdt))); + _FDT(epow_events = fdt_add_subnode(fdt, event_sources, "epow-events")); + _FDT(fdt_setprop(fdt, epow_events, "interrupts", + interrupts, sizeof(interrupts))); } static void rtas_event_log_queue(int log_type, void *data, bool exception) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 8b8bb97..ae7d1d7 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -581,7 +581,7 @@ struct sPAPREventLogEntry { }; void spapr_events_init(sPAPRMachineState *sm); -void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq); +void spapr_dt_events(void *fdt, uint32_t check_exception_irq); int spapr_h_cas_compose_response(sPAPRMachineState *sm, target_ulong addr, target_ulong size, bool cpu_update, bool memory_update);