From: Laurent Vivier <laurent@vivier.eu>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH v2] q800: fix I/O memory map
Date: Mon, 4 Nov 2019 10:00:01 +0100 [thread overview]
Message-ID: <cf301d2c-b6b9-c76c-3430-37b2743f5364@vivier.eu> (raw)
In-Reply-To: <6a200cd8-bb8f-d2b1-dc1f-247fb0870396@redhat.com>
Le 03/11/2019 à 23:30, Philippe Mathieu-Daudé a écrit :
> On 11/2/19 10:42 PM, Laurent Vivier wrote:
>> Linux kernel 5.4 will introduce a new memory map for SWIM device.
>> (aee6bff1c325 ("m68k: mac: Revisit floppy disc controller base
>> addresses"))
>>
>> Until this release all MMIO are mapped between 0x50f00000 and 0x50f40000,
>> but it appears that for real hardware 0x50f00000 is not the base address:
>> the MMIO region spans 0x50000000 through 0x60000000, and 0x50040000
>> through
>> 0x54000000 is repeated images of 0x50000000 to 0x50040000.
>>
>> Fixed: 04e7ca8d0f ("hw/m68k: define Macintosh Quadra 800")
>> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
>> ---
>>
>> Notes:
>> v2: add some constant definitions
>> allocate a bloc of memory to stores all I/O MemoryRegion
>>
>> hw/m68k/q800.c | 40 ++++++++++++++++++++++++++++++++--------
>> 1 file changed, 32 insertions(+), 8 deletions(-)
>>
>> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
>> index 2b4842f8c6..822bd13d36 100644
>> --- a/hw/m68k/q800.c
>> +++ b/hw/m68k/q800.c
>> @@ -60,14 +60,19 @@
>> #define MACH_MAC 3
>> #define Q800_MAC_CPU_ID 2
>> -#define VIA_BASE 0x50f00000
>> -#define SONIC_PROM_BASE 0x50f08000
>> -#define SONIC_BASE 0x50f0a000
>> -#define SCC_BASE 0x50f0c020
>> -#define ESP_BASE 0x50f10000
>> -#define ESP_PDMA 0x50f10100
>> -#define ASC_BASE 0x50F14000
>> -#define SWIM_BASE 0x50F1E000
>> +#define IO_BASE 0x50000000
>> +#define IO_SLICE 0x00040000
>> +#define IO_SIZE 0x04000000
>> +
>> +#define VIA_BASE (IO_BASE + 0x00000)
>
> Good idea.
>
>> +#define SONIC_PROM_BASE (IO_BASE + 0x08000)
>> +#define SONIC_BASE (IO_BASE + 0x0a000)
>> +#define SCC_BASE (IO_BASE + 0x0c020)
>> +#define ESP_BASE (IO_BASE + 0x10000)
>> +#define ESP_PDMA (IO_BASE + 0x10100)
>> +#define ASC_BASE (IO_BASE + 0x14000)
>> +#define SWIM_BASE (IO_BASE + 0x1E000)
>> +
>> #define NUBUS_SUPER_SLOT_BASE 0x60000000
>> #define NUBUS_SLOT_BASE 0xf0000000
>> @@ -135,6 +140,9 @@ static void q800_init(MachineState *machine)
>> int32_t initrd_size;
>> MemoryRegion *rom;
>> MemoryRegion *ram;
>> + MemoryRegion *io;
>> + const int io_slice_nb = (IO_SIZE / IO_SLICE) - 1;
>> + int i;
>> ram_addr_t ram_size = machine->ram_size;
>> const char *kernel_filename = machine->kernel_filename;
>> const char *initrd_filename = machine->initrd_filename;
>> @@ -163,10 +171,26 @@ static void q800_init(MachineState *machine)
>> cpu = M68K_CPU(cpu_create(machine->cpu_type));
>> qemu_register_reset(main_cpu_reset, cpu);
>> + /* RAM */
>> ram = g_malloc(sizeof(*ram));
>> memory_region_init_ram(ram, NULL, "m68k_mac.ram", ram_size,
>> &error_abort);
>> memory_region_add_subregion(get_system_memory(), 0, ram);
>> + /*
>> + * Memory from IO_BASE to IO_BASE + IO_SLICE is repeated
>> + * from IO_BASE + IO_SLICE to IO_BASE + IO_SIZE
>> + */
>> + io = g_new(MemoryRegion, io_slice_nb);
>> + for (i = 0; i < io_slice_nb; i++) {
>> + char *name = g_strdup_printf("mac_m68k.io[%d]", i + 1);
>> +
>> + memory_region_init_alias(io + i, NULL, name,
>> get_system_memory(),
>
> We usually use &io[i], anyway:
ok, I'll update in this way before adding it to my pull request.
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
Thanks,
Laurent
prev parent reply other threads:[~2019-11-04 9:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-02 21:42 [PATCH v2] q800: fix I/O memory map Laurent Vivier
2019-11-03 22:30 ` Philippe Mathieu-Daudé
2019-11-04 9:00 ` Laurent Vivier [this message]
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=cf301d2c-b6b9-c76c-3430-37b2743f5364@vivier.eu \
--to=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.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).