[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 43/53] hppa: move hppa_pci_ignore_ops from pci.c to machine.c
From: |
Mark Cave-Ayland |
Subject: |
[PULL 43/53] hppa: move hppa_pci_ignore_ops from pci.c to machine.c |
Date: |
Sun, 8 May 2022 20:56:40 +0100 |
The memory region only has one user which is for ensuring accesses to the ISA
bus memory do not fault.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-44-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/hppa/hppa_sys.h | 1 -
hw/hppa/machine.c | 23 +++++++++++++++++++++++
hw/hppa/pci.c | 26 --------------------------
3 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/hw/hppa/hppa_sys.h b/hw/hppa/hppa_sys.h
index 9964d4a7a7..d984b2895d 100644
--- a/hw/hppa/hppa_sys.h
+++ b/hw/hppa/hppa_sys.h
@@ -10,7 +10,6 @@
#define enable_lasi_lan() 0
/* hppa_pci.c. */
-extern const MemoryRegionOps hppa_pci_ignore_ops;
extern const MemoryRegionOps hppa_pci_conf1_ops;
extern const MemoryRegionOps hppa_pci_iack_ops;
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index f3d72b4c35..ca595d343e 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -57,6 +57,29 @@ static Notifier hppa_system_powerdown_notifier = {
.notify = hppa_powerdown_req
};
+/* Fallback for unassigned PCI I/O operations. Avoids MCHK. */
+static uint64_t ignore_read(void *opaque, hwaddr addr, unsigned size)
+{
+ return 0;
+}
+
+static void ignore_write(void *opaque, hwaddr addr, uint64_t v, unsigned size)
+{
+}
+
+static const MemoryRegionOps hppa_pci_ignore_ops = {
+ .read = ignore_read,
+ .write = ignore_write,
+ .endianness = DEVICE_BIG_ENDIAN,
+ .valid = {
+ .min_access_size = 1,
+ .max_access_size = 8,
+ },
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 8,
+ },
+};
static ISABus *hppa_isa_bus(void)
{
diff --git a/hw/hppa/pci.c b/hw/hppa/pci.c
index a92dcb6b9e..4d62d54c22 100644
--- a/hw/hppa/pci.c
+++ b/hw/hppa/pci.c
@@ -12,32 +12,6 @@
#include "trace.h"
-/* Fallback for unassigned PCI I/O operations. Avoids MCHK. */
-
-static uint64_t ignore_read(void *opaque, hwaddr addr, unsigned size)
-{
- return 0;
-}
-
-static void ignore_write(void *opaque, hwaddr addr, uint64_t v, unsigned size)
-{
-}
-
-const MemoryRegionOps hppa_pci_ignore_ops = {
- .read = ignore_read,
- .write = ignore_write,
- .endianness = DEVICE_BIG_ENDIAN,
- .valid = {
- .min_access_size = 1,
- .max_access_size = 8,
- },
- .impl = {
- .min_access_size = 1,
- .max_access_size = 8,
- },
-};
-
-
/* PCI config space reads/writes, to byte-word addressable memory. */
static uint64_t bw_conf1_read(void *opaque, hwaddr addr,
unsigned size)
--
2.20.1
- [PULL 37/53] lasi: remove address space parameter from lasi_initfn(), (continued)
- [PULL 37/53] lasi: remove address space parameter from lasi_initfn(), Mark Cave-Ayland, 2022/05/08
- [PULL 33/53] lasi: move LAN initialisation to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 36/53] lasi: move PS2 initialisation to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 34/53] lasi: move parallel port initialisation to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 41/53] hppa: move device headers from hppa_sys.h into individual .c files, Mark Cave-Ayland, 2022/05/08
- [PULL 42/53] lasi: move from hw/hppa to hw/misc, Mark Cave-Ayland, 2022/05/08
- [PULL 38/53] lasi: move lasi_initfn() to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 35/53] lasi: move second serial port initialisation to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 39/53] lasi: use constants for device register offsets, Mark Cave-Ayland, 2022/05/08
- [PULL 40/53] lasi: use numerical constant for iar reset value, Mark Cave-Ayland, 2022/05/08
- [PULL 43/53] hppa: move hppa_pci_ignore_ops from pci.c to machine.c,
Mark Cave-Ayland <=
- [PULL 44/53] hppa: remove hw/hppa/pci.c, Mark Cave-Ayland, 2022/05/08
- [PULL 45/53] hppa: remove unused trace-events from from hw/hppa, Mark Cave-Ayland, 2022/05/08
- [PULL 46/53] hppa: move enable_lan() define from hppa_sys.h to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 47/53] hppa: remove the empty hppa_sys.h file, Mark Cave-Ayland, 2022/05/08
- [PULL 48/53] hppa: use MACHINE QOM macros for defining the hppa machine, Mark Cave-Ayland, 2022/05/08
- [PULL 49/53] hppa: fold machine_hppa_machine_init() into machine_hppa_machine_init_class_init(), Mark Cave-Ayland, 2022/05/08
- [PULL 51/53] artist: checkpatch and newline style fixes, Mark Cave-Ayland, 2022/05/08
- [PULL 50/53] hppa: simplify machine function names in machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 53/53] artist: only render dirty scanlines on the display surface, Mark Cave-Ayland, 2022/05/08
- [PULL 52/53] artist: remove unused ROP8OFF() macro, Mark Cave-Ayland, 2022/05/08