From: Helge Deller <deller@gmx.de>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Helge Deller <deller@gmx.de>,
Richard Henderson <richard.henderson@linaro.org>,
Richard Henderson <rth@twiddle.net>
Subject: [PULL v5 01/12] hw/hppa: Sync hppa_hardware.h file with SeaBIOS sources
Date: Wed, 26 Aug 2020 23:13:34 +0200 [thread overview]
Message-ID: <20200826211345.14295-2-deller@gmx.de> (raw)
In-Reply-To: <20200826211345.14295-1-deller@gmx.de>
The hppa_hardware.h file is shared with SeaBIOS. Sync it.
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Helge Deller <deller@gmx.de>
---
hw/hppa/hppa_hardware.h | 6 ++++++
hw/hppa/lasi.c | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h
index 4a2fe2df60..cdb7fa6240 100644
--- a/hw/hppa/hppa_hardware.h
+++ b/hw/hppa/hppa_hardware.h
@@ -17,6 +17,7 @@
#define LASI_UART_HPA 0xffd05000
#define LASI_SCSI_HPA 0xffd06000
#define LASI_LAN_HPA 0xffd07000
+#define LASI_RTC_HPA 0xffd09000
#define LASI_LPT_HPA 0xffd02000
#define LASI_AUDIO_HPA 0xffd04000
#define LASI_PS2KBD_HPA 0xffd08000
@@ -37,10 +38,15 @@
#define PORT_PCI_CMD (PCI_HPA + DINO_PCI_ADDR)
#define PORT_PCI_DATA (PCI_HPA + DINO_CONFIG_DATA)
+/* QEMU fw_cfg interface port */
+#define QEMU_FW_CFG_IO_BASE (MEMORY_HPA + 0x80)
+
#define PORT_SERIAL1 (DINO_UART_HPA + 0x800)
#define PORT_SERIAL2 (LASI_UART_HPA + 0x800)
#define HPPA_MAX_CPUS 8 /* max. number of SMP CPUs */
#define CPU_CLOCK_MHZ 250 /* emulate a 250 MHz CPU */
+#define CPU_HPA_CR_REG 7 /* store CPU HPA in cr7 (SeaBIOS internal) */
+
#endif
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 19974034f3..ffcbb988b8 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -54,8 +54,6 @@
#define LASI_CHIP(obj) \
OBJECT_CHECK(LasiState, (obj), TYPE_LASI_CHIP)
-#define LASI_RTC_HPA (LASI_HPA + 0x9000)
-
typedef struct LasiState {
PCIHostState parent_obj;
--
2.21.3
next prev parent reply other threads:[~2020-08-26 21:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 21:13 [PULL v5 00/12] The following changes since commit 3461487523b897d324e8d91f3fd20ed55f849544: Helge Deller
2020-08-26 21:13 ` Helge Deller [this message]
2020-08-26 21:13 ` [PULL v5 02/12] seabios-hppa: Update to SeaBIOS hppa version 1 Helge Deller
2020-08-26 21:13 ` [PULL v5 03/12] hw/hppa: Implement proper SeaBIOS version check Helge Deller
2020-08-26 21:13 ` [PULL v5 04/12] hw/display/artist.c: fix out of bounds check Helge Deller
2020-08-26 21:13 ` [PULL v5 05/12] hw/hppa/lasi: Don't abort on invalid IMR value Helge Deller
2020-08-26 21:13 ` [PULL v5 06/12] hw/display/artist: Check offset in draw_line to avoid buffer over-run Helge Deller
2020-08-26 21:13 ` [PULL v5 07/12] hw/display/artist: Refactor artist_rop8() " Helge Deller
2020-08-26 21:13 ` [PULL v5 08/12] Revert "hw/display/artist: Avoid drawing line when nothing to display" Helge Deller
2020-08-26 21:13 ` [PULL v5 09/12] hw/display/artist: Prevent out of VRAM buffer accesses Helge Deller
2020-08-26 21:13 ` [PULL v5 10/12] hw/display/artist: Unbreak size mismatch memory accesses Helge Deller
2020-08-26 21:13 ` [PULL v5 11/12] hw/display/artist: Fix invalidation of lines in artist_draw_line() Helge Deller
2020-08-26 21:13 ` [PULL v5 12/12] hw/display/artist: Fix invalidation of lines near screen border Helge Deller
2020-08-27 10:20 ` [PULL v5 00/12] The following changes since commit 3461487523b897d324e8d91f3fd20ed55f849544: Peter Maydell
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=20200826211345.14295-2-deller@gmx.de \
--to=deller@gmx.de \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=rth@twiddle.net \
/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).