From nobody Fri Dec 19 18:44:30 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E63E822579E; Mon, 19 May 2025 21:37:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747690632; cv=none; b=dRzDetqOQA3aut73I/3G0GEl/iljc+s5N3+oXmluT+N9ZitOt0qhCH/N6jFv+YGBks8NW7dqSpf+lk9l0v5wfaOAq+5fn5n8Nk5W7AIz6VMqTIfzw59glrCB/1/D2vgpuDD4AXGdLh9Fm0sDZJPwu4T87CCa9lI+R/XqD5qQa8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747690632; c=relaxed/simple; bh=gyTffYIyVHu/5mrxLUkN3VCblYgURBDMeOg8PlZXd/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m5E8UnK4zAoqO29TXB7Mj3GSWgGyMOTjIE/ZqeGi2ppfV6rieDC7JhzbGN2x1+0KG5RQpGDKkoRhs5Bum67U20EFbYfxFXt1L2Yio3voXd3ToI/LLTZ0hu3bZ3ocj7VW8Xm3pxb1AQOvE0VF9+ShfZekSJl88fUk1C0nsmR43L4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ScPn6Vtm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ScPn6Vtm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36AF3C4CEE9; Mon, 19 May 2025 21:37:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747690631; bh=gyTffYIyVHu/5mrxLUkN3VCblYgURBDMeOg8PlZXd/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ScPn6VtmrlcZmG6H6TNWgNVU8DCGTrwM66otpxLKrHpcKbsCE+7wboo7W9kWvol33 2EapjOnvBzOmRr/pG88R7RSFeIEoAEzLU/hYuX8rmctpOOJZhFmLXP1CTlvPNYegn/ z8o5kWipr4a9rk0DDNDiqS8bFjdby5Nwi6d+kkYcusyQOwSSRFApixaO+XbcT6oPZ/ EYUg/8lwXJDCpRtK9tiWWVX2/BjSEkjM1PcXiKWslbC1EkX1F8f5mT/0TGUyupeK6i SFsEerDrrkdVvnxiprY8WKAOWqVeOvo5ibVRq2TOmOC/J4R0Q7ZQz/m96DuDM1oPqO J6FifV6+H30yg== 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 13/16] PCI/AER: Rename struct aer_stats to aer_report Date: Mon, 19 May 2025 16:35:55 -0500 Message-ID: <20250519213603.1257897-14-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Karolina Stolarek Update name to reflect the broader definition of structs/variables that are stored (e.g. ratelimits). This is a preparatory patch for adding rate limit support. Link: https://lore.kernel.org/r/20250321015806.954866-6-pandoh@google.com Signed-off-by: Karolina Stolarek Signed-off-by: Bjorn Helgaas Reviewed-by: Ilpo J=C3=A4rvinen Reviewed-by: Kuppuswamy Sathyanarayanan --- drivers/pci/pcie/aer.c | 50 +++++++++++++++++++++--------------------- include/linux/pci.h | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 06a7dda20846..da62032bf024 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -54,11 +54,11 @@ struct aer_rpc { DECLARE_KFIFO(aer_fifo, struct aer_err_source, AER_ERROR_SOURCES_MAX); }; =20 -/* AER stats for the device */ -struct aer_stats { +/* AER report for the device */ +struct aer_report { =20 /* - * Fields for all AER capable devices. They indicate the errors + * Stats for all AER capable devices. They indicate the errors * "as seen by this device". Note that this may mean that if an * Endpoint is causing problems, the AER counters may increment * at its link partner (e.g. Root Port) because the errors will be @@ -80,7 +80,7 @@ struct aer_stats { u64 dev_total_nonfatal_errs; =20 /* - * Fields for Root Ports & Root Complex Event Collectors only; these + * Stats for Root Ports & Root Complex Event Collectors only; these * indicate the total number of ERR_COR, ERR_FATAL, and ERR_NONFATAL * messages received by the Root Port / Event Collector, INCLUDING the * ones that are generated internally (by the Root Port itself) @@ -377,7 +377,7 @@ void pci_aer_init(struct pci_dev *dev) if (!dev->aer_cap) return; =20 - dev->aer_stats =3D kzalloc(sizeof(struct aer_stats), GFP_KERNEL); + dev->aer_report =3D kzalloc(sizeof(*dev->aer_report), GFP_KERNEL); =20 /* * We save/restore PCI_ERR_UNCOR_MASK, PCI_ERR_UNCOR_SEVER, @@ -398,8 +398,8 @@ void pci_aer_init(struct pci_dev *dev) =20 void pci_aer_exit(struct pci_dev *dev) { - kfree(dev->aer_stats); - dev->aer_stats =3D NULL; + kfree(dev->aer_report); + dev->aer_report =3D NULL; } =20 #define AER_AGENT_RECEIVER 0 @@ -537,10 +537,10 @@ static const char *aer_agent_string[] =3D { { \ unsigned int i; \ struct pci_dev *pdev =3D to_pci_dev(dev); \ - u64 *stats =3D pdev->aer_stats->stats_array; \ + u64 *stats =3D pdev->aer_report->stats_array; \ size_t len =3D 0; \ \ - for (i =3D 0; i < ARRAY_SIZE(pdev->aer_stats->stats_array); i++) {\ + for (i =3D 0; i < ARRAY_SIZE(pdev->aer_report->stats_array); i++) {\ if (strings_array[i]) \ len +=3D sysfs_emit_at(buf, len, "%s %llu\n", \ strings_array[i], \ @@ -551,7 +551,7 @@ static const char *aer_agent_string[] =3D { i, stats[i]); \ } \ len +=3D sysfs_emit_at(buf, len, "TOTAL_%s %llu\n", total_string, \ - pdev->aer_stats->total_field); \ + pdev->aer_report->total_field); \ return len; \ } \ static DEVICE_ATTR_RO(name) @@ -572,7 +572,7 @@ aer_stats_dev_attr(aer_dev_nonfatal, dev_nonfatal_errs, char *buf) \ { \ struct pci_dev *pdev =3D to_pci_dev(dev); \ - return sysfs_emit(buf, "%llu\n", pdev->aer_stats->field); \ + return sysfs_emit(buf, "%llu\n", pdev->aer_report->field); \ } \ static DEVICE_ATTR_RO(name) =20 @@ -599,7 +599,7 @@ static umode_t aer_stats_attrs_are_visible(struct kobje= ct *kobj, struct device *dev =3D kobj_to_dev(kobj); struct pci_dev *pdev =3D to_pci_dev(dev); =20 - if (!pdev->aer_stats) + if (!pdev->aer_report) return 0; =20 if ((a =3D=3D &dev_attr_aer_rootport_total_err_cor.attr || @@ -623,28 +623,28 @@ static void pci_dev_aer_stats_incr(struct pci_dev *pd= ev, unsigned long status =3D info->status & ~info->mask; int i, max =3D -1; u64 *counter =3D NULL; - struct aer_stats *aer_stats =3D pdev->aer_stats; + struct aer_report *aer_report =3D pdev->aer_report; =20 trace_aer_event(pci_name(pdev), (info->status & ~info->mask), info->severity, info->tlp_header_valid, &info->tlp); =20 - if (!aer_stats) + if (!aer_report) return; =20 switch (info->severity) { case AER_CORRECTABLE: - aer_stats->dev_total_cor_errs++; - counter =3D &aer_stats->dev_cor_errs[0]; + aer_report->dev_total_cor_errs++; + counter =3D &aer_report->dev_cor_errs[0]; max =3D AER_MAX_TYPEOF_COR_ERRS; break; case AER_NONFATAL: - aer_stats->dev_total_nonfatal_errs++; - counter =3D &aer_stats->dev_nonfatal_errs[0]; + aer_report->dev_total_nonfatal_errs++; + counter =3D &aer_report->dev_nonfatal_errs[0]; max =3D AER_MAX_TYPEOF_UNCOR_ERRS; break; case AER_FATAL: - aer_stats->dev_total_fatal_errs++; - counter =3D &aer_stats->dev_fatal_errs[0]; + aer_report->dev_total_fatal_errs++; + counter =3D &aer_report->dev_fatal_errs[0]; max =3D AER_MAX_TYPEOF_UNCOR_ERRS; break; } @@ -656,19 +656,19 @@ static void pci_dev_aer_stats_incr(struct pci_dev *pd= ev, static void pci_rootport_aer_stats_incr(struct pci_dev *pdev, struct aer_err_source *e_src) { - struct aer_stats *aer_stats =3D pdev->aer_stats; + struct aer_report *aer_report =3D pdev->aer_report; =20 - if (!aer_stats) + if (!aer_report) return; =20 if (e_src->status & PCI_ERR_ROOT_COR_RCV) - aer_stats->rootport_total_cor_errs++; + aer_report->rootport_total_cor_errs++; =20 if (e_src->status & PCI_ERR_ROOT_UNCOR_RCV) { if (e_src->status & PCI_ERR_ROOT_FATAL_RCV) - aer_stats->rootport_total_fatal_errs++; + aer_report->rootport_total_fatal_errs++; else - aer_stats->rootport_total_nonfatal_errs++; + aer_report->rootport_total_nonfatal_errs++; } } =20 diff --git a/include/linux/pci.h b/include/linux/pci.h index 0e8e3fd77e96..4b11a90107cb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -346,7 +346,7 @@ struct pci_dev { u8 hdr_type; /* PCI header type (`multi' flag masked out) */ #ifdef CONFIG_PCIEAER u16 aer_cap; /* AER capability offset */ - struct aer_stats *aer_stats; /* AER stats for this device */ + struct aer_report *aer_report; /* AER report for this device */ #endif #ifdef CONFIG_PCIEPORTBUS struct rcec_ea *rcec_ea; /* RCEC cached endpoint association */ --=20 2.43.0