From: deller@kernel.org
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
Helge Deller <deller@gmx.de>
Subject: [PATCH 09/12] hw/hppa: Export machine name, BTLBs, power-button address via fw_cfg
Date: Sat, 14 Oct 2023 21:57:16 +0200 [thread overview]
Message-ID: <20231014195719.151397-10-deller@kernel.org> (raw)
In-Reply-To: <20231014195719.151397-1-deller@kernel.org>
From: Helge Deller <deller@gmx.de>
Provide necessary info to SeaBIOS-hppa.
Signed-off-by: Helge Deller <deller@gmx.de>
---
hw/hppa/machine.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index c6d8deffcf..be0caf4675 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -37,6 +37,7 @@
#define enable_lasi_lan() 0
+static PCIBus *pci_bus;
static void hppa_powerdown_req(Notifier *n, void *opaque)
{
@@ -123,6 +124,8 @@ static FWCfgState *create_fw_cfg(MachineState *ms)
FWCfgState *fw_cfg;
uint64_t val;
const char qemu_version[] = QEMU_VERSION;
+ MachineClass *mc = MACHINE_GET_CLASS(ms);
+ int len;
fw_cfg = fw_cfg_init_mem(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4);
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, ms->smp.cpus);
@@ -137,8 +140,20 @@ static FWCfgState *create_fw_cfg(MachineState *ms)
fw_cfg_add_file(fw_cfg, "/etc/cpu/tlb_entries",
g_memdup(&val, sizeof(val)), sizeof(val));
+ val = cpu_to_le64(HPPA_BTLB_ENTRIES);
+ fw_cfg_add_file(fw_cfg, "/etc/cpu/btlb_entries",
+ g_memdup(&val, sizeof(val)), sizeof(val));
+
+ len = strlen(mc->name) + 1;
+ fw_cfg_add_file(fw_cfg, "/etc/hppa/machine",
+ g_memdup(mc->name, len), len);
+
val = cpu_to_le64(HPA_POWER_BUTTON);
- fw_cfg_add_file(fw_cfg, "/etc/power-button-addr",
+ fw_cfg_add_file(fw_cfg, "/etc/hppa/power-button-addr",
+ g_memdup(&val, sizeof(val)), sizeof(val));
+
+ val = cpu_to_le64(CPU_HPA + 24);
+ fw_cfg_add_file(fw_cfg, "/etc/hppa/DebugOutputPort",
g_memdup(&val, sizeof(val)), sizeof(val));
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, ms->boot_config.order[0]);
@@ -148,6 +163,8 @@ static FWCfgState *create_fw_cfg(MachineState *ms)
g_memdup(qemu_version, sizeof(qemu_version)),
sizeof(qemu_version));
+ fw_cfg_add_extra_pci_roots(pci_bus, fw_cfg);
+
return fw_cfg;
}
--
2.41.0
next prev parent reply other threads:[~2023-10-14 19:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-14 19:57 [PATCH 00/12] target/hppa: Add emulation of a C3700 HP-PARISC workstation deller
2023-10-14 19:57 ` [PATCH 01/12] target/hppa: Update to SeaBIOS-hppa version 10 deller
2023-10-14 19:57 ` [PATCH 02/12] pci_ids: Add PCI vendor ID for HP deller
2023-10-14 19:57 ` [PATCH 03/12] hw/pci-host: Add Astro system bus adapter found on PA-RISC machines deller
2023-10-14 19:57 ` [PATCH 04/12] MAINTAINERS: Add Astro PCI host for hppa machines deller
2023-10-14 19:57 ` [PATCH 05/12] lasips2: LASI PS/2 devices are not user-createable deller
2023-10-14 20:33 ` BALATON Zoltan
2023-10-14 19:57 ` [PATCH 06/12] tulip: Use the HP PCI vendor ID instead of number deller
2023-10-14 20:37 ` BALATON Zoltan
2023-10-14 19:57 ` [PATCH 07/12] pci-host: Wire up new Astro/Elroy PCI bridge deller
2023-10-14 19:57 ` [PATCH 08/12] hw/hppa: Require at least SeaBIOS-hppa version 10 deller
2023-10-14 20:40 ` BALATON Zoltan
2023-10-14 19:57 ` deller [this message]
2023-10-16 13:48 ` [PATCH 09/12] hw/hppa: Export machine name, BTLBs, power-button address via fw_cfg Philippe Mathieu-Daudé
2023-10-14 19:57 ` [PATCH 10/12] hw/hppa: Provide RTC and DebugOutputPort on CPU #0 deller
2023-10-14 19:57 ` [PATCH 11/12] hw/hppa: Split out machine creation deller
2023-10-14 19:57 ` [PATCH 12/12] hw/hppa: Add new HP C3700 machine deller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231014195719.151397-10-deller@kernel.org \
--to=deller@kernel.org \
--cc=deller@gmx.de \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).