From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" <mst@redhat.com>,
danielhb413@gmail.com, richard.henderson@linaro.org,
qemu-ppc@nongnu.org, Frederic Barrat <fbarrat@linux.ibm.com>
Subject: [PULL 20/23] pcie: Don't try triggering a LSI when not defined
Date: Wed, 20 Apr 2022 19:13:26 -0300 [thread overview]
Message-ID: <20220420221329.169755-21-danielhb413@gmail.com> (raw)
In-Reply-To: <20220420221329.169755-1-danielhb413@gmail.com>
From: Frederic Barrat <fbarrat@linux.ibm.com>
This patch skips [de]asserting a LSI interrupt if the device doesn't
have any LSI defined. Doing so would trigger an assert in
pci_irq_handler().
The PCIE root port implementation in qemu requests a LSI (INTA), but a
subclass may want to change that behavior since it's a valid
configuration. For example on the POWER8/POWER9/POWER10 systems, the
root bridge doesn't request any LSI.
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20220408131303.147840-2-fbarrat@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/pci/pcie.c | 5 +++--
hw/pci/pcie_aer.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 67a5d67372..68a62da0b5 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -353,7 +353,7 @@ static void hotplug_event_notify(PCIDevice *dev)
msix_notify(dev, pcie_cap_flags_get_vector(dev));
} else if (msi_enabled(dev)) {
msi_notify(dev, pcie_cap_flags_get_vector(dev));
- } else {
+ } else if (pci_intx(dev) != -1) {
pci_set_irq(dev, dev->exp.hpev_notified);
}
}
@@ -361,7 +361,8 @@ static void hotplug_event_notify(PCIDevice *dev)
static void hotplug_event_clear(PCIDevice *dev)
{
hotplug_event_update_event_status(dev);
- if (!msix_enabled(dev) && !msi_enabled(dev) && !dev->exp.hpev_notified) {
+ if (!msix_enabled(dev) && !msi_enabled(dev) && pci_intx(dev) != -1 &&
+ !dev->exp.hpev_notified) {
pci_irq_deassert(dev);
}
}
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index e1a8a88c8c..92bd0530dd 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -290,7 +290,7 @@ static void pcie_aer_root_notify(PCIDevice *dev)
msix_notify(dev, pcie_aer_root_get_vector(dev));
} else if (msi_enabled(dev)) {
msi_notify(dev, pcie_aer_root_get_vector(dev));
- } else {
+ } else if (pci_intx(dev) != -1) {
pci_irq_assert(dev);
}
}
--
2.35.1
next prev parent reply other threads:[~2022-04-20 22:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 22:13 [PULL 00/23] ppc queue Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 01/23] ppc/pnv: Update skiboot to v7.0 Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 02/23] ppc/spapr/ddw: Add 2M pagesize Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 03/23] ppc/pnv: Fix PSI IRQ definition Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 04/23] ppc/pnv: Remove PnvLpcController::psi link Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 05/23] ppc/pnv: Remove PnvOCC::psi link Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 06/23] ppc/pnv: Remove PnvPsiClas::irq_set Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 07/23] ppc/pnv: Remove useless checks in set_irq handlers Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 08/23] spapr: Move hypercall_register_softmmu Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 09/23] spapr: Move nested KVM hypercalls under a TCG only config Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 10/23] target/ppc: Improve KVM hypercall trace Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 11/23] qemu/int128: add int128_urshift Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 12/23] softfloat: add uint128_to_float128 Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 13/23] softfloat: add int128_to_float128 Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 14/23] softfloat: add float128_to_uint128 Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 15/23] softfloat: add float128_to_int128 Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 16/23] target/ppc: implement xscv[su]qqp Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 17/23] target/ppc: implement xscvqp[su]qz Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 18/23] hw/ppc/ppc405_boards: Initialize g_autofree pointer Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 19/23] ppc/vof: Fix uninitialized string tracing Daniel Henrique Barboza
2022-04-20 22:13 ` Daniel Henrique Barboza [this message]
2022-04-20 22:13 ` [PULL 21/23] ppc/pnv: Remove LSI on the PCIE host bridge Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 22/23] target/ppc: Add two missing register callbacks on POWER10 Daniel Henrique Barboza
2022-04-20 22:13 ` [PULL 23/23] hw/ppc: change indentation to spaces from TABs Daniel Henrique Barboza
2022-04-21 13:53 ` [PULL 00/23] ppc queue Richard Henderson
2022-04-21 14:21 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220420221329.169755-21-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=fbarrat@linux.ibm.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).