Date
1 - 2 of 2
[PATCH v2] config-tools: reserve the secondary PCI bus mmio windows
|
Yang, Yu-chu
From: "Yang,Yu-chu" <yu-chu.yang@...>
Prevent allocator to allocate PCI bus mmio windows to other devices. v1->v2 1. add "contains()" to class AddrWindow 2. append the mmio window of memory type resource to the dev_list if it's not contained by any secondary pci 3. check all the mmio window of dev_list falls into the pci hole 4. remove the test code 5. the xpath to nodes and secondary_pci_nodes extracts the element which contains attributes "min" and "max" 6. refine the xpath to secondary_pci_nodes with a condition that there is a bus of type "pci" Tracked-On: #8191 Signed-off-by: Yang,Yu-chu <yu-chu.yang@...> --- misc/config_tools/static_allocators/gpa.py | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/misc/config_tools/static_allocators/gpa.py b/misc/config_tools/static_allocators/gpa.py index 43935bebd..e9fde5d09 100644 --- a/misc/config_tools/static_allocators/gpa.py +++ b/misc/config_tools/static_allocators/gpa.py @@ -109,6 +109,13 @@ class AddrWindow(namedtuple( return False return True + def contains(self, other): + if not isinstance(other, AddrWindow): + raise TypeError('contains() other must be an AddrWindow: {}'.format(type(other))) + if other.start >= self.start and other.end <= self.end: + return True + return False + def insert_vuart_to_dev_dict(scenario_etree, vm_id, devdict_32bits): console_vuart = scenario_etree.xpath(f"./console_vuart[base != 'INVALID_PCI_BASE']/@id") @@ -223,18 +230,22 @@ def insert_vmsix_to_dev_dict(pt_dev_node, devdict): devdict[(f"{dev_name}", f"bar{next_bar_region}")] = VMSIX_VBAR_SIZE def get_devs_mem_native(board_etree, mems): - nodes = board_etree.xpath(f"//resource[@type = 'memory' and @len != '0x0' and @id and @width]") + nodes = board_etree.xpath(f"//resource[@type = 'memory' and @len != '0x0' and @id and @width and @min and @max]") + secondary_pci_nodes = board_etree.xpath(f"//resource[../bus[@type = 'pci'] and @type = 'memory' and @len != '0x0' and @min and @max]") + secondary_pci_windows = [AddrWindow(int(node.get('min'), 16), int(node.get('max'), 16)) for node in secondary_pci_nodes] dev_list = [] + for node in nodes: start = node.get('min') end = node.get('max') - if start is not None and end is not None: - window = AddrWindow(int(start, 16), int(end, 16)) - for mem in mems: - if window.start >= mem.start and window.end <= mem.end: - dev_list.append(window) - break - return sorted(dev_list) + node_window = AddrWindow(int(start, 16), int(end, 16)) + if all(not(w.contains(node_window)) for w in secondary_pci_windows): + dev_list.append(node_window) + dev_list += secondary_pci_windows + # check if all the mmio window of dev_list fall into pci hole + return_dev_list = [d for d in dev_list if any(mem.contains(d) for mem in mems)] + + return sorted(return_dev_list) def get_devs_io_port_native(board_etree, io_port_range): nodes = board_etree.xpath(f"//device/resource[@type = 'io_port' and @len != '0x0' and @id]") -- 2.25.1 |
|
|
|
Junjie Mao
toggle quoted message
Show quoted text
-----Original Message-----You'll still have overlap AddrWindow objects if the platform has nested busses. If that's not intended for the returned list of this method, you need to add secondary PCI windows in the same way as you do for the device ones. --- Best Regards Junjie Mao + # check if all the mmio window of dev_list fall into pci hole |
|
|