From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92765C43216 for ; Tue, 10 Aug 2021 09:07:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7776E61058 for ; Tue, 10 Aug 2021 09:07:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238642AbhHJJIO (ORCPT ); Tue, 10 Aug 2021 05:08:14 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:41876 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238578AbhHJJIF (ORCPT ); Tue, 10 Aug 2021 05:08:05 -0400 Date: Tue, 10 Aug 2021 09:07:41 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1628586461; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gxqa8nbwnFRiQ1PT8I8LRkSFEgM/fHFqNWU4QKbVjjY=; b=zHT6fNPJCl3R8WONQJIpVHPcnHEFd47OrODRXH9nigumSv0D/UhcQIbEWjXavP+fEy5gAg ZNbRBf9oSJdmYqDU1uxbKVXYIDx2TXs/NlIATLz1WFFDpblzupDnHOuceHD42LktfKaJv4 DEC+q8+SNQuyQDnppShEoECLdZxe7qGO83N7wCYnW+RMu8pIUM9jF40PMAF73X+dBS+hmq SUMTmvaOTc79cRzxSdHGnJScHWUr1orIGdOswY8wB1OwhnX19/wa5nTBEJMJUEtn/vhEAn VOe7o+oyuXGjkty5x/sRWGHVW9CzH78ViEofFF3kkn6rVrfhF1P3vbTXuH8g7Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1628586461; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gxqa8nbwnFRiQ1PT8I8LRkSFEgM/fHFqNWU4QKbVjjY=; b=g5BIq8IwEBcenB0SpUWzvU8gQ1NaUT0+UL4ujz7eeGexwTEO6UxcW47kbhC8lq0SvUXCum +xo55yiaupfas6Ag== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] PCI/MSI: Simplify msi_verify_entries() Cc: Thomas Gleixner , Marc Zyngier , Bjorn Helgaas , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210729222542.992849326@linutronix.de> References: <20210729222542.992849326@linutronix.de> MIME-Version: 1.0 Message-ID: <162858646108.395.9412874888117593842.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: a6e8b946508cda3c3bf0f9b0e133d293dc9754f6 Gitweb: https://git.kernel.org/tip/a6e8b946508cda3c3bf0f9b0e133d293dc9754f6 Author: Thomas Gleixner AuthorDate: Thu, 29 Jul 2021 23:51:52 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 10 Aug 2021 11:03:29 +02:00 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 Tested-by: Marc Zyngier Reviewed-by: Marc Zyngier Acked-by: Bjorn Helgaas Link: https://lore.kernel.org/r/20210729222542.992849326@linutronix.de --- drivers/pci/msi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 95e6ce4..b59957c 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;