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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5186EC3ABDD for ; Mon, 19 May 2025 21:37:27 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4b1WGz31JYz2ykX; Tue, 20 May 2025 07:36:59 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=139.178.84.217 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1747690619; cv=none; b=kT2UnF9htwk3Gyo9KI5rYO8jnzkd7S2HAALGduhoEpGwU6n/+z602kAazve2zm++meTZgHFGgRNoaXdEzeRHWxeQW8zRrdv2zc6lXex0E8GGGw+QFESjy/wDIwwV2cAb5ldnRu0FnklGQlUIZjrrd0G+dbCBcgt+TtKeEwB6iJ+X2FhyhXGPgHKQebDyzjLlMiEwzDK6ObEg8BKTJml+2PvPKWQ7/e2T1HLhbM3e7OjAeKNFbfwPOgk1hGommX2YxnQJsjPqeWwV2h5i1g5BARUv0+7Nr8+cSFVRpZ5I9nrhMEKPhqo8jqUDAvKBH73hm6Bga1Wj2QapYN8LWJeDaA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1747690619; c=relaxed/relaxed; bh=orspJc/yjXfqOnlpaTdhGYTpIPYJj08ty7Ou0rbL5eM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kWRpj040FvE0Irzno44zng2D1KsipenJuTMWRGKiV+vtIDc9Em2t8CPqGipIKJqq5gqRG4mfa5Hp3QYOx7iCznQ6zK/ivdIbFwf7oqxXLCm4iRUqt6i9XWhES04AbuRqTgGjIS9j0N6VksyIP6KpRdYxpaVBXUATrOCP0luJHG5ZsUVQi3LRsKQXJPJ16N4n0lM3rdx64tIzNkrHWi6If+HYuJdYjCOdQJ3dzpDTLjMJpfx9vxRyZONnbWOlesoP13fjpcMIq1cxMuiLtS9iFotIfykdrXgN5p95Mu0+t4sfJFDpkEEJqnW03U8DBqTIld0Tv6O8gkCZpHMl+OAHNQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=fTnNXU7m; dkim-atps=neutral; spf=pass (client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=helgaas@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=fTnNXU7m; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=helgaas@kernel.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4b1WGz02kQz2yrF for ; Tue, 20 May 2025 07:36:59 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 29AB75C55FA; Mon, 19 May 2025 21:34:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D89EDC4CEE9; Mon, 19 May 2025 21:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747690617; bh=DulaQY6ernJiaxTu28SIKrpHEXWBgTCvlzTG5LfrQA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fTnNXU7mDGJfOvaHgjsFPzu8rMdbjnqqbs3rxFyPOEwKP0a0NVn/WQGfFoLpoaFuX mhxT3R0NBa56lgjvAbcvsq//vRcK6G9graqeXgjuYxFSWBvxXudsIsAqJWIQu8IX+X 6oHceZioe/o6WKpQfxeAABaqf/SLA/Al66RL3xIcdqt8upxheGG4LcqQ3pCWLXQVbu dSsrmd9PfaK9Qx/7IcxZS92u1EJs4xIdqWRel3KzpneHQ1fJyE0SfeVMqR0pZ0ueNO nCFCW+aAdEVa4LALIq++CLJ5VpXwggu9t01J7hh/xGVRMNgBbcFTsBybWXNs2NveUR +p3/Y77CJOL8w== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Jon Pan-Doh , Karolina Stolarek , Martin Petersen , Ben Fuller , Drew Walton , Anil Agrawal , Tony Luck , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sathyanarayanan Kuppuswamy , Lukas Wunner , Jonathan Cameron , Sargun Dhillon , "Paul E . McKenney" , Mahesh J Salgaonkar , Oliver O'Halloran , Kai-Heng Feng , Keith Busch , Robert Richter , Terry Bowman , Shiju Jose , Dave Jiang , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Bjorn Helgaas Subject: [PATCH v6 04/16] PCI/AER: Extract bus/dev/fn in aer_print_port_info() with PCI_BUS_NUM(), etc Date: Mon, 19 May 2025 16:35:46 -0500 Message-ID: <20250519213603.1257897-5-helgaas@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250519213603.1257897-1-helgaas@kernel.org> References: <20250519213603.1257897-1-helgaas@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bjorn Helgaas Use PCI_BUS_NUM(), PCI_SLOT(), PCI_FUNC() to extract the bus number, device, and function number directly from the Error Source ID. There's no need to shift and mask it explicitly. Signed-off-by: Bjorn Helgaas --- drivers/pci/pcie/aer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index b8494ccd935b..dc8a50e0a2b7 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -736,14 +736,13 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) static void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info, const char *details) { - u8 bus = info->id >> 8; - u8 devfn = info->id & 0xff; + u16 source = info->id; pci_info(dev, "%s%s error message received from %04x:%02x:%02x.%d%s\n", info->multi_error_valid ? "Multiple " : "", aer_error_severity_string[info->severity], - pci_domain_nr(dev->bus), bus, PCI_SLOT(devfn), - PCI_FUNC(devfn), details); + pci_domain_nr(dev->bus), PCI_BUS_NUM(source), + PCI_SLOT(source), PCI_FUNC(source), details); } #ifdef CONFIG_ACPI_APEI_PCIEAER -- 2.43.0