From patchwork Thu Oct 19 21:17:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 735614 Delivered-To: patch@linaro.org Received: by 2002:adf:f0cd:0:b0:32d:baff:b0ca with SMTP id x13csp1731007wro; Thu, 19 Oct 2023 14:23:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6nQ9fAJL3Z4sRWCfGOXxbMKnH475Ja5GW20ZhFPIrg4CQCq8JhfkcCbq4HGt46ceZc8Bc X-Received: by 2002:a05:620a:44c4:b0:775:ce76:474a with SMTP id y4-20020a05620a44c400b00775ce76474amr3857121qkp.52.1697750600612; Thu, 19 Oct 2023 14:23:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697750600; cv=none; d=google.com; s=arc-20160816; b=LXY1te+MBlYC4Pw2OKlwNSEIh1lNVCAyd5lVnhLWfYWDvAxizPdNgDIbbvaP+d23Yj Db3YxDeBSThJq9KD9BDIgAcJhz2Ekel0yg0jgVycjUcJczw2XJd7HMI81ULsmRZs5HXP jGyDbzTR8aKre9tp0dQuk6CneJYvRtzXyk5xPCvHhLLWrKxzvAUN1Wuq+zNqES4EMxQE 92602jSUlx1k+8Hcudfzmd6oQW523nNdY1Oh4G8wO3w0NR8ExAHJlR5JbmVCMcnfl//F EH13QDtNErfqUcP6hF6Ex3KooRlEeVL3S+TExSbGOOeY5mt7NqgH45xrr/LXyS9b9S6R cKTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RctKb6lJoE4fPKPR7iwErgm5ApYF3Oq0zyKJn1rvnek=; fh=dmOCqvos1g3r1RzW1CO0kfggl2PD3Dx25NFBbr1xQIo=; b=cfKtW3HVBat8NEEOYRI41fmhhRmQuDczpIWupoeZ7oxMuZupcALMSUN6xSyRuQfaSD gJZKnzuMX+MJgubBuxvz2AU30jICwnU4bWNhhUPb6o7jyNaS7aBDZ35IGvmzJQZfMlOx umh3lfjEcGn95cXhK4QFZgMFc3Wq64tnWoAHV5bomBHeAh7Z2MMilza3LKKbcQ1xvO6A QZk6ybnZgGbm5xvLrt7XvnEXqQcGFVFO3cxA1WPbrDFGItegWR3BtYcaOwyt8PQlds/r t44jOhFKPnqyURdFR08NJaKeDdVMyvww6mSJpimg7h8Y1qQJi0adCF1o3/bCWcynXwW+ /voA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q0CfCjC+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z22-20020a05620a08d600b00777449886basi253156qkz.572.2023.10.19.14.23.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2023 14:23:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q0CfCjC+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtaSy-0002B4-GL; Thu, 19 Oct 2023 17:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtaSx-00026y-EH for qemu-devel@nongnu.org; Thu, 19 Oct 2023 17:22:03 -0400 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtaSu-0007s2-Rz for qemu-devel@nongnu.org; Thu, 19 Oct 2023 17:22:03 -0400 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-507b18cf2e1so114611e87.3 for ; Thu, 19 Oct 2023 14:22:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697750519; x=1698355319; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RctKb6lJoE4fPKPR7iwErgm5ApYF3Oq0zyKJn1rvnek=; b=q0CfCjC+lkq8ai1mn5+34tw2rVRzN0wsHzp/ah0FDVPfgJEpEfF3JtupLwW8AY0TSQ A9qQnxGqkNra+BwtcWOafdEgFXodL/CErbybAz2mKuD9dNdhwcACO2coXTwaWBvinS0U FAG5oNFe7FeT1OI9FuBD2xgeid50fXX5Mz+Z2ZSzUMOoXYPEygZf5aMtEOO+h7THQ3mm PPJeB9UVzWME04b3zb2FVSUOTt16twHYIynZIVZoKhYN58sJt1ZmJe55R6JWfTeKrbWu kRX5NkQ4ehnOM0QUh5kiOiKaOTV6mCGIv+hmUM3l+mfNq89v0I3H0wv1AJ9Xgihd+gZC 94Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697750519; x=1698355319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RctKb6lJoE4fPKPR7iwErgm5ApYF3Oq0zyKJn1rvnek=; b=roQUQibOhSND3meMCTFwiJiFPpVIETwE+mQXJDbfVtUzpBDZy7NKelX+4KNBu0CspP U2sAllq/yAGXiF057zLwhX4R+v6lVr75JQ6WrKyBHvWS2LeNQeOADETspkINBAMopIie 11ODJRMiSD4cuBFA1XsydsV1IeI2WVf+qUILtWQu1TPczmo9cmxMjwlsYwWFnwu3NR+Z y+pxx0si5A+Vukx7Axb7TxuC+GxEvn1RYosatoMs0SLptaZJ1wkG7jDowgpYTYKLIYjV NvH2uhQjv2hEZlEtETnD5eHDep8nrKdk88BYrtNg7rdgEHl17juQy26/AaDIdZKqI3cz gjjg== X-Gm-Message-State: AOJu0Yy47F4W8O8LBJt36RCp55OeKVuhIps+9HJGfD3dN5eT0H/eD04U xDgcfQciVV9UvfgsoeFnkNglIg0zTMxJnQpvMnMwug== X-Received: by 2002:a05:6512:48d4:b0:507:9689:f446 with SMTP id er20-20020a05651248d400b005079689f446mr1933381lfb.42.1697750518762; Thu, 19 Oct 2023 14:21:58 -0700 (PDT) Received: from m1x-phil.lan (176-131-216-177.abo.bbox.fr. [176.131.216.177]) by smtp.gmail.com with ESMTPSA id t18-20020a5d6a52000000b0032db8cccd3asm210876wrw.114.2023.10.19.14.21.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Oct 2023 14:21:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Beniamino Galvani , Peter Maydell , Strahinja Jankovic Subject: [PULL 33/46] hw/misc/allwinner-dramc: Move sysbus_mmio_map call from init -> realize Date: Thu, 19 Oct 2023 23:17:58 +0200 Message-ID: <20231019211814.30576-34-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019211814.30576-1-philmd@linaro.org> References: <20231019211814.30576-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::130; envelope-from=philmd@linaro.org; helo=mail-lf1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In order to make the next commit trivial, move the sysbus_init_mmio() call in allwinner_r40_dramc_init() just before the corresponding sysbus_mmio_map_overlap() call in allwinner_r40_dramc_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20231019071611.98885-4-philmd@linaro.org> --- hw/misc/allwinner-r40-dramc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c index 6944f84455..2cc0254a55 100644 --- a/hw/misc/allwinner-r40-dramc.c +++ b/hw/misc/allwinner-r40-dramc.c @@ -414,6 +414,7 @@ static void allwinner_r40_dramc_reset(DeviceState *dev) static void allwinner_r40_dramc_realize(DeviceState *dev, Error **errp) { AwR40DramCtlState *s = AW_R40_DRAMC(dev); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); if (!get_match_ddr(s->ram_size)) { error_report("%s: ram-size %u MiB is not supported", @@ -421,8 +422,12 @@ static void allwinner_r40_dramc_realize(DeviceState *dev, Error **errp) exit(1); } - /* detect_cells */ - sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s), 3, s->ram_addr, 10); + /* R40 support max 2G memory but we only support up to 1G now. index 3 */ + memory_region_init_io(&s->detect_cells, OBJECT(s), + &allwinner_r40_detect_ops, s, + "DRAMCELLS", 1 * GiB); + sysbus_init_mmio(sbd, &s->detect_cells); + sysbus_mmio_map_overlap(sbd, 3, s->ram_addr, 10); memory_region_set_enabled(&s->detect_cells, false); /* @@ -458,12 +463,6 @@ static void allwinner_r40_dramc_init(Object *obj) &allwinner_r40_dramphy_ops, s, "DRAMPHY", 4 * KiB); sysbus_init_mmio(sbd, &s->dramphy_iomem); - - /* R40 support max 2G memory but we only support up to 1G now. index 3 */ - memory_region_init_io(&s->detect_cells, OBJECT(s), - &allwinner_r40_detect_ops, s, - "DRAMCELLS", 1 * GiB); - sysbus_init_mmio(sbd, &s->detect_cells); } static Property allwinner_r40_dramc_properties[] = {