Unify I/O port and MMIO trap handling
v3 cover Unify I/O port and MMIO trap handling
Hi,
this version is addressing Alexandru's comments, fixing mostly minor issues in the naming scheme. The biggest change is to keep the ioport__read/ioport_write wrappers for the serial device. For more details see the changelog below.
==============
At the moment we use two separate code paths to handle exits for KVM_EXIT_IO (ioport.c) and KVM_EXIT_MMIO (mmio.c), even though they are semantically very similar. Because the trap handler callback routine is different, devices need to decide on one conduit or need to provide different handler functions for both of them.
This is not only unnecessary code duplication, but makes switching devices from I/O port to MMIO a tedious task, even though there is no real difference between the two, especially on ARM and PowerPC.
For ARM we aim at providing a flexible memory layout, and also have trouble with the UART and RTC device overlapping with the PCI I/O area, so it seems indicated to tackle this once and for all.
The first three patches do some cleanup, to simplify things later.
Patch 04/22 lays the groundwork, by extending mmio.c to be able to also register I/O port trap handlers, using the same callback prototype as we use for MMIO.
The next 14 patches then convert devices that use the I/O port interface over to the new joint interface. This requires to rework the trap handler routine to adhere to the same prototype as the existing MMIO handlers. For most devices this is done in two steps: a first to introduce the reworked handler routine, and a second to switch to the new joint registration routine. For some devices the first step is trivial, so it's done in one patch.
Patch 19/22 then retires the old I/O port interface, by removing ioport.c and friends.
Patch 20/22 uses the opportunity to clean up the memory map description, also declares a new region (from 16MB on), where the final two patches switch the UART and the RTC device to. They are now registered on the MMIO "bus", when running on ARM or arm64. This moves them away from the first 64KB, so they are not in the PCI I/O area anymore.
Please have a look and comment!
Cheers,
Andre
Changelog v2 .. v3:
- use _io as function prefix for x86 I/O port devices
- retain ioport__{read,write}8() wrappers for serial device
- fix memory map ASCII art
- fix serial base declaration
- minor nit fixes
- add Reviewed-by: tags
Changelog v1 .. v2:
- rework memory map definition
- add explicit debug output for debug I/O port
- add explicit check for MMIO coalescing on I/O ports
- drop usage of ioport__{read,write}8() from serial
- drop explicit I/O port cleanup routine (to mimic MMIO operation)
- add comment for IOTRAP_BUS_MASK
- minor cleanups / formatting changes
Andre Przywara (22):
ioport: Remove ioport__setup_arch()
hw/serial: Use device abstraction for FDT generator function
ioport: Retire .generate_fdt_node functionality
mmio: Extend handling to include ioport emulation hw/i8042: Clean up data types
hw/i8042: Refactor trap handler
hw/i8042: Switch to new trap handlers
x86/ioport: Refactor trap handlers
x86/ioport: Switch to new trap handlers
hw/rtc: Refactor trap handlers
hw/rtc: Switch to new trap handler
hw/vesa: Switch trap handling to use MMIO handler hw/serial: Refactor trap handler
hw/serial: Switch to new trap handlers
vfio: Refactor ioport trap handler
vfio: Switch to new ioport trap handlers
virtio: Switch trap handling to use MMIO handler
pci: Switch trap handling to use MMIO handler Remove ioport specific routines
arm: Reorganise and document memory map
hw/serial: ARM/arm64: Use MMIO at higher addresses hw/rtc: ARM/arm64: Use MMIO at higher addresses
Makefile | 1 - arm/include/arm-common/kvm-arch.h | 47 ++++-- arm/ioport.c | 5 - hw/i8042.c | 94 +++++------- hw/rtc.c | 91 ++++++------ hw/serial.c | 126 +++++++++++----- hw/vesa.c | 19 +-- include/kvm/i8042.h | 1 - include/kvm/ioport.h | 32 ---- include/kvm/kvm.h | 49 ++++++- ioport.c | 235 ------------------------------ mips/kvm.c | 5 - mmio.c | 65 +++++++-- pci.c | 82 +++-------- powerpc/ioport.c | 6 - vfio/core.c | 50 ++++--- virtio/pci.c | 46 ++---- x86/ioport.c | 108 +++++++------- 18 files changed, 421 insertions(+), 641 deletions(-) delete mode 100644 ioport.c
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 1/22 ioport: Remove ioport__setup_arch()
Since x86 had a special need for registering tons of special I/O ports, we had an ioport__setup_arch() callback, to allow each architecture to do the same. As it turns out no one uses it beside x86, so we remove that unnecessary abstraction.
The generic function was registered via a device_base_init() call, so we just do the same for the x86 specific function only, and can remove the unneeded ioport__setup_arch().
--- arm/ioport.c | 5 ----- include/kvm/ioport.h | 1 - ioport.c | 6 ------ mips/kvm.c | 5 ----- powerpc/ioport.c | 6 ------ x86/ioport.c | 3 ++- 6 files changed, 2 insertions(+), 24 deletions(-)
arm/ioport.c +0 -5
@@ -1,11 +1,6 @@#include "kvm/ioport.h" #include "kvm/irq.h" -int ioport__setup_arch (struct kvm *kvm) -{ -return 0 ; -} -void ioport__map_irq (u8 *irq) { *irq =irq__alloc_line ();
include/kvm/ioport.h +0 -1
@@ -35,7 +35,6 @@ struct ioport_operations { enum irq_type)); }; -int ioport__setup_arch (struct kvm *kvm);void ioport__map_irq (u8 *irq); int __must_check ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops,
ioport.c +0 -6
@@ -221,12 +221,6 @@ out:return !kvm->cfg.ioport_debug; } -int ioport__init (struct kvm *kvm) -{ -return ioport__setup_arch (kvm); -} -dev_base_init (ioport__init); -int ioport__exit (struct kvm *kvm) {ioport__unregister_all ();
mips/kvm.c +0 -5
@@ -100,11 +100,6 @@ void kvm__irq_trigger(struct kvm *kvm, int irq)die_perror ("KVM_IRQ_LINE ioctl" ); } -int ioport__setup_arch (struct kvm *kvm) -{ -return 0 ; -} -bool kvm__arch_cpu_supports_vm (void ) {return true;
powerpc/ioport.c +0 -6
@@ -12,12 +12,6 @@#include <stdlib.h> -int ioport__setup_arch (struct kvm *kvm) -{ -/* PPC has no legacy ioports to set up */ -return 0 ; -} -void ioport__map_irq (u8 *irq) { }
x86/ioport.c +2 -1
@@ -69,7 +69,7 @@ void ioport__map_irq(u8 *irq) { } -int ioport__setup_arch (struct kvm *kvm) +static int ioport__setup_arch (struct kvm *kvm) {int r;
@@ -150,3 +150,4 @@ int ioport__setup_arch(struct kvm *kvm)return 0 ; } +dev_base_init (ioport__setup_arch);
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 2/22 hw/serial: Use device abstraction for FDT generator function
In reply to Andre PrzywaraAt the moment we use the .generate_fdt_node member of the ioport ops structure to store the function pointer for the FDT node generator function. ioport__register() will then put a wrapper and this pointer into the device header.
The serial device is the only device making use of this special ioport feature, so let's move this over to using the device header directly.
This will allow us to get rid of this .generate_fdt_node member in the ops and simplify the code.
--- hw/serial.c | 49 +++++++++++++++++++++++++++++++++++++---------- include/kvm/kvm.h | 2 ++ 2 files changed, 41 insertions(+), 10 deletions(-)
hw/serial.c +39 -10
@@ -23,6 +23,7 @@#define UART_IIR_TYPE_BITS 0xc0struct serial8250_device { +struct device_header dev_hdr;struct mutex mutex;u8 id;
@@ -53,9 +54,20 @@ struct serial8250_device { .msr = UART_MSR_DCD | UART_MSR_DSR | UART_MSR_CTS, \ .mcr = UART_MCR_OUT2, +#ifdef CONFIG_HAS_LIBFDT +static +void serial8250_generate_fdt_node (void *fdt,struct device_header *dev_hdr, +fdt_irq_fn irq_fn); +#else +#define serial8250_generate_fdt_node NULL +#endif static struct serial8250_device devices[] = {/* ttyS0 */ [0 ] = { + .dev_hdr = { + .bus_type =DEVICE_BUS_IOPORT , + .data = serial8250_generate_fdt_node, + }, .mutex =MUTEX_INITIALIZER , .id =0 ,
@@ -66,6 +78,10 @@ static struct serial8250_device devices[] = { }, /* ttyS1 */ [1] = { + .dev_hdr = { + .bus_type = DEVICE_BUS_IOPORT, + .data = serial8250_generate_fdt_node, + }, .mutex = MUTEX_INITIALIZER, .id = 1,
@@ -76,6 +92,10 @@ static struct serial8250_device devices[] = { }, /* ttyS2 */ [2] = { + .dev_hdr = { + .bus_type = DEVICE_BUS_IOPORT, + .data = serial8250_generate_fdt_node, + }, .mutex = MUTEX_INITIALIZER, .id = 2,
@@ -86,6 +106,10 @@ static struct serial8250_device devices[] = { }, /* ttyS3 */ [3] = { + .dev_hdr = { + .bus_type = DEVICE_BUS_IOPORT, + .data = serial8250_generate_fdt_node, + }, .mutex = MUTEX_INITIALIZER, .id = 3,
@@ -371,13 +395,14 @@ char *fdt_stdout_path = NULL;#define DEVICE_NAME_MAX_LEN 32static -void serial8250_generate_fdt_node (struct ioport *ioport,void *fdt, -void (*generate_irq_prop)(void *fdt, -u8 irq, -enum irq_type )) +void serial8250_generate_fdt_node (void *fdt,struct device_header *dev_hdr, +fdt_irq_fn irq_fn) {char dev_name[DEVICE_NAME_MAX_LEN ]; -struct serial8250_device *dev = ioport->priv; +struct serial8250_device *dev =container_of (dev_hdr, + struct serial8250_device, + dev_hdr); +u64 addr =KVM_IOPORT_AREA + dev->iobase;u64 reg_prop[] = {cpu_to_fdt64 (addr),
@@ -395,24 +420,26 @@ void serial8250_generate_fdt_node(struct ioport *ioport, void *fdt,_FDT (fdt_begin_node (fdt, dev_name));_FDT (fdt_property_string (fdt,"compatible" ,"ns16550a" ));_FDT (fdt_property (fdt,"reg" , reg_prop,sizeof (reg_prop))); -generate_irq_prop (fdt, dev->irq,IRQ_TYPE_LEVEL_HIGH ); +irq_fn (fdt, dev->irq,IRQ_TYPE_LEVEL_HIGH );_FDT (fdt_property_cell (fdt,"clock-frequency" ,1843200 )); _FDT(fdt_end_node(fdt)); } -#else -#define serial8250_generate_fdt_node NULL#endif static struct ioport_operations serial8250_ops = { .io_in = serial8250_in, .io_out = serial8250_out, - .generate_fdt_node = serial8250_generate_fdt_node, }; -static int serial8250__device_init (struct kvm *kvm,struct serial8250_device *dev) +static int serial8250__device_init (struct kvm *kvm, +struct serial8250_device *dev) {int r; + r =device__register (&dev->dev_hdr); +if (r <0 ) +return r; +ioport__map_irq (&dev->irq); r =ioport__register (kvm, dev->iobase, &serial8250_ops,8 , dev);
@@ -438,6 +465,7 @@ cleanup:struct serial8250_device *dev = &devices[j];ioport__unregister (kvm, dev->iobase); +device__unregister (&dev->dev_hdr); }return r;
@@ -455,6 +483,7 @@ int serial8250__exit(struct kvm *kvm) r =ioport__unregister (kvm, dev->iobase);if (r <0 )return r; +device__unregister (&dev->dev_hdr); }return 0 ;
include/kvm/kvm.h +2 -0
@@ -31,6 +31,8 @@ .name = #ext, \ .code = ext +typedef void (*fdt_irq_fn )(void *fdt,u8 irq,enum irq_type irq_type); +enum {KVM_VMSTATE_RUNNING ,KVM_VMSTATE_PAUSED ,
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 3/22 ioport: Retire .generate_fdt_node functionality
In reply to Andre PrzywaraThe ioport routines support a special way of registering FDT node generator functions. There is no reason to have this separate from the already existing way via the device header.
Now that the only user of this special ioport variety has been transferred, we can retire this code, to simplify ioport handling.
--- include/kvm/ioport.h | 4 ---- ioport.c | 34 ---------------------------------- 2 files changed, 38 deletions(-)
include/kvm/ioport.h +0 -4
@@ -29,10 +29,6 @@ struct ioport {struct ioport_operations {bool (*io_in)(struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size);bool (*io_out)(struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size); -void (*generate_fdt_node)(struct ioport *ioport,void *fdt, -void (*generate_irq_prop)(void *fdt, -u8 irq, -enum irq_type )); };void ioport__map_irq (u8 *irq);
ioport.c +0 -34
@@ -56,7 +56,6 @@ static struct ioport *ioport_get(struct rb_root *root, u64 addr)/* Called with ioport_lock held. */ static void ioport_unregister (struct rb_root *root,struct ioport *data) { -device__unregister (&data->dev_hdr);ioport_remove (root, data);free (data); }
@@ -70,30 +69,6 @@ static void ioport_put(struct rb_root *root, struct ioport *data)mutex_unlock (&ioport_lock); } -#ifdef CONFIG_HAS_LIBFDT -static void generate_ioport_fdt_node (void *fdt, -struct device_header *dev_hdr, -void (*generate_irq_prop)(void *fdt, -u8 irq, -enum irq_type )) -{ - struct ioport *ioport = container_of(dev_hdr, struct ioport, dev_hdr); -struct ioport_operations *ops = ioport->ops; - -if (ops->generate_fdt_node) - ops->generate_fdt_node (ioport, fdt, generate_irq_prop); -} -#else -static void generate_ioport_fdt_node (void *fdt, -struct device_header *dev_hdr, -void (*generate_irq_prop)(void *fdt, -u8 irq, -enum irq_type )) -{ -die ("Unable to generate device tree nodes without libfdt\n" ); -} -#endif -int ioport__register (struct kvm *kvm,u16 port,struct ioport_operations *ops,int count,void *param) {struct ioport *entry;
@@ -107,10 +82,6 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i .node = RB_INT_INIT(port, port + count), .ops = ops, .priv = param, - .dev_hdr = (struct device_header ) { - .bus_type =DEVICE_BUS_IOPORT , - .data = generate_ioport_fdt_node, - },/* * Start from 0 because ioport__unregister() doesn't decrement * the reference count.
@@ -123,15 +94,10 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i r =ioport_insert (&ioport_tree, entry);if (r <0 ) goto out_free; - r =device__register (&entry->dev_hdr); -if (r <0 ) - goto out_remove;mutex_unlock (&ioport_lock);return port; -out_remove: -ioport_remove (&ioport_tree, entry); out_free:free (entry);mutex_unlock (&ioport_lock);
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 4/22 mmio: Extend handling to include ioport emulation
In reply to Andre PrzywaraIn their core functionality MMIO and I/O port traps are not really different, yet we still have two totally separate code paths for handling them. Devices need to decide on one conduit or need to provide different handler functions for each of them.
Extend the existing MMIO emulation to also cover ioport handlers. This just adds another RB tree root for holding the I/O port handlers, but otherwise uses the same tree population and lookup code. "ioport" or "mmio" just become a flag in the registration function. Provide wrappers to not break existing users, and allow an easy transition for the existing ioport handlers.
This also means that ioport handlers now can use the same emulation callback prototype as MMIO handlers, which means we have to migrate them over. To allow a smooth transition, we hook up the new I/O emulate function to the end of the existing ioport emulation code.
--- include/kvm/kvm.h | 49 ++++++++++++++++++++++++++++++++--- ioport.c | 4 +-- mmio.c | 65 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 102 insertions(+), 16 deletions(-)
include/kvm/kvm.h +45 -4
@@ -27,10 +27,23 @@#define PAGE_SIZE (sysconf(_SC_PAGE_SIZE))#endif +/* +* We are reusing the existing DEVICE_BUS_MMIO and DEVICE_BUS_IOPORT constants +* from kvm/devices.h to differentiate between registering an I/O port and an +* MMIO region. +* To avoid collisions with future additions of more bus types, we reserve +* a generous 4 bits for the bus mask here. +*/ +#define IOTRAP_BUS_MASK 0xf +#define IOTRAP_COALESCE (1U << 4) +#define DEFINE_KVM_EXT (ext) \ .name = #ext, \ .code = ext +struct kvm_cpu ; +typedef void (*mmio_handler_fn )(struct kvm_cpu *vcpu,u64 addr,u8 *data, +u32 len,u8 is_write,void *ptr);typedef void (*fdt_irq_fn )(void *fdt,u8 irq,enum irq_type irq_type);enum {
@@ -113,6 +126,8 @@ void kvm__irq_line(struct kvm *kvm, int irq, int level);void kvm__irq_trigger (struct kvm *kvm,int irq);bool kvm__emulate_io (struct kvm_cpu *vcpu,u16 port,void *data,int direction,int size,u32 count);bool kvm__emulate_mmio (struct kvm_cpu *vcpu,u64 phys_addr,u8 *data,u32 len,u8 is_write); +bool kvm__emulate_pio (struct kvm_cpu *vcpu,u16 port,void *data, +int direction,int size,u32 count);int kvm__destroy_mem (struct kvm *kvm,u64 guest_phys,u64 size,void *userspace_addr);int kvm__register_mem (struct kvm *kvm,u64 guest_phys,u64 size,void *userspace_addr,enum kvm_mem_type type);
@@ -136,10 +151,36 @@ static inline int kvm__reserve_mem(struct kvm *kvm, u64 guest_phys, u64 size) KVM_MEM_TYPE_RESERVED); } -int __must_check kvm__register_mmio (struct kvm *kvm,u64 phys_addr,u64 phys_addr_len,bool coalesce, -void (*mmio_fn)(struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len,u8 is_write,void *ptr), -void *ptr); -bool kvm__deregister_mmio (struct kvm *kvm,u64 phys_addr); +int __must_check kvm__register_iotrap (struct kvm *kvm,u64 phys_addr,u64 len, +mmio_handler_fn mmio_fn,void *ptr, +unsigned int flags); + +static inline +int __must_check kvm__register_mmio (struct kvm *kvm,u64 phys_addr, +u64 phys_addr_len,bool coalesce, +mmio_handler_fn mmio_fn,void *ptr) +{ +return kvm__register_iotrap (kvm, phys_addr, phys_addr_len, mmio_fn, ptr, +DEVICE_BUS_MMIO | (coalesce ?IOTRAP_COALESCE :0 )); +} +static inline +int __must_check kvm__register_pio (struct kvm *kvm,u16 port,u16 len, +mmio_handler_fn mmio_fn,void *ptr) +{ +return kvm__register_iotrap (kvm, port, len, mmio_fn, ptr, +DEVICE_BUS_IOPORT ); +} + +bool kvm__deregister_iotrap (struct kvm *kvm,u64 phys_addr,unsigned int flags); +static inline bool kvm__deregister_mmio (struct kvm *kvm,u64 phys_addr) +{ +return kvm__deregister_iotrap (kvm, phys_addr,DEVICE_BUS_MMIO ); +} +static inline bool kvm__deregister_pio (struct kvm *kvm,u16 port) +{ +return kvm__deregister_iotrap (kvm, port,DEVICE_BUS_IOPORT ); +} +void kvm__reboot (struct kvm *kvm);void kvm__pause (struct kvm *kvm);void kvm__continue (struct kvm *kvm);
ioport.c +2 -2
@@ -162,7 +162,8 @@ bool kvm__emulate_io(struct kvm_cpu *vcpu, u16 port, void *data, int direction, entry =ioport_get (&ioport_tree, port);if (!entry) - goto out; +return kvm__emulate_pio (vcpu, port, data, direction, + size, count); ops = entry->ops;
@@ -177,7 +178,6 @@ bool kvm__emulate_io(struct kvm_cpu *vcpu, u16 port, void *data, int direction,ioport_put (&ioport_tree, entry); -out:if (ret)return true;
mmio.c +55 -10
120 lines not on this page · raw message
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 5/22 hw/i8042: Clean up data types
In reply to Andre PrzywaraThe i8042 is clearly an 8-bit era device, so there is little room for 32-bit registers.
Clean up the data types used.
--- hw/i8042.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
hw/i8042.c +13 -13
@@ -64,11 +64,11 @@struct kbd_state {struct kvm *kvm; -char kq[QUEUE_SIZE ];/* Keyboard queue */ +u8 kq[QUEUE_SIZE ];/* Keyboard queue */ int kread, kwrite;/* Indexes into the queue */ int kcount;/* number of elements in queue */ -char mq[QUEUE_SIZE ]; +u8 mq[QUEUE_SIZE ];int mread, mwrite;int mcount;
@@ -82,7 +82,7 @@ struct kbd_state {* Some commands (on port 0x64) have arguments; * we store the command here while we wait for the argument */ -u32 write_cmd; +u8 write_cmd; };static struct kbd_state state;
@@ -173,9 +173,9 @@ static void kbd_write_command(struct kvm *kvm, u8 val)/* * Called when the OS reads from port 0x60 (PS/2 data) */ -static u32 kbd_read_data (void ) +static u8 kbd_read_data (void ) { -u32 ret; +u8 ret;int i;if (state.kcount !=0 ) {
@@ -202,9 +202,9 @@ static u32 kbd_read_data(void)/* * Called when the OS read from port 0x64, the command port */ -static u32 kbd_read_status (void ) +static u8 kbd_read_status (void ) { -return (u32 )state.status; +return state.status; }/*
@@ -212,7 +212,7 @@ static u32 kbd_read_status(void)* Things written here are generally arguments to commands previously * written to port 0x64 and stored in state.write_cmd */ -static void kbd_write_data (u32 val) +static void kbd_write_data (u8 val) {switch (state.write_cmd) {case I8042_CMD_CTL_WCTR :
@@ -266,8 +266,8 @@ static void kbd_write_data(u32 val)break ;default :break ; - } -break ; + } +break ;case 0 :/* Just send the ID */ kbd_queue (RESPONSE_ACK );
@@ -304,8 +304,8 @@ static bool kbd_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *break ; }case I8042_DATA_REG : { -u32 value =kbd_read_data (); -ioport__write32 (data, value); +u8 value =kbd_read_data (); +ioport__write8 (data, value);break ; }case I8042_PORT_B_REG : {
@@ -328,7 +328,7 @@ static bool kbd_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, voidbreak ; }case I8042_DATA_REG : { -u32 value =ioport__read32 (data); +u8 value =ioport__read8 (data);kbd_write_data (value);break ; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 6/22 hw/i8042: Refactor trap handler
In reply to Andre PrzywaraWith the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype.
Adjust the trap handler to use that new function, and provide shims to implement the old ioport interface, for now.
--- hw/i8042.c | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-)
hw/i8042.c +34 -34
@@ -292,52 +292,52 @@ static void kbd_reset(void) }; } -/* -* Called when the OS has written to one of the keyboard's ports (0x60 or 0x64) -*/ -static bool kbd_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void kbd_io (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) { -switch (port) { -case I8042_COMMAND_REG : { -u8 value =kbd_read_status (); -ioport__write8 (data, value); +u8 value; + +if (is_write) + value =ioport__read8 (data); + +switch (addr) { +case I8042_COMMAND_REG : +if (is_write) +kbd_write_command (vcpu->kvm, value); +else + value =kbd_read_status ();break ; - } -case I8042_DATA_REG : { -u8 value =kbd_read_data (); -ioport__write8 (data, value); +case I8042_DATA_REG : +if (is_write) +kbd_write_data (value); +else + value =kbd_read_data ();break ; - } -case I8042_PORT_B_REG : { -ioport__write8 (data,0x20 ); +case I8042_PORT_B_REG : +if (!is_write) + value =0x20 ;break ; - }default : -return false; +return ; } +if (!is_write) +ioport__write8 (data, value); +} + +/* +* Called when the OS has written to one of the keyboard's ports (0x60 or 0x64) +*/ +static bool kbd_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +{ +kbd_io (vcpu, port, data, size, false,NULL ); +return true; }static bool kbd_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) { -switch (port) { -case I8042_COMMAND_REG : { -u8 value =ioport__read8 (data); -kbd_write_command (vcpu->kvm, value); -break ; - } -case I8042_DATA_REG : { -u8 value =ioport__read8 (data); -kbd_write_data (value); -break ; - } -case I8042_PORT_B_REG : { -break ; - } -default : -return false; - } +kbd_io (vcpu, port, data, size, true,NULL );return true; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 7/22 hw/i8042: Switch to new trap handlers
In reply to Andre PrzywaraNow that the PC keyboard has a trap handler adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine.
This allows us to get rid of the ioport shim routines.
Make the kbd_init() function static on the way.
--- hw/i8042.c | 30 ++++-------------------------- include/kvm/i8042.h | 1 - 2 files changed, 4 insertions(+), 27 deletions(-)
hw/i8042.c +4 -26
@@ -325,40 +325,18 @@ static void kbd_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,ioport__write8 (data, value); } -/* -* Called when the OS has written to one of the keyboard's ports (0x60 or 0x64) -*/ -static bool kbd_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -kbd_io (vcpu, port, data, size, false,NULL ); - -return true; -} - -static bool kbd_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -kbd_io (vcpu, port, data, size, true,NULL ); - -return true; -} - -static struct ioport_operations kbd_ops = { - .io_in = kbd_in, - .io_out = kbd_out, -}; - -int kbd__init (struct kvm *kvm) +static int kbd__init (struct kvm *kvm) {int r;kbd_reset (); state.kvm = kvm; - r =ioport__register (kvm,I8042_DATA_REG , &kbd_ops,2 ,NULL ); + r =kvm__register_pio (kvm,I8042_DATA_REG ,2 , kbd_io,NULL );if (r <0 )return r; - r =ioport__register (kvm,I8042_COMMAND_REG , &kbd_ops,2 ,NULL ); + r =kvm__register_pio (kvm,I8042_COMMAND_REG ,2 , kbd_io,NULL );if (r <0 ) { -ioport__unregister (kvm,I8042_DATA_REG ); +kvm__deregister_pio (kvm,I8042_DATA_REG );return r; }
include/kvm/i8042.h +0 -1
@@ -7,6 +7,5 @@ struct kvm;void mouse_queue (u8 c);void kbd_queue (u8 c); -int kbd__init (struct kvm *kvm);#endif
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 8/22 x86/ioport: Refactor trap handlers
In reply to Andre PrzywaraWith the planned retirement of the special ioport emulation code, we need to provide emulation functions compatible with the MMIO prototype.
Adjust the trap handlers to use that new function, and provide shims to implement the old ioport interface, for now.
--- x86/ioport.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
x86/ioport.c +26 -4
@@ -3,8 +3,14 @@#include <stdlib.h> #include <stdio.h> +static void dummy_io (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) +{ +} +static bool debug_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) { +dummy_io (vcpu, port, data, size, true,NULL );return 0 ; }
@@ -12,15 +18,23 @@ static struct ioport_operations debug_ops = { .io_out = debug_io_out, }; -static bool seabios_debug_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void seabios_debug_io (struct kvm_cpu *vcpu,u64 addr,u8 *data, +u32 len,u8 is_write,void *ptr) {char ch; +if (!is_write) +return ; + ch =ioport__read8 (data);putchar (ch); +} -return true; +static bool seabios_debug_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +{ +seabios_debug_io (vcpu, port, data, size, true,NULL ); +return 0 ; }static struct ioport_operations seabios_debug_ops = {
@@ -29,11 +43,13 @@ static struct ioport_operations seabios_debug_ops = {static bool dummy_io_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) { +dummy_io (vcpu, port, data, size, false,NULL );return true; }static bool dummy_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) { +dummy_io (vcpu, port, data, size, true,NULL );return true; }
@@ -50,13 +66,19 @@ static struct ioport_operations dummy_write_only_ioport_ops = {* The "fast A20 gate" */ -static bool ps2_control_a_io_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void ps2_control_io (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) {/* * A20 is always enabled. */ -ioport__write8 (data,0x02 ); +if (!is_write) +ioport__write8 (data,0x02 ); +} +static bool ps2_control_a_io_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +{ +ps2_control_io (vcpu, port, data, size, false,NULL );return true; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 9/22 x86/ioport: Switch to new trap handlers
In reply to Andre PrzywaraNow that the x86 I/O ports have trap handlers adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine.
This allows us to get rid of the ioport shim routines.
Since the debug output was done in ioport.c, we would lose this functionality when moving over to the MMIO handlers. So bring this back here explicitly, by introducing debug_io().
--- x86/ioport.c | 101 +++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 64 deletions(-)
x86/ioport.c +37 -64
@@ -8,15 +8,29 @@ static void dummy_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, { } -static bool debug_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void debug_io (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) { -dummy_io (vcpu, port, data, size, true,NULL ); -return 0 ; -} +if (!vcpu->kvm->cfg.ioport_debug) +return ; -static struct ioport_operations debug_ops = { - .io_out = debug_io_out, -}; +fprintf (stderr,"debug port %s from VCPU%lu: port=0x%lx, size=%u" , + is_write ?"write" :"read" , vcpu->cpu_id, + (unsigned long )addr, len); +if (is_write) { +u32 value; + +switch (len) { +case 1 : value =ioport__read8 (data);break ; +case 2 : value =ioport__read16 ((u16 *)data);break ; +case 4 : value =ioport__read32 ((u32 *)data);break ; +default : value =0 ;break ; + } +fprintf (stderr,", data: 0x%x\n" , value); + }else { +fprintf (stderr,"\n" ); + } +}static void seabios_debug_io (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len,u8 is_write,void *ptr)
@@ -31,37 +45,6 @@ static void seabios_debug_io(struct kvm_cpu *vcpu, u64 addr, u8 *data,putchar (ch); } -static bool seabios_debug_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -seabios_debug_io (vcpu, port, data, size, true,NULL ); -return 0 ; -} - -static struct ioport_operations seabios_debug_ops = { - .io_out = seabios_debug_io_out, -}; - -static bool dummy_io_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -dummy_io (vcpu, port, data, size, false,NULL ); -return true; -} - -static bool dummy_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -dummy_io (vcpu, port, data, size, true,NULL ); -return true; -} - -static struct ioport_operations dummy_read_write_ioport_ops = { - .io_in = dummy_io_in, - .io_out = dummy_io_out, -}; - -static struct ioport_operations dummy_write_only_ioport_ops = { - .io_out = dummy_io_out, -}; -/* * The "fast A20 gate" */
@@ -76,17 +59,6 @@ static void ps2_control_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,ioport__write8 (data,0x02 ); } -static bool ps2_control_a_io_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -ps2_control_io (vcpu, port, data, size, false,NULL ); -return true; -} - -static struct ioport_operations ps2_control_a_ops = { - .io_in = ps2_control_a_io_in, - .io_out = dummy_io_out, -}; -void ioport__map_irq (u8 *irq) { }
@@ -98,75 +70,76 @@ static int ioport__setup_arch(struct kvm *kvm)/* Legacy ioport setup */ /* 0000 - 001F - DMA1 controller */ - r =ioport__register (kvm,0x0000 , &dummy_read_write_ioport_ops,32 ,NULL ); + r =kvm__register_pio (kvm,0x0000 ,32 , dummy_io,NULL );if (r <0 )return r;/* 0x0020 - 0x003F - 8259A PIC 1 */ - r =ioport__register (kvm,0x0020 , &dummy_read_write_ioport_ops,2 ,NULL ); + r =kvm__register_pio (kvm,0x0020 ,2 , dummy_io,NULL );if (r <0 )return r;/* PORT 0040-005F - PIT - PROGRAMMABLE INTERVAL TIMER (8253, 8254) */ - r =ioport__register (kvm,0x0040 , &dummy_read_write_ioport_ops,4 ,NULL ); + r =kvm__register_pio (kvm,0x0040 ,4 , dummy_io,NULL );if (r <0 )return r;/* 0092 - PS/2 system control port A */ - r =ioport__register (kvm,0x0092 , &ps2_control_a_ops,1 ,NULL ); + r =kvm__register_pio (kvm,0x0092 ,1 , ps2_control_io,NULL );if (r <0 )return r;/* 0x00A0 - 0x00AF - 8259A PIC 2 */ - r =ioport__register (kvm,0x00A0 , &dummy_read_write_ioport_ops,2 ,NULL ); + r =kvm__register_pio (kvm,0x00A0 ,2 , dummy_io,NULL );if (r <0 )return r;/* 00C0 - 001F - DMA2 controller */ - r =ioport__register (kvm,0x00C0 , &dummy_read_write_ioport_ops,32 ,NULL ); + r =kvm__register_pio (kvm,0x00c0 ,32 , dummy_io,NULL );if (r <0 )return r;/* PORT 00E0-00EF are 'motherboard specific' so we use them for our internal debugging purposes. */ - r =ioport__register (kvm,IOPORT_DBG , &debug_ops,1 ,NULL ); + r =kvm__register_pio (kvm,IOPORT_DBG ,1 , debug_io,NULL );if (r <0 )return r;/* PORT 00ED - DUMMY PORT FOR DELAY??? */ - r =ioport__register (kvm,0x00ED , &dummy_write_only_ioport_ops,1 ,NULL ); + r =kvm__register_pio (kvm,0x00ed ,1 , dummy_io,NULL );if (r <0 )return r;/* 0x00F0 - 0x00FF - Math co-processor */ - r =ioport__register (kvm,0x00F0 , &dummy_write_only_ioport_ops,2 ,NULL ); + r =kvm__register_pio (kvm,0x00f0 ,2 , dummy_io,NULL ); +if (r <0 )return r;/* PORT 0278-027A - PARALLEL PRINTER PORT (usually LPT1, sometimes LPT2) */ - r =ioport__register (kvm,0x0278 , &dummy_read_write_ioport_ops,3 ,NULL ); + r =kvm__register_pio (kvm,0x0278 ,3 , dummy_io,NULL );if (r <0 )return r;/* PORT 0378-037A - PARALLEL PRINTER PORT (usually LPT2, sometimes LPT3) */ - r =ioport__register (kvm,0x0378 , &dummy_read_write_ioport_ops,3 ,NULL ); + r =kvm__register_pio (kvm,0x0378 ,3 , dummy_io,NULL );if (r <0 )return r;/* PORT 03D4-03D5 - COLOR VIDEO - CRT CONTROL REGISTERS */ - r =ioport__register (kvm,0x03D4 , &dummy_read_write_ioport_ops,1 ,NULL ); + r =kvm__register_pio (kvm,0x03d4 ,1 , dummy_io,NULL );if (r <0 )return r; - r =ioport__register (kvm,0x03D5 , &dummy_write_only_ioport_ops,1 ,NULL ); + r =kvm__register_pio (kvm,0x03d5 ,1 , dummy_io,NULL );if (r <0 )return r; - r =ioport__register (kvm,0x402 , &seabios_debug_ops,1 ,NULL ); + r =kvm__register_pio (kvm,0x0402 ,1 , seabios_debug_io,NULL );if (r <0 )return r;/* 0510 - QEMU BIOS configuration register */ - r =ioport__register (kvm,0x510 , &dummy_read_write_ioport_ops,2 ,NULL ); + r =kvm__register_pio (kvm,0x0510 ,2 , dummy_io,NULL );if (r <0 )return r;
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 10/22 hw/rtc: Refactor trap handlers
In reply to Andre PrzywaraWith the planned retirement of the special ioport emulation code, we need to provide emulation functions compatible with the MMIO prototype.
Merge the two different trap handlers into one function, checking for read/write and data/index register inside.
Adjust the trap handlers to use that new function, and provide shims to implement the old ioport interface, for now.
--- hw/rtc.c | 70 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 35 deletions(-)
hw/rtc.c +35 -35
@@ -42,11 +42,37 @@ static inline unsigned char bin2bcd(unsigned val)return ((val /10 ) <<4 ) + val %10 ; } -static bool cmos_ram_data_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void cmos_ram_io (struct kvm_cpu *vcpu,u64 addr,u8 *data, +u32 len,u8 is_write,void *ptr) {struct tm *tm;time_t ti; +if (is_write) { +if (addr ==0x70 ) {/* index register */ +u8 value =ioport__read8 (data); + + vcpu->kvm->nmi_disabled = value & (1UL <<7 ); + rtc.cmos_idx = value & ~(1UL <<7 ); + +return ; + } + +switch (rtc.cmos_idx) { +case RTC_REG_C : +case RTC_REG_D : +/* Read-only */ +break ; +default : + rtc.cmos_data[rtc.cmos_idx] =ioport__read8 (data); +break ; + } +return ; + } + +if (addr ==0x70 ) +return ; +time (&ti); tm =gmtime (&ti);
@@ -92,42 +118,23 @@ static bool cmos_ram_data_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 poioport__write8 (data, rtc.cmos_data[rtc.cmos_idx]);break ; } - -return true; } -static bool cmos_ram_data_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static bool cmos_ram_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) { -switch (rtc.cmos_idx) { -case RTC_REG_C : -case RTC_REG_D : -/* Read-only */ -break ; -default : - rtc.cmos_data[rtc.cmos_idx] =ioport__read8 (data); -break ; - } - +cmos_ram_io (vcpu, port, data, size, false,NULL );return true; } -static struct ioport_operations cmos_ram_data_ioport_ops = { - .io_out = cmos_ram_data_out, - .io_in = cmos_ram_data_in, -}; - -static bool cmos_ram_index_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static bool cmos_ram_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) { -u8 value =ioport__read8 (data); - - vcpu->kvm->nmi_disabled = value & (1UL <<7 ); - rtc.cmos_idx = value & ~(1UL <<7 ); - +cmos_ram_io (vcpu, port, data, size, true,NULL );return true; } -static struct ioport_operations cmos_ram_index_ioport_ops = { - .io_out = cmos_ram_index_out, +static struct ioport_operations cmos_ram_ioport_ops = { + .io_out = cmos_ram_out, + .io_in = cmos_ram_in, };#ifdef CONFIG_HAS_LIBFDT
@@ -162,21 +169,15 @@ int rtc__init(struct kvm *kvm)return r;/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ - r =ioport__register (kvm,0x0070 , &cmos_ram_index_ioport_ops,1 ,NULL ); + r =ioport__register (kvm,0x0070 , &cmos_ram_ioport_ops,2 ,NULL );if (r <0 ) goto out_device; - r =ioport__register (kvm,0x0071 , &cmos_ram_data_ioport_ops,1 ,NULL ); -if (r <0 ) - goto out_ioport; -/* Set the VRT bit in Register D to indicate valid RAM and time */ rtc.cmos_data[RTC_REG_D ] =RTC_REG_D_VRT ;return r; -out_ioport: -ioport__unregister (kvm,0x0070 ); out_device:device__unregister (&rtc_dev_hdr);
@@ -188,7 +189,6 @@ int rtc__exit(struct kvm *kvm) {/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ ioport__unregister (kvm,0x0070 ); -ioport__unregister (kvm,0x0071 );return 0 ; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 11/22 hw/rtc: Switch to new trap handler
In reply to Andre PrzywaraNow that the RTC device has a trap handler adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine.
This allows us to get rid of the ioport shim routines.
--- hw/rtc.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)
hw/rtc.c +2 -19
@@ -120,23 +120,6 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, } } -static bool cmos_ram_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -cmos_ram_io (vcpu, port, data, size, false,NULL ); -return true; -} - -static bool cmos_ram_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -cmos_ram_io (vcpu, port, data, size, true,NULL ); -return true; -} - -static struct ioport_operations cmos_ram_ioport_ops = { - .io_out = cmos_ram_out, - .io_in = cmos_ram_in, -}; -#ifdef CONFIG_HAS_LIBFDT static void generate_rtc_fdt_node(void *fdt, struct device_header *dev_hdr,
@@ -169,7 +152,7 @@ int rtc__init(struct kvm *kvm)return r;/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ - r =ioport__register (kvm,0x0070 , &cmos_ram_ioport_ops,2 ,NULL ); + r =kvm__register_pio (kvm,0x0070 ,2 , cmos_ram_io,NULL );if (r <0 ) goto out_device;
@@ -188,7 +171,7 @@ dev_init(rtc__init);int rtc__exit (struct kvm *kvm) {/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ -ioport__unregister (kvm,0x0070 ); +kvm__deregister_pio (kvm,0x0070 );return 0 ; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 12/22 hw/vesa: Switch trap handling to use MMIO handler
In reply to Andre PrzywaraTo be able to use the VESA device with the new generic I/O trap handler, we need to use the different MMIO handler callback routine.
Replace the existing dummy in and out handlers with a joint dummy MMIO handler, and register this using the new registration function.
--- hw/vesa.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
hw/vesa.c +5 -14
@@ -43,21 +43,11 @@ static struct framebuffer vesafb = { .mem_size = VESA_MEM_SIZE, }; -static bool vesa_pci_io_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void vesa_pci_io (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) { -return true; } -static bool vesa_pci_io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -return true; -} - -static struct ioport_operations vesa_io_ops = { - .io_in = vesa_pci_io_in, - .io_out = vesa_pci_io_out, -}; -static int vesa__bar_activate (struct kvm *kvm,struct pci_device_header *pci_hdr,int bar_num,void *data) {
@@ -82,7 +72,8 @@ struct framebuffer *vesa__init(struct kvm *kvm)BUILD_BUG_ON (VESA_MEM_SIZE <VESA_BPP /8 *VESA_WIDTH *VESA_HEIGHT ); vesa_base_addr =pci_get_io_port_block (PCI_IO_SIZE ); - r =ioport__register (kvm, vesa_base_addr, &vesa_io_ops,PCI_IO_SIZE ,NULL ); + r =kvm__register_pio (kvm, vesa_base_addr,PCI_IO_SIZE , vesa_pci_io, +NULL );if (r <0 ) goto out_error;
@@ -116,7 +107,7 @@ unmap_dev: unregister_device:device__unregister (&vesa_device); unregister_ioport: -ioport__unregister (kvm, vesa_base_addr); +kvm__deregister_pio (kvm, vesa_base_addr); out_error:return ERR_PTR (r); }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 13/22 hw/serial: Refactor trap handler
In reply to Andre PrzywaraWith the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype.
Adjust the trap handler to use that new function, and provide shims to implement the old ioport interface, for now.
--- hw/serial.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-)
hw/serial.c +37 -13
@@ -242,18 +242,14 @@ void serial8250__inject_sysrq(struct kvm *kvm, char sysrq) sysrq_pending = sysrq; } -static bool serial8250_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port, -void *data,int size) +static bool serial8250_out (struct serial8250_device *dev,struct kvm_cpu *vcpu, +u16 offset,void *data) { -struct serial8250_device *dev = ioport->priv; -u16 offset;bool ret = true;char *addr = data;mutex_lock (&dev->mutex); - offset = port - dev->iobase; -switch (offset) {case UART_TX :if (dev->lcr &UART_LCR_DLAB ) {
@@ -336,16 +332,13 @@ static void serial8250_rx(struct serial8250_device *dev, void *data) } } -static bool serial8250_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static bool serial8250_in (struct serial8250_device *dev,struct kvm_cpu *vcpu, +u16 offset,void *data) { -struct serial8250_device *dev = ioport->priv; -u16 offset;bool ret = true;mutex_lock (&dev->mutex); - offset = port - dev->iobase; -switch (offset) {case UART_RX :if (dev->lcr &UART_LCR_DLAB )
@@ -389,6 +382,37 @@ static bool serial8250_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port,return ret; } +static void serial8250_mmio (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) +{ +struct serial8250_device *dev = ptr; + +if (is_write) +serial8250_out (dev, vcpu, addr - dev->iobase, data); +else +serial8250_in (dev, vcpu, addr - dev->iobase, data); +} + +static bool serial8250_ioport_out (struct ioport *ioport,struct kvm_cpu *vcpu, +u16 port,void *data,int size) +{ +struct serial8250_device *dev = ioport->priv; + +serial8250_mmio (vcpu, port, data,1 , true, dev); + +return true; +} + +static bool serial8250_ioport_in (struct ioport *ioport,struct kvm_cpu *vcpu, +u16 port,void *data,int size) +{ +struct serial8250_device *dev = ioport->priv; + +serial8250_mmio (vcpu, port, data,1 , false, dev); + +return true; +} +#ifdef CONFIG_HAS_LIBFDT char *fdt_stdout_path =NULL ;
@@ -427,8 +451,8 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr,#endif static struct ioport_operations serial8250_ops = { - .io_in = serial8250_in, - .io_out = serial8250_out, + .io_in = serial8250_ioport_in, + .io_out = serial8250_ioport_out, }; static int serial8250__device_init(struct kvm *kvm,
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH kvmtool v3 13/22] hw/serial: Refactor trap handler
Hi Andre,
Quoted 5 lines · Andre Przywara
With the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype.
Adjust the trap handler to use that new function, and provide shims to implement the old ioport interface, for now.
The diff looks nice and tidy. I checked that the changes are functionally identical, also did a quick kvm-unit-tests run and booted an arm64 kernel:
Thanks,
Alex
Quoted 89 lines
Signed-off-by Andre Przywara <[email protected]>--- hw/serial.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-)hw/serial.c +35
-11@@ -242,18 +242,14 @@ void serial8250__inject_sysrq(struct kvm *kvm, char sysrq) sysrq_pending = sysrq; } -static bool serial8250_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port, -void *data,int size) +static bool serial8250_out (struct serial8250_device *dev,struct kvm_cpu *vcpu, +u16 offset,void *data) { -struct serial8250_device *dev = ioport->priv; -u16 offset;bool ret = true;char *addr = data;mutex_lock (&dev->mutex); - offset = port - dev->iobase; -switch (offset) {case UART_TX :if (dev->lcr &UART_LCR_DLAB ) {@@ -336,16 +332,13 @@ static void serial8250_rx(struct serial8250_device *dev, void *data) } } -static bool serial8250_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static bool serial8250_in (struct serial8250_device *dev,struct kvm_cpu *vcpu, +u16 offset,void *data) { -struct serial8250_device *dev = ioport->priv; -u16 offset;bool ret = true;mutex_lock (&dev->mutex); - offset = port - dev->iobase; -switch (offset) {case UART_RX :if (dev->lcr &UART_LCR_DLAB )@@ -389,6 +382,37 @@ static bool serial8250_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port,return ret; } +static void serial8250_mmio (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) +{ +struct serial8250_device *dev = ptr; + +if (is_write) +serial8250_out (dev, vcpu, addr - dev->iobase, data); +else +serial8250_in (dev, vcpu, addr - dev->iobase, data); +} + +static bool serial8250_ioport_out (struct ioport *ioport,struct kvm_cpu *vcpu, +u16 port,void *data,int size) +{ +struct serial8250_device *dev = ioport->priv; + +serial8250_mmio (vcpu, port, data,1 , true, dev); + +return true; +} + +static bool serial8250_ioport_in (struct ioport *ioport,struct kvm_cpu *vcpu, +u16 port,void *data,int size) +{ +struct serial8250_device *dev = ioport->priv; + +serial8250_mmio (vcpu, port, data,1 , false, dev); + +return true; +} +#ifdef CONFIG_HAS_LIBFDT char *fdt_stdout_path =NULL ;
hw/serial.c void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, · line 458
Quoted 10 lines
hw/serial.c +2
-2@@ -427,8 +451,8 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr,#endif static struct ioport_operations serial8250_ops = { - .io_in = serial8250_in, - .io_out = serial8250_out, + .io_in = serial8250_ioport_in, + .io_out = serial8250_ioport_out, }; static int serial8250__device_init(struct kvm *kvm,
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 14/22 hw/serial: Switch to new trap handlers
In reply to Andre PrzywaraNow that the serial device has a trap handler adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine.
This allows us to get rid of the ioport shim routines.
--- hw/serial.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)
hw/serial.c +3 -28
@@ -393,26 +393,6 @@ static void serial8250_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,serial8250_in (dev, vcpu, addr - dev->iobase, data); } -static bool serial8250_ioport_out (struct ioport *ioport,struct kvm_cpu *vcpu, -u16 port,void *data,int size) -{ -struct serial8250_device *dev = ioport->priv; - -serial8250_mmio (vcpu, port, data,1 , true, dev); - -return true; -} - -static bool serial8250_ioport_in (struct ioport *ioport,struct kvm_cpu *vcpu, -u16 port,void *data,int size) -{ -struct serial8250_device *dev = ioport->priv; - -serial8250_mmio (vcpu, port, data,1 , false, dev); - -return true; -} -#ifdef CONFIG_HAS_LIBFDT char *fdt_stdout_path =NULL ;
@@ -450,11 +430,6 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, }#endif -static struct ioport_operations serial8250_ops = { - .io_in = serial8250_ioport_in, - .io_out = serial8250_ioport_out, -}; -static int serial8250__device_init (struct kvm *kvm,struct serial8250_device *dev) {
@@ -465,7 +440,7 @@ static int serial8250__device_init(struct kvm *kvm,return r;ioport__map_irq (&dev->irq); - r =ioport__register (kvm, dev->iobase, &serial8250_ops,8 , dev); + r =kvm__register_pio (kvm, dev->iobase,8 , serial8250_mmio, dev);return r; }
@@ -488,7 +463,7 @@ cleanup:for (j =0 ; j <= i; j++) {struct serial8250_device *dev = &devices[j]; -ioport__unregister (kvm, dev->iobase); +kvm__deregister_pio (kvm, dev->iobase);device__unregister (&dev->dev_hdr); }
@@ -504,7 +479,7 @@ int serial8250__exit(struct kvm *kvm)for (i =0 ; i <ARRAY_SIZE (devices); i++) {struct serial8250_device *dev = &devices[i]; - r =ioport__unregister (kvm, dev->iobase); + r =kvm__deregister_pio (kvm, dev->iobase);if (r <0 )return r;device__unregister (&dev->dev_hdr);
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 15/22 vfio: Refactor ioport trap handler
In reply to Andre PrzywaraWith the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype.
Adjust the I/O port trap handler to use that new function, and provide shims to implement the old ioport interface, for now.
--- vfio/core.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-)
vfio/core.c +36 -15
@@ -81,15 +81,12 @@ out_free_buf:return ret; } -static bool vfio_ioport_in (struct ioport *ioport,struct kvm_cpu *vcpu, -u16 port,void *data,int len) +static bool _vfio_ioport_in (struct vfio_region *region,u32 offset, +void *data,int len) { -u32 val; -ssize_t nr; -struct vfio_region *region = ioport->priv;struct vfio_device *vdev = region->vdev; - -u32 offset = port - region->port_base; +ssize_t nr; +u32 val;if (!(region->info.flags &VFIO_REGION_INFO_FLAG_READ ))return false;
@@ -97,7 +94,7 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, nr =pread (vdev->fd, &val, len, region->info.offset + offset);if (nr != len) {vfio_dev_err (vdev,"could not read %d bytes from I/O port 0x%x\n" , - len, port); + len, offset + region->port_base);return false; }
@@ -118,15 +115,13 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu,return true; } -static bool vfio_ioport_out (struct ioport *ioport,struct kvm_cpu *vcpu, -u16 port,void *data,int len) +static bool _vfio_ioport_out (struct vfio_region *region,u32 offset, +void *data,int len) { -u32 val; -ssize_t nr; -struct vfio_region *region = ioport->priv;struct vfio_device *vdev = region->vdev; +ssize_t nr; +u32 val; -u32 offset = port - region->port_base;if (!(region->info.flags &VFIO_REGION_INFO_FLAG_WRITE ))return false;
@@ -148,11 +143,37 @@ static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, nr =pwrite (vdev->fd, &val, len, region->info.offset + offset);if (nr != len)vfio_dev_err (vdev,"could not write %d bytes to I/O port 0x%x" , - len, port); + len, offset + region->port_base);return nr == len; } +static void vfio_ioport_mmio (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len, +u8 is_write,void *ptr) +{ +struct vfio_region *region = ptr; +u32 offset = addr - region->port_base; + +if (is_write) +_vfio_ioport_out (region, offset, data, len); +else +_vfio_ioport_in (region, offset, data, len); +} + +static bool vfio_ioport_out (struct ioport *ioport,struct kvm_cpu *vcpu, +u16 port,void *data,int len) +{ +vfio_ioport_mmio (vcpu, port, data, len, true, ioport->priv); +return true; +} + +static bool vfio_ioport_in (struct ioport *ioport,struct kvm_cpu *vcpu, +u16 port,void *data,int len) +{ +vfio_ioport_mmio (vcpu, port, data, len, false, ioport->priv); +return true; +} +static struct ioport_operations vfio_ioport_ops = { .io_in = vfio_ioport_in, .io_out = vfio_ioport_out,
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 16/22 vfio: Switch to new ioport trap handlers
In reply to Andre PrzywaraNow that the vfio device has a trap handler adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine.
This allows us to get rid of the ioport shim routines.
--- vfio/core.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-)
vfio/core.c +10 -27
@@ -81,7 +81,7 @@ out_free_buf:return ret; } -static bool _vfio_ioport_in (struct vfio_region *region,u32 offset, +static bool vfio_ioport_in (struct vfio_region *region,u32 offset,void *data,int len) {struct vfio_device *vdev = region->vdev;
@@ -115,7 +115,7 @@ static bool _vfio_ioport_in(struct vfio_region *region, u32 offset,return true; } -static bool _vfio_ioport_out (struct vfio_region *region,u32 offset, +static bool vfio_ioport_out (struct vfio_region *region,u32 offset,void *data,int len) {struct vfio_device *vdev = region->vdev;
@@ -155,30 +155,11 @@ static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,u32 offset = addr - region->port_base;if (is_write) -_vfio_ioport_out (region, offset, data, len); +vfio_ioport_out (region, offset, data, len);else -_vfio_ioport_in (region, offset, data, len); +vfio_ioport_in (region, offset, data, len); } -static bool vfio_ioport_out (struct ioport *ioport,struct kvm_cpu *vcpu, -u16 port,void *data,int len) -{ -vfio_ioport_mmio (vcpu, port, data, len, true, ioport->priv); -return true; -} - -static bool vfio_ioport_in (struct ioport *ioport,struct kvm_cpu *vcpu, -u16 port,void *data,int len) -{ -vfio_ioport_mmio (vcpu, port, data, len, false, ioport->priv); -return true; -} - -static struct ioport_operations vfio_ioport_ops = { - .io_in = vfio_ioport_in, - .io_out = vfio_ioport_out, -}; -static void vfio_mmio_access (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len,u8 is_write,void *ptr) {
@@ -223,9 +204,11 @@ static int vfio_setup_trap_region(struct kvm *kvm, struct vfio_device *vdev, struct vfio_region *region) {if (region->is_ioport) { -int port =ioport__register (kvm, region->port_base, - &vfio_ioport_ops, region->info.size, - region); +int port; + + port =kvm__register_pio (kvm, region->port_base, + region->info.size, vfio_ioport_mmio, + region);if (port <0 )return port;return 0 ;
@@ -292,7 +275,7 @@ void vfio_unmap_region(struct kvm *kvm, struct vfio_region *region)munmap (region->host_addr, region->info.size); region->host_addr =NULL ; }else if (region->is_ioport) { -ioport__unregister (kvm, region->port_base); +kvm__deregister_pio (kvm, region->port_base); }else {kvm__deregister_mmio (kvm, region->guest_phys_addr); }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 17/22 virtio: Switch trap handling to use MMIO handler
In reply to Andre PrzywaraWith the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype.
Adjust the existing MMIO callback routine to automatically determine the region this trap came through, and call the existing I/O handlers. Register the ioport region using the new registration function.
--- virtio/pci.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-)
virtio/pci.c +14 -32
@@ -178,15 +178,6 @@ static bool virtio_pci__data_in(struct kvm_cpu *vcpu, struct virtio_device *vdevreturn ret; } -static bool virtio_pci__io_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -struct virtio_device *vdev = ioport->priv; -struct virtio_pci *vpci = vdev->virtio; -unsigned long offset = port -virtio_pci__port_addr (vpci); - -return virtio_pci__data_in (vcpu, vdev, offset, data, size); -} -static void update_msix_map (struct virtio_pci *vpci,struct msix_table *msix_entry,u32 vecnum) {
@@ -334,20 +325,6 @@ static bool virtio_pci__data_out(struct kvm_cpu *vcpu, struct virtio_device *vdereturn ret; } -static bool virtio_pci__io_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -struct virtio_device *vdev = ioport->priv; -struct virtio_pci *vpci = vdev->virtio; -unsigned long offset = port -virtio_pci__port_addr (vpci); - -return virtio_pci__data_out (vcpu, vdev, offset, data, size); -} - -static struct ioport_operations virtio_pci__io_ops = { - .io_in = virtio_pci__io_in, - .io_out = virtio_pci__io_out, -}; -static void virtio_pci__msix_mmio_callback (struct kvm_cpu *vcpu,u64 addr,u8 *data,u32 len,u8 is_write,void *ptr)
@@ -455,12 +432,19 @@ static void virtio_pci__io_mmio_callback(struct kvm_cpu *vcpu, {struct virtio_device *vdev = ptr;struct virtio_pci *vpci = vdev->virtio; -u32 mmio_addr =virtio_pci__mmio_addr (vpci); +u32 ioport_addr =virtio_pci__port_addr (vpci); +u32 base_addr; + +if (addr >= ioport_addr && + addr < ioport_addr +pci__bar_size (&vpci->pci_hdr,0 )) + base_addr = ioport_addr; +else + base_addr =virtio_pci__mmio_addr (vpci);if (!is_write) -virtio_pci__data_in (vcpu, vdev, addr - mmio_addr, data, len); +virtio_pci__data_in (vcpu, vdev, addr - base_addr, data, len);else -virtio_pci__data_out (vcpu, vdev, addr - mmio_addr, data, len); +virtio_pci__data_out (vcpu, vdev, addr - base_addr, data, len); } static int virtio_pci__bar_activate(struct kvm *kvm,
@@ -478,10 +462,8 @@ static int virtio_pci__bar_activate(struct kvm *kvm,switch (bar_num) {case 0 : - r =ioport__register (kvm, bar_addr, &virtio_pci__io_ops, - bar_size, vdev); -if (r >0 ) - r =0 ; + r =kvm__register_pio (kvm, bar_addr, bar_size, + virtio_pci__io_mmio_callback, vdev);break ;case 1 : r = kvm__register_mmio(kvm, bar_addr, bar_size, false,
@@ -510,7 +492,7 @@ static int virtio_pci__bar_deactivate(struct kvm *kvm,switch (bar_num) {case 0 : - r =ioport__unregister (kvm, bar_addr); + r =kvm__deregister_pio (kvm, bar_addr);break ;case 1 :case 2 :
@@ -625,7 +607,7 @@ int virtio_pci__exit(struct kvm *kvm, struct virtio_device *vdev)virtio_pci__reset (kvm, vdev);kvm__deregister_mmio (kvm,virtio_pci__mmio_addr (vpci));kvm__deregister_mmio (kvm,virtio_pci__msix_io_addr (vpci)); -ioport__unregister (kvm,virtio_pci__port_addr (vpci)); +kvm__deregister_pio (kvm,virtio_pci__port_addr (vpci));return 0 ; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 18/22 pci: Switch trap handling to use MMIO handler
In reply to Andre PrzywaraWith the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype.
Merge the existing _in and _out handlers to adhere to that MMIO interface, and register these using the new registration function.
--- pci.c | 82 +++++++++++++++++------------------------------------------ 1 file changed, 24 insertions(+), 58 deletions(-)
pci.c +24 -58
@@ -87,29 +87,16 @@ static void *pci_config_address_ptr(u16 port)return base + offset; } -static bool pci_config_address_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void pci_config_address_mmio (struct kvm_cpu *vcpu,u64 addr,u8 *data, +u32 len,u8 is_write,void *ptr) { -void *p =pci_config_address_ptr (port); +void *p =pci_config_address_ptr (addr); -memcpy (p, data, size); - -return true; -} - -static bool pci_config_address_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -void *p =pci_config_address_ptr (port); - -memcpy (data, p, size); - -return true; +if (is_write) +memcpy (p, data, len); +else +memcpy (data, p, len); } - -static struct ioport_operations pci_config_address_ops = { - .io_in = pci_config_address_in, - .io_out = pci_config_address_out, -}; -static bool pci_device_exists (u8 bus_number,u8 device_number,u8 function_number) {union pci_config_address pci_config_address;
@@ -125,49 +112,27 @@ static bool pci_device_exists(u8 bus_number, u8 device_number, u8 function_numbereturn !IS_ERR_OR_NULL (device__find_dev (DEVICE_BUS_PCI , device_number)); } -static bool pci_config_data_out (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) -{ -union pci_config_address pci_config_address; - -if (size >4 ) - size =4 ; - - pci_config_address.w =ioport__read32 (&pci_config_address_bits); -/* -* If someone accesses PCI configuration space offsets that are not -* aligned to 4 bytes, it uses ioports to signify that. -*/ - pci_config_address.reg_offset = port -PCI_CONFIG_DATA ; - -pci__config_wr (vcpu->kvm, pci_config_address, data, size); - -return true; -} - -static bool pci_config_data_in (struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size) +static void pci_config_data_mmio (struct kvm_cpu *vcpu,u64 addr,u8 *data, +u32 len,u8 is_write,void *kvm) {union pci_config_address pci_config_address; -if (size >4 ) - size =4 ; +if (len >4 ) + len =4 ; pci_config_address.w =ioport__read32 (&pci_config_address_bits);/* * If someone accesses PCI configuration space offsets that are not * aligned to 4 bytes, it uses ioports to signify that. */ - pci_config_address.reg_offset = port -PCI_CONFIG_DATA ; + pci_config_address.reg_offset = addr -PCI_CONFIG_DATA ; -pci__config_rd (vcpu->kvm, pci_config_address, data, size); - -return true; +if (is_write) +pci__config_wr (vcpu->kvm, pci_config_address, data, len); +else +pci__config_rd (vcpu->kvm, pci_config_address, data, len); } -static struct ioport_operations pci_config_data_ops = { - .io_in = pci_config_data_in, - .io_out = pci_config_data_out, -}; -static int pci_activate_bar (struct kvm *kvm,struct pci_device_header *pci_hdr,int bar_num) {
@@ -512,11 +477,12 @@ int pci__init(struct kvm *kvm) {int r; - r =ioport__register (kvm,PCI_CONFIG_DATA +0 , &pci_config_data_ops,4 ,NULL ); + r =kvm__register_pio (kvm,PCI_CONFIG_DATA ,4 , + pci_config_data_mmio,NULL );if (r <0 )return r; - - r =ioport__register (kvm,PCI_CONFIG_ADDRESS +0 , &pci_config_address_ops,4 ,NULL ); + r =kvm__register_pio (kvm,PCI_CONFIG_ADDRESS ,4 , + pci_config_address_mmio,NULL );if (r <0 ) goto err_unregister_data;
@@ -528,17 +494,17 @@ int pci__init(struct kvm *kvm)return 0 ; err_unregister_addr: -ioport__unregister (kvm,PCI_CONFIG_ADDRESS ); +kvm__deregister_pio (kvm,PCI_CONFIG_ADDRESS ); err_unregister_data: -ioport__unregister (kvm,PCI_CONFIG_DATA ); +kvm__deregister_pio (kvm,PCI_CONFIG_DATA );return r; }dev_base_init (pci__init);int pci__exit (struct kvm *kvm) { -ioport__unregister (kvm,PCI_CONFIG_DATA ); -ioport__unregister (kvm,PCI_CONFIG_ADDRESS ); +kvm__deregister_pio (kvm,PCI_CONFIG_DATA ); +kvm__deregister_pio (kvm,PCI_CONFIG_ADDRESS );return 0 ; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 19/22 Remove ioport specific routines
In reply to Andre PrzywaraNow that all users of the dedicated ioport trap handler interface are gone, we can retire the code associated with it.
This removes ioport.c and ioport.h, along with removing prototypes from other header files.
This also transfers the responsibility for port I/O trap handling entirely into the new routine in mmio.c.
--- Makefile | 1 - include/kvm/ioport.h | 27 ------ include/kvm/kvm.h | 2 - ioport.c | 195 ------------------------------------------- mmio.c | 2 +- 5 files changed, 1 insertion(+), 226 deletions(-) delete mode 100644 ioport.c
Makefile +0 -1
@@ -56,7 +56,6 @@ OBJS += framebuffer.o OBJS += guest_compat.o OBJS += hw/rtc.o OBJS += hw/serial.o -OBJS += ioport.o OBJS += irq.o OBJS += kvm-cpu.o OBJS += kvm.o
include/kvm/ioport.h +0 -27
@@ -1,13 +1,8 @@#ifndef KVM__IOPORT_H #define KVM__IOPORT_H -#include "kvm/devices.h" #include "kvm/kvm-cpu.h" -#include "kvm/rbtree-interval.h" -#include "kvm/fdt.h" -#include <stdbool.h> -#include <limits.h> #include <asm/types.h> #include <linux/types.h> #include <linux/byteorder.h>
@@ -15,30 +10,8 @@/* some ports we reserve for own use */ #define IOPORT_DBG 0xe0 -struct kvm ; - -struct ioport { -struct rb_int_node node; -struct ioport_operations *ops; -void *priv; -struct device_header dev_hdr; -u32 refcount; -bool remove; -}; - -struct ioport_operations { -bool (*io_in)(struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size); -bool (*io_out)(struct ioport *ioport,struct kvm_cpu *vcpu,u16 port,void *data,int size); -}; -void ioport__map_irq (u8 *irq); -int __must_check ioport__register (struct kvm *kvm,u16 port,struct ioport_operations *ops, -int count,void *param); -int ioport__unregister (struct kvm *kvm,u16 port); -int ioport__init (struct kvm *kvm); -int ioport__exit (struct kvm *kvm); -static inline u8 ioport__read8 (u8 *data) {return *data;
include/kvm/kvm.h +0 -2
@@ -126,8 +126,6 @@ void kvm__irq_line(struct kvm *kvm, int irq, int level);void kvm__irq_trigger (struct kvm *kvm,int irq);bool kvm__emulate_io (struct kvm_cpu *vcpu,u16 port,void *data,int direction,int size,u32 count);bool kvm__emulate_mmio (struct kvm_cpu *vcpu,u64 phys_addr,u8 *data,u32 len,u8 is_write); -bool kvm__emulate_pio (struct kvm_cpu *vcpu,u16 port,void *data, -int direction,int size,u32 count);int kvm__destroy_mem (struct kvm *kvm,u64 guest_phys,u64 size,void *userspace_addr);int kvm__register_mem (struct kvm *kvm,u64 guest_phys,u64 size,void *userspace_addr,enum kvm_mem_type type);
ioport.c deleted +0 -195
195 lines not on this page · raw message
mmio.c +1 -1
@@ -212,7 +212,7 @@ out:return true; } -bool kvm__emulate_pio (struct kvm_cpu *vcpu,u16 port,void *data, +bool kvm__emulate_io (struct kvm_cpu *vcpu,u16 port,void *data,int direction,int size,u32 count) {struct mmio_mapping *mmio;
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 20/22 arm: Reorganise and document memory map
In reply to Andre PrzywaraThe hardcoded memory map we expose to a guest is currently described using a series of partially interconnected preprocessor constants, which is hard to read and follow.
In preparation for moving the UART and RTC to some different MMIO region, document the current map with some ASCII art, and clean up the definition of the sections.
This changes the only internally used value of ARM_MMIO_AREA, to better align with its actual meaning and future extensions.
No functional change.
--- arm/include/arm-common/kvm-arch.h | 41 ++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 12 deletions(-)
arm/include/arm-common/kvm-arch.h +29 -12
@@ -7,14 +7,33 @@#include "arm-common/gic.h" +/* +* The memory map used for ARM guests (not to scale): +* +* 0 64K 16M 32M 48M 1GB 2GB +* +-------+----+-------+-------+--------+-----+---------+---...... +* | PCI |////| plat | | | | | +* | I/O |////| MMIO | Flash | virtio | GIC | PCI | DRAM +* | space |////| | | MMIO | | (AXI) | +* | |////| | | | | | +* +-------+----+-------+-------+--------+-----+---------+---...... +*/ +#define ARM_IOPORT_AREA _AC(0x0000000000000000, UL) -#define ARM_FLASH_AREA _AC(0x0000000002000000, UL) -#define ARM_MMIO_AREA _AC(0x0000000003000000, UL) +#define ARM_MMIO_AREA _AC(0x0000000001000000, UL)#define ARM_AXI_AREA _AC(0x0000000040000000, UL)#define ARM_MEMORY_AREA _AC(0x0000000080000000, UL) -#define ARM_LOMAP_MAX_MEMORY ((1ULL << 32) - ARM_MEMORY_AREA) -#define ARM_HIMAP_MAX_MEMORY ((1ULL << 40) - ARM_MEMORY_AREA) +#define KVM_IOPORT_AREA ARM_IOPORT_AREA +#define ARM_IOPORT_SIZE (1U << 16) + + +#define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000) +#define KVM_FLASH_MAX_SIZE 0x1000000 + +#define KVM_VIRTIO_MMIO_AREA (KVM_FLASH_MMIO_BASE + KVM_FLASH_MAX_SIZE) +#define ARM_VIRTIO_MMIO_SIZE (ARM_AXI_AREA - \ + (KVM_VIRTIO_MMIO_AREA + ARM_GIC_SIZE))#define ARM_GIC_DIST_BASE (ARM_AXI_AREA - ARM_GIC_DIST_SIZE)#define ARM_GIC_CPUI_BASE (ARM_GIC_DIST_BASE - ARM_GIC_CPUI_SIZE)
@@ -22,19 +41,17 @@#define ARM_GIC_DIST_SIZE 0x10000#define ARM_GIC_CPUI_SIZE 0x20000 -#define KVM_FLASH_MMIO_BASE ARM_FLASH_AREA -#define KVM_FLASH_MAX_SIZE (ARM_MMIO_AREA - ARM_FLASH_AREA) -#define ARM_IOPORT_SIZE (1U << 16) -#define ARM_VIRTIO_MMIO_SIZE (ARM_AXI_AREA - (ARM_MMIO_AREA + ARM_GIC_SIZE)) +#define KVM_PCI_CFG_AREA ARM_AXI_AREA#define ARM_PCI_CFG_SIZE (1ULL << 24) +#define KVM_PCI_MMIO_AREA (KVM_PCI_CFG_AREA + ARM_PCI_CFG_SIZE)#define ARM_PCI_MMIO_SIZE (ARM_MEMORY_AREA - \ (ARM_AXI_AREA + ARM_PCI_CFG_SIZE)) -#define KVM_IOPORT_AREA ARM_IOPORT_AREA -#define KVM_PCI_CFG_AREA ARM_AXI_AREA -#define KVM_PCI_MMIO_AREA (KVM_PCI_CFG_AREA + ARM_PCI_CFG_SIZE) -#define KVM_VIRTIO_MMIO_AREA ARM_MMIO_AREA + +#define ARM_LOMAP_MAX_MEMORY ((1ULL << 32) - ARM_MEMORY_AREA) +#define ARM_HIMAP_MAX_MEMORY ((1ULL << 40) - ARM_MEMORY_AREA) +#define KVM_IOEVENTFD_HAS_PIO 0
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH kvmtool v3 20/22] arm: Reorganise and document memory map
Hi Andre,
Quoted 4 lines · Andre Przywara
The hardcoded memory map we expose to a guest is currently described using a series of partially interconnected preprocessor constants, which is hard to read and follow.
Quoted 8 lines
In preparation for moving the UART and RTC to some different MMIO region, document the current map with some ASCII art, and clean up the definition of the sections.
This changes the only internally used value of
ARM_MMIO_AREA, to better align with its actual meaning and future extensions.No functional change.
Looks good, the values in the map match the defines, and there's no forward declaration of the serial or RTC MMIO regions:
Thanks,
Alex
Quoted 63 lines
Signed-off-by Andre Przywara <[email protected]>--- arm/include/arm-common/kvm-arch.h | 41 ++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 12 deletions(-)arm/include/arm-common/kvm-arch.h +25
-9@@ -7,14 +7,33 @@#include "arm-common/gic.h" +/* +* The memory map used for ARM guests (not to scale): +* +* 0 64K 16M 32M 48M 1GB 2GB +* +-------+----+-------+-------+--------+-----+---------+---...... +* | PCI |////| plat | | | | | +* | I/O |////| MMIO | Flash | virtio | GIC | PCI | DRAM +* | space |////| | | MMIO | | (AXI) | +* | |////| | | | | | +* +-------+----+-------+-------+--------+-----+---------+---...... +*/ +#define ARM_IOPORT_AREA _AC(0x0000000000000000, UL) -#define ARM_FLASH_AREA _AC(0x0000000002000000, UL) -#define ARM_MMIO_AREA _AC(0x0000000003000000, UL) +#define ARM_MMIO_AREA _AC(0x0000000001000000, UL)#define ARM_AXI_AREA _AC(0x0000000040000000, UL)#define ARM_MEMORY_AREA _AC(0x0000000080000000, UL) -#define ARM_LOMAP_MAX_MEMORY ((1ULL << 32) - ARM_MEMORY_AREA) -#define ARM_HIMAP_MAX_MEMORY ((1ULL << 40) - ARM_MEMORY_AREA) +#define KVM_IOPORT_AREA ARM_IOPORT_AREA +#define ARM_IOPORT_SIZE (1U << 16) + + +#define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000) +#define KVM_FLASH_MAX_SIZE 0x1000000 + +#define KVM_VIRTIO_MMIO_AREA (KVM_FLASH_MMIO_BASE + KVM_FLASH_MAX_SIZE) +#define ARM_VIRTIO_MMIO_SIZE (ARM_AXI_AREA - \ + (KVM_VIRTIO_MMIO_AREA + ARM_GIC_SIZE))#define ARM_GIC_DIST_BASE (ARM_AXI_AREA - ARM_GIC_DIST_SIZE)#define ARM_GIC_CPUI_BASE (ARM_GIC_DIST_BASE - ARM_GIC_CPUI_SIZE)@@ -22,19 +41,17 @@#define ARM_GIC_DIST_SIZE 0x10000#define ARM_GIC_CPUI_SIZE 0x20000 -#define KVM_FLASH_MMIO_BASE ARM_FLASH_AREA -#define KVM_FLASH_MAX_SIZE (ARM_MMIO_AREA - ARM_FLASH_AREA) -#define ARM_IOPORT_SIZE (1U << 16) -#define ARM_VIRTIO_MMIO_SIZE (ARM_AXI_AREA - (ARM_MMIO_AREA + ARM_GIC_SIZE)) +#define KVM_PCI_CFG_AREA ARM_AXI_AREA#define ARM_PCI_CFG_SIZE (1ULL << 24) +#define KVM_PCI_MMIO_AREA (KVM_PCI_CFG_AREA + ARM_PCI_CFG_SIZE)#define ARM_PCI_MMIO_SIZE (ARM_MEMORY_AREA - \ (ARM_AXI_AREA + ARM_PCI_CFG_SIZE)) -#define KVM_IOPORT_AREA ARM_IOPORT_AREA
arm/include/arm-common/kvm-arch.h line 57
Quoted 10 lines
arm/include/arm-common/kvm-arch.h +4
-3-#define KVM_PCI_CFG_AREA ARM_AXI_AREA -#define KVM_PCI_MMIO_AREA (KVM_PCI_CFG_AREA + ARM_PCI_CFG_SIZE) -#define KVM_VIRTIO_MMIO_AREA ARM_MMIO_AREA + +#define ARM_LOMAP_MAX_MEMORY ((1ULL << 32) - ARM_MEMORY_AREA) +#define ARM_HIMAP_MAX_MEMORY ((1ULL << 40) - ARM_MEMORY_AREA) +#define KVM_IOEVENTFD_HAS_PIO 0
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 21/22 hw/serial: ARM/arm64: Use MMIO at higher addresses
In reply to Andre PrzywaraUsing the UART devices at their legacy I/O addresses as set by IBM in 1981 was a kludge we used for simplicity on ARM platforms as well. However this imposes problems due to their missing alignment and overlap with the PCI I/O address space.
Now that we can switch a device easily between using ioports and MMIO, let's move the UARTs out of the first 4K of memory on ARM platforms.
That should be transparent for well behaved guests, since the change is naturally reflected in the device tree. Even "earlycon" keeps working, as the stdout-path property is adjusted automatically.
People providing direct earlycon parameters via the command line need to adjust it to: "earlycon=uart,mmio,0x1000000".
--- arm/include/arm-common/kvm-arch.h | 7 ++-- hw/serial.c | 54 +++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 19 deletions(-)
arm/include/arm-common/kvm-arch.h +5 -2
@@ -13,8 +13,8 @@* 0 64K 16M 32M 48M 1GB 2GB * +-------+----+-------+-------+--------+-----+---------+---...... * | PCI |////| plat | | | | | -* | I/O |////| MMIO | Flash | virtio | GIC | PCI | DRAM -* | space |////| | | MMIO | | (AXI) | +* | I/O |////| MMIO: | Flash | virtio | GIC | PCI | DRAM +* | space |////| UART | | MMIO | | (AXI) | * | |////| | | | | | * +-------+----+-------+-------+--------+-----+---------+---...... */
@@ -28,6 +28,9 @@#define ARM_IOPORT_SIZE (1U << 16) +#define ARM_UART_MMIO_BASE ARM_MMIO_AREA +#define ARM_UART_MMIO_SIZE 0x10000 +#define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000)#define KVM_FLASH_MAX_SIZE 0x1000000
hw/serial.c +37 -17
134 lines not on this page · raw message
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH kvmtool v3 21/22] hw/serial: ARM/arm64: Use MMIO at higher addresses
Hi Andre,
Quoted 8 lines · Andre Przywara
Using the UART devices at their legacy I/O addresses as set by IBM in 1981 was a kludge we used for simplicity on ARM platforms as well. However this imposes problems due to their missing alignment and overlap with the PCI I/O address space.
Now that we can switch a device easily between using ioports and MMIO, let's move the UARTs out of the first 4K of memory on ARM platforms.
Quoted 6 lines
That should be transparent for well behaved guests, since the change is naturally reflected in the device tree. Even "earlycon" keeps working, as the stdout-path property is adjusted automatically.
People providing direct earlycon parameters via the command line need to adjust it to: "earlycon=uart,mmio,0x1000000".
Checked and that's indeed the address of the first UART.
Quoted 168 lines
Signed-off-by Andre Przywara <[email protected]>--- arm/include/arm-common/kvm-arch.h | 7 ++-- hw/serial.c | 54 +++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 19 deletions(-)arm/include/arm-common/kvm-arch.h +5
-2@@ -13,8 +13,8 @@* 0 64K 16M 32M 48M 1GB 2GB * +-------+----+-------+-------+--------+-----+---------+---...... * | PCI |////| plat | | | | | -* | I/O |////| MMIO | Flash | virtio | GIC | PCI | DRAM -* | space |////| | | MMIO | | (AXI) | +* | I/O |////| MMIO: | Flash | virtio | GIC | PCI | DRAM +* | space |////| UART | | MMIO | | (AXI) | * | |////| | | | | | * +-------+----+-------+-------+--------+-----+---------+---...... */ @@ -28,6 +28,9 @@#define ARM_IOPORT_SIZE (1U << 16) +#define ARM_UART_MMIO_BASE ARM_MMIO_AREA +#define ARM_UART_MMIO_SIZE 0x10000 +#define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000)#define KVM_FLASH_MAX_SIZE 0x1000000hw/serial.c +35
-16@@ -13,6 +13,24 @@#include <pthread.h> +#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 ) +#define serial_iobase (nr) (ARM_UART_MMIO_BASE + (nr) * 0x1000) +#define serial_irq (nr) (32 + (nr)) +#define SERIAL8250_BUS_TYPE DEVICE_BUS_MMIO +#else +#define serial_iobase_0 (KVM_IOPORT_AREA + 0x3f8) +#define serial_iobase_1 (KVM_IOPORT_AREA + 0x2f8) +#define serial_iobase_2 (KVM_IOPORT_AREA + 0x3e8) +#define serial_iobase_3 (KVM_IOPORT_AREA + 0x2e8) +#define serial_irq_0 4 +#define serial_irq_1 3 +#define serial_irq_2 4 +#define serial_irq_3 3 +#define serial_iobase (nr) serial_iobase_##nr +#define serial_irq (nr) serial_irq_##nr +#define SERIAL8250_BUS_TYPE DEVICE_BUS_IOPORT +#endif +/* * This fakes a U6_16550A. The fifo len needs to be 64 as the kernel * expects that for autodetection. @@ -27,7 +45,7 @@ struct serial8250_device {struct mutex mutex;u8 id; -u16 iobase; +u32 iobase;u8 irq;u8 irq_state;int txcnt;@@ -65,56 +83,56 @@ static struct serial8250_device devices[] = { /* ttyS0 */ [0] = { .dev_hdr = { - .bus_type = DEVICE_BUS_IOPORT, + .bus_type = SERIAL8250_BUS_TYPE, .data = serial8250_generate_fdt_node, }, .mutex = MUTEX_INITIALIZER, .id = 0, - .iobase = 0x3f8, - .irq = 4, + .iobase = serial_iobase(0), + .irq = serial_irq(0), SERIAL_REGS_SETTING },/* ttyS1 */ [1] = { .dev_hdr = { - .bus_type = DEVICE_BUS_IOPORT, + .bus_type = SERIAL8250_BUS_TYPE, .data = serial8250_generate_fdt_node, }, .mutex = MUTEX_INITIALIZER, .id = 1, - .iobase = 0x2f8, - .irq = 3, + .iobase = serial_iobase(1), + .irq = serial_irq(1), SERIAL_REGS_SETTING },/* ttyS2 */ [2] = { .dev_hdr = { - .bus_type = DEVICE_BUS_IOPORT, + .bus_type = SERIAL8250_BUS_TYPE, .data = serial8250_generate_fdt_node, }, .mutex = MUTEX_INITIALIZER, .id = 2, - .iobase = 0x3e8, - .irq = 4, + .iobase = serial_iobase(2), + .irq = serial_irq(2), SERIAL_REGS_SETTING },/* ttyS3 */ [3] = { .dev_hdr = { - .bus_type = DEVICE_BUS_IOPORT, + .bus_type = SERIAL8250_BUS_TYPE, .data = serial8250_generate_fdt_node, }, .mutex = MUTEX_INITIALIZER, .id = 3, - .iobase = 0x2e8, - .irq = 3, + .iobase = serial_iobase(3), + .irq = serial_irq(3), SERIAL_REGS_SETTING },@@ -407,7 +425,7 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, struct serial8250_device, dev_hdr); -u64 addr =KVM_IOPORT_AREA + dev->iobase; +u64 addr = dev->iobase;u64 reg_prop[] = {cpu_to_fdt64 (addr),cpu_to_fdt64 (8 ),@@ -440,7 +458,8 @@ static int serial8250__device_init(struct kvm *kvm,return r;ioport__map_irq (&dev->irq); - r =kvm__register_pio (kvm, dev->iobase,8 , serial8250_mmio, dev); + r =kvm__register_iotrap (kvm, dev->iobase,8 , serial8250_mmio, dev, +SERIAL8250_BUS_TYPE );return r; }@@ -463,7 +482,7 @@ cleanup:for (j =0 ; j <= i; j++) {struct serial8250_device *dev = &devices[j]; -kvm__deregister_pio (kvm, dev->iobase); +kvm__deregister_iotrap (kvm, dev->iobase,SERIAL8250_BUS_TYPE );device__unregister (&dev->dev_hdr); }
hw/serial.c int serial8250__exit(struct kvm *kvm) · line 505
Quoted 9 lines
hw/serial.c +2
-1@@ -479,7 +498,8 @@ int serial8250__exit(struct kvm *kvm)for (i =0 ; i <ARRAY_SIZE (devices); i++) {struct serial8250_device *dev = &devices[i]; - r =kvm__deregister_pio (kvm, dev->iobase); + r =kvm__deregister_iotrap (kvm, dev->iobase, +SERIAL8250_BUS_TYPE );if (r <0 )return r;device__unregister (&dev->dev_hdr);
Looks good to me:
Thanks,
Alex
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 22/22 hw/rtc: ARM/arm64: Use MMIO at higher addresses
In reply to Andre PrzywaraUsing the RTC device at its legacy I/O address as set by IBM in 1981 was a kludge we used for simplicity on ARM platforms as well. However this imposes problems due to their missing alignment and overlap with the PCI I/O address space.
Now that we can switch a device easily between using ioports and MMIO, let's move the RTC out of the first 4K of memory on ARM platforms.
That should be transparent for well behaved guests, since the change is naturally reflected in the device tree.
--- arm/include/arm-common/kvm-arch.h | 7 +++++-- hw/rtc.c | 24 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-)
arm/include/arm-common/kvm-arch.h +5 -2
@@ -14,8 +14,8 @@* +-------+----+-------+-------+--------+-----+---------+---...... * | PCI |////| plat | | | | | * | I/O |////| MMIO: | Flash | virtio | GIC | PCI | DRAM -* | space |////| UART | | MMIO | | (AXI) | -* | |////| | | | | | +* | space |////| UART, | | MMIO | | (AXI) | +* | |////| RTC | | | | | * +-------+----+-------+-------+--------+-----+---------+---...... */
@@ -31,6 +31,9 @@#define ARM_UART_MMIO_BASE ARM_MMIO_AREA#define ARM_UART_MMIO_SIZE 0x10000 +#define ARM_RTC_MMIO_BASE (ARM_UART_MMIO_BASE + ARM_UART_MMIO_SIZE) +#define ARM_RTC_MMIO_SIZE 0x10000 +#define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000)#define KVM_FLASH_MAX_SIZE 0x1000000
hw/rtc.c +16 -8
@@ -5,6 +5,15 @@#include <time.h> +#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 ) +#define RTC_BUS_TYPE DEVICE_BUS_MMIO +#define RTC_BASE_ADDRESS ARM_RTC_MMIO_BASE +#else +/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ +#define RTC_BUS_TYPE DEVICE_BUS_IOPORT +#define RTC_BASE_ADDRESS 0x70 +#endif +/* * MC146818 RTC registers */
@@ -49,7 +58,7 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data,time_t ti;if (is_write) { -if (addr ==0x70 ) {/* index register */ +if (addr ==RTC_BASE_ADDRESS ) {/* index register */ u8 value =ioport__read8 (data); vcpu->kvm->nmi_disabled = value & (1UL <<7 );
@@ -70,7 +79,7 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data,return ; } -if (addr ==0x70 ) +if (addr ==RTC_BASE_ADDRESS )/* index register is write-only */ return ;time (&ti);
@@ -127,7 +136,7 @@ static void generate_rtc_fdt_node(void *fdt, u8 irq, enum irq_type)) { -u64 reg_prop[2 ] = {cpu_to_fdt64 (0x70 ),cpu_to_fdt64 (2 ) }; +u64 reg_prop[2 ] = {cpu_to_fdt64 (RTC_BASE_ADDRESS ),cpu_to_fdt64 (2 ) };_FDT (fdt_begin_node (fdt,"rtc" ));_FDT (fdt_property_string (fdt,"compatible" ,"motorola,mc146818" ));
@@ -139,7 +148,7 @@ static void generate_rtc_fdt_node(void *fdt,#endif struct device_header rtc_dev_hdr = { - .bus_type =DEVICE_BUS_IOPORT , + .bus_type =RTC_BUS_TYPE , .data = generate_rtc_fdt_node, };
@@ -151,8 +160,8 @@ int rtc__init(struct kvm *kvm)if (r <0 )return r; -/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ - r =kvm__register_pio (kvm,0x0070 ,2 , cmos_ram_io,NULL ); + r =kvm__register_iotrap (kvm,RTC_BASE_ADDRESS ,2 , cmos_ram_io,NULL , +RTC_BUS_TYPE );if (r <0 ) goto out_device;
@@ -170,8 +179,7 @@ dev_init(rtc__init);int rtc__exit (struct kvm *kvm) { -/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ -kvm__deregister_pio (kvm,0x0070 ); +kvm__deregister_iotrap (kvm,RTC_BASE_ADDRESS ,RTC_BUS_TYPE );return 0 ; }
Signature · 6 lines
2.17.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Hi Will, Julien,
Quoted 36 lines · Andre Przywara
Hi,
this version is addressing Alexandru's comments, fixing mostly minor issues in the naming scheme. The biggest change is to keep the ioport__read/ioport_write wrappers for the serial device. For more details see the changelog below.
==============At the moment we use two separate code paths to handle exits for
KVM_EXIT_IO(ioport.c) andKVM_EXIT_MMIO(mmio.c), even though they are semantically very similar. Because the trap handler callback routine is different, devices need to decide on one conduit or need to provide different handler functions for both of them.This is not only unnecessary code duplication, but makes switching devices from I/O port to MMIO a tedious task, even though there is no real difference between the two, especially on ARM and PowerPC.
For ARM we aim at providing a flexible memory layout, and also have trouble with the UART and RTC device overlapping with the PCI I/O area, so it seems indicated to tackle this once and for all.
The first three patches do some cleanup, to simplify things later.
Patch 04/22 lays the groundwork, by extending
mmio.cto be able to also register I/O port trap handlers, using the same callback prototype as we use for MMIO.The next 14 patches then convert devices that use the I/O port interface over to the new joint interface. This requires to rework the trap handler routine to adhere to the same prototype as the existing MMIO handlers. For most devices this is done in two steps: a first to introduce the reworked handler routine, and a second to switch to the new joint registration routine. For some devices the first step is trivial, so it's done in one patch.
Quoted 7 lines
Patch 19/22 then retires the old I/O port interface, by removing
ioport.cand friends.
Patch 20/22 uses the opportunity to clean up the memory map description, also declares a new region (from 16MB on), where the final two patches switch the UART and the RTC device to. They are now registered on the MMIO "bus", when running on ARM or arm64. This moves them away from the first 64KB, so they are not in the PCI I/O area anymore.
I have reviewed the series and everything looks fine to me and ready to be merged. I have also ran the following tests:
- On my x86_64 desktop, I ran a guest with --sdl, to exercise the vesa device.
- On a rockpro64, I ran kvm-unit-tests for arm64 and arm (kvmtool was compiled for arm64); I also ran Linux guests using 4k and 64k pages with and without --force-pci.
- On a Seattle machine, I did PCI passthrough for an Intel 82574L network card and ran Linux guests using 4k and 64k pages with and without --force-pci.
- On an odroid-c4 (4 x Cortex-A55), I ran Linux guests using 4k, 16k and 64k pages with and without --force-pci.
With this series merged, everything will be in place to bring back the patch that adds PCI Express 1.1 support for arm/arm64 [1]. The patch was previously dropped because the RTC and UART were overlapping with the PCI I/O space and EDK2 doesn't not understand PCI I/O bus addresses above 64k, but this series fixes that by moving the addresses of the two devices.
[1] https://www.spinics.net/lists/kvm/msg211304.html
Thanks,
Alex
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Will Deacon
AppliedQuoted 6 lines · Andre Przywara
this version is addressing Alexandru's comments, fixing mostly minor issues in the naming scheme. The biggest change is to keep the ioport__read/ioport_write wrappers for the serial device. For more details see the changelog below.
==============
Quoted 7 lines
At the moment we use two separate code paths to handle exits for
KVM_EXIT_IO(ioport.c) andKVM_EXIT_MMIO(mmio.c), even though they are semantically very similar. Because the trap handler callback routine is different, devices need to decide on one conduit or need to provide different handler functions for both of them.[...]
Applied to kvmtool (master), thanks!
[01/22] ioport: Remove ioport__setup_arch()
https://git.kernel.org/will/kvmtool/c/97531eb2ca70 [02/22] hw/serial: Use device abstraction for FDT generator function https://git.kernel.org/will/kvmtool/c/a81be31eee6e [03/22] ioport: Retire .generate_fdt_node functionality https://git.kernel.org/will/kvmtool/c/9bc7e2ce343e [04/22] mmio: Extend handling to include ioport emulation https://git.kernel.org/will/kvmtool/c/96f0c86ce221 [05/22] hw/i8042: Clean up data types https://git.kernel.org/will/kvmtool/c/fc7696277b29 [06/22] hw/i8042: Refactor trap handler https://git.kernel.org/will/kvmtool/c/f7ef3dc0cd28 [07/22] hw/i8042: Switch to new trap handlers https://git.kernel.org/will/kvmtool/c/d24bedb1cc9a [08/22] x86/ioport: Refactor trap handlers https://git.kernel.org/will/kvmtool/c/82304999f936 [09/22] x86/ioport: Switch to new trap handlers https://git.kernel.org/will/kvmtool/c/3adbcb235020 [10/22] hw/rtc: Refactor trap handlers https://git.kernel.org/will/kvmtool/c/8c45f36430bd [11/22] hw/rtc: Switch to new trap handler https://git.kernel.org/will/kvmtool/c/123ee474b97b [12/22] hw/vesa: Switch trap handling to use MMIO handler https://git.kernel.org/will/kvmtool/c/38ae332ffcec [13/22] hw/serial: Refactor trap handler https://git.kernel.org/will/kvmtool/c/47a510600e08 [14/22] hw/serial: Switch to new trap handlers https://git.kernel.org/will/kvmtool/c/59866df60b4b [15/22] vfio: Refactor ioport trap handler https://git.kernel.org/will/kvmtool/c/a4a0dac75469 [16/22] vfio: Switch to new ioport trap handlers https://git.kernel.org/will/kvmtool/c/579bc61f8798 [17/22] virtio: Switch trap handling to use MMIO handler https://git.kernel.org/will/kvmtool/c/205eaa794be7 [18/22] pci: Switch trap handling to use MMIO handler https://git.kernel.org/will/kvmtool/c/1f56b9d10a28 [19/22] Remove ioport specific routines https://git.kernel.org/will/kvmtool/c/7e19cb54a7cc [20/22] arm: Reorganise and document memory map https://git.kernel.org/will/kvmtool/c/f01cc778bd65 [21/22] hw/serial: ARM/arm64: Use MMIO at higher addresses https://git.kernel.org/will/kvmtool/c/45b4968e0de1 [22/22] hw/rtc: ARM/arm64: Use MMIO at higher addresses https://git.kernel.org/will/kvmtool/c/382eaad7b695
Cheers,
Signature · 9 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm