From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6498C35247 for ; Thu, 6 Feb 2020 01:32:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B27B020661 for ; Thu, 6 Feb 2020 01:32:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o0biDPwt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B27B020661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izW1v-00028k-Un for qemu-devel@archiver.kernel.org; Wed, 05 Feb 2020 20:32:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54245) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izVoY-00012D-G9 for qemu-devel@nongnu.org; Wed, 05 Feb 2020 20:18:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izVoX-0003kj-9v for qemu-devel@nongnu.org; Wed, 05 Feb 2020 20:18:42 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36280) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izVoX-0003bp-1j; Wed, 05 Feb 2020 20:18:41 -0500 Received: by mail-wm1-x343.google.com with SMTP id p17so5062770wma.1; Wed, 05 Feb 2020 17:18:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B1P152VP3CyxvJ0hiqDereblCgbtylimKSTziv7Dq7E=; b=o0biDPwthid9iFIRvD5pWCxc0e1Gj158XdbKDYmH1e6zGL1J5Rjvj3P4GcZpO4JkNS P3FnNYYe18HTwUVYS5fECl0XwuEg2MDtlL/oDSg0hX9qt6BTOX8cyLYmDBokQqHiHgfX IPH4480fJz9X0/VsWxgJeCWNwttcMo2q+QRKo1KuWPmH5AgKOGq1dEwf0FYLBIqzCzIK b/odmNLpzp4yIRa/IVG7IFs47uO/lD8xO3TS2IrsbB9QqlA8raVplRvE1uf1Je5Oc2ad ojbI+raM7bG9o9AXM50UWvS1TxtEyOXdM5fUgu5wHuEkLsBaCPT65YBEVvXTrU6P5HAW eLrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=B1P152VP3CyxvJ0hiqDereblCgbtylimKSTziv7Dq7E=; b=A2ep4AuwKyMk5UdshSirFssi0hQuLv/wsesuGZlKjIFrvyYlnGWEZIAOtQAskGUSoH mUTreIhwPNKqLJK6sbVRwzPkVSbq6/oxCeF75QJN66dOQjVQxj6j00Zarl1d4BzlVZAH /yyLTcbJIjQHn+Tbu52VdtBJRbi00DaE3ionDKEc4Xz8roExMJWPQQaGRKJmvXiqqZmd LeUBj/lbCQYEz/m95lVLgcCgS5Nt+lJwnM9X1UsK1DfqNWCgx7IkV+83c1/Kaj30VdHN YT27yEeCOZcHO4QyWx4l9T3SE8pIf6ynIEbRLhAoh1utS0QkQABS8HZRpPrWin23QFsI glZg== X-Gm-Message-State: APjAAAXG8eNpnIc4Ot95sdK2U/q4rghTmzDG+gIzsRhwTIcbVnE//Hql o6cOfQx12sbJujBMBUkF6/IgTlVV X-Google-Smtp-Source: APXvYqzEZDX4yMMaj7BEDv+6IUHXNrNe35dw1xHiAVYXxW2Vnt2Jf+EfTwFrLNbqEeAaNsYNNGrb/g== X-Received: by 2002:a7b:cf08:: with SMTP id l8mr576418wmg.169.1580951917859; Wed, 05 Feb 2020 17:18:37 -0800 (PST) Received: from localhost.localdomain (2.red-95-127-156.staticip.rima-tde.net. [95.127.156.2]) by smtp.gmail.com with ESMTPSA id w13sm2053526wru.38.2020.02.05.17.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2020 17:18:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 18/30] hw/arm/bcm2836: Split out common realize() code Date: Thu, 6 Feb 2020 02:17:44 +0100 Message-Id: <20200206011756.2413-19-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200206011756.2413-1-f4bug@amsat.org> References: <20200206011756.2413-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Joaquin de Andres , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Esteban Bosse , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The realize() function is clearly composed of two parts, each described by a comment: void realize() { /* common peripherals from bcm2835 */ ... /* bcm2836 interrupt controller (and mailboxes, etc.) */ ... } Split the two part, so we can reuse the common part with other SoCs from this family. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/bcm2836.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index caaa4b625e..2b6fe31139 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -51,8 +51,10 @@ static void bcm2836_init(Object *obj) qdev_prop_set_uint32(DEVICE(obj), "enabled-cpus", bc->core_count); } - sysbus_init_child_obj(obj, "control", &s->control, sizeof(s->control), - TYPE_BCM2836_CONTROL); + if (bc->ctrl_base) { + sysbus_init_child_obj(obj, "control", &s->control, + sizeof(s->control), TYPE_BCM2836_CONTROL); + } sysbus_init_child_obj(obj, "peripherals", &s->peripherals, sizeof(s->peripherals), TYPE_BCM2835_PERIPHERALS); @@ -62,13 +64,12 @@ static void bcm2836_init(Object *obj) "vcram-size", &error_abort); } -static void bcm2836_realize(DeviceState *dev, Error **errp) +static void bcm283x_common_realize(DeviceState *dev, Error **errp) { BCM283XState *s = BCM283X(dev); BCM283XClass *bc = BCM283X_GET_CLASS(dev); Object *obj; Error *err = NULL; - int n; /* common peripherals from bcm2835 */ @@ -100,6 +101,20 @@ static void bcm2836_realize(DeviceState *dev, Error **errp) sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0, bc->peri_base, 1); +} + +static void bcm2836_realize(DeviceState *dev, Error **errp) +{ + BCM283XState *s = BCM283X(dev); + BCM283XClass *bc = BCM283X_GET_CLASS(dev); + Error *err = NULL; + int n; + + bcm283x_common_realize(dev, &err); + if (err) { + error_propagate(errp, err); + return; + } /* bcm2836 interrupt controller (and mailboxes, etc.) */ object_property_set_bool(OBJECT(&s->control), true, "realized", &err); -- 2.21.1