From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3F442206A7 for ; Thu, 20 Mar 2025 08:21:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742458879; cv=none; b=cNrjEYJNa2+PDppoVgAHTV+wk4lpVhGGNnUlA6/taxx/txyPhLVpZqr8AvoaCq6lJNnzEZLWSPkdITWf4OB4er6irOIRjTpOu243IRppi+c0yrzgPs71d4976x5kZQpEsEXaalQ2wWEjuoM/JCBZDEfyFBAjxpqMwHd5/57z9GI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742458879; c=relaxed/simple; bh=k5rFdbQhm3pw/hayG+/q4771VVgUPEBU8CavapCmhfg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=K5rTjgvtORfUE0/QBp6vb/F5NLn+o1Y3kAJV9K7IaTA1MUsX0KGTI88suPSxob5bGkvetEBbEZzNcC4ybPYvVrwabPO8y9MAYJ8L3heRmZCRPgNtHaQFp7ykxcNz9zVnP4G0YaLHRDqmetNwGngMh6wT7Dv/7qIENFI2hTYCEQQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--pandoh.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WVMP7cMn; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--pandoh.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WVMP7cMn" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ff58318acaso1535735a91.0 for ; Thu, 20 Mar 2025 01:21:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742458877; x=1743063677; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=x7/ULNcUXPOzpv/f3rvt4AgCuBswHwprxKHKSfASrF8=; b=WVMP7cMnqia5e00KamtmTCpz/EXqmakenDM4QHyxXa/Llgu/2Slk7smGtWMKEYN5V7 3JY0UBkrKdnG9r+rZ72w1WWdYmQyd4NUK12tiab+9FvelAsJah943k24jBriTpjrf3+m oeYJdUc6mc3FefWoVmac35QTak192aEY/4PWXxe8iACh9jDsI/yTvaIHTZOuIgjTrNqg IrRf+BuOrpUJ/cERWDPsfYXcJOc13yhRstIKEO9b2Ddmy7knILyy1Lr7jL0R8TYKduSg IXDWVOJPrSoOvjzB4Ik6HHEl3qIdBk3yOZo6vgW/zSixX5jXhND3YiDEJbGc4Jtn2hiT 1IlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742458877; x=1743063677; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=x7/ULNcUXPOzpv/f3rvt4AgCuBswHwprxKHKSfASrF8=; b=Wxify1nNN42/+I1PLAqYZHrxo3C4w9hWHPwLGXZs9aAPiXgtQI/NV8G4RKc5gw9sqd ezEBLiez+MFcHDu7UkQdlA9oQJr6NA9vLzJQsms4KteqnG5obXNah4AZPgc0g7odhm5H IQZpBwVLup3Cy3x8f1TD6cgCAXzcZH5Z3D9IRQmscP5oY1z8BF3fMT2gxE2T0+oN3X/j yTwbe/K9MbsR496xFgZJumb5VYfrid2liCZ72mTSqSyw+FR/RiNyv+FSULkFexTiaZkL VM9GGJvNIAgxQV2jhQyMmNBQAVgS9Zago+CyN+tcu0Cq86Vh+C10Dn2GwhbhgBaNV+PU qrRQ== X-Gm-Message-State: AOJu0YybmTVgtpbiGyK+rjkZ/sQVQJF49QjBd0Xq6mVtn6SkqqYzUxMj 7LDSg3pT6XsM7piZRgOCwKq3suOcehZggMGwU7xOlEVd1VmnRVXyLMah+SYVDfnKZh+4Xg5/wPp 47g== X-Google-Smtp-Source: AGHT+IEEVIXO7sseT3Z78QBvfvrQrJBhtPXPykqN1XJJjxzQa88QXw2u589aA1w1ZAy7AN7yKcydNekoNss= X-Received: from pgct9.prod.google.com ([2002:a05:6a02:5289:b0:aef:faff:6861]) (user=pandoh job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:614a:b0:1f5:7d57:830f with SMTP id adf61e73a8af0-1fd133f00cemr4064077637.33.1742458877124; Thu, 20 Mar 2025 01:21:17 -0700 (PDT) Date: Thu, 20 Mar 2025 01:20:54 -0700 In-Reply-To: <20250320082057.622983-1-pandoh@google.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250320082057.622983-1-pandoh@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250320082057.622983-5-pandoh@google.com> Subject: [PATCH v4 4/7] PCI/AER: Rename struct aer_stats to aer_report From: Jon Pan-Doh To: Bjorn Helgaas , Karolina Stolarek Cc: linux-pci@vger.kernel.org, Martin Petersen , Ben Fuller , Drew Walton , Anil Agrawal , Tony Luck , "=?UTF-8?q?Ilpo=20J=C3=A4rvinen?=" , Sathyanarayanan Kuppuswamy , Lukas Wunner , Jonathan Cameron , Terry Bowman , Jon Pan-Doh Content-Type: text/plain; charset="UTF-8" Update name to reflect the broader definition of structs/variables that are stored (e.g. ratelimits). Signed-off-by: Karolina Stolarek Signed-off-by: Jon Pan-Doh Reviewed-by: Karolina Stolarek --- 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 e5db1fdd8421..3069376b3553 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); }; -/* AER stats for the device */ -struct aer_stats { +/* AER report for the device */ +struct aer_report { /* - * 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 * end point 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; /* - * 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 rootport itself) @@ -377,7 +377,7 @@ void pci_aer_init(struct pci_dev *dev) if (!dev->aer_cap) return; - dev->aer_stats = kzalloc(sizeof(struct aer_stats), GFP_KERNEL); + dev->aer_report = kzalloc(sizeof(*dev->aer_report), GFP_KERNEL); /* * We save/restore PCI_ERR_UNCOR_MASK, PCI_ERR_UNCOR_SEVER, @@ -398,8 +398,8 @@ void pci_aer_init(struct pci_dev *dev) void pci_aer_exit(struct pci_dev *dev) { - kfree(dev->aer_stats); - dev->aer_stats = NULL; + kfree(dev->aer_report); + dev->aer_report = NULL; } #define AER_AGENT_RECEIVER 0 @@ -537,10 +537,10 @@ static const char *aer_agent_string[] = { { \ unsigned int i; \ struct pci_dev *pdev = to_pci_dev(dev); \ - u64 *stats = pdev->aer_stats->stats_array; \ + u64 *stats = pdev->aer_report->stats_array; \ size_t len = 0; \ \ - for (i = 0; i < ARRAY_SIZE(pdev->aer_stats->stats_array); i++) {\ + for (i = 0; i < ARRAY_SIZE(pdev->aer_report->stats_array); i++) {\ if (strings_array[i]) \ len += sysfs_emit_at(buf, len, "%s %llu\n", \ strings_array[i], \ @@ -551,7 +551,7 @@ static const char *aer_agent_string[] = { i, stats[i]); \ } \ len += 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 = 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) @@ -599,7 +599,7 @@ static umode_t aer_stats_attrs_are_visible(struct kobject *kobj, struct device *dev = kobj_to_dev(kobj); struct pci_dev *pdev = to_pci_dev(dev); - if (!pdev->aer_stats) + if (!pdev->aer_report) return 0; if ((a == &dev_attr_aer_rootport_total_err_cor.attr || @@ -622,25 +622,25 @@ void pci_dev_aer_stats_incr(struct pci_dev *pdev, struct aer_err_info *info) unsigned long status = info->status & ~info->mask; int i, max = -1; u64 *counter = NULL; - struct aer_stats *aer_stats = pdev->aer_stats; + struct aer_report *aer_report = pdev->aer_report; - if (!aer_stats) + if (!aer_report) return; switch (info->severity) { case AER_CORRECTABLE: - aer_stats->dev_total_cor_errs++; - counter = &aer_stats->dev_cor_errs[0]; + aer_report->dev_total_cor_errs++; + counter = &aer_report->dev_cor_errs[0]; max = AER_MAX_TYPEOF_COR_ERRS; break; case AER_NONFATAL: - aer_stats->dev_total_nonfatal_errs++; - counter = &aer_stats->dev_nonfatal_errs[0]; + aer_report->dev_total_nonfatal_errs++; + counter = &aer_report->dev_nonfatal_errs[0]; max = AER_MAX_TYPEOF_UNCOR_ERRS; break; case AER_FATAL: - aer_stats->dev_total_fatal_errs++; - counter = &aer_stats->dev_fatal_errs[0]; + aer_report->dev_total_fatal_errs++; + counter = &aer_report->dev_fatal_errs[0]; max = AER_MAX_TYPEOF_UNCOR_ERRS; break; } @@ -652,19 +652,19 @@ void pci_dev_aer_stats_incr(struct pci_dev *pdev, struct aer_err_info *info) static void pci_rootport_aer_stats_incr(struct pci_dev *pdev, struct aer_err_source *e_src) { - struct aer_stats *aer_stats = pdev->aer_stats; + struct aer_report *aer_report = pdev->aer_report; - if (!aer_stats) + if (!aer_report) return; if (e_src->status & PCI_ERR_ROOT_COR_RCV) - aer_stats->rootport_total_cor_errs++; + aer_report->rootport_total_cor_errs++; 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++; } } diff --git a/include/linux/pci.h b/include/linux/pci.h index e4bf67bf8172..900edb6f8f62 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 */ -- 2.49.0.rc1.451.g8f38331e32-goog