From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
libvir-list@redhat.com, "QEMU Developers" <qemu-devel@nongnu.org>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Huacai Chen" <chenhc@lemote.com>,
"Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: Re: [PATCH 06/14] hw/pci-host/bonito: Map the different PCI ranges more detailled
Date: Tue, 26 May 2020 12:59:59 +0200 [thread overview]
Message-ID: <CAHiYmc69Y+ETD7fhKA+7MfXo+1k+XS9sCGcHx_rHD7o9oUefGg@mail.gmail.com> (raw)
In-Reply-To: <20200526104726.11273-7-f4bug@amsat.org>
уто, 26. мај 2020. у 12:47 Philippe Mathieu-Daudé <f4bug@amsat.org> је
написао/ла:
>
> Better describe the Bonito64 MEM HI/LO and I/O PCI ranges,
> add more PCI regions as unimplemented.
>
> Message-id: <20200510210128.18343-10-f4bug@amsat.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/pci-host/bonito.c | 32 ++++++++++++++++++++++++++++----
> 1 file changed, 28 insertions(+), 4 deletions(-)
>
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
> index f09bb1c6a8..52015cc2a7 100644
> --- a/hw/pci-host/bonito.c
> +++ b/hw/pci-host/bonito.c
> @@ -39,6 +39,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "hw/pci/pci.h"
> #include "hw/irq.h"
> @@ -82,7 +83,7 @@
> #define BONITO_PCILO1_BASE 0x14000000
> #define BONITO_PCILO2_BASE 0x18000000
> #define BONITO_PCIHI_BASE 0x20000000
> -#define BONITO_PCIHI_SIZE 0x20000000
> +#define BONITO_PCIHI_SIZE 0x60000000
> #define BONITO_PCIHI_TOP (BONITO_PCIHI_BASE + BONITO_PCIHI_SIZE - 1)
> #define BONITO_PCIIO_BASE 0x1fd00000
> #define BONITO_PCIIO_BASE_VA 0xbfd00000
> @@ -605,14 +606,26 @@ static void bonito_pcihost_realize(DeviceState *dev, Error **errp)
> {
> PCIHostState *phb = PCI_HOST_BRIDGE(dev);
> BonitoState *bs = BONITO_PCI_HOST_BRIDGE(dev);
> + MemoryRegion *pcimem_lo_alias = g_new(MemoryRegion, 3);
>
> - memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCILO_SIZE);
> + memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCIHI_SIZE);
> phb->bus = pci_register_root_bus(dev, "pci",
> pci_bonito_set_irq, pci_bonito_map_irq,
> dev, &bs->pci_mem, get_system_io(),
> 0x28, 32, TYPE_PCI_BUS);
> - memory_region_add_subregion(get_system_memory(), BONITO_PCILO_BASE,
> - &bs->pci_mem);
> +
> + for (size_t i = 0; i < 3; i++) {
> + char *name = g_strdup_printf("pci.lomem%zu", i);
> +
> + memory_region_init_alias(&pcimem_lo_alias[i], NULL, name,
> + &bs->pci_mem, i * 64 * MiB, 64 * MiB);
> + memory_region_add_subregion(get_system_memory(),
> + BONITO_PCILO_BASE + i * 64 * MiB,
> + &pcimem_lo_alias[i]);
> + g_free(name);
> + }
> +
> + create_unimplemented_device("pci.io", BONITO_PCIIO_BASE, 1 * MiB);
> }
>
> static void bonito_realize(PCIDevice *dev, Error **errp)
> @@ -620,6 +633,8 @@ static void bonito_realize(PCIDevice *dev, Error **errp)
> PCIBonitoState *s = PCI_BONITO(dev);
> SysBusDevice *sysbus = SYS_BUS_DEVICE(s->pcihost);
> PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
> + BonitoState *bs = BONITO_PCI_HOST_BRIDGE(s->pcihost);
> + MemoryRegion *pcimem_alias = g_new(MemoryRegion, 1);
>
> /*
> * Bonito North Bridge, built on FPGA,
> @@ -652,6 +667,7 @@ static void bonito_realize(PCIDevice *dev, Error **errp)
> sysbus_init_mmio(sysbus, &s->iomem_ldma);
> sysbus_mmio_map(sysbus, 3, 0x1fe00200);
>
> + /* PCI copier */
> memory_region_init_io(&s->iomem_cop, OBJECT(s), &bonito_cop_ops, s,
> "cop", 0x100);
> sysbus_init_mmio(sysbus, &s->iomem_cop);
> @@ -669,6 +685,14 @@ static void bonito_realize(PCIDevice *dev, Error **errp)
> sysbus_init_mmio(sysbus, &s->bonito_localio);
> sysbus_mmio_map(sysbus, 6, BONITO_DEV_BASE);
>
> + memory_region_init_alias(pcimem_alias, NULL, "pci.mem.alias",
> + &bs->pci_mem, 0, BONITO_PCIHI_SIZE);
> + memory_region_add_subregion(get_system_memory(),
> + BONITO_PCIHI_BASE, pcimem_alias);
> + create_unimplemented_device("PCI_2",
> + (hwaddr)BONITO_PCIHI_BASE + BONITO_PCIHI_SIZE,
> + 2 * GiB);
> +
> /* set the default value of north bridge pci config */
> pci_set_word(dev->config + PCI_COMMAND, 0x0000);
> pci_set_word(dev->config + PCI_STATUS, 0x0000);
> --
> 2.21.3
>
next prev parent reply other threads:[~2020-05-26 11:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 10:47 [PATCH 00/14] hw/mips: patch queue for 2020-05-26 Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 01/14] MAINTAINERS: Add Huacai Chen as fuloong2e co-maintainer Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 02/14] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 03/14] hw/pci-host/bonito: Fix DPRINTF() format strings Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 04/14] hw/pci-host/bonito: Map peripheral using physical address Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 05/14] hw/pci-host/bonito: Map all the Bonito64 I/O range Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 06/14] hw/pci-host/bonito: Map the different PCI ranges more detailled Philippe Mathieu-Daudé
2020-05-26 10:59 ` Aleksandar Markovic [this message]
2020-05-26 10:47 ` [PATCH 07/14] hw/pci-host/bonito: Better describe the I/O CS regions Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 08/14] hw/pci-host/bonito: Set the Config register reset value with FIELD_DP32 Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 09/14] hw/mips/fuloong2e: Move code and update a comment Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 10/14] hw/mips/fuloong2e: Fix typo in Fuloong machine name Philippe Mathieu-Daudé
2020-05-26 10:57 ` Aleksandar Markovic
2020-05-26 11:53 ` Peter Krempa
2020-05-26 12:37 ` Aleksandar Markovic
2020-05-26 12:47 ` Philippe Mathieu-Daudé
2020-05-26 12:50 ` Peter Krempa
2020-05-26 13:04 ` Aleksandar Markovic
2020-05-27 8:51 ` Aleksandar Markovic
2020-05-27 9:05 ` Peter Krempa
2020-05-26 10:47 ` [PATCH 11/14] hw/mips: Rename malta/mipssim/r4k/jazz files Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 12/14] hw/mips/malta: Add some logging for bad register offset cases Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 13/14] hw/mips/mips_int: De-duplicate KVM interrupt delivery Philippe Mathieu-Daudé
2020-05-26 10:47 ` [PATCH 14/14] MAINTAINERS: Change Aleksandar Rikalo's email address Philippe Mathieu-Daudé
2020-05-26 11:06 ` [PATCH 00/14] hw/mips: patch queue for 2020-05-26 Aleksandar Markovic
2020-05-26 13:14 ` Aleksandar Markovic
2020-05-26 13:20 ` Philippe Mathieu-Daudé
2020-05-26 13:29 ` Aleksandar Markovic
2020-05-26 13:38 ` Philippe Mathieu-Daudé
2020-05-26 13:20 ` Aleksandar Markovic
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=CAHiYmc69Y+ETD7fhKA+7MfXo+1k+XS9sCGcHx_rHD7o9oUefGg@mail.gmail.com \
--to=aleksandar.qemu.devel@gmail.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=chenhc@lemote.com \
--cc=f4bug@amsat.org \
--cc=jiaxun.yang@flygoat.com \
--cc=libvir-list@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).