diff options
| -rw-r--r-- | tools/python/xen/xend/server/pciif.py | 35 | ||||
| -rw-r--r-- | xen/include/public/io/pciif.h | 35 |
2 files changed, 63 insertions, 7 deletions
diff --git a/tools/python/xen/xend/server/pciif.py b/tools/python/xen/xend/server/pciif.py index c5fa86ed95..1051450a08 100644 --- a/tools/python/xen/xend/server/pciif.py +++ b/tools/python/xen/xend/server/pciif.py @@ -35,6 +35,8 @@ import resource import re from xen.xend.server.pciquirk import * +from xen.xend.xenstore.xstransact import xstransact +from xen.xend.xenstore.xswatch import xswatch xc = xen.lowlevel.xc.xc() @@ -58,6 +60,7 @@ def parse_hex(val): class PciController(DevController): def __init__(self, vm): + self.aerStateWatch = None DevController.__init__(self, vm) @@ -431,9 +434,23 @@ class PciController(DevController): for (domain, bus, slot, func) in pci_dev_list: self.setupOneDevice(domain, bus, slot, func) - + wPath = '/local/domain/0/backend/pci/%u/0/aerState' % (self.getDomid()) + self.aerStatePath = xswatch(wPath, self._handleAerStateWatch) + log.debug('pci: register aer watch %s', wPath) return + def _handleAerStateWatch(self, _): + log.debug('XendDomainInfo.handleAerStateWatch') + if self.getDomid() == 0: + raise XendError('Domain 0 cannot be shutdown') + readPath = '/local/domain/0/backend/pci/%u/0/aerState' % (self.getDomid()) + action = xstransact.Read(readPath) + if action and action=='aerfail': + log.debug('shutdown domain because of aer handle error') + self.vm.shutdown('poweroff') + return True + + def cleanupOneDevice(self, domain, bus, slot, func): """ Detach I/O resources for device from frontend domain """ @@ -545,6 +562,22 @@ class PciController(DevController): return new_num_devs + def destroyDevice(self, devid, force): + DevController.destroyDevice(self, devid, True) + log.debug('pci: unregister aer watch') + self.unwatchAerState + + def unwatchAerState(self): + """Remove the watch on the domain's aerState node, if any.""" + try: + try: + if self.aerStateWatch: + self.aerStateWatch.unwatch() + finally: + self.aerStateWatch = None + except: + log.exception("Unwatching aerState failed.") + def waitForBackend(self,devid): return (0, "ok - no hotplug") diff --git a/xen/include/public/io/pciif.h b/xen/include/public/io/pciif.h index 0a0ffcc6e2..7e75392599 100644 --- a/xen/include/public/io/pciif.h +++ b/xen/include/public/io/pciif.h @@ -30,14 +30,22 @@ /* xen_pci_sharedinfo flags */ #define _XEN_PCIF_active (0) #define XEN_PCIF_active (1<<_XEN_PCI_active) +#define _XEN_PCIB_AERHANDLER (1) +#define XEN_PCIB_AERHANDLER (1<<_XEN_PCIB_AERHANDLER) +#define _XEN_PCIB_active (2) +#define XEN_PCIB_active (1<<_XEN_PCIB_active) /* xen_pci_op commands */ -#define XEN_PCI_OP_conf_read (0) -#define XEN_PCI_OP_conf_write (1) -#define XEN_PCI_OP_enable_msi (2) -#define XEN_PCI_OP_disable_msi (3) -#define XEN_PCI_OP_enable_msix (4) -#define XEN_PCI_OP_disable_msix (5) +#define XEN_PCI_OP_conf_read (0) +#define XEN_PCI_OP_conf_write (1) +#define XEN_PCI_OP_enable_msi (2) +#define XEN_PCI_OP_disable_msi (3) +#define XEN_PCI_OP_enable_msix (4) +#define XEN_PCI_OP_disable_msix (5) +#define XEN_PCI_OP_aer_detected (6) +#define XEN_PCI_OP_aer_resume (7) +#define XEN_PCI_OP_aer_mmio (8) +#define XEN_PCI_OP_aer_slotreset (9) /* xen_pci_op error numbers */ #define XEN_PCI_ERR_success (0) @@ -82,10 +90,25 @@ struct xen_pci_op { struct xen_msix_entry msix_entries[SH_INFO_MAX_VEC]; }; +/*used for pcie aer handling*/ +struct xen_pcie_aer_op +{ + + /* IN: what action to perform: XEN_PCI_OP_* */ + uint32_t cmd; + /*IN/OUT: return aer_op result or carry error_detected state as input*/ + int32_t err; + + /* IN: which device to touch */ + uint32_t domain; /* PCI Domain/Segment*/ + uint32_t bus; + uint32_t devfn; +}; struct xen_pci_sharedinfo { /* flags - XEN_PCIF_* */ uint32_t flags; struct xen_pci_op op; + struct xen_pcie_aer_op aer_op; }; #endif /* __XEN_PCI_COMMON_H__ */ |