From patchwork Sat Nov 12 01:51:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 624216 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1139294pvb; Fri, 11 Nov 2022 17:52:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf4D77gL7cPEm8QTINYNvLI1k3g1ccyXHzXlz/ukbjH/S6MFe3HwyENOeG3lKObUmWbAza0n X-Received: by 2002:ac8:5046:0:b0:393:bda:9995 with SMTP id h6-20020ac85046000000b003930bda9995mr3900135qtm.123.1668217942306; Fri, 11 Nov 2022 17:52:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668217942; cv=none; d=google.com; s=arc-20160816; b=Xt5D1WuPxhkP5NQb2r67hvw42tDhWNdIqI42U8JbfPbdzFYCkvFm9+5F4/FsM4doRA VbY3Kc8ZoE1kMWlnm7Avd1Zny2g45U5j0lVBOGK5YOIzmK0XYY47E29w/h11BkLStZxy xUCBUwo0rGih7Hs2Nbk/YPvzxrGqPBozj+2LYj9kQxWN5eg6Khku9QX3uE6/BrRg59DO KhUFOBqTMVldEGpRSURLpO45oIOW01WAbKXW89ng7mstIYnOYE3kCk7oEYrNKoXmsXrk ogEkGwvvXwK4ymtE1nloZeZ3nPZhl6uRoa2H5wNrlU9qVqbJPug6EcBFqnmiZndG47YB HURw== 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=r8grnVfFhCf4IqG9/V3mzncjVBIJwid8+uRko3ngptU=; b=Avfr3jpSO0aeNfw6fdXtCo+7VHNRaDQV1kK+R2Eld2OvxgwQJMFXC+3CDgmoA3yWPF aTTzfuwJBu9ITWZk5t8T0lzOLr9lBytBCdkwygcg+LrEfka4xj1UUOuOVpgJEk91n54i xQQFLehPgZowi02/y54UBcfsNya11cGt2WxJB+YVUSQOZ54uftm92b9KYJ2xzXcoIx6J qxPcMOZ74tDQERnBSTiax8HPJ+VIVOdkrj5ms21A0IYWDSo9hcSSgd4DWLuOwmxis5vO WyGPIUnk4MLDYg/aOoGsScZoQTjB57k/mtC1Afi68ORrikOWKUSwXDNMJ3k6m8BQCS/j QdzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CUEiCfGz; 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 d20-20020ac847d4000000b00399d7c42f5asi1846957qtr.201.2022.11.11.17.52.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Nov 2022 17:52:22 -0800 (PST) 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=CUEiCfGz; 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 1otfgR-0003U5-RX; Fri, 11 Nov 2022 20:51:47 -0500 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 1otfgQ-0003Ts-99 for qemu-devel@nongnu.org; Fri, 11 Nov 2022 20:51:46 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1otfgO-0005I3-Kx for qemu-devel@nongnu.org; Fri, 11 Nov 2022 20:51:46 -0500 Received: by mail-pl1-x62b.google.com with SMTP id 4so5625566pli.0 for ; Fri, 11 Nov 2022 17:51:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=r8grnVfFhCf4IqG9/V3mzncjVBIJwid8+uRko3ngptU=; b=CUEiCfGzWAKwZYH7HIuguDGJc3dzl+r1iP4nRGGSVHM8Mi3Lcj2bnEeOVd873eHf+t YpxxUzkr1FeCbOlgAUDGm7KprgROoJ9lvK09XXRNe+jjWAqEHw8JJc/Pc/XtWbp24C49 KQgPPDG+3X61dws3kXp0WqxFsSX7TKDQp0QE1vfU/xDmZyZtE0BqDMR5Q1eNRZC6FISb TsOChe4bKTG4019HJ5QaXrQb2pLNxmNVvCq15hobCW2udfTdlpUjJg48PS5Qo9QTFfrv kHcbZ1qcnDjNY4UUVvbYwNAd8lVtJtvf5TAbLPrbJ1peP5nw68DHR9qZa6G3rBOwFKU/ Xa+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=r8grnVfFhCf4IqG9/V3mzncjVBIJwid8+uRko3ngptU=; b=ZUi9AlCuNzmtCmJDtjwQN/pV8sMu86fcJOACp3fmdeDG8hyBqlX2vI+3IbQWxnxMBH a+y5eM24j6EfYPogK8NrPCJmUWw6rDcMRojkqh3lmNrO8Mr0MomLEZ63YyQaz+xv5lod ubW87SWbAIb+BuAyxqjC3I6HvUjaLDK3Rzt2tNUJu4maUU6POTSJBYtheMFTH0f61/gw 0dSuQfQWNAcqV1lMO9eMUaJmF9zhgsmnKL9qB4kliNO9nF2jKaVCk3blDEY/4SkuvA2I P6vFebA5ZBL/blebb620FB6yWunfgn97kOdoWT/OMZI4O7CV/a0HMsvfdZDEyykUAQDL PupA== X-Gm-Message-State: ANoB5plGMUJgGPUzQrboN03g1RNnLd/I7tgE7U7wS9BqcSCGSxpzZGyP SWGdA1RlyDNGi7TH3yS0xBWXxD02embUV/XF X-Received: by 2002:a17:90a:2b08:b0:213:30b2:4e4e with SMTP id x8-20020a17090a2b0800b0021330b24e4emr4637724pjc.193.1668217903266; Fri, 11 Nov 2022 17:51:43 -0800 (PST) Received: from stoup.lan (2001-44b8-2176-c800-6e1e-8b39-f1a5-d250.static.ipv6.internode.on.net. [2001:44b8:2176:c800:6e1e:8b39:f1a5:d250]) by smtp.gmail.com with ESMTPSA id n5-20020a170903110500b00174c235e1fdsm2365265plh.199.2022.11.11.17.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 17:51:42 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: gaosong@loongson.cn, stefanha@redhat.com Subject: [PULL 1/1] hw/loongarch: Fix loongarch fdt addr confict Date: Sat, 12 Nov 2022 11:51:33 +1000 Message-Id: <20221112015133.2593661-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221112015133.2593661-1-richard.henderson@linaro.org> References: <20221112015133.2593661-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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=ham 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 From: Song Gao Fix LoongArch check-tcg error: TEST hello on loongarch64 qemu-system-loongarch64: Some ROM regions are overlapping These ROM regions might have been loaded by direct user request or by default. They could be BIOS/firmware images, a guest kernel, initrd or some other file loaded into guest memory. Check whether you intended to load all this guest code, and whether it has been built to load to the correct addresses. The following two regions overlap (in the memory address space): hello ELF program header segment 0 (addresses 0x0000000000200000 - 0x0000000000242000) fdt (addresses 0x0000000000200000 - 0x0000000000300000) make[1]: *** [Makefile:177: run-hello] Error 1 Fixes: 021836936ef ("hw/loongarch: Load FDT table into dram memory space") Reported-by: Richard Henderson Signed-off-by: Song Gao Reviewed-by: Richard Henderson Message-Id: <20221109020449.978064-1-gaosong@loongson.cn> Signed-off-by: Richard Henderson --- hw/loongarch/virt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 5e4c2790bf..5136940b0b 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -793,13 +793,13 @@ static void loongarch_init(MachineState *machine) qemu_add_machine_init_done_notifier(&lams->machine_done); fdt_add_pcie_node(lams); /* - * Since lowmem region starts from 0, FDT base address is located - * at 2 MiB to avoid NULL pointer access. - * + * Since lowmem region starts from 0 and Linux kernel legacy start address + * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer + * access. FDT size limit with 1 MiB. * Put the FDT into the memory map as a ROM image: this will ensure * the FDT is copied again upon reset, even if addr points into RAM. */ - fdt_base = 2 * MiB; + fdt_base = 1 * MiB; qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size); rom_add_blob_fixed("fdt", machine->fdt, lams->fdt_size, fdt_base); }