From nobody Wed Oct 23 00:27:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1729483870; cv=none; d=zohomail.com; s=zohoarc; b=QvKoGoAbjSFolS85lIdUNf4TrbHnfn+cUsejqrjBKO5aM69c4lWiTiMVk6MQboFSp5TW+spz6BxXl5gZrbEfP6Yx4vetbWqQEkRduQ5WsfaEyZL2/BuZHETvQTaUFyxLETCbG+I1nFsNENq384bMBstk/E5OABHiZxcLnrQw8NY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729483870; h=Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OwVJe7wl6Df047z4n/QoSabetufigoEzxYrd+cn69aw=; b=lS0WXIGmcUv+psI4TcZ+uDvr0GqftyHaasgdnk4f0JH2Phyu+9FhUO2B560aAirikHR8tGGCTcn2N4aDEFXTDkDvOq8T9TMdduzzNFxigBF4776iV2kTKt1Lxq7m5WqyR/V19BgXqzJKYEgMjZ3R2UEp7AfEwACBS8yefrQ9XEw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729483870851618.4491572703619; Sun, 20 Oct 2024 21:11:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2jkE-0007Nv-NK; Mon, 21 Oct 2024 00:10:15 -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 1t2jjy-0007Lc-S9 for qemu-devel@nongnu.org; Mon, 21 Oct 2024 00:10:00 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t2jjx-0004EU-Ac for qemu-devel@nongnu.org; Mon, 21 Oct 2024 00:09:58 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-20bb39d97d1so36419435ad.2 for ; Sun, 20 Oct 2024 21:09:56 -0700 (PDT) Received: from hsinchu26.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e7f0dfc09sm16863485ad.236.2024.10.20.21.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2024 21:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1729483795; x=1730088595; darn=nongnu.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=OwVJe7wl6Df047z4n/QoSabetufigoEzxYrd+cn69aw=; b=VmyvRcgmf6B5iVq3QYy+SKUnuj4INlSXnBVUPne66WgnCWFWPuPjh6peclSPAsp9Qk bso5OgQJPbLEzDCfJIzojuAxA8++QUfKuZ8Dk+11kJALmGfK6nVLiR8xGg22DNJtmKwn I5nY4jmkZrNxqw75yMrrnksPRuyvknf5VTii5+E+0cNcJggUp9PmIpxp34KcrcfXldAg Fm5Gg/InOvDl5z3nlnVMfzoKkizUjnisqBfuXKAbZlYmfe3TAHAngD+P1EytFwR4efMY zHEODfU27f5o/N8qepVswtMqdes1AFZzpZtk2TvHrJHrbrBbfXkV9g6pGVxmfcK97AIA kVkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729483795; x=1730088595; h=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=OwVJe7wl6Df047z4n/QoSabetufigoEzxYrd+cn69aw=; b=XgT1hZXaNm75hIPgNyLuT3jSu8x4A1tbnK4lDtxCxdLD0suqCsDedgch151HmCUNPC +YsqeSKeOFvGzc4TRDlniNQiulI034JS6HlOQLyowQcgk5ecrmSUQO7D/4bqY6b6xYCm 8K3hmMQaYt/aV34O8Txa82mZK+qjrvKA8Hr6N0uM/KX0VAwVma4fnHAR454lhaWKppSG aS28dSTZuq1QwhtSURfavUpb7hvK+yCgL5HTKvPKhk/zFOM0LnHZqD/BmfSNfTiUcDc5 lQd08kq0pJWdnXVbK1z1/b8Nu19sYARU3JmLugeYISPGNoJj6NU0X8zl9UWmJCeKILJy odMg== X-Gm-Message-State: AOJu0Yyv2czcJA4P9y8b/WiwNBFQxqQ13oqNmY8lWE+VCZGDziqBwS7b bxq7yE2295aYVnYWN6dYgRGVOCkEIGckyHsC1ddFEoBb+1Trkjln5jPcjd2yTRRkb54TA+pj1/0 pNB0ERefbUFb1nQQWmSJfbeM5H0XKGQLbZ1HFzFDkmAhiaBz+nCz1qsuTsKL6mRdHFf5mazgPuV ZCRlKd6iJEafHxGQkP73WEcXNNX6nM5vRZgg== X-Google-Smtp-Source: AGHT+IEYScQBVVlOFS2dVqmQWINMu2ecqVajApJTE975BxkebBmnPbcyBq5J1gXMVMe85A0RVjEVHg== X-Received: by 2002:a17:902:f9cc:b0:20c:9ecd:11c2 with SMTP id d9443c01a7336-20e5a95025amr125265865ad.55.1729483794962; Sun, 20 Oct 2024 21:09:54 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH 2/2] hw/riscv: Support different address-cells for initrd Date: Mon, 21 Oct 2024 12:09:42 +0800 Message-Id: <20241021040942.400-3-jim.shu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241021040942.400-1-jim.shu@sifive.com> References: <20241021040942.400-1-jim.shu@sifive.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x630.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1729483873450116600 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The cells of 'initrd-start/end' should follow the '#address-cell'. QEMU API could support 1 and 2 cells. Signed-off-by: Jim Shu --- hw/riscv/boot.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index ad45bd7a6a..76b099c696 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -182,6 +182,7 @@ static void riscv_load_initrd(MachineState *machine, ui= nt64_t kernel_entry) void *fdt =3D machine->fdt; hwaddr start, end; ssize_t size; + uint32_t acells; =20 g_assert(filename !=3D NULL); =20 @@ -209,9 +210,18 @@ static void riscv_load_initrd(MachineState *machine, u= int64_t kernel_entry) =20 /* Some RISC-V machines (e.g. opentitan) don't have a fdt. */ if (fdt) { + acells =3D qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, NULL); + if (acells =3D=3D 0) { + error_report("dtb file invalid (#address-cells 0)"); + exit(1); + } + end =3D start + size; - qemu_fdt_setprop_u64(fdt, "/chosen", "linux,initrd-start", start); - qemu_fdt_setprop_u64(fdt, "/chosen", "linux,initrd-end", end); + qemu_fdt_setprop_sized_cells(fdt, "/chosen", "linux,initrd-start", + acells, start); + qemu_fdt_setprop_sized_cells(fdt, "/chosen", "linux,initrd-end", + acells, end); } } =20 --=20 2.17.1