From: Juergen Gross <jgross@suse.com> To: grub-devel@gnu.org Cc: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com, Juergen Gross <jgross@suse.com>, xen-devel@lists.xen.org Subject: [PATCH v4 12/19] xen: add PCI MMIO areas to memory map Date: Fri, 2 Nov 2018 13:37:31 +0100 [thread overview] Message-ID: <20181102123738.16395-13-jgross@suse.com> (raw) In-Reply-To: <20181102123738.16395-1-jgross@suse.com> Add possible PCI space MMIO areas as "Reserved" to the memory map in order to avoid using those areas for special Xen pages later. Signed-off-by: Juergen Gross <jgross@suse.com> --- V4: new patch (Roger Pau Monné) --- grub-core/kern/i386/xen/pvh.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c index 58e6fefd5..442351d1d 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -20,6 +20,7 @@ #include <grub/misc.h> #include <grub/memory.h> #include <grub/mm.h> +#include <grub/pci.h> #include <grub/i386/cpuid.h> #include <grub/i386/io.h> #include <grub/xen.h> @@ -170,6 +171,73 @@ grub_xen_sort_mmap (void) } } +static grub_uint64_t +grub_xen_pci_read (grub_pci_address_t addr, grub_uint32_t is_64bit) +{ + grub_uint64_t val; + + val = grub_pci_read (addr); + if (is_64bit) + { + addr += sizeof (grub_uint32_t); + val |= ((grub_uint64_t) grub_pci_read (addr)) << 32; + } + + return val; +} + +static void +grub_xen_pci_write (grub_pci_address_t addr, grub_uint64_t val, + grub_uint32_t is_64bit) +{ + grub_pci_write (addr, (grub_uint32_t) val); + if (is_64bit) + { + addr += sizeof (grub_uint32_t); + grub_pci_write (addr, val >> 32); + } +} + +static int +grub_xen_pci_mmap (grub_pci_device_t dev, + grub_pci_id_t pciid __attribute__ ((unused)), + void *data __attribute__ ((unused))) +{ + int reg; + grub_pci_address_t addr; + grub_uint32_t val; + grub_uint64_t mmio_addr, mmio_size; + + if (nr_map_entries == ARRAY_SIZE (map)) + return 1; + + for (reg = GRUB_PCI_REG_ADDRESSES; reg < GRUB_PCI_REG_CIS_POINTER; + reg += sizeof (grub_uint32_t)) + { + addr = grub_pci_make_address (dev, reg); + val = grub_pci_read (addr); + if (val == 0 || + (val & GRUB_PCI_ADDR_SPACE_MASK) != GRUB_PCI_ADDR_SPACE_MEMORY) + continue; + + val &= GRUB_PCI_ADDR_MEM_TYPE_MASK; + mmio_addr = grub_xen_pci_read (addr, val); + grub_xen_pci_write (addr, ~0ULL, val); + mmio_size = ~(grub_xen_pci_read (addr, val) & ~0x0fULL) + 1; + grub_xen_pci_write (addr, mmio_addr, val); + + map[nr_map_entries].type = GRUB_MEMORY_RESERVED; + map[nr_map_entries].addr = mmio_addr; + map[nr_map_entries].len = mmio_size; + nr_map_entries++; + + if (val) + reg += sizeof (grub_uint32_t); + } + + return 0; +} + static void grub_xen_get_mmap (void) { @@ -182,6 +250,8 @@ grub_xen_get_mmap (void) grub_xen_panic ("Could not get memory map from Xen.\n"); nr_map_entries = memmap.nr_entries; + grub_pci_iterate (grub_xen_pci_mmap, NULL); + grub_xen_sort_mmap (); } -- 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
WARNING: multiple messages have this Message-ID (diff)
From: Juergen Gross <jgross@suse.com> To: grub-devel@gnu.org Cc: xen-devel@lists.xen.org, phcoder@gmail.com, daniel.kiper@oracle.com, hans@knorrie.org, Juergen Gross <jgross@suse.com> Subject: [PATCH v4 12/19] xen: add PCI MMIO areas to memory map Date: Fri, 2 Nov 2018 13:37:31 +0100 [thread overview] Message-ID: <20181102123738.16395-13-jgross@suse.com> (raw) In-Reply-To: <20181102123738.16395-1-jgross@suse.com> Add possible PCI space MMIO areas as "Reserved" to the memory map in order to avoid using those areas for special Xen pages later. Signed-off-by: Juergen Gross <jgross@suse.com> --- V4: new patch (Roger Pau Monné) --- grub-core/kern/i386/xen/pvh.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c index 58e6fefd5..442351d1d 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -20,6 +20,7 @@ #include <grub/misc.h> #include <grub/memory.h> #include <grub/mm.h> +#include <grub/pci.h> #include <grub/i386/cpuid.h> #include <grub/i386/io.h> #include <grub/xen.h> @@ -170,6 +171,73 @@ grub_xen_sort_mmap (void) } } +static grub_uint64_t +grub_xen_pci_read (grub_pci_address_t addr, grub_uint32_t is_64bit) +{ + grub_uint64_t val; + + val = grub_pci_read (addr); + if (is_64bit) + { + addr += sizeof (grub_uint32_t); + val |= ((grub_uint64_t) grub_pci_read (addr)) << 32; + } + + return val; +} + +static void +grub_xen_pci_write (grub_pci_address_t addr, grub_uint64_t val, + grub_uint32_t is_64bit) +{ + grub_pci_write (addr, (grub_uint32_t) val); + if (is_64bit) + { + addr += sizeof (grub_uint32_t); + grub_pci_write (addr, val >> 32); + } +} + +static int +grub_xen_pci_mmap (grub_pci_device_t dev, + grub_pci_id_t pciid __attribute__ ((unused)), + void *data __attribute__ ((unused))) +{ + int reg; + grub_pci_address_t addr; + grub_uint32_t val; + grub_uint64_t mmio_addr, mmio_size; + + if (nr_map_entries == ARRAY_SIZE (map)) + return 1; + + for (reg = GRUB_PCI_REG_ADDRESSES; reg < GRUB_PCI_REG_CIS_POINTER; + reg += sizeof (grub_uint32_t)) + { + addr = grub_pci_make_address (dev, reg); + val = grub_pci_read (addr); + if (val == 0 || + (val & GRUB_PCI_ADDR_SPACE_MASK) != GRUB_PCI_ADDR_SPACE_MEMORY) + continue; + + val &= GRUB_PCI_ADDR_MEM_TYPE_MASK; + mmio_addr = grub_xen_pci_read (addr, val); + grub_xen_pci_write (addr, ~0ULL, val); + mmio_size = ~(grub_xen_pci_read (addr, val) & ~0x0fULL) + 1; + grub_xen_pci_write (addr, mmio_addr, val); + + map[nr_map_entries].type = GRUB_MEMORY_RESERVED; + map[nr_map_entries].addr = mmio_addr; + map[nr_map_entries].len = mmio_size; + nr_map_entries++; + + if (val) + reg += sizeof (grub_uint32_t); + } + + return 0; +} + static void grub_xen_get_mmap (void) { @@ -182,6 +250,8 @@ grub_xen_get_mmap (void) grub_xen_panic ("Could not get memory map from Xen.\n"); nr_map_entries = memmap.nr_entries; + grub_pci_iterate (grub_xen_pci_mmap, NULL); + grub_xen_sort_mmap (); } -- 2.16.4
next prev parent reply other threads:[~2018-11-02 12:37 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-02 12:37 [PATCH v4 00/19] xen: add pvh guest support Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 01/19] xen: add some xen headers Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 02/19] loader/linux: support passing rsdp address via boot params Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 11:36 ` Daniel Kiper 2018-11-07 11:36 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 03/19] xen: carve out grant tab initialization into dedicated function Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 04/19] xen: prepare common code for Xen PVH support Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 12:10 ` Daniel Kiper 2018-11-07 12:10 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 05/19] xen: add some dummy headers for PVH mode Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 12:21 ` Daniel Kiper 2018-11-07 12:21 ` Daniel Kiper 2018-11-07 14:49 ` Juergen Gross 2018-11-08 15:36 ` Daniel Kiper 2018-11-08 15:36 ` Daniel Kiper 2018-11-08 15:40 ` Juergen Gross 2018-11-08 15:40 ` Juergen Gross 2018-11-07 14:49 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 06/19] xen: rearrange xen/init.c to prepare it for Xen " Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 07/19] xen: add PVH specific defines to offset.h Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 12:27 ` Daniel Kiper 2018-11-07 12:27 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 08/19] xen: add basic hooks for PVH in current code Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-08 15:45 ` Daniel Kiper 2018-11-08 19:23 ` [Xen-devel] " Juergen Gross 2018-11-09 17:55 ` Daniel Kiper 2018-11-09 17:55 ` Daniel Kiper 2018-11-08 19:23 ` Juergen Gross 2018-11-08 15:45 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 09/19] xen: add PVH boot entry code Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-08 15:53 ` Daniel Kiper 2018-11-08 15:53 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 10/19] xen: setup hypercall page for PVH Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 18:12 ` Daniel Kiper 2018-11-09 18:12 ` Daniel Kiper 2018-11-20 9:27 ` Juergen Gross 2018-11-20 9:27 ` Juergen Gross 2018-11-21 13:58 ` Juergen Gross 2018-11-21 13:58 ` [Xen-devel] " Juergen Gross 2018-11-15 8:33 ` Roger Pau Monné 2018-11-20 9:16 ` Juergen Gross 2018-11-20 9:16 ` Juergen Gross 2018-11-15 8:33 ` Roger Pau Monné 2018-11-02 12:37 ` [PATCH v4 11/19] xen: get memory map from hypervisor " Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 18:35 ` Daniel Kiper 2018-11-09 18:35 ` Daniel Kiper 2018-11-15 9:36 ` [Xen-devel] " Roger Pau Monné 2018-11-21 8:52 ` Juergen Gross 2018-11-21 8:52 ` Juergen Gross 2018-11-15 9:36 ` Roger Pau Monné 2018-11-02 12:37 ` Juergen Gross [this message] 2018-11-02 12:37 ` [PATCH v4 12/19] xen: add PCI MMIO areas to memory map Juergen Gross 2018-11-09 19:14 ` Daniel Kiper 2018-11-14 12:49 ` Roger Pau Monné 2018-11-14 12:49 ` [Xen-devel] " Roger Pau Monné 2018-11-14 15:30 ` Daniel Kiper 2018-11-14 15:30 ` Daniel Kiper 2018-11-09 19:14 ` Daniel Kiper 2018-11-14 12:48 ` Roger Pau Monné 2018-11-14 12:48 ` [Xen-devel] " Roger Pau Monné 2018-11-21 9:02 ` Juergen Gross 2018-11-21 9:02 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 13/19] xen: setup Xen specific data for PVH Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 19:47 ` Daniel Kiper 2018-11-09 19:47 ` Daniel Kiper 2018-11-15 10:03 ` [Xen-devel] " Roger Pau Monné 2018-11-21 9:07 ` Juergen Gross 2018-11-21 9:07 ` Juergen Gross 2018-11-15 10:03 ` Roger Pau Monné 2018-11-02 12:37 ` [PATCH v4 14/19] xen: init memory regions " Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 19:56 ` Daniel Kiper 2018-11-09 19:56 ` Daniel Kiper 2018-11-15 10:07 ` Roger Pau Monné 2018-11-15 10:07 ` [Xen-devel] " Roger Pau Monné 2018-11-02 12:37 ` [PATCH v4 15/19] xen_pvh: add build runes for grub-core Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 16/19] grub-module-verifier: Ignore all_video for xenpvh Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 17/19] xen_pvh: support building a standalone image Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 20:06 ` Daniel Kiper 2018-11-09 20:06 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 18/19] xen_pvh: support grub-install for xen_pvh Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 19/19] xen_pvh: add support to configure Juergen Gross 2018-11-02 12:37 ` Juergen Gross
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=20181102123738.16395-13-jgross@suse.com \ --to=jgross@suse.com \ --cc=daniel.kiper@oracle.com \ --cc=grub-devel@gnu.org \ --cc=hans@knorrie.org \ --cc=phcoder@gmail.com \ --cc=xen-devel@lists.xen.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.