From nobody Sun Oct 19 03:35:55 2025 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747627729; cv=none; d=zohomail.com; s=zohoarc; b=F/mwuShDoNFF+SK9JPdBUDpsvZwypFrefrVcfPLVzLFpFzN6aKVJ34Yaw0lvrO8x82RF8u1DRDF6h7caTP00IM4738fApP28blMAfC99ATls0DsJ+uqNgFec2XnaV/T+L8ZS2NUeCcFdedUmt3ZT3Ja7J1YbnjEJdQ9qH9ZJJ40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747627729; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zsKoSChLOgf9IXWkPW+gBtADC5q1GRWfNKybDJ3aAWQ=; b=RCO7fPXNqupSSsuURZ9UdKoLv3YqpRlpV6DR6z51ZF9C6XwxOgYGEdF5F4m/uQUfg83Kowtqw0+CylDiXJfN7+3sKl/cY05U+IV6CVGF+JOXWAlwHTbGb1unTZY/CfftcyLlJnCntcyKPrxQ7fHnMPThq+bF0wIWymHbXohrHaQ= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747627729309934.8709083274782; Sun, 18 May 2025 21:08:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGrnE-0004xK-R7; Mon, 19 May 2025 00:08:00 -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 1uGrmv-0004lt-As for qemu-devel@nongnu.org; Mon, 19 May 2025 00:07:41 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uGrmt-00049Q-J0 for qemu-devel@nongnu.org; Mon, 19 May 2025 00:07:41 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-7fd35b301bdso4433542a12.2 for ; Sun, 18 May 2025 21:07:37 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231ecd5ea41sm41750035ad.228.2025.05.18.21.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 21:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747627656; x=1748232456; 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=zsKoSChLOgf9IXWkPW+gBtADC5q1GRWfNKybDJ3aAWQ=; b=D5r7RZsMp0SMf3mb2lyMr8krJs/ABzkAVB+GSIzpJpXREq+pcfPqk3LSW+jVBqO3Rb sgeqcUzumn4PtIIyh5hp5RAIHsKM2hYCYbJsCIcq7AwiRZW5zwQ51fwqwxSPa9D0kb28 ZCYZAdhfbefgrsoXpyyG2iQhYa/d65hj5txitWQ1PRbOAyzvsuMKAQTuqWIYEFtAbnQM k/8HxFxhv24UYcrZvuel5rk6Qn9CT88yt09GKtJ2CwYsQxExNGK8aFhj6j1SrhP38VDv jHDOsPWCl+5FgE7yPFNcejinXwQ9WlYgIF78ksYiPkd7TBS6ZSNt6ODZHeUF/dhHvpa5 YY/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747627656; x=1748232456; 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=zsKoSChLOgf9IXWkPW+gBtADC5q1GRWfNKybDJ3aAWQ=; b=Z7JyvCfe9leNBx5tV0GjTcgwggQq1+gQcRZLbCWzu/6t+woogxgGtfIUA5z/h3PSgH zkErb6vnIK8O5lbtBeyL2OBRkrXByy8GW3COi/UjSFxLPwAmZRFkcnoTfUwHVKckO273 1eQQ4odAUg8h+h2P8SHPUo8kzmWSCOWMwLE/BYqUsjNqEHPU43Z4ao4WU0eOPFRUYnM5 d6t3Pa3uUGTLO/9uIS0+6NDn6k9ow/4QXcLcGdmMu+/iirQBEJtVNnpcWTuAYEl91bgF okUMV6fv/5EPeOq4rye/ZgJ9Wr1MEVtrDNwugIeqDi8P+6MBqM5tq9LiCq9W54UF3VAm PMfw== X-Gm-Message-State: AOJu0YxINooMFl8dEAxk9rm4r/LSXNvMbxilgN1ZSfNOABQn4T+8T70P oK6c0sBgDal8E0ftlsYivgow3D389gC6ZvzmIjtHOHhnJhcm5RA8j2TT8lRfTQ== X-Gm-Gg: ASbGncuUW9iNepnkquTqSNRZaoRyVPJqR0hYeVe4kWkcA7aFH4OzunX2cR5lW4Nb+5X h4mElhRseTsSodOgsI6cj/P2B6sDWN0+Trw8nfeBRdTs8hWW2R+No562/Dy55IsQ9ijCaVcci43 XFCGYL1Ip3KZZVsFGgRpRSf6AjfbL1c9DFfYeWlGPa1p5hoRQSqmNlt7K5IJRtRVRBKtX1NeiA0 kYDvhwkr74mxUj3ZMHmljts2mEO2FNWj9f7jmb6EqKJvzfHsH6anDkPn40vTw74lTbIjPLnhW/0 pJMWCpd4KbeB4dFXrWiKRAUWLZ6cmsDAKS+6jDPSeH8IH3gCyPVFYwnsUHzAC8Jftqdnckn3Mx0 1FiJTTdGEiGnRrZ34yvLra7MfdVqeZqfVT8Ie6n0syZbaqUUG30kZry81 X-Google-Smtp-Source: AGHT+IEb2u61/bsK4ij3F3u0eIjtE+N/nrQ1XXcYgyC1b7vol+gRE7yExMvg3Tbit2bWwK8y50Gb8w== X-Received: by 2002:a17:902:f78c:b0:215:7421:262 with SMTP id d9443c01a7336-231de35f13fmr188046155ad.12.1747627656601; Sun, 18 May 2025 21:07:36 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Sebastian Huber , Alistair Francis Subject: [PULL 10/56] hw/riscv: More flexible FDT placement for MPFS Date: Mon, 19 May 2025 14:05:07 +1000 Message-ID: <20250519040555.3797167-11-alistair.francis@wdc.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250519040555.3797167-1-alistair.francis@wdc.com> References: <20250519040555.3797167-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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::531; envelope-from=alistair23@gmail.com; helo=mail-pg1-x531.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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-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 @gmail.com) X-ZM-MESSAGEID: 1747627729963116600 Content-Type: text/plain; charset="utf-8" From: Sebastian Huber If the kernel entry is in the high DRAM area, place the FDT into this area. Signed-off-by: Sebastian Huber Reviewed-by: Alistair Francis Message-ID: <20250319061342.26435-3-sebastian.huber@embedded-brains.de> Signed-off-by: Alistair Francis --- hw/riscv/microchip_pfsoc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index e39ee657cd..6bb44e3ac5 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -626,8 +626,15 @@ static void microchip_icicle_kit_machine_init(MachineS= tate *machine) kernel_entry =3D boot_info.image_low_addr; =20 /* Compute the fdt load address in dram */ - fdt_load_addr =3D riscv_compute_fdt_addr(memmap[MICROCHIP_PFSOC_DR= AM_LO].base, - memmap[MICROCHIP_PFSOC_DRAM= _LO].size, + hwaddr kernel_ram_base =3D memmap[MICROCHIP_PFSOC_DRAM_LO].base; + hwaddr kernel_ram_size =3D memmap[MICROCHIP_PFSOC_DRAM_LO].size; + + if (kernel_entry - kernel_ram_base >=3D kernel_ram_size) { + kernel_ram_base =3D memmap[MICROCHIP_PFSOC_DRAM_HI].base; + kernel_ram_size =3D mem_high_size; + } + + fdt_load_addr =3D riscv_compute_fdt_addr(kernel_ram_base, kernel_r= am_size, machine, &boot_info); riscv_load_fdt(fdt_load_addr, machine->fdt); =20 --=20 2.49.0