From patchwork Wed Dec 6 22:42:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 174756 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4422435vqy; Wed, 6 Dec 2023 14:42:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkaxhVPI31ksKINRXViUS5WUEzOT6geFgFbzv/H4n7Pf6NCc9nh+7gMab8SjkPuy3YP1LM X-Received: by 2002:a17:90b:1fc5:b0:286:9bbb:ee90 with SMTP id st5-20020a17090b1fc500b002869bbbee90mr1319816pjb.35.1701902568438; Wed, 06 Dec 2023 14:42:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701902568; cv=none; d=google.com; s=arc-20160816; b=dqr0ZBoOycQ4ttaMPXKryO3ztvMPXFaDOLUdms6vTPBpVRM3Xakd45kLraKhIdn7eK 3nNSZZcqW2qgamTl5FOaw0n2SaLQqecpHqOtovnVNjPOoYjJXVQtY1xNxIFW8BotbCuH rEd8AXow6MveljrNJuqDqZvnjIRgSIsrhiih49rGChLHc42OKUu/xZWi2x3MLVeZ5cdG 4jHnSXE0XwkkSbU581GHCkwIWNyGnQFc9TgDQxt/bE/PpH4JKkVrIAFT6c3qJfVK+TxG QibkaTBYY/6eurGAqGgrgF8hNG47m6+OVD5dWzcqK1MeHzDhgK9eszOSRMC+mEUB8jRu guhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KJXM0MwM4JgSX9RyMUHrBdzZZUXRcAuceKMRp2bcR8E=; fh=N5OmSpWPccR8ckj8Qkdo529mqM7WPU2gJpcsQRMo0yY=; b=kyXdasbXQHIldk92QXUpdaBfjeCHuKDRCYbQPxavBosbQXNuoLS2kxd5zcrJdXecKT 3YclZGICtz0Lfr9k8FqYctGeg7aVFdjah6VICex09JV2hRvWD57ZBOLTHfOKDWIeQ0Yk OxpQnojaiIdZaP4bP8pDuxmtiCwnBgGLuufOUjU5t1o+WHe3BY9cKrhBCYs01gO/stqq 9maTekbPAOqQvUOCd48xtrZFrCl5TKE+8taGvDQCT/2nWpUKu0sB4OweiQyFjyW551Dx /Kplc16Xr5G8Q/PvwkbAPC7FG4k9WtInMul9dhgLTNzv1QbJEJxTtd4dF4yS8af21Jwg HNLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=udeflMBF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id go23-20020a17090b03d700b002886d6c7ea2si474995pjb.177.2023.12.06.14.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 14:42:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=udeflMBF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 300C8802583C; Wed, 6 Dec 2023 14:42:47 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377642AbjLFWmf (ORCPT + 99 others); Wed, 6 Dec 2023 17:42:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377594AbjLFWme (ORCPT ); Wed, 6 Dec 2023 17:42:34 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2A39D5B for ; Wed, 6 Dec 2023 14:42:40 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C6D5C433C9; Wed, 6 Dec 2023 22:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701902560; bh=7cHmMbybKrcpsaIuCFsEGmwf1pycx3Ksk6fyQJF+zME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=udeflMBF4LfGQE+1gMmco53gECNUhwPIYb1EpsGpaa9OW+4tQlZc2nhTHNReQ2ioE TLF+CbG4qCR+Ql1SjfAyEuKy5Zy1CqoNYH7lcRMrVs8i47VgeYd6ZzYhQyKe1KTqzC XnT9Jvzqv9HNvZLqeXPiHUX64Q1UxNKS3itjy9tqr8+/kXzP/EQ2uS9UpxWzKd+N9E 8qO8vyGDdOaywN7EkOuRMhW6IW6cJk05deGN2H3isCvCsJQ/H4a/KeprlRygSVV1AP CQdJ70a3h5C+DW11ZdbfdG6euahmWVRG71FQs3KvHUaQ6Q/KETtNACDb9wfZsIfb3j KdFaqqi5nItfw== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Mahesh J Salgaonkar , Oliver O'Halloran , Robert Richter , Terry Bowman , Kai-Heng Feng , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/3] PCI/AER: Use 'Correctable' and 'Uncorrectable' spec terms for errors Date: Wed, 6 Dec 2023 16:42:29 -0600 Message-Id: <20231206224231.732765-2-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231206224231.732765-1-helgaas@kernel.org> References: <20231206224231.732765-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 06 Dec 2023 14:42:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784574187271663835 X-GMAIL-MSGID: 1784574187271663835 From: Bjorn Helgaas The PCIe spec classifies errors as either "Correctable" or "Uncorrectable". Previously we printed these as "Corrected" or "Uncorrected". To avoid confusion, use the same terms as the spec. One confusing situation is when one agent detects an error, but another agent is responsible for recovery, e.g., by re-attempting the operation. The first agent may log a "correctable" error but it has not yet been corrected. The recovery agent must report an uncorrectable error if it is unable to recover. If we print the first agent's error as "Corrected", it gives the false impression that it has already been resolved. Sample message change: - pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5 + pcieport 0000:00:1c.5: AER: Correctable error received: 0000:00:1c.5 Signed-off-by: Bjorn Helgaas Reviewed-by: Kuppuswamy Sathyanarayanan --- drivers/pci/pcie/aer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 42a3bd35a3e1..20db80018b5d 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -436,9 +436,9 @@ void pci_aer_exit(struct pci_dev *dev) * AER error strings */ static const char *aer_error_severity_string[] = { - "Uncorrected (Non-Fatal)", - "Uncorrected (Fatal)", - "Corrected" + "Uncorrectable (Non-Fatal)", + "Uncorrectable (Fatal)", + "Correctable" }; static const char *aer_error_layer[] = { From patchwork Wed Dec 6 22:42:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 174758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4422496vqy; Wed, 6 Dec 2023 14:42:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFSCjxEjnOwSypMzHdZVxeTb1KXmwEL34xhGRXiDfzajPd+wsY5UjlSxr9rYSmE/fSUFK+ X-Received: by 2002:a05:6a21:99aa:b0:18f:97c:b9f1 with SMTP id ve42-20020a056a2199aa00b0018f097cb9f1mr1589000pzb.75.1701902576992; Wed, 06 Dec 2023 14:42:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701902576; cv=none; d=google.com; s=arc-20160816; b=SCsoB5v2anURm5hYF8J07opkq+OLRR+SKJMXOIs4z8C1ziGCrD90WtIYWns2th0jCD tZ8GKFrFP+B1PK84YJHs4WA3W+8O+/Z/YVvApw8g0sqA4htcN/wVQl1C5TOCPwxD4p2t 3ruWrwb6rpLBtnHfGla1W8RsdenYtzW9zkxWA+lT1Pr16i91o6SwflwvW6dL84BKJ0gS lbUwF2tnAzNs0kFWLwnqKrEfcnwDpBN9K5d+cbj++m0PxWt/8pzJuisrq/Pb/ftpoYC2 DB8nFySx7BAr8CgOmg4XwUjSjUvibbWowvNJLLbZGWdvLq9Cs7zuHb3nbKgFLBX0PDA6 fjGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lv2hhxeNts7fHvZDAXpcNUD3iQ20AHX8Ek3pTSk7Z3A=; fh=N5OmSpWPccR8ckj8Qkdo529mqM7WPU2gJpcsQRMo0yY=; b=qS9NVJHilTlTqD46KZQ9SX/qqNWqX63A82j6UrfYYJo+15QxUzQTH2fkPc+YQKvZEl FRGWVLLjbcrJFOktxqGqY3qDs+MAckA5lko6VZ5PpUdE6DijsbyMh3LCth27xXrePPZd iOW/aRigyA1BpmQD9zWe1WwFcLQdVM7q5p5ihSwkg7VdyhyxgKSLOX4Thezr4zOb5oIu 2MtPAnL4AHeu1UJVcK6iUrZnYY0EN+hrc0j0o8zF8VJeYa1XEaDdnuCkvN7E1yDD9QE2 YcSfb21bSxQYxd/i1KiOh+WC0EFTyYac0bxWxX6W5v+X877sx19PDd3GGHTSe2Jtjzsp nx0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Sr6tDrjV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id u15-20020a170903124f00b001d06e8a15desi486357plh.322.2023.12.06.14.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 14:42:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Sr6tDrjV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5A14380278C3; Wed, 6 Dec 2023 14:42:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377716AbjLFWmi (ORCPT + 99 others); Wed, 6 Dec 2023 17:42:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377664AbjLFWmg (ORCPT ); Wed, 6 Dec 2023 17:42:36 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3A25D5B for ; Wed, 6 Dec 2023 14:42:42 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33D98C433C8; Wed, 6 Dec 2023 22:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701902562; bh=C/z2J4QPXebp5y/KZX3b+//X9l7x7jrXFPy9z32q6dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sr6tDrjVNEGXBrIduHYruCE+26Os5jBYxrBIYnZAcYvDRtFDMObUCXJJLzMUiCw7N xChDFP4dnQByUNM2/9AyMINDb1Vomrc7EhfOeGD2bM4wqUrc+hhuYlwKunZE96eJkg G+g2dZ/la0NQ90ncYg3505KmeqhbhUQ/Si+BzUaflfPMPdSZO/raSwCsdtAVQ30vrl zRlsZmwaCZva4DJ9GndQ1gNnQm55/qaRW60CcvTD+BxbS/ZpmExY0DNPWSKO7cNl/6 86Z5jo9swQunULx2h2jUinrNNC1rLTrUPa3Vci2CxSo+rTAtgIUph4s/Y9dyPHI3SN wCN/Tr12lMFjQ== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Mahesh J Salgaonkar , Oliver O'Halloran , Robert Richter , Terry Bowman , Kai-Heng Feng , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 2/3] PCI/AER: Decode Requester ID when no error info found Date: Wed, 6 Dec 2023 16:42:30 -0600 Message-Id: <20231206224231.732765-3-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231206224231.732765-1-helgaas@kernel.org> References: <20231206224231.732765-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 06 Dec 2023 14:42:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784574196416906456 X-GMAIL-MSGID: 1784574196416906456 From: Bjorn Helgaas When a device with AER detects an error, it logs error information in its own AER Error Status registers. It may send an Error Message to the Root Port (RCEC in the case of an RCiEP), which logs the fact that an Error Message was received (Root Error Status) and the Requester ID of the message source (Error Source Identification). aer_print_port_info() prints the Requester ID from the Root Port Error Source in the usual Linux "bb:dd.f" format, but when find_source_device() finds no error details in the hierarchy below the Root Port, it printed the raw Requester ID without decoding it. Decode the Requester ID in the usual Linux format so it matches other messages. Sample message changes: - pcieport 0000:00:1c.5: AER: Correctable error received: 0000:00:1c.5 - pcieport 0000:00:1c.5: AER: can't find device of ID00e5 + pcieport 0000:00:1c.5: AER: Correctable error message received from 0000:00:1c.5 + pcieport 0000:00:1c.5: AER: found no error details for 0000:00:1c.5 Signed-off-by: Bjorn Helgaas Reviewed-by: Kuppuswamy Sathyanarayanan --- drivers/pci/pcie/aer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 20db80018b5d..2ff6bac9979f 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -740,7 +740,7 @@ static void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info) u8 bus = info->id >> 8; u8 devfn = info->id & 0xff; - pci_info(dev, "%s%s error received: %04x:%02x:%02x.%d\n", + pci_info(dev, "%s%s error message received from %04x:%02x:%02x.%d\n", info->multi_error_valid ? "Multiple " : "", aer_error_severity_string[info->severity], pci_domain_nr(dev->bus), bus, PCI_SLOT(devfn), @@ -929,7 +929,12 @@ static bool find_source_device(struct pci_dev *parent, pci_walk_bus(parent->subordinate, find_device_iter, e_info); if (!e_info->error_dev_num) { - pci_info(parent, "can't find device of ID%04x\n", e_info->id); + u8 bus = e_info->id >> 8; + u8 devfn = e_info->id & 0xff; + + pci_info(parent, "found no error details for %04x:%02x:%02x.%d\n", + pci_domain_nr(parent->bus), bus, PCI_SLOT(devfn), + PCI_FUNC(devfn)); return false; } return true; From patchwork Wed Dec 6 22:42:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 174757 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4422472vqy; Wed, 6 Dec 2023 14:42:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHCvktKsBDL9fOQgJyRpbMQIDdcvnMdDJz2iCJoxUoWHYGXX08FgFIbu4klKBA34daDqFWg X-Received: by 2002:a05:6e02:20cb:b0:35d:a0fc:d4d1 with SMTP id 11-20020a056e0220cb00b0035da0fcd4d1mr72376ilq.34.1701902573838; Wed, 06 Dec 2023 14:42:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701902573; cv=none; d=google.com; s=arc-20160816; b=P5FgydkfG3qSMlPHuEgLAqUgnzDSv1w/umYOC5jIixy2GpJkeKVNe3MOGqpOHs/HJY W8n6lD7wBx5KC9QrgwGNr3F12Bvrpfw+3nbNOJJnrxUmCVTC6WyX9Nkm4UBKVhmN2oE0 2qT3c1A3ZGFT6UKTfDZ5Qcr+L6XWDY5U7/R9ukiFLT7zt90ECnWfOpPukd8v9IGaIhmc 85/L+gF6hy7i2Pazxo2u3BBRhjb30CLSnmmbadSDbxjUv1d7Tn9Ptx7YyP/uIvC6+mRd N449MzPajCu1seeQrF7Yu/TgtwvE6kck24LL88S3ri+VEoBblQzoEs934fT/oW3T4qga J5sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MwEQDbrWVc/tzAvD5xLB4mT8ouOMBNUytYqo6b+FRYY=; fh=N5OmSpWPccR8ckj8Qkdo529mqM7WPU2gJpcsQRMo0yY=; b=fo6MX6xoIc8CI4iewBUTQuA1XDK0klwOkLIJeIlBDHp9TxLGNBPHl94DznLjmW4Uox 4Mi4tzPc52Wh/FNwFfNoxkuFL7FwaaB2XiE6qtoRl1k0H9ATlKxjiY/3uUmRpyfHtdDo 3ZDHS6sKnxm216N3MavgLo9B++DIa/FBT9gm9BlRlYGXkot/IkueKGxc1skIbJz/4uvS H87kTWaxVszm67EDo9p4WULHAd1Yjkfyhu9TG67Jt53eW0sE/ez19aCFTT+xCC4A8KKi hhmOgVXfTK6mxxnva32br5Eq/lQG0mpGPd984Ejr/LoMzk6gelJWHaiGeMlZEITMmzfU vZzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YlZfUNOq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id j7-20020a654287000000b005c625af78acsi566491pgp.881.2023.12.06.14.42.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 14:42:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YlZfUNOq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id BDCA5802572E; Wed, 6 Dec 2023 14:42:52 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379462AbjLFWmk (ORCPT + 99 others); Wed, 6 Dec 2023 17:42:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377710AbjLFWmi (ORCPT ); Wed, 6 Dec 2023 17:42:38 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A2C6D5A for ; Wed, 6 Dec 2023 14:42:44 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF022C433C7; Wed, 6 Dec 2023 22:42:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701902564; bh=hxM1IqtzAU7BiNojl8vsj+19zxebOt7Ey++poguftDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YlZfUNOqCiUR8pGApkpmaP+V44at9k1507c7BwV1zzncNfobRNhMLfI2WyMjUsFjm 27edqPyiJttSwkBvUmXNIaEiSlUQLZDNi6dGcHoTt4+/iMJc7Z3pN3AdyzK1zEl/dY l6aYfjIBlCD9YxyUXPda6iUwJeXv1ef416UqPeo0hsYVEIDuG9u8qapWg+ERkCLjsN WZeBQ/QyLvH9kTPQXUEv9C4lKmteraeqZWaFw67/H0/7BgS9tHkz7DJ/930BWt2oS6 v8mZD24D/av/nEW17SjCkp9BhfQtZMNFvljb2ftgqs2V3MBDD6+LCJRLU2Ntoxg5gm X8QGZxeMAOjUg== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Mahesh J Salgaonkar , Oliver O'Halloran , Robert Richter , Terry Bowman , Kai-Heng Feng , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 3/3] PCI/AER: Use explicit register sizes for struct members Date: Wed, 6 Dec 2023 16:42:31 -0600 Message-Id: <20231206224231.732765-4-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231206224231.732765-1-helgaas@kernel.org> References: <20231206224231.732765-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 06 Dec 2023 14:42:52 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784574193283982265 X-GMAIL-MSGID: 1784574193283982265 From: Bjorn Helgaas aer_irq() reads the AER Root Error Status and Error Source Identification (PCI_ERR_ROOT_STATUS and PCI_ERR_ROOT_ERR_SRC) registers directly into struct aer_err_source. Both registers are 32 bits, so declare the members explicitly as "u32" instead of "unsigned int". Similarly, aer_get_device_error_info() reads the AER Header Log (PCI_ERR_HEADER_LOG) registers, which are also 32 bits, into struct aer_header_log_regs. Declare those members as "u32" as well. No functional changes intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/pcie/aer.c | 4 ++-- include/linux/aer.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 2ff6bac9979f..60f84414ec2a 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -41,8 +41,8 @@ #define AER_MAX_TYPEOF_UNCOR_ERRS 27 /* as per PCI_ERR_UNCOR_STATUS*/ struct aer_err_source { - unsigned int status; - unsigned int id; + u32 status; /* PCI_ERR_ROOT_STATUS */ + u32 id; /* PCI_ERR_ROOT_ERR_SRC */ }; struct aer_rpc { diff --git a/include/linux/aer.h b/include/linux/aer.h index f6ea2f57d808..ae0fae70d4bd 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -19,10 +19,10 @@ struct pci_dev; struct aer_header_log_regs { - unsigned int dw0; - unsigned int dw1; - unsigned int dw2; - unsigned int dw3; + u32 dw0; + u32 dw1; + u32 dw2; + u32 dw3; }; struct aer_capability_regs {