pci: keep window properties up to date
v2 cover pci: keep window properties up to date
w32/w64 properties that we report in QOM are currently static, but this is wrong:
guest firmware can select its own windows:
optimal placement for w64 is guest-dependent, further, for Q35, w32 is affected by the MCFG base and size.
This detects the actual window configuration used by guest and reports it in QOM.
Changes from v1:
Fix up issues noted by Igor:
- ignore addresses below 1<<32 when getting W64
- don't change W64 - instead calculate it in a local variable. This way users are forced to use the property API so they won't get an out of date range by accessing w64 directly.
Note: maybe we should get rid of the pci_info struct completely, it doesn't seem to be all that useful anymore.
However, this is better addressed by a separate patch.
Michael S. Tsirkin (6):
q35: make pci window address/size match guest cfg
range: add Range to typedefs
range: add min/max operations on ranges
pci: add helper to retrieve the 64-bit range
q35: use 64 bit window programmed by guest
piix: use 64 bit window programmed by guest
include/hw/pci/pci.h | 1 + include/qemu/range.h | 19 ++++++++++++++++++- include/qemu/typedefs.h | 1 + hw/pci-host/piix.c | 14 ++++++++++---- hw/pci-host/q35.c | 24 ++++++++++++++++++++---- hw/pci/pci.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 9 deletions(-)
Signature · 1 line
MST
PATCH v2 1/6 q35: make pci window address/size match guest cfg
For Q35, MMCFG address and size are guest configurable. Update w32 property to make it behave accordingly.
--- hw/pci-host/q35.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
hw/pci-host/q35.c +10 -0
@@ -214,6 +214,16 @@ static void mch_update_pciexbar(MCHPCIState *mch) } addr = pciexbar & addr_mask;pcie_host_mmcfg_update (pehb, enable, addr, length); +/* Leave enough space for the MCFG BAR */ +/* +* TODO: this matches current bios behaviour, but it's not a power of two, +* which means an MTRR can't cover it exactly. +*/ +if (enable) { + mch->pci_info.w32.begin = addr + length; + }else { + mch->pci_info.w32.begin =MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT ; + } }/* PAM */
Signature · 1 line
MST
PATCH v2 2/6 range: add Range to typedefs
In reply to Michael S. Tsirkinwill help simplify header dependencies.
--- include/qemu/range.h | 2 +- include/qemu/typedefs.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
include/qemu/range.h +1 -1
@@ -2,6 +2,7 @@#define QEMU_RANGE_H #include <inttypes.h> +#include <qemu/typedefs.h> /* * Operations on 64 bit address ranges.
@@ -15,7 +16,6 @@ struct Range {uint64_t begin;/* First byte of the range, or 0 if empty. */ uint64_t end;/* 1 + the last byte. 0 if range empty or ends at ~0x0LL. */ }; -typedef struct Range Range ;/* Get last byte of a range from offset + length. * Undefined for ranges that wrap around 0. */
include/qemu/typedefs.h +1 -0
@@ -68,5 +68,6 @@ typedef struct QEMUSGList QEMUSGList;typedef struct SHPCDevice SHPCDevice ;typedef struct FWCfgState FWCfgState ;typedef struct PcGuestInfo PcGuestInfo ; +typedef struct Range Range ;#endif /* QEMU_TYPEDEFS_H */
Signature · 1 line
MST
PATCH v2 3/6 range: add min/max operations on ranges
In reply to Michael S. Tsirkin--- include/qemu/range.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/qemu/range.h +17 -0
@@ -17,6 +17,23 @@ struct Range {uint64_t end;/* 1 + the last byte. 0 if range empty or ends at ~0x0LL. */ }; +static inline void range_extend (Range *range,Range *extend_by) +{ +if (!extend_by->begin && !extend_by->end) { +return ; + } +if (!range->begin && !range->end) { + *range = *extend_by; +return ; + } +if (range->begin > extend_by->begin) { + range->begin = extend_by->begin; + } +if (range->end -1 < extend_by->end -1 ) { + range->end = extend_by->end; + } +} +/* Get last byte of a range from offset + length. * Undefined for ranges that wrap around 0. */ static inline uint64_t range_get_last (uint64_t offset,uint64_t len)
Signature · 1 line
MST
Re: [Qemu-devel] [PATCH v2 3/6] range: add min/max operations on ranges
Quoted 1 line · Michael S. Tsirkin
Signed-off-by Michael S. Tsirkin <[email protected]>
Actually I applied the following on top - not going to repost as that just adds a comment.
include/qemu/range.h +1 -0
@@ -29,6 +29,7 @@ static inline void range_extend(Range *range, Range *extend_by)if (range->begin > extend_by->begin) { range->begin = extend_by->begin; } +/* Compare last byte in case region ends at ~0x0LL */ if (range->end -1 < extend_by->end -1 ) { range->end = extend_by->end; }
PATCH v2 4/6 pci: add helper to retrieve the 64-bit range
In reply to Michael S. Tsirkin--- include/hw/pci/pci.h | 1 + hw/pci/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+)
include/hw/pci/pci.h +1 -0
@@ -397,6 +397,7 @@ const char *pci_root_bus_path(PCIDevice *dev);PCIDevice *pci_find_device (PCIBus *bus,int bus_num,uint8_t devfn);int pci_qdev_find_device (const char *id,PCIDevice **pdev);PCIBus *pci_get_bus_devfn (int *devfnp,PCIBus *root,const char *devaddr); +void pci_bus_get_w64_range (PCIBus *bus,Range *range);int pci_parse_devaddr (const char *addr,int *domp,int *busp,unsigned int *slotp,unsigned int *funcp);
hw/pci/pci.c +50 -0
56 lines not on this page · raw message
Signature · 1 line
MST
PATCH v2 5/6 q35: use 64 bit window programmed by guest
In reply to Michael S. TsirkinDetect the 64 bit window programmed by firmware
and configure properties accordingly.
--- hw/pci-host/q35.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
hw/pci-host/q35.c +10 -4
@@ -89,18 +89,24 @@ static void q35_host_get_pci_hole64_start(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { - Q35PCIHost *s = Q35_HOST_DEVICE(obj); + PCIHostState *h = PCI_HOST_BRIDGE(obj); +Range w64; + +pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &s->mch.pci_info.w64.begin, name, errp); +visit_type_uint64 (v, &w64.begin, name, errp); }static void q35_host_get_pci_hole64_end (Object *obj,Visitor *v,void *opaque,const char *name,Error **errp) { -Q35PCIHost *s =Q35_HOST_DEVICE (obj); +PCIHostState *h =PCI_HOST_BRIDGE (obj); +Range w64; + +pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &s->mch.pci_info.w64.end, name, errp); +visit_type_uint64 (v, &w64.end, name, errp); } static Property mch_props[] = {
Signature · 1 line
MST
PATCH v2 6/6 piix: use 64 bit window programmed by guest
In reply to Michael S. TsirkinDetect the 64 bit window programmed by firmware
and configure properties accordingly.
--- hw/pci-host/piix.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
hw/pci-host/piix.c +10 -4
@@ -235,18 +235,24 @@ static void i440fx_pcihost_get_pci_hole64_start(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { - I440FXState *s = I440FX_PCI_HOST_BRIDGE(obj); + PCIHostState *h = PCI_HOST_BRIDGE(obj); +Range w64; + +pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &s->pci_info.w64.begin, name, errp); +visit_type_uint64 (v, &w64.begin, name, errp); }static void i440fx_pcihost_get_pci_hole64_end (Object *obj,Visitor *v,void *opaque,const char *name,Error **errp) { -I440FXState *s =I440FX_PCI_HOST_BRIDGE (obj); +PCIHostState *h =PCI_HOST_BRIDGE (obj); +Range w64; + +pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &s->pci_info.w64.end, name, errp); +visit_type_uint64 (v, &w64.end, name, errp); }static void i440fx_pcihost_initfn (Object *obj)
Signature · 1 line
MST
Quoted 17 lines · On Sun, 15 Sep 2013 11:46:36 +0300 "Michael S. Tsirkin" <[email protected]> wrote:
w32/w64 properties that we report in QOM are currently static, but this is wrong:
guest firmware can select its own windows:
optimal placement for w64 is guest-dependent, further, for Q35, w32 is affected by the MCFG base and size.This detects the actual window configuration used by guest and reports it in QOM.
Changes from v1:
Fix up issues noted by Igor:
- ignore addresses below 1<<32 when getting W64
- don't change W64 - instead calculate it in a local variable. This way users are forced to use the property API so they won't get an out of date range by accessing w64 directly.
Quoted 4 lines
Note: maybe we should get rid of the
pci_infostruct completely, it doesn't seem to be all that useful anymore.However, this is better addressed by a separate patch.
Provided cleanup will be in ACPI tables series, then from memory hotplug pov,
Quoted 16 lines
Michael S. Tsirkin (6):
q35: make pci window address/size match guest cfg
range: add Range to typedefs
range: add min/max operations on ranges
pci: add helper to retrieve the 64-bit range
q35: use 64 bit window programmed by guest
piix: use 64 bit window programmed by guestinclude/hw/pci/pci.h | 1 + include/qemu/range.h | 19 ++++++++++++++++++- include/qemu/typedefs.h | 1 + hw/pci-host/piix.c | 14 ++++++++++---- hw/pci-host/q35.c | 24 ++++++++++++++++++++---- hw/pci/pci.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 9 deletions(-)