From: Helge Deller <deller@gmx.de>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-devel@nongnu.org
Cc: Richard Henderson <rth@twiddle.net>
Subject: Re: [PATCH 1/4] hw/hppa: Sync hppa_hardware.h file with SeaBIOS sources
Date: Sat, 1 Aug 2020 15:11:49 +0200 [thread overview]
Message-ID: <ef18d47f-f37c-b93a-6921-c77d191ed7fc@gmx.de> (raw)
In-Reply-To: <7a559501-3a8a-f778-6058-5407043bd1f7@amsat.org>
On 29.07.20 20:21, Philippe Mathieu-Daudé wrote:
> On 7/27/20 11:46 PM, Helge Deller wrote:
>> The hppa_hardware.h file is shared with SeaBIOS. Sync it.
>>
>> 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
>
> I find the line you are removing cleaner:
> -#define LASI_RTC_HPA (LASI_HPA + 0x9000)
Yes, but at least temporarily it should be consistent inside
the header file.
> "Offset in the LASI memory region".
>
> Anyway not a blocker.
Ok, thanks!
Helge
> Having these values sorted would help.
>
>> #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-01 13:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 21:46 [PATCH 0/4] Various fixes for hppa architecture Helge Deller
2020-07-27 21:46 ` [PATCH 1/4] hw/hppa: Sync hppa_hardware.h file with SeaBIOS sources Helge Deller
2020-07-29 16:36 ` Richard Henderson
2020-07-29 18:21 ` Philippe Mathieu-Daudé
2020-08-01 13:11 ` Helge Deller [this message]
2020-07-27 21:46 ` [PATCH 2/4] seabios-hppa: Update to SeaBIOS hppa version 1 Helge Deller
2020-07-27 21:46 ` [PATCH 3/4] hw/hppa: Implement proper SeaBIOS version check Helge Deller
2020-07-27 21:46 ` [PATCH 4/4] hw/display/artist.c: fix out of bounds check Helge Deller
2020-07-29 17:26 ` Richard Henderson
2020-08-01 13:10 ` Helge 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=ef18d47f-f37c-b93a-6921-c77d191ed7fc@gmx.de \
--to=deller@gmx.de \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.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).