pcie: clean up hot plug notification
RFC PATCH 1/1 pcie: clean up hot plug notification
Simplify logic for hotplug notification, by tracking state of the logical interrupt condition. We then simply use this variable to make the interrupt decision, according to spec.
API is made cleaner as we no longer force users to pass in old slot control value.
Untested.
--- hw/ioh3420.c | 5 +-- hw/pcie.c | 79 ++++++++++++++++++++++------------------------ hw/pcie.h | 8 +++- hw/xio3130_downstream.c | 5 +-- 4 files changed, 46 insertions(+), 51 deletions(-)
hw/ioh3420.c +1 -4
@@ -39,12 +39,9 @@static void ioh3420_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -uint16_t sltctl = -pci_get_word (d->config + d->exp.exp_cap +PCI_EXP_SLTCTL ); -pci_bridge_write_config (d, address, val, len);msi_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len, sltctl); +pcie_cap_slot_write_config (d, address, val, len);/* TODO: AER */ }
hw/pcie.c +38 -41
115 lines not on this page · raw message
hw/pcie.h +6 -2
@@ -74,6 +74,11 @@ struct PCIExpressDevice {* also initialize it when loaded as * appropreately. */ +bool hpev_notified;/* Logical AND of conditions for hot plug event. +Following 6.7.3.4: +Software Notification of Hot-Plug Events, an interrupt +is sent whenever the logical and of these conditions +transitions from false to true. */ };/* PCI express capability helper functions */
@@ -89,8 +94,7 @@ void pcie_cap_deverr_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev);void pcie_cap_slot_write_config (PCIDevice *dev, -uint32_t addr,uint32_t val,int len, -uint16_t sltctl_prev); +uint32_t addr,uint32_t val,int len);void pcie_cap_slot_push_attention_button (PCIDevice *dev);void pcie_cap_root_init (PCIDevice *dev);
hw/xio3130_downstream.c +1 -4
@@ -38,12 +38,9 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -uint16_t sltctl = -pci_get_word (d->config + d->exp.exp_cap +PCI_EXP_SLTCTL ); -pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len, sltctl); +pcie_cap_slot_write_config (d, address, val, len);msi_write_config (d, address, val, len);/* TODO: AER */ }
Signature · 1 line
1.7.3-rc1
Quoted 6 lines · Michael S. Tsirkin
Quoted 5 lines · Isaku Yamahata
Quoted 4 lines · Michael S. Tsirkin
Simplify logic for hotplug notification, by tracking state of the logical interrupt condition. We then simply use this variable to make the interrupt decision, according to spec.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
API is made cleaner as we no longer force users to pass in old slot control value.
Thank you for looking into it.
Some comments below.Thanks! Care fixing up the remaining issues?
I will fold the fixup in.
Will do.
Signature · 1 line
yamahata
Quoted 10 lines · Isaku Yamahata
Quoted 6 lines · Michael S. Tsirkin
Simplify logic for hotplug notification, by tracking state of the logical interrupt condition. We then simply use this variable to make the interrupt decision, according to spec.
API is made cleaner as we no longer force users to pass in old slot control value.
Thank you for looking into it.
Some comments below.
Thanks! Care fixing up the remaining issues? I will fold the fixup in.
Quoted 49 lines
Quoted 49 lines
Untested.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/ioh3420.c | 5 +-- hw/pcie.c | 79 ++++++++++++++++++++++------------------------ hw/pcie.h | 8 +++- hw/xio3130_downstream.c | 5 +-- 4 files changed, 46 insertions(+), 51 deletions(-)hw/ioh3420.c +1
-4@@ -39,12 +39,9 @@static void ioh3420_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -uint16_t sltctl = -pci_get_word (d->config + d->exp.exp_cap +PCI_EXP_SLTCTL ); -pci_bridge_write_config (d, address, val, len);msi_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len, sltctl); +pcie_cap_slot_write_config (d, address, val, len);/* TODO: AER */ }hw/pcie.c +1
-8@@ -155,20 +155,11 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event)"sltctl: 0x%02" PRIx16" sltsta: 0x%02" PRIx16" event: %x\n" , sltctl, sltsta, event); +/* Minor optimization: if nothing changed - no event is needed. */ if (pci_word_test_and_set_mask (exp_cap +PCI_EXP_SLTSTA , event)) {return ; } - sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); -PCIE_DEV_PRINTF (dev,"sltsta -> %02" PRIx16"\n" , sltsta); - -if ((sltctl &PCI_EXP_SLTCTL_HPIE ) && - (sltctl & event &PCI_EXP_HP_EV_SUPPORTED )) { -if (pci_msi_enabled (dev)) { -pci_msi_notify (dev,pcie_cap_flags_get_vector (dev)); - }else {
Quoted 8 lines
hw/pcie.c static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) · line 163
Quoted 5 lines
hw/pcie.c +1
-3-qemu_set_irq (dev->irq[dev->exp.hpev_intx],1 ); - } - } +hotplug_event_notify (dev); }The forward declaration of
hotplug_event_notify()is necessary. Or move uphotplug_event_notify().
fixed up already
Quoted 6 lines
Quoted 6 lines
hw/pcie.c +0
-0static int pcie_cap_slot_hotplug(DeviceState *qdev,@@ -212,6 +203,36 @@ static int pcie_cap_slot_hotplug(DeviceState *qdev,return 0 ; }
Quoted 13 lines
hw/pcie.c static int pcie_cap_slot_hotplug(DeviceState *qdev,
Quoted 10 lines
hw/pcie.c +10
-0+static void hotplug_event_notify (PCIDevice *dev) +{ +bool prev = dev->exp.hpev_notified; +uint32_t pos = dev->exp.exp_cap; +uint8_t *exp_cap = dev->config + pos; +uint16_t sltctl =pci_get_word (exp_cap +PCI_EXP_SLTCTL ); +uint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); + + dev->exp.hpev_notified = (sltctl &PCI_EXP_SLTCTL_HPIE ) && + (sltsta &PCI_EXP_HP_EV_SUPPORTED )should be (sltctl & sltsta &
PCI_EXP_HP_EV_SUPPORTED) instead of (sltsta &PCI_EXP_HP_EV_SUPPORTED).
Right. Care sending a patch on top of current pci branch?
Quoted 11 lines
Quoted 11 lines
hw/pcie.c +10
-0+ +if (prev == dev->exp.hpev_notified) { +return ; + } + +/* Note: the logic above does not take into account whether interrupts +* are masked. The result is that interrupt will be sent when it is +* subsequently unmasked. This appears to be legal: Section 6.7.3.4: +* The Port may optionally send an MSI when there are hot-plug events that +* occur while interrupt generation is disabled, and interrupt generation is
Quoted 8 lines
hw/pcie.c static int pcie_cap_slot_hotplug(DeviceState *qdev, · line 231
Quoted 6 lines
hw/pcie.c +6
-0+* subsequently enabled. */ +if (!pci_msi_enabled (dev)) { +qemu_set_irq (dev->irq[dev->exp.hpev_intx], dev->exp.hpev_notified); + }else if (dev->exp.hpev_notified) { +pci_msi_notify (dev,pcie_cap_flags_get_vector (dev)); +return ;This return seems redundant.
right. remove it
Quoted 75 lines
Quoted 75 lines
hw/pcie.c +10
-30+ } + +} +/* pci express slot for pci express root/downstream port PCI express capability slot registers */ void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot)@@ -256,6 +277,8 @@ void pcie_cap_slot_init(PCIDevice *dev, uint16_t slot)pci_word_test_and_set_mask (dev->w1cmask + pos +PCI_EXP_SLTSTA ,PCI_EXP_HP_EV_SUPPORTED ); + dev->cap.hpev_notified = false; +pci_bus_hotplug (pci_bridge_get_sec_bus (DO_UPCAST (PCIBridge, dev, dev)), pcie_cap_slot_hotplug, &dev->qdev); }@@ -284,11 +307,12 @@ void pcie_cap_slot_reset(PCIDevice *dev)PCI_EXP_SLTSTA_CC |PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_ABP); + +hotplug_event_notify (dev); }void pcie_cap_slot_write_config (PCIDevice *dev, -uint32_t addr,uint32_t val,int len, -uint16_t sltctl_prev) +uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;uint8_t *exp_cap = dev->config + pos;@@ -313,34 +337,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev, sltsta); } -/* -* The events control bits might be enabled or disabled, -* Check if the software notificastion condition is satisfied -* or disatisfied. -* -* 6.7.3.4 Software Notification of Hot-plug events -*/ -if (pci_msi_enabled (dev)) { -bool msi_trigger = - (sltctl &PCI_EXP_SLTCTL_HPIE ) && - ((sltctl_prev ^ sltctl) & sltctl &/* stlctl: 0 -> 1 */ - sltsta &PCI_EXP_HP_EV_SUPPORTED ); -if (msi_trigger) { -pci_msi_notify (dev,pcie_cap_flags_get_vector (dev)); - } - }else { -int int_level = - (sltctl &PCI_EXP_SLTCTL_HPIE ) && - (sltctl & sltsta &PCI_EXP_HP_EV_SUPPORTED ); -qemu_set_irq (dev->irq[dev->exp.hpev_intx], int_level); - } - -if (!((sltctl_prev ^ sltctl) &PCI_EXP_SLTCTL_SUPPORTED )) { -PCIE_DEV_PRINTF (dev, -"sprious command completion slctl " -"0x%" PRIx16" -> 0x%" PRIx16"\n" , - sltctl_prev, sltctl); - } +hotplug_event_notify (dev);/* command completion. * Real hardware might take a while to complete hw/pcie.h +0
-0@@ -74,6 +74,11 @@ struct PCIExpressDevice {* also initialize it when loaded as * appropreately. */
Quoted 8 lines
hw/pcie.h struct PCIExpressDevice { · line 82
Quoted 6 lines
hw/pcie.h +5
-0+bool hpev_notified;/* Logical AND of conditions for hot plug event. +Following 6.7.3.4: +Software Notification of Hot-Plug Events, an interrupt +is sent whenever the logical and of these conditions +transitions from false to true. */ };This breaks save/load.
Right. We'll need to restore this on load. Take a subfunction of hotplug_event_notify and put it in the appropriate _load function.
Quoted 37 lines
Quoted 34 lines
hw/pcie.h +1
-2/* PCI express capability helper functions */ @@ -89,8 +94,7 @@ void pcie_cap_deverr_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev);void pcie_cap_slot_write_config (PCIDevice *dev, -uint32_t addr,uint32_t val,int len, -uint16_t sltctl_prev); +uint32_t addr,uint32_t val,int len);void pcie_cap_slot_push_attention_button (PCIDevice *dev);void pcie_cap_root_init (PCIDevice *dev);hw/xio3130_downstream.c +1
-4@@ -38,12 +38,9 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -uint16_t sltctl = -pci_get_word (d->config + d->exp.exp_cap +PCI_EXP_SLTCTL ); -pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len, sltctl); +pcie_cap_slot_write_config (d, address, val, len);msi_write_config (d, address, val, len);/* TODO: AER */ }Signature · 1 line
1.7.3-rc1Signature · 1 line
yamahata
Quoted 6 lines · Michael S. Tsirkin
Simplify logic for hotplug notification, by tracking state of the logical interrupt condition. We then simply use this variable to make the interrupt decision, according to spec.
API is made cleaner as we no longer force users to pass in old slot control value.
Thank you for looking into it.
Some comments below.
Quoted 44 lines
Untested.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/ioh3420.c | 5 +-- hw/pcie.c | 79 ++++++++++++++++++++++------------------------ hw/pcie.h | 8 +++- hw/xio3130_downstream.c | 5 +-- 4 files changed, 46 insertions(+), 51 deletions(-)hw/ioh3420.c +1
-4@@ -39,12 +39,9 @@static void ioh3420_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -uint16_t sltctl = -pci_get_word (d->config + d->exp.exp_cap +PCI_EXP_SLTCTL ); -pci_bridge_write_config (d, address, val, len);msi_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len, sltctl); +pcie_cap_slot_write_config (d, address, val, len);/* TODO: AER */ }hw/pcie.c +1
-3@@ -155,20 +155,11 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event)"sltctl: 0x%02" PRIx16" sltsta: 0x%02" PRIx16" event: %x\n" , sltctl, sltsta, event); +/* Minor optimization: if nothing changed - no event is needed. */ if (pci_word_test_and_set_mask (exp_cap +PCI_EXP_SLTSTA , event)) {return ; } - sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); -PCIE_DEV_PRINTF (dev,"sltsta -> %02" PRIx16"\n" , sltsta); -
hw/pcie.c static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) · line 163
Quoted 10 lines
hw/pcie.c +1
-8-if ((sltctl &PCI_EXP_SLTCTL_HPIE ) && - (sltctl & event &PCI_EXP_HP_EV_SUPPORTED )) { -if (pci_msi_enabled (dev)) { -pci_msi_notify (dev,pcie_cap_flags_get_vector (dev)); - }else { -qemu_set_irq (dev->irq[dev->exp.hpev_intx],1 ); - } - } +hotplug_event_notify (dev); }
The forward declaration of hotplug_event_notify() is necessary. Or move up hotplug_event_notify().
Quoted 6 lines
hw/pcie.c +0
-0static int pcie_cap_slot_hotplug(DeviceState *qdev,@@ -212,6 +203,36 @@ static int pcie_cap_slot_hotplug(DeviceState *qdev,return 0 ; }
hw/pcie.c static int pcie_cap_slot_hotplug(DeviceState *qdev, · line 215
Quoted 10 lines
hw/pcie.c +10
-0+static void hotplug_event_notify (PCIDevice *dev) +{ +bool prev = dev->exp.hpev_notified; +uint32_t pos = dev->exp.exp_cap; +uint8_t *exp_cap = dev->config + pos; +uint16_t sltctl =pci_get_word (exp_cap +PCI_EXP_SLTCTL ); +uint16_t sltsta =pci_get_word (exp_cap +PCI_EXP_SLTSTA ); + + dev->exp.hpev_notified = (sltctl &PCI_EXP_SLTCTL_HPIE ) && + (sltsta &PCI_EXP_HP_EV_SUPPORTED )
should be (sltctl & sltsta & PCI_EXP_HP_EV_SUPPORTED) instead of (sltsta & PCI_EXP_HP_EV_SUPPORTED).
Quoted 6 lines
hw/pcie.c +6
-0+ +if (prev == dev->exp.hpev_notified) { +return ; + } + +/* Note: the logic above does not take into account whether interrupts
hw/pcie.c static int pcie_cap_slot_hotplug(DeviceState *qdev, · line 231
Quoted 10 lines
hw/pcie.c +10
-0+* are masked. The result is that interrupt will be sent when it is +* subsequently unmasked. This appears to be legal: Section 6.7.3.4: +* The Port may optionally send an MSI when there are hot-plug events that +* occur while interrupt generation is disabled, and interrupt generation is +* subsequently enabled. */ +if (!pci_msi_enabled (dev)) { +qemu_set_irq (dev->irq[dev->exp.hpev_intx], dev->exp.hpev_notified); + }else if (dev->exp.hpev_notified) { +pci_msi_notify (dev,pcie_cap_flags_get_vector (dev)); +return ;
This return seems redundant.
Quoted 72 lines
hw/pcie.c +10
-30+ } + +} +/* pci express slot for pci express root/downstream port PCI express capability slot registers */ void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot)@@ -256,6 +277,8 @@ void pcie_cap_slot_init(PCIDevice *dev, uint16_t slot)pci_word_test_and_set_mask (dev->w1cmask + pos +PCI_EXP_SLTSTA ,PCI_EXP_HP_EV_SUPPORTED ); + dev->cap.hpev_notified = false; +pci_bus_hotplug (pci_bridge_get_sec_bus (DO_UPCAST (PCIBridge, dev, dev)), pcie_cap_slot_hotplug, &dev->qdev); }@@ -284,11 +307,12 @@ void pcie_cap_slot_reset(PCIDevice *dev)PCI_EXP_SLTSTA_CC |PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_ABP); + +hotplug_event_notify (dev); }void pcie_cap_slot_write_config (PCIDevice *dev, -uint32_t addr,uint32_t val,int len, -uint16_t sltctl_prev) +uint32_t addr,uint32_t val,int len) {uint32_t pos = dev->exp.exp_cap;uint8_t *exp_cap = dev->config + pos;@@ -313,34 +337,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev, sltsta); } -/* -* The events control bits might be enabled or disabled, -* Check if the software notificastion condition is satisfied -* or disatisfied. -* -* 6.7.3.4 Software Notification of Hot-plug events -*/ -if (pci_msi_enabled (dev)) { -bool msi_trigger = - (sltctl &PCI_EXP_SLTCTL_HPIE ) && - ((sltctl_prev ^ sltctl) & sltctl &/* stlctl: 0 -> 1 */ - sltsta &PCI_EXP_HP_EV_SUPPORTED ); -if (msi_trigger) { -pci_msi_notify (dev,pcie_cap_flags_get_vector (dev)); - } - }else { -int int_level = - (sltctl &PCI_EXP_SLTCTL_HPIE ) && - (sltctl & sltsta &PCI_EXP_HP_EV_SUPPORTED ); -qemu_set_irq (dev->irq[dev->exp.hpev_intx], int_level); - } - -if (!((sltctl_prev ^ sltctl) &PCI_EXP_SLTCTL_SUPPORTED )) { -PCIE_DEV_PRINTF (dev, -"sprious command completion slctl " -"0x%" PRIx16" -> 0x%" PRIx16"\n" , - sltctl_prev, sltctl); - } +hotplug_event_notify (dev);/* command completion. * Real hardware might take a while to complete hw/pcie.h +0
-0
hw/pcie.h struct PCIExpressDevice { · line 82
Quoted 9 lines
hw/pcie.h +5
-0@@ -74,6 +74,11 @@ struct PCIExpressDevice {* also initialize it when loaded as * appropreately. */ +bool hpev_notified;/* Logical AND of conditions for hot plug event. +Following 6.7.3.4: +Software Notification of Hot-Plug Events, an interrupt +is sent whenever the logical and of these conditions +transitions from false to true. */ };
This breaks save/load.
Quoted 33 lines
hw/pcie.h +1
-2/* PCI express capability helper functions */ @@ -89,8 +94,7 @@ void pcie_cap_deverr_reset(PCIDevice *dev);void pcie_cap_slot_init (PCIDevice *dev,uint16_t slot);void pcie_cap_slot_reset (PCIDevice *dev);void pcie_cap_slot_write_config (PCIDevice *dev, -uint32_t addr,uint32_t val,int len, -uint16_t sltctl_prev); +uint32_t addr,uint32_t val,int len);void pcie_cap_slot_push_attention_button (PCIDevice *dev);void pcie_cap_root_init (PCIDevice *dev);hw/xio3130_downstream.c +1
-4@@ -38,12 +38,9 @@static void xio3130_downstream_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -uint16_t sltctl = -pci_get_word (d->config + d->exp.exp_cap +PCI_EXP_SLTCTL ); -pci_bridge_write_config (d, address, val, len);pcie_cap_flr_write_config (d, address, val, len); -pcie_cap_slot_write_config (d, address, val, len, sltctl); +pcie_cap_slot_write_config (d, address, val, len);msi_write_config (d, address, val, len);/* TODO: AER */ }Signature · 1 line
1.7.3-rc1
Signature · 1 line
yamahata
Quoted 10 lines · Michael S. Tsirkin
Simplify logic for hotplug notification, by tracking state of the logical interrupt condition. We then simply use this variable to make the interrupt decision, according to spec.
API is made cleaner as we no longer force users to pass in old slot control value.
Untested.
Signed-off-by Michael S. Tsirkin <[email protected]>
I made some changes to this and other patches, and pushed them out on my branch so everyone can take a look there.
Signature · 1 line
MST
Quoted 10 lines · Isaku Yamahata
Quoted 9 lines · Michael S. Tsirkin
Quoted 8 lines · Isaku Yamahata
Quoted 6 lines · Michael S. Tsirkin
Simplify logic for hotplug notification, by tracking state of the logical interrupt condition. We then simply use this variable to make the interrupt decision, according to spec.
API is made cleaner as we no longer force users to pass in old slot control value.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Thank you for looking into it.
Some comments below.Thanks! Care fixing up the remaining issues?
I will fold the fixup in.Will do.
One other thing: I think when we validate data on load need to take w1c mask into account, not just wmask.
Quoted 1 line
yamahata
Quoted 15 lines · Michael S. Tsirkin
Quoted 6 lines
Quoted 6 lines
hw/pcie.h +0
-0@@ -74,6 +74,11 @@ struct PCIExpressDevice {* also initialize it when loaded as * appropreately. */ Quoted 8 lines
hw/pcie.h struct PCIExpressDevice { · line 82
Quoted 6 lines
hw/pcie.h +5
-0+bool hpev_notified;/* Logical AND of conditions for hot plug event. +Following 6.7.3.4: +Software Notification of Hot-Plug Events, an interrupt +is sent whenever the logical and of these conditions +transitions from false to true. */ };This breaks save/load.
Quoted 3 lines
Right. We'll need to restore this on load.
Take a subfunction ofhotplug_event_notify
and put it in the appropriate_loadfunction.
Or just call the notify - worst case we get an extra msi interrupt ... Not sure whether this is required but this seems to be what we do in virtio-pci. Up to you really ...
Signature · 1 line
MST