From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 29 Jul 2021 21:51:52 +0000 (+0200)
Subject: PCI/MSI: Simplify msi_verify_entries()
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6e8b946508cda3c3bf0f9b0e133d293dc9754f6;p=uclinux-h8%2Flinux.git

PCI/MSI: Simplify msi_verify_entries()

No point in looping over all entries when 64bit addressing mode is enabled
for nothing.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20210729222542.992849326@linutronix.de
---

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 95e6ce478c04..b59957c021a8 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -613,8 +613,11 @@ static int msi_verify_entries(struct pci_dev *dev)
 {
 	struct msi_desc *entry;
 
+	if (!dev->no_64bit_msi)
+		return 0;
+
 	for_each_pci_msi_entry(entry, dev) {
-		if (entry->msg.address_hi && dev->no_64bit_msi) {
+		if (entry->msg.address_hi) {
 			pci_err(dev, "arch assigned 64-bit MSI address %#x%08x but device only supports 32 bits\n",
 				entry->msg.address_hi, entry->msg.address_lo);
 			return -EIO;