From nobody Mon Jun 29 21:06:51 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C323CC433EF for ; Wed, 2 Feb 2022 20:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347214AbiBBUbM (ORCPT ); Wed, 2 Feb 2022 15:31:12 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:48962 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347133AbiBBUav (ORCPT ); Wed, 2 Feb 2022 15:30:51 -0500 Date: Wed, 02 Feb 2022 20:30:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1643833849; 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=it/bd9GP8SweyuwYrMPemeUJ+iMlIc2pEixb7rQ3wUc=; b=OM5Ndl1uU33mwxrjKMvorI84dy1Z7ZV2gV562YWqYkX8+MnGcyTs2BGtuyO296k6pAXO8E VChKpUTEZ/TF4NoOxzH5mvqJ6ygfEw6vU32g7wWTdnXiLj625wiifP+NR49E2VabuhNR3+ y6sXQfgvQwDsv/hP9HDTy23CivKouzIxMZoe158zlNjyoQNXDqqajZM4dHMun7UNzNVHTj 8CYCfAcW5Yq8aX0XblH/bqMLMjmRUv4ipZWRz5hoTwE/2f6etKf/YycQKYL2OtnFaK7JYh VnY3PPoytIS+xp8916+jm6sLYtjTUGf6mMO3pSwcNsXn3tZcLFDHG4mmTJbJhw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1643833849; 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=it/bd9GP8SweyuwYrMPemeUJ+iMlIc2pEixb7rQ3wUc=; b=BvfoOJMIUiEqtxH/6C40VA3wEUzN8wMPgag+yH3wc6Tb+zkgaqXVPdAJhrV8y78asAPzLv KcvhONFs6lEoyfCQ== From: "tip-bot2 for Maciej W. Rozycki" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/irq] x86/PCI: Include function number in $PIR table dump Cc: "Maciej W. Rozycki" , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <164383384808.16921.16565325155265314016.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: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/irq branch of tip: Commit-ID: 9574931789945734fd8abcf99883b83a3b3b32ba Gitweb: https://git.kernel.org/tip/9574931789945734fd8abcf99883b83a3= b3b32ba Author: Maciej W. Rozycki AuthorDate: Sun, 02 Jan 2022 23:24:29=20 Committer: Thomas Gleixner CommitterDate: Wed, 02 Feb 2022 21:27:54 +01:00 x86/PCI: Include function number in $PIR table dump Contrary to the PCI BIOS specification[1] some systems include the PCI=20 function number for motherboard devices in their $PIR table, e.g. this=20 is what the Tyan Tomcat IV S1564D board reports: 00:14 slot=3D01 0:60/deb8 1:61/deb8 2:62/deb8 3:63/deb8 00:13 slot=3D02 0:61/deb8 1:62/deb8 2:63/deb8 3:60/deb8 00:12 slot=3D03 0:62/deb8 1:63/deb8 2:60/deb8 3:61/deb8 00:11 slot=3D04 0:63/deb8 1:60/deb8 2:61/deb8 3:62/deb8 00:07 slot=3D00 0:00/deb8 1:00/deb8 2:00/deb8 3:00/deb8 00:07 slot=3D00 0:00/deb8 1:00/deb8 2:00/deb8 3:63/deb8 Print the function number then in the debug $PIR table dump: 00:14.0 slot=3D01 0:60/deb8 1:61/deb8 2:62/deb8 3:63/deb8 00:13.0 slot=3D02 0:61/deb8 1:62/deb8 2:63/deb8 3:60/deb8 00:12.0 slot=3D03 0:62/deb8 1:63/deb8 2:60/deb8 3:61/deb8 00:11.0 slot=3D04 0:63/deb8 1:60/deb8 2:61/deb8 3:62/deb8 00:07.1 slot=3D00 0:00/deb8 1:00/deb8 2:00/deb8 3:00/deb8 00:07.2 slot=3D00 0:00/deb8 1:00/deb8 2:00/deb8 3:63/deb8 References: [1] "PCI BIOS Specification", Revision 2.1, PCI Special Interest Group,=20 August 26, 1994, Table 4-1 "Layout of IRQ routing table entry.", p.=20 12 Signed-off-by: Maciej W. Rozycki Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/alpine.DEB.2.21.2201020153230.56863@angie.o= rcam.me.uk --- arch/x86/pci/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index a33fe9c..b6b9853 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -135,7 +135,8 @@ static void __init pirq_peer_trick(void) #ifdef DEBUG { int j; - DBG(KERN_DEBUG "%02x:%02x slot=3D%02x", e->bus, e->devfn/8, e->slot); + DBG(KERN_DEBUG "%02x:%02x.%x slot=3D%02x", + e->bus, e->devfn / 8, e->devfn % 8, e->slot); for (j =3D 0; j < 4; j++) DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap); DBG("\n");