qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org, Anthony Liguori <anthony@codemonkey.ws>
Cc: peter.maydell@linaro.org, imammedo@redhat.com, mst@redhat.com,
	kraxel@redhat.com, marcel.a@redhat.com
Subject: [Qemu-devel] [PULL v2 03/39] hw/pci: partially handle pci master abort
Date: Tue, 15 Oct 2013 09:30:10 +0300	[thread overview]
Message-ID: <1381818560-18367-4-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1381818560-18367-1-git-send-email-mst@redhat.com>

From: Marcel Apfelbaum <marcel.a@redhat.com>

A MemoryRegion with negative priority was created and
it spans over all the pci address space.
It "intercepts" the accesses to unassigned pci
address space and will follow the pci spec:
 1. returns -1 on read
 2. does nothing on write

Note: setting the RECEIVED MASTER ABORT bit in the STATUS register
      of the device that initiated the transaction will be
      implemented in another series

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/pci/pci_bus.h |  1 +
 hw/pci/pci.c             | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
index 9df1788..2ad5edb 100644
--- a/include/hw/pci/pci_bus.h
+++ b/include/hw/pci/pci_bus.h
@@ -23,6 +23,7 @@ struct PCIBus {
     PCIDevice *parent_dev;
     MemoryRegion *address_space_mem;
     MemoryRegion *address_space_io;
+    MemoryRegion master_abort_mem;
 
     QLIST_HEAD(, PCIBus) child; /* this will be replaced by qdev later */
     QLIST_ENTRY(PCIBus) sibling;/* this will be replaced by qdev later */
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 00554a0..25626b8 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -283,6 +283,24 @@ const char *pci_root_bus_path(PCIDevice *dev)
     return rootbus->qbus.name;
 }
 
+static uint64_t master_abort_mem_read(void *opaque, hwaddr addr, unsigned size)
+{
+   return -1ULL;
+}
+
+static void master_abort_mem_write(void *opaque, hwaddr addr, uint64_t val,
+                                   unsigned size)
+{
+}
+
+static const MemoryRegionOps master_abort_mem_ops = {
+    .read = master_abort_mem_read,
+    .write = master_abort_mem_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
+#define MASTER_ABORT_MEM_PRIORITY INT_MIN
+
 static void pci_bus_init(PCIBus *bus, DeviceState *parent,
                          const char *name,
                          MemoryRegion *address_space_mem,
@@ -294,6 +312,14 @@ static void pci_bus_init(PCIBus *bus, DeviceState *parent,
     bus->address_space_mem = address_space_mem;
     bus->address_space_io = address_space_io;
 
+
+    memory_region_init_io(&bus->master_abort_mem, OBJECT(bus),
+                          &master_abort_mem_ops, bus, "pci-master-abort",
+                          memory_region_size(bus->address_space_mem));
+    memory_region_add_subregion_overlap(bus->address_space_mem,
+                                        0, &bus->master_abort_mem,
+                                        MASTER_ABORT_MEM_PRIORITY);
+
     /* host bridge */
     QLIST_INIT(&bus->child);
 
-- 
MST

  parent reply	other threads:[~2013-10-15  6:27 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-15  6:29 [Qemu-devel] [PULL v2 00/39] pci, pc, acpi fixes, enhancements Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 01/39] memory: Change MemoryRegion priorities from unsigned to signed Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 02/39] docs/memory: Explictly state that MemoryRegion priority is signed Michael S. Tsirkin
2013-10-15  6:30 ` Michael S. Tsirkin [this message]
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 04/39] hw/core: Add interface to allocate and free a single IRQ Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 05/39] hw/pci: add pci wrappers for allocating and asserting irqs Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 06/39] hw/pci-bridge: set PCI_INTERRUPT_PIN register before shpc init Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 07/39] hw/vmxnet3: set interrupts using pci irq wrappers Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 08/39] hw/vfio: " Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 09/39] hw: " Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 10/39] hw/pcie: AER and hot-plug events must use device's interrupt Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 11/39] hw/pci: removed irq field from PCIDevice Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 12/39] cleanup object.h: include error.h directly Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 13/39] qom: cleanup struct Error references Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 14/39] qom: add pointer to int property helpers Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 15/39] pci: fix up w64 size calculation helper Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 16/39] fw_cfg: interface to trigger callback on read Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 17/39] loader: support for unmapped ROM blobs Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 18/39] pcie_host: expose UNMAPPED macro Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 19/39] pcie_host: expose address format Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 20/39] q35: use macro for MCFG property name Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 21/39] q35: expose mmcfg size as a property Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 22/39] i386: add ACPI table files from seabios Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 23/39] acpi: add rules to compile ASL source Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 24/39] acpi: pre-compiled ASL files Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 25/39] acpi: ssdt pcihp: updat generated file Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 26/39] loader: use file path size from fw_cfg.h Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 27/39] i386: add bios linker/loader Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 28/39] loader: allow adding ROMs in done callbacks Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 29/39] i386: define pc guest info Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 30/39] acpi/piix: add macros for acpi property names Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 31/39] piix: APIs for pc guest info Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 32/39] ich9: " Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 33/39] pvpanic: add API to access io port Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 34/39] hpet: add API to find it Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 35/39] acpi: add interface to access user-installed tables Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 36/39] pc: use new api to add builtin tables Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 37/39] i386: ACPI table generation code from seabios Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 38/39] ssdt: fix PBLK length Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 39/39] ssdt-proc: update generated file Michael S. Tsirkin

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=1381818560-18367-4-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=imammedo@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=marcel.a@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).