From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978063; cv=none; d=zohomail.com; s=zohoarc; b=dSu3PDm+KoZmfWyYzXV7h8n1FYhG3aiKPU3FjX7wA36POtkWSjqTxH25jDHLBcs7WRTRfPLmtVlVVHUW93UCyi2nMAisjgGdv3B0xe1HE6kb02cEd4or1HilDDHnyLk7ltgfPSWCtvOsyeSwzzxDj3Ng6+s2bApVH/kWZwl9zfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978063; h=Content-Type: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=4Ewny7Ig+IF5SZ44xAxxXp2VzjXnLsFkLvuWLWJotnY=; b=SehzoNHV7p8iwv1iXNuuOO6f/07BkFks8gdYVILJdDwgLQk3vlVWy9R4SG39S41xYFZXnV65fgO/kKZWtUwCkNvUJeVBdp5Oal8Du4ATFt+FTJjvMy9Yq/UOJQrLdy/V7lA8GNST0lcyGoqtzDfcFoo+H1yx3iHuiaFzVJyFAf8= 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 1763978063405895.6027641930664; Mon, 24 Nov 2025 01:54:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTGh-0004uj-VG; Mon, 24 Nov 2025 04:54:00 -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 1vNTEB-0004Qg-AS for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:46 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTE7-0001WS-MF for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:20 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-42b32900c8bso2302061f8f.0 for ; Mon, 24 Nov 2025 01:51:19 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7fb9022sm27299457f8f.36.2025.11.24.01.51.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:51:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977878; x=1764582678; 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=4Ewny7Ig+IF5SZ44xAxxXp2VzjXnLsFkLvuWLWJotnY=; b=BvUuVxH57S8dzOfD8yuqmGBV91+IBYbYnrW1DjIZ1PqyxyE/QFW9MoLZSG+NELnuy5 2/5d39iF/3hOADgP7tIV8wv5eAiVJN4Q9/PblrC+gtnvPjvb8V6hvLewwpZkJBdI7W01 9gxFwrfmgzIAlJGnDbbVHdv6B/wv6pQIll6CtEzDKgHjO2aBlcvsFiTLpWhB1ipI/Zem +7cMsBWLMiXSQghz8T6n+1sdQqCjoP981shQ6iUq/3YOuxqqN4tdcWyePA6wigcrk5L+ FpQu4VShjGXLxLUISpmlykkuDcg9cfzFAX7a436XO4AGSQL5aswkfyvH2jE86UonmvcL SJ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977878; x=1764582678; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4Ewny7Ig+IF5SZ44xAxxXp2VzjXnLsFkLvuWLWJotnY=; b=cW4Pg9RkS+8FilwhxbzR9+8Xvd4ZIOCraUK115+SGyo5QjFcXvA3rnEYkrPcC3t9HZ YTHEdLjCPrkzHfB+XOIT66YCKZ0Fbx5kyeLDE68kmXdfPAZOx8L9a7+drr8FSiZ8rVfy 8HzC0IBT6NCAXnnzNKKVxT/7pxGgoNXUZhlZqxW9vkDLQhuLJ/Bapqc8lh+/E5Bsisyc 2GXH89xZRyg05iN4TVKUIRKClZT8yS+Prmgovq0jN4PIvJbu4DnlvRZJNzZQPz6XfF52 aZ3MPxDeGMaRkyiSUzK31IHU4hWFEG4iSDEieF5HusNre6caiFnj1dQhXJUE4lkvrTEt 7OMw== X-Forwarded-Encrypted: i=1; AJvYcCWHhTmbtJLkDW1XjUSKnNj5+KTLe4b8I0ZoAisV9i5cSSjUdw1PqybedHPqdS9cYcFatDWaN2cr0FFG@nongnu.org X-Gm-Message-State: AOJu0YyP9HbKvWDFJTkiQKVbyqGq601WAsnfpHPrm9BxSfvtwJfpoFlQ hl9Fik5xLv3IIjkZ5NtKbTqfJ462cbb1T6CwddzMaYHZ95tx9gZzL1q2CP/MN1RdYq0= X-Gm-Gg: ASbGncsjv5AMVwZZBN6UVJt6AP/0JZ28ob3lUThVo3TUj7+ceq8LuMEmxha52sXo5VO QaznwXgssSt2Har3+XjIIDwUfkuLrW4bEVvlaMjPnIRLu5apYv42kBCnPD59JvsMY31n2AS4Yzf /aMQSdtGfV3Za0IiyuqrdeMTKx3TCtatjCUpVpItW7+nWqAuUJ8aFFDBxUgxcAXcpf2MaT+5N98 phyTiZdnoWeeIJSUdDiVW4stakJUXQWh9cAQfcabak+oEoNKYe0nyybk84dwka3K2p39WdRfJnf ubURBHIE1swvlbhmjkfn7zDxuc8VitAE7ZxLvk+sWz3Ep86wdOFulaFjuGpxl4PkbWfJUeaoUXa 3Gtr09RIVGuX40B7VvkGoFEmRxRuNsKZdzDQ6PFe9ESj83Mz0HsjsraTpBQGlNV8y2nghfx3h4Q 10DX7CdaR5T2KTuMI06T6T8Nkgb4S/d0Scbk1Qzbv1/5vvjy6IKcEUWtfH0whz X-Google-Smtp-Source: AGHT+IFTNqHM7/uE6ftUdJ+eRm0sgsWm9rqk858WJA4coPUZA/uz2p50OaVcY0Ej99Z1mdf5StX0/w== X-Received: by 2002:a05:6000:40cc:b0:42b:3cd2:e9b3 with SMTP id ffacd0b85a97d-42cc1d2eee5mr11828305f8f.33.1763977877983; Mon, 24 Nov 2025 01:51:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 01/13] hw/sh4/r2d: Bail out early if user request invalid RAM size Date: Mon, 24 Nov 2025 10:50:56 +0100 Message-ID: <20251124095109.66091-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978065317019200 Do not give false expectations, as this machine only uses 64MB of RAM. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 010be6d5394..56da48f64cb 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -251,6 +251,14 @@ static void r2d_init(MachineState *machine) USBBus *usb_bus; r2d_fpga_t *fpga; =20 + switch (machine->ram_size) { + case 64 * MiB: + break; + default: + error_report("This machine can only use 64M of memory"); + exit(EXIT_FAILURE); + } + cpu =3D SUPERH_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978096; cv=none; d=zohomail.com; s=zohoarc; b=QvflrLY7y2BzV8oNJMFlirYvIth+zyaHApyHoKiZ1XKzw/nB1Z5eUApKYBT4ResgX7aLKFYKL4xaxyLzsVnqE0sSbc7UKVNUxIHTKU1uQa4o+eaxHrf+xl4e1MumF0L40bBr3up+2xbsnNjf+ED2RYxMSGBTcCHzHbUMjA+Qyxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978096; h=Content-Type: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=XhKFJZWydbqGmcIRFL5kj0hz2mqSNQ29ausDGKqoC0E=; b=L7VjBmokXKYeuvIhBlvuiHVkrtZxo/mX9szrVx70JNjjRT6D10rkog+8WdaNkbGwOO1uxPuRZJgWs1aDD5BLSVgJI2OPme+tH2RxqnTvpqw79J/2LKkG6Kow1AhPTdYaQQqoccakM+BtRCnJG5IzSS4i79Ri+nDa0r8cDkhnKxo= 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 1763978096329869.5968639942911; Mon, 24 Nov 2025 01:54:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTGj-0004wA-A7; Mon, 24 Nov 2025 04:54:02 -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 1vNTES-0004Rw-M8 for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:49 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTEM-0001XD-7d for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:37 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-47755de027eso21282095e9.0 for ; Mon, 24 Nov 2025 01:51:26 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477a9de46cdsm142677525e9.8.2025.11.24.01.51.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977886; x=1764582686; 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=XhKFJZWydbqGmcIRFL5kj0hz2mqSNQ29ausDGKqoC0E=; b=oZvwqC+SJ971LCsG30vZCCc0O8MwrU/Nj8qEb0AwMBzLUQFWBrWD14nhO3wM9v7Eqw Di+O7yFRk3xkIO+Plf/A1qq7PYyi3ZJEvyVZdROQ/9mdychRPBSZ9+Hby6ueFcnMZ1AB GLtzF1EWJwMdC3rdZh7i+7Dzx3pE3urDaS7+kqUMmRQu/hQaLrV9SnuA0ZRr55+hqz7F KkFwWoqJH+hWHYSrpN8i9m1I0OQQCGyJt6waC0FwZl77u4wDvNlNfsZ/Ia6mz0FdB+W9 6ZqsuErNvZBtj/kv09Jpcsg1zjqqFo+ZiwoJWDMYAuhcK+EsBqfmaZn4GG0PwnR0pmFl DHjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977886; x=1764582686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XhKFJZWydbqGmcIRFL5kj0hz2mqSNQ29ausDGKqoC0E=; b=hn/b7T3Dpg8bRqI24/Qpql1V2Qi+kglcQXvpQbYHVDCI+sjitv+M7OIp6MI1K9Cyki b6WCyb7zxhETDCDVCR4C2cUHniaIhhsnPEvIBzRdCS4qpFv53Y6LHGqf/Vn0dK7Wgho0 gy8bFevL+NmRhiZePzfl7xfJNepy++BXDMaYM4l0aaWnNJIUp+OURXUCIfKog85xDesX ZJtx5LDoolk01+RIjeE8v+hQm6Zq1HPutsOMDWEvl/GJm6gpTd/8HdjucguwDy5gypJl 1fpCaBpg+Mq6HAq/EPbMltthVKkE70EobTZc5PCyiJIHnFWbxWI9kD60rPw1Bu0Twaqn Mu6w== X-Forwarded-Encrypted: i=1; AJvYcCUbw1K1wx8pAo2NZ2Ys7BfrqlrEKvuA3jetrt82CX1r6K9CsGfHW6feGcfC8BETnYZjRLoS5rqANs07@nongnu.org X-Gm-Message-State: AOJu0YwFuIW5TDZd4AY2YsIAwj2pxzvQ1Gz3uAnYuxjP3vBXzmdDFXqq pVlk8h3cKCxDiL1LWw/HNyI4pbXBMVXBLe0naWC+VzcBYoWGyJeIEA3siOLHVE+2OzM= X-Gm-Gg: ASbGncvDHmSimaDiHO2QP0W66872S73Qyl9MO4jm41s0xtzfZRyJDurdQ829utZa2KB b9tX1gR/YMb6fexlIru9R+MOFiPyS4cQBMSzCIRyOAtCdtXvJtR9rMMKTS4I1OssmxlbRcNn5/f g/MAUM/sC6hvfEN45jas4UTQTarTfcaEkfB+dytjcXjMyKulDTQDKaZIuGuYVocBZGtmUV8+wxT S1BnI5KZIjRJ6zitB8lhmsvxS1wz8rSettXM9EpytJjXndqNDPyhtrifAtsxQyS9yIDIYp8opEh Lsdb4qcfzFxjhfAiLNjKWkuq0PFrN0dwggQnVZmrI8BfKtfaVbacpM41i3HwwfBPudtU4cPt/oB ae78mf+3dG5i/ZwLwcLWCCKDf3f+wT27GFIegyl7bJM8JLgA+81wI88MuPqHmaFBBRT9EcnNZdK JXkO/X91BRWQR+IhX2U5jH//KDJrgYYfFShZw9WnptWPfjk+mLwLIzfto0hPW+ X-Google-Smtp-Source: AGHT+IHsGWgCAJboBWS7bs81d0BfnA28hzhfVbh2PpGkl8huKl27F3zPdLIAATDUfOlYGujKUuCeZA== X-Received: by 2002:a05:600c:548b:b0:477:1af2:f40a with SMTP id 5b1f17b1804b1-477c01be313mr102460775e9.17.1763977885796; Mon, 24 Nov 2025 01:51:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 02/13] hw/sh4/r2d: Define BOOT_PARAMS_BASE Date: Mon, 24 Nov 2025 10:50:57 +0100 Message-ID: <20251124095109.66091-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978097153019200 Linux expects the boot_params structure at a fixed location. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 56da48f64cb..5f8c034e1af 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -53,6 +53,7 @@ =20 #define SM501_VRAM_SIZE 0x800000 =20 +#define BOOT_PARAMS_BASE 0x0c000000 #define BOOT_PARAMS_OFFSET 0x0010000 /* CONFIG_BOOT_LINK_OFFSET of Linux kernel */ #define LINUX_LOAD_OFFSET 0x0800000 @@ -383,7 +384,7 @@ static void r2d_init(MachineState *machine) } =20 rom_add_blob_fixed("boot_params", &boot_params, sizeof(boot_params), - SDRAM_BASE + BOOT_PARAMS_OFFSET); + BOOT_PARAMS_BASE + BOOT_PARAMS_OFFSET); } =20 static void r2d_machine_init(MachineClass *mc) --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978045; cv=none; d=zohomail.com; s=zohoarc; b=MYSxlMjojkTqlHZIeq+VV0siQrhy7UqqPSkZ0njkiy/fI8eWJ9jmBSITzJ9CygpVh5FFZCR+hNI5hzCqX+pmWy2YSSjKyASL2o95yHUaqvdj/PC79gvFA0Cp6lKhsh0Q1Cs60OIvdjbmUqvqU8vIn9/8K0ssQRQf7YDhectAahY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978045; h=Content-Type: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=rCezNN/txmXrYZ6BZ8Ldxddi41Hxexd+q2ZF1K5QXyk=; b=YUfARw1UxEfFpDNNlb9himN5cbR3vhSQt9LgDqKOv8ENOU8aFirygbaGlactzsHbDAfh2UMK3c0pbwlECKvempukAP4k+e2tn1TaljRKSDUXqjOpM97itpo0sblnEf/n1YMRvkM01dO47Ke1FhX+nBM8UTNmHuErr3w5R9LEUbg= 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 1763978045348129.48575255687933; Mon, 24 Nov 2025 01:54:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTGb-0004n2-DQ; Mon, 24 Nov 2025 04:53:53 -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 1vNTES-0004Ru-KN for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:48 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTEM-0001YA-8V for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:38 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-42b2a0c18caso2490966f8f.1 for ; Mon, 24 Nov 2025 01:51:33 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f2e581sm25966916f8f.8.2025.11.24.01.51.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977893; x=1764582693; 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=rCezNN/txmXrYZ6BZ8Ldxddi41Hxexd+q2ZF1K5QXyk=; b=T1YP+3AFn+5rBjcX3P6T1n5g1YkVAtF1ZYR93UhaE3Lr9OetfH6533WjIIEIIYjXHp OGWpfDCMOPH98X0AyTRexzZkb/lxGRsL8QGoct74k6TYylAPkJni5WO0TkIvqeeGumjG 4ks54BawYITK0F8USMhRzmfei6P30y5jaUSVFaoUvZxj1hTOTRNe4y0X7g2G1fnqwor1 mS8Zfbqs70lKqUOoLegOrRKY8BXQv3GlLHCm8aNXdKUJEzJ8hTxqtffefZHL4lunZ9+k Kms9kpP9Ii4KS/hqepeO1g+og6LHHGT4g6wY8aTI08Bfk9KEgLUfYWkKMBX/kslRFH4X iKiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977893; x=1764582693; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=rCezNN/txmXrYZ6BZ8Ldxddi41Hxexd+q2ZF1K5QXyk=; b=fVwo49Iq9hP3WzecLbzd/EiwuEnOPovewynrWTj185TEuWtss3829NE0WWypARIBDd aGiGx/rZHBWtWvue/7MYH9HY0sEOdc/PEPI0EOYCzRf2+oBVx1KY2kr1nc+MtCYBEnUq pSLbls6aXFziEM8ZmkJ6Jo7ibQ/uuTu1fHkPuEEDSKmv0QV2aPM2WIAo3z8t/BiYhcs0 VBCIdzgZf3mC6priBRcQ1Iy6ho27mHxqiI6E0oD+dMm0/Q1unpcs1/OIx+px7J6T5utm Fv6rHUki9nY/OX7M9jOYX6VH+152Cnal3R5aU6KhPB2WWrFcjlMT+yhLKf9PSc1R+Liv Bn7w== X-Forwarded-Encrypted: i=1; AJvYcCUEhlczcH1yo/HhTWbIdoS+5b6T0EcUrLbLx1FMoX/p2qFarBV8XHb2/Ks8VPR682hITabSAPlA+2s0@nongnu.org X-Gm-Message-State: AOJu0YwG4HXAdLlJIF19F7Hg4Bp+nH8vWK61eDhsf3lyXRCNVvpCwB7y vPF4+FlTdnnYXwkm8H7qtKaXqnMiu1H0otVShcuc0GbwwIs6Ra+eptjGxlK09Cto/Wo= X-Gm-Gg: ASbGnctwYwyIS/BO/tO9dm9OA7VBVKfcm2ZB5UMEuPOg2XpVyjApc7BJasFWlVKXfcF vMNMGOua8G5+BYYLWBiYOrfHNwCaoumEdwb+yEGxFVcn1ivjqJjyJa9rjMFRsBfEtwlXtWHfYoH 6nWIVxdmfHcqVIRPo46HEb5/nwwVK0QaD/NcbmryOqHkFgsn7SXfKCX0bnnDnW/MnZGSEfZnyiM wUNGcZiyKrVBNEjxW0OyM1XpPuFJU29L2Y5QJxjrPbZ7hxJrwkHtN7QSVJUCEWHlC5IgZPiqufB +CYbQmfOVo8YkuO93n03/I4+CkMfHc7JEf7JHA1Ygle2iYZCDtU3Zi0jSic7wdNmAbwAgmAv85v FACyoNu3KgZvkVwM3ABZ6pjivBFE3NWMc5u4a+RycjKMQ/bQbz8Le4rcmbGIuh6ceTrlH8thZOP lX2rmBiDs6+T54qapWqsxL+Vgz6DuYhfkdLWRs1cwfwjTid5mQ/7tPefu7pUAz X-Google-Smtp-Source: AGHT+IGyvQCmzOVQZfAkts8ZgbzGna0YcRb/Py1cmbK9iKhKBwIQBPKtdJCyZZVUIMjrajWC9u8HGg== X-Received: by 2002:a5d:584d:0:b0:429:d391:642d with SMTP id ffacd0b85a97d-42cc1ac9a9fmr10524149f8f.5.1763977892812; Mon, 24 Nov 2025 01:51:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 03/13] hw/sh4/r2d: Introduce sdram_base and sdram_size variables Date: Mon, 24 Nov 2025 10:50:58 +0100 Message-ID: <20251124095109.66091-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978047212019200 Soon RAM base / size won't be fixed, so introduce local variables for them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 5f8c034e1af..51c7c3e2e07 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -251,9 +251,12 @@ static void r2d_init(MachineState *machine) PCIBus *pci_bus; USBBus *usb_bus; r2d_fpga_t *fpga; + hwaddr sdram_base; + uint64_t sdram_size =3D SDRAM_SIZE; =20 switch (machine->ram_size) { case 64 * MiB: + sdram_base =3D SDRAM_BASE; break; default: error_report("This machine can only use 64M of memory"); @@ -269,8 +272,8 @@ static void r2d_init(MachineState *machine) qemu_register_reset(main_cpu_reset, reset_info); =20 /* Allocate memory space */ - memory_region_init_ram(sdram, NULL, "r2d.sdram", SDRAM_SIZE, &error_fa= tal); - memory_region_add_subregion(address_space_mem, SDRAM_BASE, sdram); + memory_region_init_ram(sdram, NULL, "r2d.sdram", sdram_size, &error_fa= tal); + memory_region_add_subregion(address_space_mem, sdram_base, sdram); /* Register peripherals */ s =3D sh7750_init(cpu, address_space_mem); fpga =3D r2d_fpga_init(address_space_mem, 0x04000000, sh7750_irl(s)); @@ -338,7 +341,7 @@ static void r2d_init(MachineState *machine) int kernel_size; =20 kernel_size =3D load_image_targphys(kernel_filename, - SDRAM_BASE + LINUX_LOAD_OFFSET, + sdram_base + LINUX_LOAD_OFFSET, INITRD_LOAD_OFFSET - LINUX_LOAD_OF= FSET, NULL); if (kernel_size < 0) { @@ -352,15 +355,15 @@ static void r2d_init(MachineState *machine) address_space_stw(&address_space_memory, SH7750_BCR2, 3 << (3 * 2), MEMTXATTRS_UNSPECIFIED, NULL); /* cs3 32bit */ /* Start from P2 area */ - reset_info->vector =3D (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa00000= 00; + reset_info->vector =3D (sdram_base + LINUX_LOAD_OFFSET) | 0xa00000= 00; } =20 if (initrd_filename) { int initrd_size; =20 initrd_size =3D load_image_targphys(initrd_filename, - SDRAM_BASE + INITRD_LOAD_OFFSET, - SDRAM_SIZE - INITRD_LOAD_OFFSET, + sdram_base + INITRD_LOAD_OFFSET, + sdram_size - INITRD_LOAD_OFFSET, NULL); =20 if (initrd_size < 0) { --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978130; cv=none; d=zohomail.com; s=zohoarc; b=oIFHCPkrtvYmYCKqgyaQDS5tky5yWqYU3mrbI1OTER8X/NEu+PWlLdZqwTUW3fDrd50zTdeQpvQNGxay2WOL8RitCgNuTKlIz3vHWDM+V7bA4OsUshBYtL60oMQLADhelYCA8ASP90sG7HpJcqtufgVr8AvMfDpXKhVMfNCJO20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978130; h=Content-Type: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=t8tG0tPqgGtNakU7Kz6dEt+20+JLjRPjTmlNHec45RY=; b=crQ0UwSk2SV+vxUVhV4591/U3f+R8recTeOMVONuH9HCoHwgPCryuZV4H0T5DPNGjKhseO8pwGGxZ0TAt/zd5UHG6cCs1FRfF6g41dIsiCQUOdPVZZkkpqwhbhvDbzaK5p/S5GE8mEvsVDRWLDVBd1Fdu+IHuC7ACwbty7zqr9I= 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 1763978130467793.5162317187522; Mon, 24 Nov 2025 01:55:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTHb-0005Wv-BE; Mon, 24 Nov 2025 04:54:56 -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 1vNTEa-0004St-8B for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:54 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTEU-0001ZC-Nx for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:47 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47118259fd8so34809105e9.3 for ; Mon, 24 Nov 2025 01:51:40 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477bf3af0e1sm183240265e9.10.2025.11.24.01.51.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977899; x=1764582699; 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=t8tG0tPqgGtNakU7Kz6dEt+20+JLjRPjTmlNHec45RY=; b=G4JwhbzG1/rECHOzYKsuwM3q19vKRFG5n2dHFWU/G/8Awf30uN12mYibLkBnly/Gxh JrmG9KLuynSyWP5wbR1OcE3hFcgkBmVLOK2P8uH9RQ8AaVLgu3x0QOCiwNNUe79VYuVN NSO8MVAagP1Jnonj6Fcz2fkjIm+u5DRTL5TtImO/qI7ScBQGX5hQJlDxq5GgeK0OnV14 sYJYNpS/mWGVXbvb5yVaRx0cOFXGTIMhmICOMJd2dH+Sc7t7JL9PYQJLhSXDMFRxmmD7 S0eGY9iuWm/rOPf7H3kAKc893e/8ppCJJihkWgK9kNUrFEeAqHzjO077vcaU24ZiwjJ4 JGgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977899; x=1764582699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=t8tG0tPqgGtNakU7Kz6dEt+20+JLjRPjTmlNHec45RY=; b=G+lxkaAZ7MetLZ+Dk5zfacxysQV7tlfAitI9S/iD/O6K3DwnJ35FKl0cbWNjnVAV3N W7EFTA1/z8ZBxziINWCanMGXB3z8HcrkZASEr3BSX7MEcSR1/fPjVrdMFm8NrISyy0an y3pHPPwK264dE7VjoUOspDiMUz7ub4DKyqaqODvta5rUrARTj/5YjBZCUGbrEqQIjPxI 4UffRNm2H1POkimda3sqa93+KQqAIG39p5Ku1AZGIcnmCZ0ihCqXch6zVp33HrzWA6lv 28gVE1Rie5GCz3GSFEAXkNgvdDKnchJaCOQdP8b77WJ3AZpIDDZVojr5nZJPZ5h71GNJ Ewqg== X-Forwarded-Encrypted: i=1; AJvYcCVthgu/tPjI+7mfK7RN0gANKNxwYEFkN0i6nsW+ThmdK3Re7Peg+JhKDTILPz4L/Ok5QiyVKaAr4yxh@nongnu.org X-Gm-Message-State: AOJu0YwbyFkcY6rx1sZJ9FRB+HruSK4xiwoxMx6jRvQG4la1GJgjaKYf UJ2xuHBuBX+9Ltu+ZLe/S3AEgJMDYaldkiPyenCCznsbplqyocKkz2yRV0wwELvKxyQcSi8v0C5 62eKWQ1FP5A== X-Gm-Gg: ASbGncvzSrtxH0YRhIVh1HTMfXb80Lg/ZHoAcZnT7F4QUCGehY9Y0RaHctvDQrYuXKI kyVslxV6SXxGBr20Fvj9Hv7LPXylFSuxEEa3zuVf33lnR36QeJXl6uIKkCCuYPXuqAYQGPHlaw4 nTkGazf6n0j61K+FQhxgtI0E4nVlAivSjCh4t3XouMUlVhSKqg1CcE5x4+YZ+x9NwcdNVyYQvYb 5gqpIv3lMI235PfHQXldf4jEc5Sc+TPYPXZURYsJaqYBOke4u1t7t8GXcoKGkXPH7ZBFMUR/Vzr KrWJk4q3KKhRwVqgJfQYf34PMXu8nJ7JYVksWOAt8wmqvfAzFUEB9+FFSpRfWpQzXKGOKMRBXQk GqdsF61qSoxtgugVOXBizWZM+RBRFK3llHK656R3sQcLmw32t9Ywi5btjg0XSXYgPbY0Gf+3J5O SEZCqB/2t0dG89zek6Quyyt/PdpTXiAbdLoyUigu4bzijf4q/26c72knyoEs3J X-Google-Smtp-Source: AGHT+IGdRsNhdR8xn4iwXa7PqXFWXUmKyFu0Zd06f7x27fsrYEj1yRhAdcNz0v3/gveF11OZpiAl1Q== X-Received: by 2002:a05:600c:1c92:b0:477:73e9:dc17 with SMTP id 5b1f17b1804b1-477c0202473mr133167415e9.35.1763977899659; Mon, 24 Nov 2025 01:51:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 04/13] hw/sh4/r2d: Use memdev allocation for RAM Date: Mon, 24 Nov 2025 10:50:59 +0100 Message-ID: <20251124095109.66091-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978131388019200 Memdev allocated MemoryRegion is initialized by generic code, so board only needs to opt in to memdev scheme by providing MachineClass::default_ram_id and using MachineState::ram instead of manually initializing RAM memory region. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 51c7c3e2e07..5fd06b3b731 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -252,7 +252,7 @@ static void r2d_init(MachineState *machine) USBBus *usb_bus; r2d_fpga_t *fpga; hwaddr sdram_base; - uint64_t sdram_size =3D SDRAM_SIZE; + uint64_t sdram_size =3D machine->ram_size; =20 switch (machine->ram_size) { case 64 * MiB: @@ -272,7 +272,7 @@ static void r2d_init(MachineState *machine) qemu_register_reset(main_cpu_reset, reset_info); =20 /* Allocate memory space */ - memory_region_init_ram(sdram, NULL, "r2d.sdram", sdram_size, &error_fa= tal); + memory_region_init_alias(sdram, NULL, "sdram", machine->ram, 0, sdram_= size); memory_region_add_subregion(address_space_mem, sdram_base, sdram); /* Register peripherals */ s =3D sh7750_init(cpu, address_space_mem); @@ -396,6 +396,8 @@ static void r2d_machine_init(MachineClass *mc) mc->init =3D r2d_init; mc->block_default_type =3D IF_IDE; mc->default_cpu_type =3D TYPE_SH7751R_CPU; + mc->default_ram_size =3D 64 * MiB; + mc->default_ram_id =3D "ram"; mc->default_nic =3D "rtl8139"; } =20 --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978109; cv=none; d=zohomail.com; s=zohoarc; b=V6YYIdUjN8pp+zDHUW88DrLgnnJUkfN4P/DYOdzqhB4UyJRNY7TyIAl8SVMPAhzTVfqXIPj2VQ9of73X34enJzvC+tBSZapRaYQhco8J3aChFvJ8b9vVmhuV30SdqddyGS4NPUGXQf1/f43Tgpuwzvr8W95zvm/PV5BF/Qe7ZF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978109; h=Content-Type: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=zl/AIacwr5jsJ7XYe78HGxVDkS5eQOZDNQOxismbb0k=; b=Ez20s0MUlXLVP7qDS6oTG32AjDremRZjCJUiWrQQAq0ICpLRXL8rFtT7KrF2SjLdEbq2Dt5lTudsSxahnHo2MqlQjp/FxgKsTAJ1fMPenGjtHfpOxK1dKWLUDZ1RHn1jEIj0cDQ4bhS+VwbNcwgcd3KpWzkhyI8LwYCC9lfyt1w= 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 1763978109789140.9282888580375; Mon, 24 Nov 2025 01:55:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTGl-0004wH-4g; Mon, 24 Nov 2025 04:54:03 -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 1vNTEc-0004TB-6R for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:55 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTEa-0001aa-1M for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:49 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-42b3b0d76fcso2499633f8f.3 for ; Mon, 24 Nov 2025 01:51:47 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7fb8e62sm27291542f8f.35.2025.11.24.01.51.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977906; x=1764582706; 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=zl/AIacwr5jsJ7XYe78HGxVDkS5eQOZDNQOxismbb0k=; b=vehp4ary7Z8jTixCxtSwJLoYqllmkBagAfRqkKcJtEu4mqYJ1IJYiK9eFNbAsQZG3g NRw5UsTf8RTQ5Y6WDI9a72PdzgogzuIfFt5heMLFWAnwuAtYFScaU4oNuNtRtCJtzert 8nwR0ByNyyNHxPfrgPuS4s9uc3EyQdrM5rnvTyMIh/GcwFcG5ax9KBi9pObofMu8iAWu KE6COhZjwPSOLVgM1+zd0Mztvkeluxrb2x7x7MDQs0l4BLvW+lY9vcovon7q17DyPkd/ jcol/xLxB9yRZz8rENYdjnydFhD03APTn+zajAVxXReXVcrHjj9niWqCpNgbEg9b+ZjW Yp7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977906; x=1764582706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zl/AIacwr5jsJ7XYe78HGxVDkS5eQOZDNQOxismbb0k=; b=sYhh2fcN92ERmm7ZTPbrerZAKp2Q4JQil/0NmPPMpAA2rPCmLWUfO/9jHi+8UnmBy5 OLux19wLvhxzByfE9IHCEKcjsl4Uq0vtCcHMNbGlRFqSAoYhEH2toWamhDRtAE/LQs7+ Z9aCDrhEd2evg7VKq3tYKuJw6PbA+FUNGKKBHUtxtw5fqzcA01xHNDtlN1vjaECmVQq5 DEW3i0qEA55tV32T64IuWXJtm2KRurlF5x7IRL+P/fyQ92csxAc3Sd8SYhHWUtk8kp/J MHvhq0Mc/SToBUEwnzhtSW9KtUZetLjwhMUTS1pmmX2G9leJj83qSFBn0HaDoo83eWz9 VOlg== X-Forwarded-Encrypted: i=1; AJvYcCUbjlje/FSaxdxpeoozdcwCSISanEGtVRvCPWzxxfWvTVOvBxAG5bRxeSBv8wRLkILbyxYg5mFygc6R@nongnu.org X-Gm-Message-State: AOJu0YwZFzBzxNKO1cemCQn7Q6Mn7+TDu/yLAIPUNeiX5tSei9n6+2Re Aw1Ku5URV0OW5jTzqr1BEyOYw14HOHYxxXjCvzsRUmeCkSvaGqoMcepjlwBtmoHT4YE= X-Gm-Gg: ASbGncsrtRTlJiNqqTHy7jFrCD+sDsOdTDU3nvOVq8n9ffk3mZ3MPLZnuYFzmCIH4Tn yjFm0Bgt8feVdziPowibTPtrvdNUy9ZIaqEWdHf3VvBqbxMd13c7i92efpFSWk4opMaoiW5V2PY KaGOc4eE5C6783/YDVp7regVFtwkidlfc1UXZdOWjeH+uofRB7AQKQS2z71QiEheECa3Yj5sgnp EsquqCo2yZK3wV2IqNuY98vM0HNiWHII8lbg849iGqs4/IktuKTFetkV9e8ryZ3EA/h4I90MhkK sFkaNyoAU6h7JdQNck7tNsrBEjXPOCwXJJcz6iiubzOPtsdSL6K82PGu9+GdBO/t92M2AiqZ6yo M8eJSJ8JBCXBlYQxSbz5opQNm0+B7ZRb0BVB+EctFPqLocLq1w29gepQaNv5g7/gdSL56E3hGip 6ZUhutdCI7Cn3WMkMB0jKZjitfjVRvyTapkmCse0w2ixiQGFqO1C5qKpVt2LRQ X-Google-Smtp-Source: AGHT+IH2/Tv+fYRvsmzCyDv4i5xGEwkB280/ldIObZgBEBwxUUrorxkuBeLcQgzx2S8cgQ0tEkjQvw== X-Received: by 2002:a05:6000:401e:b0:42b:4139:579f with SMTP id ffacd0b85a97d-42cc1d08990mr10764023f8f.25.1763977906311; Mon, 24 Nov 2025 01:51:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 05/13] hw/sh4/r2d: Reword SH7750_BCR1 and SH7750_BCR2 initialization comments Date: Mon, 24 Nov 2025 10:51:00 +0100 Message-ID: <20251124095109.66091-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978111251019201 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 5fd06b3b731..9de4944ecee 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -350,10 +350,12 @@ static void r2d_init(MachineState *machine) } =20 /* initialization which should be done by firmware */ - address_space_stl(&address_space_memory, SH7750_BCR1, 1 << 3, - MEMTXATTRS_UNSPECIFIED, NULL); /* cs3 SDRAM */ - address_space_stw(&address_space_memory, SH7750_BCR2, 3 << (3 * 2), - MEMTXATTRS_UNSPECIFIED, NULL); /* cs3 32bit */ + address_space_stl(&address_space_memory, SH7750_BCR1, + (1 << 3) | /* Areas 3 accessed as SDRAM */ + 0, MEMTXATTRS_UNSPECIFIED, NULL); + address_space_stw(&address_space_memory, SH7750_BCR2, + (0b11 << 2 * 3) | /* Area 3 Bus width is 32 bits= */ + 0, MEMTXATTRS_UNSPECIFIED, NULL); /* Start from P2 area */ reset_info->vector =3D (sdram_base + LINUX_LOAD_OFFSET) | 0xa00000= 00; } --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978216; cv=none; d=zohomail.com; s=zohoarc; b=PYYyJCUDuMJ4Prb8P6ZtMOMaqdIXCQsEcocVCNS8/lQUlMdyv7muCVISO4PbiWjJsUhFy5ET7m/la1gTlwfSYMeX6Ak1fItag5+xUMremRP0Aez1NMMvASt6tY07Guh84ZcIqMD42CS1p4cmxjdLAeqT5M8oo/ygPj8hNpcLtoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978216; h=Content-Type: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=8eh6MHRib1ellMghl3+SNmWwKGGVxvwx21luylnyRog=; b=Pe28/fJPvEVBIeQngiF29koOZbpMakxtalCctSnMLLRo4sYhE7aFlFvdfRknIlhApRLeTpvrZmocic+A9Xt1nCaan7AOJMCWRUSMgiPMDtRwPjSdboX40H1zDJe85s0aOX41zXRh8u3SZV3bj0HAVMp9YdaQ/EGqr7kfMs4lwt4= 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 1763978216617552.5477503772373; Mon, 24 Nov 2025 01:56:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTIE-0006P5-MQ; Mon, 24 Nov 2025 04:55:42 -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 1vNTEj-0004UW-Jw for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:06 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTEg-0001bR-LM for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:51:56 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-47118259fd8so34811145e9.3 for ; Mon, 24 Nov 2025 01:51:54 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7fb919bsm27301138f8f.34.2025.11.24.01.51.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:51:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977913; x=1764582713; 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=8eh6MHRib1ellMghl3+SNmWwKGGVxvwx21luylnyRog=; b=mr5SxW4CPblrjpnydCuLRf1m8DKAHQ+PFdxsDHq3Zub1IBOmoccv/6Rn31enB8T28G pUAG3isjUj6dqlbSSmep075XuqOlbTzUoUIM1k0C/jtEXo38r6qY7bJnMFtvw6JdUmD6 NniEcwuRN0YYz7r1PdrCU6t/VR1yDDArKM+ZqGDYw7JN4NwmGXZlIEWAidtyRwIwEZfL hbGpfVE7eEQDLav9ib75d+n8wCzdGVmVM0Ja8dM47qEDogQJPaktR0Lay0O2lMgucMm4 nAAsMhAqESr+f2u1g0BjF85MQOD2jF/BUab9igvfM1/mHIwuIwckvjN5ita+P8RhQWgl P/cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977913; x=1764582713; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8eh6MHRib1ellMghl3+SNmWwKGGVxvwx21luylnyRog=; b=Z/Mej+09ptYIn960YAPCZvFWkhfbjWj2XrCj7clvbiAZbz1xDP7zLSre2mYD5UqQNz T2MBEmhY81Mk0RX8ThXVUyVTzadxwJ9yRqZLgxTQ3BCegLMSr2tMm+WuQmfhGBG0QUAj k2GGyA1QwYRusKkjFmiMOibm7GMvmX1NkdLBFhUo3bTGH2SyR5bf7ryeFZ3WtzVihLQ/ BdNSbuiyTrk79B0KZq/iBIejTrm1NuwDc2O+RrgHT3gCyhRhz75kqtTryz8uBGCCEzwb 34AIn6c1BcEQP8uC1WFYcOn1po0qBRLdmX+ErT7GPUEN/1BOseJJk92mt9O+uh4hTANV vewA== X-Forwarded-Encrypted: i=1; AJvYcCXeX64J3I4TwtxO+86t/WoxLrx3p6w0WpqIDt/8pLXrrnOjv7IuS80uMj6KrLrN8sr8piUOR0oOmwAH@nongnu.org X-Gm-Message-State: AOJu0YyDY58T0svISy33GuRpt0Y0DDb6H5ljsyRD+efrMivto0AjL36P J3F2ON6DSdIbsLaNOmE/Mh0qR6climKcs3/JkA+MsmElaNTTZmg8ogbXSFLfSXYb5To= X-Gm-Gg: ASbGnctpuX79+I+/qyAyOKhaZCBU77qTDC7ofbNP/MbHhXjAtnzgk+ynC3Z2S8A9tSl NReWm+QJuqEG82YutoVGfZalZjl/RV4IMe/ewuHLTybWMxXeFxPzRNgdwcCcTtkovWBfUrsv1Gu BAdY96KoDLcS4U8P5OotqYu2lbl3Sv0GGBGqz581yWrJhviINivyKlKJQv2z3KyoURsW7A2basv Fee8rPU3jIhNtSlyFODIhw4PTnZNQ6Mmq92lI3ug0ZGzwJz/8aUFhlGSWWUrA6r1b07xWVClbfb ULRSAHpiGLepeRkkYizHCpCZ+dqMuUy2NTw6NVlb7LdCT5ftIy5xap0Jv/L5WW34glsPxm6CcTW PwQGJMhxPOHo7tlzoBYRInXuuon8wR2iS+TnasDmUWN5+U8/9GRDmBxtdK/R9W06h7ifHgOJbSF xEcveaTbt1CG9l9oQwgoLlLJQpMSsgU/4zCsZh6pnjdupBGI/BwLyB6netJydh X-Google-Smtp-Source: AGHT+IFRUPXz9O97zT7tTvi8FfCO8H57dP7njZ+Jy9z/qALg7vYF3PusT8921QsTwHRlo/IuG9ZcXg== X-Received: by 2002:a05:600c:1c89:b0:477:8a29:582c with SMTP id 5b1f17b1804b1-477c01fc60amr119087025e9.34.1763977913012; Mon, 24 Nov 2025 01:51:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 06/13] hw/sh4/r2d: Configure flash (CS#0) as 16-bit accessible Date: Mon, 24 Nov 2025 10:51:01 +0100 Message-ID: <20251124095109.66091-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978217996019200 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 9de4944ecee..12232fabbdf 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -355,6 +355,7 @@ static void r2d_init(MachineState *machine) 0, MEMTXATTRS_UNSPECIFIED, NULL); address_space_stw(&address_space_memory, SH7750_BCR2, (0b11 << 2 * 3) | /* Area 3 Bus width is 32 bits= */ + (0b10 << 14) | /* Area 0 Bus Width is 16 bits= */ 0, MEMTXATTRS_UNSPECIFIED, NULL); /* Start from P2 area */ reset_info->vector =3D (sdram_base + LINUX_LOAD_OFFSET) | 0xa00000= 00; --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978108; cv=none; d=zohomail.com; s=zohoarc; b=ScGeI3pnGANOBKVkluUTbEEFlmUn9E0TT56ldXUgoVb5HMsKanUQgswl+DYxurU8oCf3obLSRuLTPbk2iimvs5xC7qEelsXEk+tdhAWWMbi4g1gdjnIKfKBJpvFNOIKYw5dkubC2t2xjoHQjnOih1JWA6LBG5GjO/SnNQ/E7CKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978108; h=Content-Type: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=ap63lntzlR8GaDypuh4WetYAtZ4MTe+hzOe+jaSU4fc=; b=Hfca1Dg/ZQO/I0DWWjD9r7PQQWzonGkg1FLWWzmgUwgrbMWMmEc1LQqIrS3CZ/MLJ27F9O3G7gkn1Lq0Sm9VLO2xMsuMNT46wrlcRnazyc3vre3P8YivhVvia3ahWNBbjByDHcFtH6IDvbn9UC11OhgtkT5uquCx82COISe3j7A= 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 1763978108478805.305402238134; Mon, 24 Nov 2025 01:55:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTHK-0005LL-E6; Mon, 24 Nov 2025 04:54:43 -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 1vNTEq-0004W0-Cm for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:09 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTEn-0001cJ-Or for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:02 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-477632b0621so27490665e9.2 for ; Mon, 24 Nov 2025 01:52:01 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477bf1df392sm189082925e9.1.2025.11.24.01.51.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:51:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977920; x=1764582720; 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=ap63lntzlR8GaDypuh4WetYAtZ4MTe+hzOe+jaSU4fc=; b=WipLM/r6hA2+pbG5nb7XvZvyJvrYIAWHQMRc1rfUgIuwVMLYPg0Wb0FIoniDIMWd0P zbTuoPF3YmDI3aJkgyxknGiYVFOo9vIhm5Br0rzbllsky8taGEe8zLJLPBch3F9K2dD4 mHYJOnP+yVsyapdbBANWyxSDqswTqMWJrsAOM3doHj3HQoh+T2z8hUoQoAJshBbUTHMD EpBxWe9PtxvklAt3j/I2BUgFpSnoTHDpWQlxxuIJGOVppW7HdoHv1eboZlKNG0qdJWIN Ruu9N5AuIS6qWlOcfdwynq0uu5F9s2LbcnsUNK7UWNTSkvLnCem8m7HCLmu8MO/OVbX2 uNfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977920; x=1764582720; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ap63lntzlR8GaDypuh4WetYAtZ4MTe+hzOe+jaSU4fc=; b=k8FdlSlr1MZrDdB8xx3HkrOnaGsFB5O9gScSK4ohJF7HRJWk8GeiAPjH9JII4QgsCt x6t6GMGNfbilNrarfbCtylLVdAa9m5uwWqJos+moI1mHyzeKd/n3EhVF+x+wECptQeXj KhIN/y/UwCUt0F281zqXGgsEAugBM4Qd7//X+fvYq+OAuKwwaeK69rVOg0+a0FTzSp65 NP2/ie7KZOfL/6O9XOz9Rh3xryrfitJfcsADV7husB4mc0M3kwmsBqqD6nyQ3Oxgm4Aq DMlnHcX5Y1+eORedbdU7vxjasovrF7onW8f2g7VZgq5rUa6oFYGmydHwMKd4qiKoPLnA GS1w== X-Forwarded-Encrypted: i=1; AJvYcCWdDF0QJEL22eJohIRzSg82fz5SyoDku93Y4U/DdVQ/MkAt0PQgU+VVCCePh6qrUx10cQBaSXescLpw@nongnu.org X-Gm-Message-State: AOJu0Yy2WxC9fX3/87tjM4ST6rBQS32HZAK2SK5B0nt5tsbVnMjVVJx1 rkBXjwxcHOQii+VrKsQKKDEi+547yNeauxhMZ14QgqdSmCKzM30q80H8EY90uJ4HT+k= X-Gm-Gg: ASbGncs8eZAlaB40LOMFQ40zQMcaDhEH2cjuXFZ7pilF0jAhL4Gctf/3CbtnUpwdUtM uWIocjw5elHkrymfANP3+/OyrbuBW4zIbgSB3pWzmJ7Nsuj18NQ58Oh/c3/VIh9dbnRxl9Gzv7f iLUKQ9RDD9kMFGhvG6ViaWvxylGXetjsENxYVbMvRCBZ1g375cKiU1esGmK9ttRIV9j5YYpQ9nd 9W0z8eSCG6U3MrAfbQLm8j1vb17AppueaDhht/SPNgglAo0S+xXyYWhVAb9N9tAlttV/N8ieewJ lClrzWQOBbG7AvM6f8/b8WhpzND1tx4zUclQFK9suyd1U8/0volqGVszOxQ4iNSFaDrkFUQvNQ6 cDRM+te6AqPEEu5C6yQCACY03u+18yGv1uLEIteEMXSc3AYC6Iyc8Qr2y0ceJNsdZgLyzncZNtk Q3gZtwKRmrXnl6K54D0oUFMnrEijZXswf1ao2j/TbHNp1/xEAnF8b6FHSV+OI5 X-Google-Smtp-Source: AGHT+IGxtwIUpPvVaKECTkaaEjbbbMFw7g3vro7n1phVNH+26EhavxI1fREA2NPZczBvrzvyL1XfqA== X-Received: by 2002:a05:600c:8b35:b0:475:d8b3:a9d5 with SMTP id 5b1f17b1804b1-477c10d6fdamr112297975e9.10.1763977919841; Mon, 24 Nov 2025 01:51:59 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 07/13] hw/sh4/r2d: Introduce EXT_CS_BASE() macro and use it for SDRAM Date: Mon, 24 Nov 2025 10:51:02 +0100 Message-ID: <20251124095109.66091-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978109333019200 The SH7751 memory controller can access 7 external banks. The 64MB of SDRAM is on bank #3. Introduce the EXT_CS_BASE() macro and use it for SDRAM. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 12232fabbdf..ecbc1ec2a98 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -45,10 +45,11 @@ #include "hw/block/flash.h" #include "exec/tswap.h" =20 -#define FLASH_BASE 0x00000000 +#define EXT_CS_SIZE (64 * MiB) +#define EXT_CS_BASE(cs_index) ((cs_index) * EXT_CS_SIZE) + #define FLASH_SIZE (16 * MiB) =20 -#define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */ #define SDRAM_SIZE 0x04000000 =20 #define SM501_VRAM_SIZE 0x800000 @@ -256,7 +257,7 @@ static void r2d_init(MachineState *machine) =20 switch (machine->ram_size) { case 64 * MiB: - sdram_base =3D SDRAM_BASE; + sdram_base =3D EXT_CS_BASE(3); /* 64M @CS3 */ break; default: error_report("This machine can only use 64M of memory"); --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978094; cv=none; d=zohomail.com; s=zohoarc; b=C6u/jRon3nInDaCwKZD4hTQ7ZC90OOTj9ugXY3C3jK6m8tnGuAN0DrqyBWilqbYI9PdLIf1hBSaOVZadIMftg29QRpV4OrzCWrsYAt2uURx0+3ofXE77Cpvvamr0LdSVra6M1L2xxK2wQIOwSEo8WqRntVeljTCW2/dbtAteOyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978094; h=Content-Type: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=ZZv0HaxYobXFFOcIY/qhqjmI7UJo1JUgEvzHSujWxJE=; b=fyV6MD8DsTToLGDOJ603RXJWckjeiLKjdrYmq1kMa2a9ForJYm7Rhiz4qDUqwAjswRLD2BYtJqakl3n0fmpesSTdTfCfWX0oRFN6Jtnn4d99Y7KQrOe1I6c7i9355hQs69GOeN4lmZgxI/+hSS7CU/Dm82aBQOqL6Z6lvuQS9nA= 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 1763978094508833.0506665192662; Mon, 24 Nov 2025 01:54:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTHK-0005LK-DI; Mon, 24 Nov 2025 04:54:43 -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 1vNTEx-0004XC-Cf for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:32 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTEu-0001dI-VQ for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:11 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-477a1c28778so45092995e9.3 for ; Mon, 24 Nov 2025 01:52:08 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477a9de4765sm144416295e9.10.2025.11.24.01.52.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977927; x=1764582727; 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=ZZv0HaxYobXFFOcIY/qhqjmI7UJo1JUgEvzHSujWxJE=; b=LDlR5dTAF9JMJ1mlGGgEDFx1JQRX8I2JBEZPlXxpOOIg/4fKr3wQSaRQhAmmya8y0e l5oicKCrVLPKgq/z9yLHF2kaGIVBXKpRbSl5CdJE6/Qdbnn6Pfrc9A0h0l/dZRwhtt1l vQoKGF8iBFB5CJkGbvPc5UilhPBhkemW/GyNVUu/t+c99B0DZerY14o5NiaHZiXwFKrg Is+ulPn6qIyAf7//M0dqbuD3cOsIV2nFcPSDobfF2TCo2OiEr8bk10DDcZ7ItyViLpNk 9crsdEIAwcnnyqh7ZGRJH8zrFtIjfX4rCkvbwB73MWSLL0AlyMiVXrdUkGd6ZB6KTZm+ v6UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977927; x=1764582727; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZZv0HaxYobXFFOcIY/qhqjmI7UJo1JUgEvzHSujWxJE=; b=dYva1al1FhcENtqhkIYXsGIjQlgvRuYUKOg4mad8T+K0e8TUAh7ZtTapNjuW2DIVom r4VazjXr8vYwsroelZY5Fly9KGssLnKS7VPg275EOPtZzC4mjHtIhrZsH72deuDmLD// KAPwelIpmOHfsqsjP8Hy7RjEky+QZFC53Pry+gTR3v1PdpSUjwp5GTHXHvzzvKeHwqp7 Lp2DjXB69VFvFD6XolBPltDtLWvqiCCdXXDpio3voKHMUrwUh8ZDka5hSI4Zi1ARuftB MOPCPVxZd1JWe/RrwZiy+eVnFwO2F6YFc3CJrUszFUQHRmnYR6NGgqhODHg/AtlOG16N E6PQ== X-Forwarded-Encrypted: i=1; AJvYcCUfajoWT0ZrQUhpp3UFggFxn5fS5UA3EaxuI+82Ara4Y4Dxdyv/jxv3kS1hTYpCg4oYmmKTrxA/FGQ7@nongnu.org X-Gm-Message-State: AOJu0YwilYvrJvs/mDD2DlPV4GhD6kLqN/kfATDEgZMWhbvfgPvOexer Bsc2z/qwsqFX47iAroTT0fn6B6R2WpCa61ZMnwb8/0AzR0pVedKPkwmxWDE/hSKHtvk= X-Gm-Gg: ASbGncuJ+A5rj1U1vp5EQggnlxRLmQ3zs7lHU9DTeopRuEhtBDhVX+3FKWblBMhR03V UlSj56cPUj0eDzkHS1seSE4KzizX9AkpkAf3WhL4T2k8mk4On0697+loGRlTCb/E3BJcG+R9T0W p319C7/P4huFdHiK639sKAQC0CrFb/OGL7vJ2Kwb7gKax+eE0g3PLjQhQzrtyKUGuIgtgOD/plT TAyLn/b2pdYddLeZyHrc8Ql0YLQlZbmi0l+G6Kx5I9PB/H2Fpkn2xPPsTUZcr2TLaEqjtJ5/VcG MWA8J4BKjLcZgDw/efP+xw5fgMYdgXv+xBVTOfQCV7Lo6STZluxEBSqWHv8gQm9LmTVCTokLCkZ 5783V4SoZ8LuZlm8u6pBo+qdWDhH63RkXLKHWDmF2AO1Gks4xw2mZgybxnilYgLonqV6dEvMkjK yA6XN8wOzoJy9y0oQ6UZu7gkgRyl0yk2LKvB1HkQZZFhV58KkHD08S3CGIcZqr X-Google-Smtp-Source: AGHT+IGGpfroJHfu/PAd7oP+q+1QpIhfe/5kzG1uDNv2xwCFwEE+tTSrVfmPZs765o2hTRlw4lizEg== X-Received: by 2002:a05:600c:c8f:b0:477:fcb:2256 with SMTP id 5b1f17b1804b1-477c01bc360mr105579675e9.17.1763977926860; Mon, 24 Nov 2025 01:52:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 08/13] hw/sh4/r2d: Use EXT_CS_BASE() macro for boot flash device Date: Mon, 24 Nov 2025 10:51:03 +0100 Message-ID: <20251124095109.66091-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978095458019200 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index ecbc1ec2a98..26edcabf2c0 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -252,6 +252,7 @@ static void r2d_init(MachineState *machine) PCIBus *pci_bus; USBBus *usb_bus; r2d_fpga_t *fpga; + const hwaddr flash_base =3D EXT_CS_BASE(0); hwaddr sdram_base; uint64_t sdram_size =3D machine->ram_size; =20 @@ -321,7 +322,7 @@ static void r2d_init(MachineState *machine) * addressable in words of 16bit. */ dinfo =3D drive_get(IF_PFLASH, 0, 0); - pflash_cfi02_register(0x0, "r2d.flash", FLASH_SIZE, + pflash_cfi02_register(flash_base, "r2d.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 64 * KiB, 1, 2, 0x0001, 0x227e, 0x2220, 0x2200, 0x555, 0x2aa, 0); --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978043; cv=none; d=zohomail.com; s=zohoarc; b=kR95tNKvd8H4v2pzmYR6SoTB5YM3Sbe7BFjLG9+Z5UcCzwSk0qRVlnWhGZEQ1IMMuixPhTH4hv35LuYs/0vSxpUpd/nTne2uQvc6fko3ptuHeirVhanjRZQedY9K73/DIGAPUHRzBfSTN0kbPvlp3KBFKtPDNcrzVG1xnJOFTUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978043; h=Content-Type: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=Y2ZTFmU6wpQn2o5DKZtDOyBUX7dktOdowLF5I8J/Wto=; b=CmiQcREFJmRXrpVRW3ZJ0hQeqEyimPsfol0lomKgkoDMnb8+ZMQwjvmmQQ5mtjU7qOoBx5dMSMVnhAT20k5kempv6MiDmsX4j1B41lOY4DcvVAdMwYn/jJ6Fj50dZlSmoIhurQkUSRE4xGo78PStToD3qlvR90J526+qNgPcnvM= 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 1763978043679957.5694646908341; Mon, 24 Nov 2025 01:54:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTGK-0004kU-R7; Mon, 24 Nov 2025 04:53:36 -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 1vNTF3-0004Xa-9C for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:32 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTF1-0001e9-Lb for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:16 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-42bb288c17bso2431011f8f.2 for ; Mon, 24 Nov 2025 01:52:14 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f34ff3sm27949304f8f.16.2025.11.24.01.52.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:52:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977934; x=1764582734; 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=Y2ZTFmU6wpQn2o5DKZtDOyBUX7dktOdowLF5I8J/Wto=; b=O7WwIisGf6VOyr6mKjheeMXgQ3XCyy1o6hpmjuhMDh/n55trFgCP1f8ix6oQt6fBlk ie0xJBGOO1RW0M2UhfyzTQe8mJxIKkAPv1wRb5dzkIGDXnvqD9/ceEiPm81xruY4O4hg +wBUJlXBQsbB+yYjq48ExuWBueHxvnkxjQ4mVonYdMhTSOREgQ2NR241dxnMhXDF/aoO LYw+MZ1+d1Vmyz3iM6yPGPZAoWlrI+GGVzRLfMlNgooYEHHHUws8hHpqJVjz0dHxw7do u3v/2lGZ+nR7mEDFOwnEoch7ocICr0GIRtvwLFjQHry9fK+iphia5xBij5hng0v8BL8Q oFEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977934; x=1764582734; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y2ZTFmU6wpQn2o5DKZtDOyBUX7dktOdowLF5I8J/Wto=; b=tjNCFDk6QjrExRvWzi3/J8GcNeWJO2eu14BraHdNeyI60it2YO+Yls/HPusewdH/5V RgrKCtlCvLX+FKxpkA1UKRG0acNAkHc2kRXXXYx1MR78aOKoKvvfc2dHWTNdSgcl3zT8 F2p4ghhd9tzsCLJVqdLNjRDVVCRrhjhSv9CcuDJif4GEvHMFmZaHUb76KfT/fprllKD6 EILrIpYbJx+3JvoIIalKWySlB+YRuKcGbr8YRo3t2vEH7763jt0s4So3ywM/QTwAd/FZ aO9L0xFPqxEFC/XyLKIeXOSkHYs895qNAqMUaleqrQhonxN+XxvpTgPT+dYcBzr0xy8n GzGg== X-Forwarded-Encrypted: i=1; AJvYcCXPbikqBlKBMX2FeVATVWfXB6k2087nlSwoGiz0m6FkUQHtuxaAUdFEKNogq2xVlLg+/1GwUazpQnhw@nongnu.org X-Gm-Message-State: AOJu0YxK7hwN+t93GQYHuTrpD+K3RXG9tWr3uL+epTNR5BVBeUR+ziNt auBdDU1qPRB9805gohmr3/QzBpLQadsNeEGdzaZVI1rof3SL9dr7AomiJ5Er7mHgTopWph3dklk ToxMvOPpuXQ== X-Gm-Gg: ASbGncsDAMTF09rypZpRCegq4fYQR79xzH8++CK0Z+WSeyjz+ATdjefhF5bOeXuIHGN cr90PexPz16FzPyhDYuF14ki4HGEO2IfkYlSE7j5bJx0sOA7rXI1M0YABl88TCCM0AMKv2Mz46u XJ+AMhxB+7e3W6oth8dLDcnRv57Vd1qoALVJcYWA+EjqMRl84HGmLNYVJ7he3WTUEeR0qcQWA3u 1f0MDGvMWn+aAwrNAjV3jVMxpJ+fTFngj25T9EEgRFmz4T4aBaINhrqzen9RqRaUPS+e3e8Owte h297K+awMLgp+0+m6YhOW1Czy0/y0TKce4kDooJDmSXOMAuPatwXCbv2s2bKaiIgpSwhrbNgXW5 ZiPuk4fzyZ+5eD3Z5N4iu6PtPmkMhBFksSv/+Xj7h5KbpM3lWVWDWBc4pLwc4JbjK867XbGo37d u7BZPl4nXl1CEimsWpl8XkDHwsPJPE8o+55kxkq4Os0Cml0WBqT/W17xU29lMU X-Google-Smtp-Source: AGHT+IF8ciSAbgAMy16t5fHYnpWhqWHq8gNIIWtYj7yTLDBkr4adUEI8ruG/Qe4la7CPnBX31SMQmQ== X-Received: by 2002:a05:6000:40cb:b0:42b:3ee9:4773 with SMTP id ffacd0b85a97d-42cc1ab89eamr10862156f8f.7.1763977933750; Mon, 24 Nov 2025 01:52:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 09/13] hw/sh4/r2d: Use EXT_CS_BASE() macro for FPGA device Date: Mon, 24 Nov 2025 10:51:04 +0100 Message-ID: <20251124095109.66091-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978045323019200 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 26edcabf2c0..2229cc6fe66 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -253,6 +253,7 @@ static void r2d_init(MachineState *machine) USBBus *usb_bus; r2d_fpga_t *fpga; const hwaddr flash_base =3D EXT_CS_BASE(0); + const hwaddr fpga_base =3D EXT_CS_BASE(1); hwaddr sdram_base; uint64_t sdram_size =3D machine->ram_size; =20 @@ -278,7 +279,7 @@ static void r2d_init(MachineState *machine) memory_region_add_subregion(address_space_mem, sdram_base, sdram); /* Register peripherals */ s =3D sh7750_init(cpu, address_space_mem); - fpga =3D r2d_fpga_init(address_space_mem, 0x04000000, sh7750_irl(s)); + fpga =3D r2d_fpga_init(address_space_mem, fpga_base, sh7750_irl(s)); =20 dev =3D qdev_new("sh_pci"); busdev =3D SYS_BUS_DEVICE(dev); --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978212; cv=none; d=zohomail.com; s=zohoarc; b=mtxoY+bAiU+9Ki9hJbve/9hOJafxHAxk/ViermxwIYOLP+OsPOAkIXPML11EQt3wCuS/bRVqWNGmzxuEp/9HyHvNEg0QE8oMlIvnVb4/UXIP1LdEAp7Ty68/TnKWG9zVsGttkKiWS3p4tUlArIt1E9DkkJwoKSVKPD3mYrxzOcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978212; h=Content-Type: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=iHirYCS7o5fHFAEDDvU/4jz9vrUedalvStdmBVvHfE0=; b=Lt1BoVoG8Z+9l28AiNO1Tlifz+iNkHXkkzPQMIZ1zmqJkvRWvvm92cnUJJldgb2IaMikSGxnikPvQUkNL7cXESYAjIXgbH/RztIeApjCTgDU2cOcGL66fX2soA8ADg5k5dHM6d4obwGt3qbHkVSzOu327CYku4o4jzC8Okfm6Fg= 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 1763978212217414.98813453295406; Mon, 24 Nov 2025 01:56:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTHf-0005ie-Et; Mon, 24 Nov 2025 04:55:00 -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 1vNTF9-0004YQ-VN for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:32 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTF8-0001ej-HG for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:23 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-42b427cda88so2728337f8f.0 for ; Mon, 24 Nov 2025 01:52:21 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f363c0sm27731794f8f.18.2025.11.24.01.52.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977941; x=1764582741; 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=iHirYCS7o5fHFAEDDvU/4jz9vrUedalvStdmBVvHfE0=; b=N4ZSy7bxC5/KnhX1kgJXTBg5/ovm478squkQbWy+057wyzJVBWQdVOXSnr6OHazU/f L2Kua4JjNauAgOyZGCN12ek6KQkzLbKeAllxTnSRbG57oRwwqmB3yI1mq4b2LqvwECRk ao+SAYNhBeEOCwlaJpvlMXY7yctzjOy3iM3wMHepIioA3NplIAhVxHRwJCaJTWeCku6Z 7MWeh8+dW3oyc30Ss+OjI9yH40C26KHNMcH3LEMBwdmL/2wPerpJNupJrQ86my+AWJfZ 479ajly3F1etN17K21WcR52/jCaY5GchSX4QARg/gtUcYNyzE9V60AnZLx6ZMJ3/7eg5 opDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977941; x=1764582741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iHirYCS7o5fHFAEDDvU/4jz9vrUedalvStdmBVvHfE0=; b=VMZSLDxJ3Yd4A3c1X2VPpIMc3yU/23Lilsymugbi74mMn2/i1HeHWjdeMuz3IlnPiY Sg5w3oysGyj5zegNF3LKMcgCIfXv2EITYTUNKftVv4WA++dLZb1PlN5cLabolprdSaze kvhSA572gD+ROXHXCYlbhkb6PeArcgK6BPIirjWxW6Ik0byBNDXODJ4c/92m22/N97hq L+zZKwhD17QmvaSsLyFhnMZFX/AZwlmGi1PT5feFpZlOxZ20iophw5MV6gNnrL6qB5Hz Sr8JYcOa3xhkcbG6znM3Y0RRANkoTY/gMMNbQCBwcKbs0myP3qKszS4Nw7loxVkX1zr8 mACA== X-Forwarded-Encrypted: i=1; AJvYcCU7XgQXusVryinqNmIHP4g7wodHr1RlO/1zIb16tt2ZI9/6GpGvXiKsWdPjCa7s3D0oNcDaAHXhsdVO@nongnu.org X-Gm-Message-State: AOJu0Yxmmsdv+AAqxt0eS87cTPlSfpqMTj2yh2uR8L+1jMjRcNSehlUS keynRnWDSQhVgVeITGQQGp7e2mw+VIPDX4fEIV/tvg0mt9+FMSM9Lyw81jfRxDgsIUY= X-Gm-Gg: ASbGncsfbT+eAhBp7snNcabwrEOgYJ6MM/N7C3GIdXUo7xAJ75xtN1TOJGfag1Wr9XN z4JUwkyNhkvQKuUIl6fn4IHdTqHbSYAY+pZPMLC04RLQWfQie+btIQvhmoW7aiEux9zTnK0czbD nlVW6aWK8qqzUz4+9U2Gbr2x5g+1p39OrKI8OUb6/v8l+BcwyGFVuidTeGypQQMj2lOEAUyd+eQ il7ziALVKzrQs6NCruyImnB8mZqM1jdk9ydEHKZRwZ4QDZ3aY2EEIRqfrJDSUqhV3OYN/ezsSQK Alk1/T/gKAqkbqj2RUkJCzvNSUhxazlp06ZAMgKtlc5iXh6Sad8chyPLFUl9G2t2ch+fb8wYbj8 ZFvN4dE6j33lfTGSnJ9INxBWemDhUosNSoXnYQNk5yrGPFmDgydEwGr238pxHS8unS17UUBQexB RiJ0AFKS2swdQP7EsXtq8JwQKO7BjgiHoDOTkrq/dLqHr2AvoJ1MiBQWPJ1xPE X-Google-Smtp-Source: AGHT+IE8lAGpWs5r47u9tfQ09QCiQp+hvwbk1sFYcYvTR9hupnHVS7a+9ruBHkNWTl1whd+N3savNw== X-Received: by 2002:a05:6000:310f:b0:429:bce4:20bf with SMTP id ffacd0b85a97d-42cc1d194fdmr10445600f8f.55.1763977940737; Mon, 24 Nov 2025 01:52:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 10/13] hw/sh4/r2d: Use EXT_CS_BASE() macro for display controller Date: Mon, 24 Nov 2025 10:51:05 +0100 Message-ID: <20251124095109.66091-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978214231019200 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 2229cc6fe66..75878abe946 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -254,6 +254,7 @@ static void r2d_init(MachineState *machine) r2d_fpga_t *fpga; const hwaddr flash_base =3D EXT_CS_BASE(0); const hwaddr fpga_base =3D EXT_CS_BASE(1); + const hwaddr sm501_base =3D EXT_CS_BASE(4); hwaddr sdram_base; uint64_t sdram_size =3D machine->ram_size; =20 @@ -295,11 +296,11 @@ static void r2d_init(MachineState *machine) dev =3D qdev_new("sysbus-sm501"); busdev =3D SYS_BUS_DEVICE(dev); qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE); - qdev_prop_set_uint64(dev, "dma-offset", 0x10000000); + qdev_prop_set_uint64(dev, "dma-offset", sm501_base); qdev_prop_set_chr(dev, "chardev", serial_hd(2)); sysbus_realize_and_unref(busdev, &error_fatal); - sysbus_mmio_map(busdev, 0, 0x10000000); - sysbus_mmio_map(busdev, 1, 0x13e00000); + sysbus_mmio_map(busdev, 0, sm501_base); + sysbus_mmio_map(busdev, 1, sm501_base + 0x3e00000); sysbus_connect_irq(busdev, 0, &fpga->irq[SM501]); =20 /* onboard CF (True IDE mode, Master only). */ --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978230; cv=none; d=zohomail.com; s=zohoarc; b=dDxhqngzKiFC/9tPqlZBbF9i5pYk/nEsMmIWHMTPZNTA7+mezNeC4XWDySs7y8Y/A3ycTyD3JvN/X/4i3VpKVxBORXzTDgdMpzjCErd83zg6ydjyo/FTbTl6L5491M+nxU6bFoppM2rVSFXDeSYub7Pdxisez94n4Hh1606D6vE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978230; h=Content-Type: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=cfavX6TO9pU3VMuLQhftw12r96pog3aSJ1S/um/Jk24=; b=PAxt7RR5lLmvfoY7hWqpDNuxd50PJIxoa5FuJjghC3dNsiH8c5+PRTZCirAjyY4FLSKJj21zwiWKli62zc74eAo9mEUabi5LDR/8wy2ykgbJxT26ab0MiUyaMYSY9BuoyJ4cnkDCLf6q+dUFF7AJK2Ed97EnG6UAhv7O0poOH+4= 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 1763978230305706.1262266212706; Mon, 24 Nov 2025 01:57:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTI7-0006E7-7G; Mon, 24 Nov 2025 04:55:31 -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 1vNTFH-0004Yn-L7 for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:32 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTFG-0001fa-5Z for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:31 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-429c4c65485so3314010f8f.0 for ; Mon, 24 Nov 2025 01:52:28 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f2e432sm26877510f8f.9.2025.11.24.01.52.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:52:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977947; x=1764582747; 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=cfavX6TO9pU3VMuLQhftw12r96pog3aSJ1S/um/Jk24=; b=BUR1zZiecFaPXNx2/nu/CMKHmESeX5V80arsokB0WqetNxNU4YtC6CHxcVFvacVrrs mlz2K+lHewRJAGkrQAkrudg+QYoVS9Yk4OnYfJ2wQ+RYRwn9rUaguNp4FoNbplJIPeNf yCEQmjFi9kECq1dWpRxsg8hhOw33u2Ws3dRhbas8Szcf1r2vRQFy5RgvONguhMG+U/m6 TM7DWkbuP4D71y0h4ePZY+IqNANEYSrW5G/5EinTqFWUFvrihUf9QXTNQI8DwRXdSIPv r7rXhKin0SuynS8X6F4D3qvmgnKcVe9+G6/2k0DATASeLRsQC0h4zKp4TnQsPuWxDjo6 c4mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977947; x=1764582747; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cfavX6TO9pU3VMuLQhftw12r96pog3aSJ1S/um/Jk24=; b=vEW08a2+8D0svomEB0joZlt4apsKGZge7MLZ+/PinizGpoTNJlvMmTMFYMt6Z8Px/F Pif1e+qY6zVKDok0QflYcb5SFIW1K/q0Gg7BPEVTe4MO3yOnV2ZJlGmK957fkJ5h4oZt i3zIv9wDzm9XkxRC087vntiuWuQ3dH0D/3HjqpvA8930lBicfCU472+GWQDmEnJPkATs jy43SUCKJGLsTZoFDSr5P70EsGiqiRxdd2hXua+pOBkkKsXlqcesqw8z8n+gpscyfe3X q926V6MVlUYYYFR8/0plbZkTN5mdEZX1aK7k9JltVrjmXr0y9EOHJDFLYmlCwLB9fgCt Llug== X-Forwarded-Encrypted: i=1; AJvYcCV9DTBPMCmbtZmP93eLSfG1b3ZdP93RKFynqdi92d0hbRhAjIqueVKdiGIEFpgVenj8lX4LjENJOZhR@nongnu.org X-Gm-Message-State: AOJu0Yw0qTEdFW9rRUkU9wDq8WoUMRfN5QCL3I5sD63WcCDe0MDAqmJg DCFpGZ8Q0Pqg5lI8ySXNiA0lJ3VEZ5UwM5EPQhKHywpWDeY2xaTXm5n1A2igjTAWMpI= X-Gm-Gg: ASbGnctxrDGWoJdGuJj4ZMYQ2yth09zf/GZpM4OIsoiCPyuMalcxBYV57CqwIlfawwT 9CFMNi+IQewAAKw5hD0TKTQ0f6rOsxvEmMNBUgDLSgbpRXAC57VAmWgyNeqNigv2ub05PZacokt 5oNM3wk0dO4Nw16GFOybmdCSKXmiGrJ/KqTX9ZJAOkqNGIKJFwgt1MfuzABEw2d889VgsLJMHF4 Pxx8lID5Q4Fe+A1/Imjf2sC1diMWVEpX7acC/103P5RA6A+rWJyIMU1I0ZRlEvr6Af8DVV6Mew1 lvatsFScvhuTN1HeNfozOoB+ZQWjQjdOopQ4fK6sTW9iQfCW4wnciGMFoEi/sUgDDMyYehBH9Qy WHdqTfhM+qyKaUrD13KdFL24Tz1Km1upFhGX+hhAx/WKaGlqVefCfD65xhM6XgBPGu/hioPnwrx dPxFnHiOEFsChZsLHv+4kYS/lXX5DoXRU4DKRVG7u77CwCa5rGnOoJRX5zVJy6X8GLjoWTmIA= X-Google-Smtp-Source: AGHT+IFCu5zlr4hfRhVhgV2uop5oXMZUZNpvhimMpzDACj1DHGdTUBWVYxyIxUqMyv21WJrwnLglcg== X-Received: by 2002:a05:6000:18a8:b0:42b:5521:31ad with SMTP id ffacd0b85a97d-42cc1d51b1fmr10303636f8f.49.1763977947524; Mon, 24 Nov 2025 01:52:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 11/13] hw/sh4/r2d: Use EXT_CS_BASE() macro for pseudo ISA bus Date: Mon, 24 Nov 2025 10:51:06 +0100 Message-ID: <20251124095109.66091-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978232204019200 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 75878abe946..df62f7a48a9 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -255,6 +255,7 @@ static void r2d_init(MachineState *machine) const hwaddr flash_base =3D EXT_CS_BASE(0); const hwaddr fpga_base =3D EXT_CS_BASE(1); const hwaddr sm501_base =3D EXT_CS_BASE(4); + const hwaddr isa_base =3D EXT_CS_BASE(5); hwaddr sdram_base; uint64_t sdram_size =3D machine->ram_size; =20 @@ -310,8 +311,8 @@ static void r2d_init(MachineState *machine) sysbus_connect_irq(busdev, 0, &fpga->irq[CF_IDE]); qdev_prop_set_uint32(dev, "shift", 1); sysbus_realize_and_unref(busdev, &error_fatal); - sysbus_mmio_map(busdev, 0, 0x14001000); - sysbus_mmio_map(busdev, 1, 0x1400080c); + sysbus_mmio_map(busdev, 0, isa_base + 0x1000); + sysbus_mmio_map(busdev, 1, isa_base + 0x080c); mmio_ide_init_drives(dev, dinfo, NULL); =20 /* --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978255; cv=none; d=zohomail.com; s=zohoarc; b=G9SErRS57dIZY6lRjIWRSn1560VR3UDHmf8bZuwlq0jwsfyusI+Jp983+bz4AawxuLxlybzfi4dLWASC1ZDNrPQRHwXjgsKFU2PRsK57WBiWWdShCVHE0Gbhy+b+0090Qo76XM4KGpBRBRPS7n/jlLakrZHZG2kZmrq2ubOnl18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978255; h=Content-Type: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=lRhpOZ2IPeUGuaRRAtlX0yNoC2KCkeWanu75zA+D2wo=; b=S2OkBk2b7QE2TpcNHQcPqddSepDzD3sE4spz5YThbDLiIrasfrN5GH4mvEiaOaz8ifDWnwSgwxS0Mwnqc9lUENdY4o+Z7SGMqbyXolrL1FNY5o8SrDUsoDEfK8euHtaOc0I0pcDFeVSPws/i/Xi7b3BoWu6kV43TTo4EhTHJlFQ= 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 1763978255557566.6644668291818; Mon, 24 Nov 2025 01:57:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTJF-00074Q-2m; Mon, 24 Nov 2025 04:56:37 -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 1vNTFN-0004bD-6x for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:45 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTFL-0001fy-Mu for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:36 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-42b31c610fcso3497797f8f.0 for ; Mon, 24 Nov 2025 01:52:35 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f49a7bsm27010486f8f.19.2025.11.24.01.52.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:52:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977954; x=1764582754; 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=lRhpOZ2IPeUGuaRRAtlX0yNoC2KCkeWanu75zA+D2wo=; b=jVaf9cz8ZNSCYjwguEXP1uKl3Z+n0RVOnIiedCyHI8xmpYFAvk+dZaFbX5BdWEtG2U xyBhl+mYSPAgzT7yNlUnOMBCT4Q6/b7TBbXaR0iB1XzKVTdJD8xLF2drvXHJDN5K+mNy uO7MQeBBdPZ5AglxuJTMSmflcyKNiyziut6HVZ80Qh4BDkTwts1fi8cP77RQKrC4cZOK ohWZOlSbBAnZt8fULP0Y+MsJWRb2uo3R3Y3v4XKjQjqyzV6wk9BdL9h09JOwl5zHik71 IIdeYIAcYxmIYgD4HNSlLHpPooZ/ZxevJLeDs+yx3XOnpSH1wR7j2upx4/kuB/O9nGPd +bsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977954; x=1764582754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lRhpOZ2IPeUGuaRRAtlX0yNoC2KCkeWanu75zA+D2wo=; b=d/bqnc54DIr35zzwuqrnRR9AA+AprMlVoT9XWBv0PpjhPdywJOaq1rIIw67KSsf2AL LL7TfFrylgGIQ1IZoNRDkVqch6gSPFl/aFWpMvMf8DC9VDsjOOsh3M1NAQeWMvg8fnz5 RxK0DvoH9aEjbc3hvz0I2KJlFRlYDtiY9BkiWwMgCj+YH0I/KMc8pnjwgBkhRuv/avHV h1ZEqJPhINxaBp4GZBWAOI5tJoZC8uhOiRL10k6xo9W9rIst6ZgleMKk2TV6I9UC9Rmg XH3IW7bITwGdBJuD5ciQ1MWWfQqZtX84gc19ZUI3etGvf/xRJp+FIx1TBEffZwrrwB89 /OqQ== X-Forwarded-Encrypted: i=1; AJvYcCWLaAzFvtZJoNXBe6nbmBjQfk4sDPB11CZoFnIkj6vnTq7wAsk+GSEBpT5OKpBDtHGolYVKGsZjySnz@nongnu.org X-Gm-Message-State: AOJu0YyZOqdyFGEP+2CD0VKHl2gHivnZNnXdI3pD42E5sVLMutPVzgP1 yeXPGeQgaj/aPiwhLPUDr+wwYoRF8jZnBFEoJ8jqIASaeI/viqfILldl5XQZGNkL/kU= X-Gm-Gg: ASbGncsSLxmXTalCIEBMXQrW7F+D+VjV0yH6RvQFe8EfO/KwJ91ib+i/r1SgeXAbWxA ItfD1RrOozEAbyDotMKGrZD2jqKqg1jOBR2eWZERbO2Nqxs6AEsjGPDFl90RxpH1u3Z87mSrwDa yv+n/rFTDUnmp9AgX9fuOzG+4SnqlhNziXMhq0Og6Z1iOs/vFXs0EQ3BoHT7UDjCC+Hv7ey8dTx 2ggPGap26KIpas0KAzfVhLFbOTqgDiojRgJCFes6Mjnbo6zfDUQCGB8/vzALojb9yWyb00APZnK lYi7KTIEgZM0hfoI8K1MzTrCIg5cpzZ6Hb5FN3fDnLOTHUAqg4tOo43jFNkDD5o1PYIwHceeE5e uCtyHrPzX29ObdLA4mTAZztLQPEy+TOTLjW5pX9LToZUSiOymOVKEzMoF7fEXCxfbUEYbtgk+sm xYQfTLZD/Wbwx0plh1H1h5bZlolm2n+ordSm2n6RSUyEpfOrEPNpR6d+cshECk X-Google-Smtp-Source: AGHT+IH1hM2dIyRXUs4GHI0q0tWK1cfmEuHIBKLHVXaY5vG7P907Z4bkaCiQILjg7HtUw+6iEDeYoA== X-Received: by 2002:a5d:5d85:0:b0:3f2:b077:94bc with SMTP id ffacd0b85a97d-42cc1ac94damr11827840f8f.4.1763977954218; Mon, 24 Nov 2025 01:52:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 12/13] hw/sh4/r2d: Add 64MB of SDRAM in CS#2 Date: Mon, 24 Nov 2025 10:51:07 +0100 Message-ID: <20251124095109.66091-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978256671019200 Expand maximum memory from 64MB to 128MB. Inspired-by: Rob Landley Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index df62f7a48a9..f5bc7c46965 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -263,8 +263,11 @@ static void r2d_init(MachineState *machine) case 64 * MiB: sdram_base =3D EXT_CS_BASE(3); /* 64M @CS3 */ break; + case 128 * MiB: + sdram_base =3D EXT_CS_BASE(2); /* 64M @CS2, 64M@CS3 */ + break; default: - error_report("This machine can only use 64M of memory"); + error_report("This machine can only use 64M or 128M of memory"); exit(EXIT_FAILURE); } =20 @@ -356,9 +359,11 @@ static void r2d_init(MachineState *machine) =20 /* initialization which should be done by firmware */ address_space_stl(&address_space_memory, SH7750_BCR1, + (1 << 2) | /* Areas 2 accessed as SDRAM */ (1 << 3) | /* Areas 3 accessed as SDRAM */ 0, MEMTXATTRS_UNSPECIFIED, NULL); address_space_stw(&address_space_memory, SH7750_BCR2, + (0b11 << 2 * 2) | /* Area 2 Bus width is 32 bits= */ (0b11 << 2 * 3) | /* Area 3 Bus width is 32 bits= */ (0b10 << 14) | /* Area 0 Bus Width is 16 bits= */ 0, MEMTXATTRS_UNSPECIFIED, NULL); --=20 2.51.0 From nobody Mon Feb 9 01:48:58 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763978254; cv=none; d=zohomail.com; s=zohoarc; b=Kxo2RHJjgg+0ysHT6wHzjqYXqrX6JHb71kiPzEZaCOVCy9MvEdtXoqWIQAd67Ha/8UluwBlzCJzREqkoaiVbVnhqOckrrI0tOLL5eSMZgdIZvHJOGINVQf9QZbfFVvqbX+OX5wyF/S+xHKYa2TuGzP7fKUihOmE/7onrLJISp+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763978254; h=Content-Type: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=uc44ADaQfZAO5yHzRIAGfCESDuHxn2hliuvpghcTObQ=; b=ak50AHaqoGlZmomzDZD13EdJsqSkGB2PQaWK0Rlw6JuwXt2MsX8yMzzKzeqZGqanFlgAHyMqNgMWBbM2ei45VjMNjpslVY2eSzY6Z/rfzev4hPUFMnluf6ccH3gCjKMZghYmrxyu5LtLRw1nVIVegQ7oEnPMsGbI+F969eyP2Og= 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 1763978254357659.4376125322566; Mon, 24 Nov 2025 01:57:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNTJ7-0006ui-EO; Mon, 24 Nov 2025 04:56:31 -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 1vNTFW-0004bw-3w for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:48 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNTFT-0001gh-Ba for qemu-devel@nongnu.org; Mon, 24 Nov 2025 04:52:45 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-477b5e0323bso26133435e9.0 for ; Mon, 24 Nov 2025 01:52:42 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477a974cdc8sm153352695e9.2.2025.11.24.01.52.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Nov 2025 01:52:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763977961; x=1764582761; 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=uc44ADaQfZAO5yHzRIAGfCESDuHxn2hliuvpghcTObQ=; b=lVaehmsbdIJXMzIaF8Pt9rsCGkVDBa0W1gE6TbvrtZlDtJM3f8rbWs6L5ENrLMM2UH 3NoUndyZEWXZmMF/QQ+8D/sjrJvOAcduXkhMRSeeyXsNmc7OtIoFcOpIwOROk9ZTrOQ6 uyOugz97vM/d9/MrsbhH/in/ENWuZ9lTZxEFytVIVc1W+kPmWD4LpsSnkmA0X2F0+eck 1gmhPkXwF1en3DKSCsFJjyBRjzOCQVObz61FWn4dq33mGbqhg2fAUXmr8mmYZx/724h0 F+8wUSKwWafEQH7/30oTZ99Z3Fx8oJIeoVKCwxxRLAJGurrfV2ZsRHkVfv2nj1Y4VEny wmng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763977961; x=1764582761; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uc44ADaQfZAO5yHzRIAGfCESDuHxn2hliuvpghcTObQ=; b=XUSO1N89cRvxFyF06XozlZW+FudWnArhgh28McD3GrCWy2PRZMmpFprn+F/ass9S3c lXF9o3823+Ga58czEOsLhtvlZU/WaORmqzlWDzcsMCXlYJNWVUjCZY0iDBZ2v6knKvHY HOG3ThvFRbZpcTqEP//19dZ3bCaJ4AXIZgtgveMELjIXfg/8oY+tB3zm9KQ0f7oME2xZ BSu6EIi713Kazhg3zPsDD99NFeH+yadEAz1jPoMvm+sE5g9f7NKLMeDyrK2ZX8UgjP1Z JnTiOR8Bo4ZNMhxGDdesizo5NEit8xlVSBDqjpdA49wNIrQycP3V+nzKRT5F14yhpojE Kx7g== X-Forwarded-Encrypted: i=1; AJvYcCVZH3lTv19cS5pLFSFMFQZVYn/fAmLoYaT6itN1QH/b2Pr2zvXiGJYUN/+mbcNOmw16o0wR9L1vi+ns@nongnu.org X-Gm-Message-State: AOJu0YxbZbnEM/oH4j6AKaOfPdLpGtsLCVfcuNrtyirzryv1RlrRkRef E6pvL0NvGVThU+GbP9ytD17nF+4maXU6Bx+oCbUDgkDafV8Fn6iUSgaQH2sImiPtz/M= X-Gm-Gg: ASbGncuwLmBEqd+P4GZARaXsuFMqqZVOty9ZsAM61Kfe/WuoYd7GpPMV2VOKcsKVVtM Rqne7UUJgMhG6TwoqXSBwT9Vq6w/I3gZF5UBDxF53V5hnLPTLx6Oj/Q+3MtZ6RkFM7Me3+8Vb6h sK4XwueIPndqQ4jik3yKfD5xjG6UURXhtMNWSU4kFbxnOdSV7mAVLoHN45DyYiWzKtjsrBUAXMN qDomVji6h1kNt/LhZS6LLWo5xGwlBbzLChKfT7znZBgXJMQPayfywsDyTzPxUtiM1iANQKLR6f4 rOwq/3yAXudbEHDL/WR+2lTJjnUJk+fMYWtmrgGzahOLiyUsKIrDobLQjb6lqCd37dmE3RBzcIY dDejeYazViU2EGzluYaGX7BftkNCEfZYXwDSO3ncZX/cjt22C96biHRsnUO50KwN/8PO5D2I05Z cI8LEW1c+1ZZrnGbSTLRDtmmr2bxpHGzK+Q0IV1H0rwUaVx82La+1AgpFJWd3K X-Google-Smtp-Source: AGHT+IETD6vrGelvXPBL1ztJ5xzr3iLtn97NmN45wmYdzNSDKptjo554EOwzRXSTyvl+g3FG+XYI2w== X-Received: by 2002:a05:600c:642:b0:477:9a61:fd06 with SMTP id 5b1f17b1804b1-477b9ead384mr90687895e9.8.1763977961009; Mon, 24 Nov 2025 01:52:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Cc: Rob Landley , Thorsten Glaser , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.0 13/13] hw/sh4/r2d: Add 64MB of SRAM in CS#6 Date: Mon, 24 Nov 2025 10:51:08 +0100 Message-ID: <20251124095109.66091-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124095109.66091-1-philmd@linaro.org> References: <20251124095109.66091-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763978256671019201 Expand maximum memory from 128MB to 192MB. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sh4/r2d.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index f5bc7c46965..445cc9a246d 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -245,6 +245,7 @@ static void r2d_init(MachineState *machine) ResetData *reset_info; struct SH7750State *s; MemoryRegion *sdram =3D g_new(MemoryRegion, 1); + MemoryRegion *sram =3D g_new(MemoryRegion, 1); DriveInfo *dinfo; DeviceState *dev; SysBusDevice *busdev; @@ -266,8 +267,15 @@ static void r2d_init(MachineState *machine) case 128 * MiB: sdram_base =3D EXT_CS_BASE(2); /* 64M @CS2, 64M@CS3 */ break; + case 192 * MiB: + sdram_base =3D EXT_CS_BASE(2); /* 64M @CS2, 64M@CS3, 64M@CS6 */ + sdram_size =3D 128 * MiB; + memory_region_init_alias(sram, NULL, + "sram", machine->ram, 128 * MiB, 64 * MiB= ); + memory_region_add_subregion(address_space_mem, EXT_CS_BASE(6), sra= m); + break; default: - error_report("This machine can only use 64M or 128M of memory"); + error_report("This machine can only use 64M, 128M or 192M of memor= y"); exit(EXIT_FAILURE); } =20 @@ -365,6 +373,7 @@ static void r2d_init(MachineState *machine) address_space_stw(&address_space_memory, SH7750_BCR2, (0b11 << 2 * 2) | /* Area 2 Bus width is 32 bits= */ (0b11 << 2 * 3) | /* Area 3 Bus width is 32 bits= */ + (0b11 << 2 * 6) | /* Area 6 Bus width is 32 bits= */ (0b10 << 14) | /* Area 0 Bus Width is 16 bits= */ 0, MEMTXATTRS_UNSPECIFIED, NULL); /* Start from P2 area */ --=20 2.51.0