Received: by 2002:a17:906:80c3:b0:7ae:d8f:8937 with SMTP id a3csp3533148ejx; Mon, 7 Nov 2022 18:36:24 -0800 (PST) X-Google-Smtp-Source: AMsMyM7fOWUsKbupnpGbA+c7m7vxhNBtGESfFzaHeaN1It6lfAdxjWO+3Zgf1cd+FTeh5UGt8g7D X-Received: by 2002:a05:622a:1a81:b0:3a5:3009:f80b with SMTP id s1-20020a05622a1a8100b003a53009f80bmr32301237qtc.327.1667874984318; Mon, 07 Nov 2022 18:36:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667874984; cv=none; d=google.com; s=arc-20160816; b=c1FycROBQZMAkKi9RmhWhna4iKsRDX8X2k4CM6kGStP4bWO40F+wMqiS8ymk1HNqbr UHqeopPY41pjbm90Qj2+cGY1ARmIfCunYE+v6BU3VQP01m7lQ7yq0tLFSw9a3QS7zviE ac+bvLMqubhSKa5goSTCnsMtaqXOzsdwv7UxbHZ5w7YhUvQH5/MBC8J3Y6roU/7sJsIb wRs5ByyFlZqVhBr+fvSJ7uS4udjVLuqfOhnFspVzXf3MQkng5UUU9+IQebpxZ++STXVB JYst4cHpUAXATFzS9G2sUR1OISETLerlsFWFQe3JjOkRxPraO/mAbxdjDZusYnlj5BTq wq2Q== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=f62dMkEZw1/VeoGmNwIOgwTYv39sXyhjpPSKZPA4t+g=; b=PXak1ROyGludgOjJKMbolHECdAkwW7tFjbZGVzBntp66iQzKPlDWYAdngB+LReaHp2 Pqhlh/S+Zw+4iiWJwNtPMuBWxgldncXdtUIbXsGzWsjncbi4KA8qOppSYP1KmzdYSgiM 1vROwsnH6H7NlqqrPA/lPc6+wE8gMFutK1ywfqqoEDdax64WZZVOlDqyqVc8UJn7qQxF m52aSpNk1Ew4I6nj+XbpFVYPFH7npUbLklMrJ1UqCmz+7xfJ5rNxZracgLBbIztmNxXA VOxhf1BbHrkZrVycrXUV0h9LW4iZ83++05w6Dz5mPG+HBE+TX5rKOY5ZXjYNZeiNRIYq D2sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ccsxEzQY; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d4-20020a05620a240400b006cf11841e8esi6128220qkn.330.2022.11.07.18.36.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Nov 2022 18:36:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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=@gmail.com header.s=20210112 header.b=ccsxEzQY; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1osET1-0004xy-Kl; Mon, 07 Nov 2022 21:35:59 -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 1osET0-0004xm-VY; Mon, 07 Nov 2022 21:35:59 -0500 Received: from mail-il1-x136.google.com ([2607:f8b0:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1osESz-00044A-7X; Mon, 07 Nov 2022 21:35:58 -0500 Received: by mail-il1-x136.google.com with SMTP id e19so6856707ili.4; Mon, 07 Nov 2022 18:35:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=f62dMkEZw1/VeoGmNwIOgwTYv39sXyhjpPSKZPA4t+g=; b=ccsxEzQY14gstyXGTTJWJVucgZuywqn21P9YZN/SEhtrISsM15RzLJ8Jk/+Aan4MyX LTJspw3N+A7dWVkJ8C15gGhOpSDB1OLIgifFOWPG1+3zxy3RCiC7Ks5qvMKr43dD5HEW 0KPe+Spd9T4AbUDpOB+wiyM/WGIw2/QnIOph1zzGDNwbwInt5SzZXUMIDgcc7OHZW2Fs Y3vY4sVgQveqYBpHvN4M1y+Y8KeK70CZTqOWxX3xWiiLciB3rRvhx5oy/lUQ3FMxC37R Ugts543DqHkIurPeHXuA1hJH+0G6pljnrHLPvktlOQaQzK3yQIw9d6yT++znB+rmDWQ/ YcoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=f62dMkEZw1/VeoGmNwIOgwTYv39sXyhjpPSKZPA4t+g=; b=Awq8dt+6EzugTa96nhkMUm0tzPzc+0VhADy+k0uxyAfDK5WNlLy6r12yYHlWFYAJ4o CEIvL5JPA42mTzrly00SpRYAw8z4P4Yn9IYMTLOGEN1rxrloWXCBCKXIk5H668inxcog NIO/yykMw9LeBtrqEz3PuK39iBrIKrimyBD51lqucp/4H3jkjeWv0XRfQzEC1H82Rl4K 2xsfEnF4WclcueOkPQLA71mHbcAXK7WCrtIdrz+WZ9JbBSUla/syUXU+Wgw0KxySEi3g NOyzKoNtO0PR8bPbMc4r3vLKryfX65waMWa0a0wN+Pl6Oq9JlIJFu7IUUAUfB7hkpxg2 4CnA== X-Gm-Message-State: ACrzQf0bZcSswNYLlSEsUAFat7UniogbIqt4Cb6qgWcf9pzULIFixRoG Bo8vAZoBp8kGktanelMZJbA= X-Received: by 2002:a05:6e02:14c4:b0:300:99b4:47f1 with SMTP id o4-20020a056e0214c400b0030099b447f1mr28792826ilk.8.1667874954864; Mon, 07 Nov 2022 18:35:54 -0800 (PST) Received: from MBP.lan (ec2-18-117-95-84.us-east-2.compute.amazonaws.com. [18.117.95.84]) by smtp.gmail.com with ESMTPSA id p21-20020a02b015000000b003750cd6e9f2sm3302743jah.177.2022.11.07.18.35.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Nov 2022 18:35:54 -0800 (PST) From: Schspa Shi To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Schspa Shi Subject: [PATCH] hw/arm/boot: set initrd parameters to 64bit in fdt Date: Tue, 8 Nov 2022 10:35:42 +0800 Message-Id: <20221108023542.17557-1-schspa@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::136; envelope-from=schspa@gmail.com; helo=mail-il1-x136.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, FREEMAIL_FROM=0.001, 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-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: cghGUbF1nqIm We use 32bit value for linux,initrd-[start/end], when we have loader_start > 4GB, there will be a wrong initrd_start passed to the kernel, and the kernel will report the following warning. [ 0.000000] ------------[ cut here ]------------ [ 0.000000] initrd not fully accessible via the linear mapping -- please check your bootloader ... [ 0.000000] WARNING: CPU: 0 PID: 0 at arch/arm64/mm/init.c:355 arm64_memblock_init+0x158/0x244 [ 0.000000] Modules linked in: [ 0.000000] CPU: 0 PID: 0 Comm: swapper Tainted: G W 6.1.0-rc3-13250-g30a0b95b1335-dirty #28 [ 0.000000] Hardware name: Horizon Sigi Virtual development board (DT) [ 0.000000] pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 0.000000] pc : arm64_memblock_init+0x158/0x244 [ 0.000000] lr : arm64_memblock_init+0x158/0x244 [ 0.000000] sp : ffff800009273df0 [ 0.000000] x29: ffff800009273df0 x28: 0000001000cc0010 x27: 0000800000000000 [ 0.000000] x26: 000000000050a3e2 x25: ffff800008b46000 x24: ffff800008b46000 [ 0.000000] x23: ffff800008a53000 x22: ffff800009420000 x21: ffff800008a53000 [ 0.000000] x20: 0000000004000000 x19: 0000000004000000 x18: 00000000ffff1020 [ 0.000000] x17: 6568632065736165 x16: 6c70202d2d20676e x15: 697070616d207261 [ 0.000000] x14: 656e696c20656874 x13: 0a2e2e2e20726564 x12: 0000000000000000 [ 0.000000] x11: 0000000000000000 x10: 00000000ffffffff x9 : 0000000000000000 [ 0.000000] x8 : 0000000000000000 x7 : 796c6c756620746f x6 : 6e20647274696e69 [ 0.000000] x5 : ffff8000093c7c47 x4 : ffff800008a2102f x3 : ffff800009273a88 [ 0.000000] x2 : 80000000fffff038 x1 : 00000000000000c0 x0 : 0000000000000056 [ 0.000000] Call trace: [ 0.000000] arm64_memblock_init+0x158/0x244 [ 0.000000] setup_arch+0x164/0x1cc [ 0.000000] start_kernel+0x94/0x4ac [ 0.000000] __primary_switched+0xb4/0xbc [ 0.000000] ---[ end trace 0000000000000000 ]--- [ 0.000000] Zone ranges: [ 0.000000] DMA [mem 0x0000001000000000-0x0000001007ffffff] To fix it, we can change it to u64 type. Signed-off-by: Schspa Shi --- hw/arm/boot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 57efb61ee419..da719a4f8874 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -638,14 +638,14 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, } if (binfo->initrd_size) { - rc = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start", + rc = qemu_fdt_setprop_u64(fdt, "/chosen", "linux,initrd-start", binfo->initrd_start); if (rc < 0) { fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n"); goto fail; } - rc = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", + rc = qemu_fdt_setprop_u64(fdt, "/chosen", "linux,initrd-end", binfo->initrd_start + binfo->initrd_size); if (rc < 0) { fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n"); -- 2.37.3