hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
PATCH 1/1 hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
Some machines have an AHCI adapter, but no PCI. To be able to compile hw/ide/ahci.c without CONFIG_PCI, we still need the two functions msi_enabled() and msi_notify() for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.
--- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
hw/pci/pci-stub.c +11 -0
@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)g_assert (false);return 0 ; } + +/* Required by ahci.c */ +bool msi_enabled (const PCIDevice *dev) +{ +return false; +} + +void msi_notify (PCIDevice *dev,unsigned int vector) +{ +g_assert_not_reached (); +}
Signature · 1 line
1.8.3.1
Quoted 8 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_notify()for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.Signed-off-by Thomas Huth <[email protected]>
Quoted 24 lines
--- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/pci/pci-stub.c +11
-0@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)g_assert (false);return 0 ; } + +/* Required by ahci.c */ +bool msi_enabled (const PCIDevice *dev) +{ +return false; +} + +void msi_notify (PCIDevice *dev,unsigned int vector) +{ +g_assert_not_reached (); +}
Quoted 22 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_notify()for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.Signed-off-by Thomas Huth <[email protected]>--- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/pci/pci-stub.c +1
-0@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)g_assert (false);return 0 ; } +
hw/pci/pci-stub.c uint16_t pci_requester_id(PCIDevice *dev) · line 66
Quoted 10 lines
hw/pci/pci-stub.c +10
-0+/* Required by ahci.c */ +bool msi_enabled (const PCIDevice *dev) +{ +return false; +} + +void msi_notify (PCIDevice *dev,unsigned int vector) +{ +g_assert_not_reached (); +}
Makes sense, but it is also abstraction time. :) What if instead there was a function
void msi_allocate_irqs(PCIDevice *pdev, int num, bool fallback_to_intx);
and then ich.c did
irqs = msi_allocate_irqs(pdev, 1, true);
s->irq = irqs[0];
g_free(irqs);? "if msi_enabled raise MSI else raise INTX" is really a common idiom.
Thanks,
Paolo
Quoted 45 lines · Paolo Bonzini
Quoted 22 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_notify()for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.Signed-off-by Thomas Huth <[email protected]>--- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/pci/pci-stub.c +1
-0@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)g_assert (false);return 0 ; } +hw/pci/pci-stub.c uint16_t pci_requester_id(PCIDevice *dev) · line 66
Quoted 10 lines
hw/pci/pci-stub.c +10
-0+/* Required by ahci.c */ +bool msi_enabled (const PCIDevice *dev) +{ +return false; +} + +void msi_notify (PCIDevice *dev,unsigned int vector) +{ +g_assert_not_reached (); +}Makes sense, but it is also abstraction time. :) What if instead there was a function
void
msi_allocate_irqs(PCIDevice *pdev, int num, bool fallback_to_intx);and then
ich.cdidirqs = msi_allocate_irqs(pdev, 1, true); s->irq = irqs[0]; g_free(irqs);
Quoted 5 lines
? "if
msi_enabledraise MSI else raise INTX" is really a common idiom.Thanks,
Paolo
Maybe it is but the specific issue is not about fallback to INTX of PCI (is the fallback broken for ahci? I don't know).
The trick is there's no pdev at all.
Signature · 1 line
MST
Quoted 12 lines
Quoted 12 lines
Makes sense, but it is also abstraction time. :) What if instead there was a function
void
msi_allocate_irqs(PCIDevice *pdev, int num, bool fallback_to_intx);and then
ich.cdidirqs = msi_allocate_irqs(pdev, 1, true); s->irq = irqs[0]; g_free(irqs);
Quoted 8 lines
Quoted 5 lines
? "if
msi_enabledraise MSI else raise INTX" is really a common idiom.Thanks,
Paolo
Maybe it is but the specific issue is not about fallback to INTX of PCI (is the fallback broken for ahci? I don't know).
It works, the above is just a new abstraction.
Quoted 1 line
The trick is there's no pdev at all.
The trick :) is that in ich.c there is a pdev. Right now we are assigning to s->irq either the INTX irq (if PCI) or a sysbus irq (if sysbus), but then we need to know about MSI with a wrapper around s->irq.
Instead, my suggestion is to put the wrapper in the PCI core as a qemu_irq callback---or perhaps in ich.c, but anyway ahci.c should not care that there could be a PCI AHCI device and it would have two different interrupt modes. In fact, doing this would also remove the need for s->container, I think.
Paolo
Quoted 21 lines · Paolo Bonzini
Quoted 12 lines
Quoted 12 lines
Makes sense, but it is also abstraction time. :) What if instead there was a function
void
msi_allocate_irqs(PCIDevice *pdev, int num, bool fallback_to_intx);and then
ich.cdidirqs = msi_allocate_irqs(pdev, 1, true); s->irq = irqs[0]; g_free(irqs);Quoted 8 lines
Quoted 5 lines
? "if
msi_enabledraise MSI else raise INTX" is really a common idiom.Thanks,
Paolo
Maybe it is but the specific issue is not about fallback to INTX of PCI (is the fallback broken for ahci? I don't know).
Quoted 7 lines
It works, the above is just a new abstraction.
Quoted 1 line
The trick is there's no pdev at all.
The trick :) is that in
ich.cthere is a pdev. Right now we are assigning tos->irqeither the INTX irq (if PCI) or a sysbus irq (if sysbus), but then we need to know about MSI with a wrapper arounds->irq.
Oh you mean just for PCI.
Quoted 3 lines
Instead, my suggestion is to put the wrapper in the PCI core as a
qemu_irqcallback---or perhaps inich.c, but anywayahci.cshould not care that there could be a PCI AHCI device and it would have two different interrupt modes.
I like it very much that devices call pci_set_irq, I'd rather not have callbacks.
I think the wrapper thay calls either pci_set_irq isn't a problem, problem is MSI/X has multiple vectors, INTX doesn't.
So for many devices there's something extra that happens just in one mode but not the other to deal with multiple vectors.
So I don't think it can be an abstraction that everyone uses. But yes it can be a helper function.
In fact mptsas_update_interrupt seems not to be
PCI spec compliant: it sets both MSI and INTX.
CC original contributor with this question.
Quoted 3 lines
In fact, doing this would also remove the need for
s->container, I think.Paolo
Quoted 8 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_notify()for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.Signed-off-by Thomas Huth <[email protected]>
Do you want me to merge this or do you prefer to
merge it with kconfig patches?
Quoted 25 lines
--- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/pci/pci-stub.c +11
-0@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)g_assert (false);return 0 ; } + +/* Required by ahci.c */ +bool msi_enabled (const PCIDevice *dev) +{ +return false; +} + +void msi_notify (PCIDevice *dev,unsigned int vector) +{ +g_assert_not_reached (); +}Signature · 1 line
1.8.3.1
Quoted 11 lines · Michael S. Tsirkin
Quoted 8 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_notify()for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.Signed-off-by Thomas Huth <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>
Thanks!
Quoted 2 lines
Do you want me to merge this or do you prefer to
merge it with kconfig patches?
If you plan a pci pull request soon, feel free to take it. Otherwise, I can also add it to my Kconfig-for-arm patch series where I need it.
Thomas
Quoted 15 lines · Thomas Huth
Quoted 11 lines · Michael S. Tsirkin
Quoted 8 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_notify()for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.Signed-off-by Thomas Huth <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Thanks!
Quoted 7 lines
Quoted 2 lines
Do you want me to merge this or do you prefer to
merge it with kconfig patches?If you plan a pci pull request soon, feel free to take it. Otherwise, I can also add it to my Kconfig-for-arm patch series where I need it.
Thomas
Feel free to include but please talk to Paolo about his ideas for abstracting it out.
Thanks!
Signature · 1 line
MST
Quoted 19 lines · Michael S. Tsirkin
Quoted 18 lines · Thomas Huth
Quoted 11 lines · Michael S. Tsirkin
Quoted 8 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_notify()for linking. This is required for the upcoming Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example.Signed-off-by Thomas Huth <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Thanks!
Quoted 2 lines
Do you want me to merge this or do you prefer to
merge it with kconfig patches?
Quoted 7 lines
Quoted 4 lines
If you plan a pci pull request soon, feel free to take it. Otherwise, I can also add it to my Kconfig-for-arm patch series where I need it.
Thomas
Feel free to include but please talk to Paolo about his ideas for abstracting it out.
Not a blocker for me.
Paolo