From nobody Mon Feb 9 12:27:58 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 356AA242D94; Tue, 29 Apr 2025 17:21:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745947296; cv=none; b=VRSLXrIsHxbOYdhJf6onwNT53BmJAKnvjWCkiUdqMZ2/srowmHAln+qj/lOpJeGHedPIr1Si8CU/P3K9pAsBM5aMXL/eRVTG05yZvzRQPwZY5e+fxWwRZOWKNigYm5jGs09T5objI4J5+TsDKuoqZi6M0G7YpGQZ0V8yiTpFpw0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745947296; c=relaxed/simple; bh=JndCVKWeSSfdR7hNOtWoioyuGzEZye/l3ydjb6NIV+w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=upXc/WFwha/bd5yNqR9KfbHW0EhlJ3boYkqW/DgH1jgQyIwo3nyEqg1SWdZPRj5ZV3hO9FqHVec16cPUhWnl8mPDikn764UFCtyk7vySMwWADfDAeGNn6EeXg4Wuro145HwaVmvkh7oemwXgtl53cqly+xz7H5HL8fcaksGrgCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=aTds4bb9; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="aTds4bb9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745947295; x=1777483295; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JndCVKWeSSfdR7hNOtWoioyuGzEZye/l3ydjb6NIV+w=; b=aTds4bb9MJPkoJVrVR9ueZIGvFQ4++ab1FyZMygGUeJTwtF9d3PRsja1 IiE+ExeLDy9gwM8PqTYVQn5VCYnOElZipm/d0oi/Dgi8ZhZoW6Lnpk2TE AzNY0iovsGhMmHRo8q9SSHUUfCEe+xMXJAPGqHzmyArP4/CxSYTxG/Ztg CKWJH+9VegxI55rVIf54zYH9W/7Aoe5tQA1Vdsk62XHnpBnpde3pK4f9l Lhptgur2XQdeaRi52a7p/Cb2/DrfzOdcXUR5d/JB4VFjMf2yxC49wEAMe 93AnKa1sNisPd9/eQSHxeG4QKpHRaspfG5zU0mh3hv0gH+vISVa/TYJDs g==; X-CSE-ConnectionGUID: niuJmg2FSlCwgoKmWI7QkA== X-CSE-MsgGUID: bvRp0fraQmu98zf8lplwGw== X-IronPort-AV: E=McAfee;i="6700,10204,11418"; a="64996955" X-IronPort-AV: E=Sophos;i="6.15,249,1739865600"; d="scan'208";a="64996955" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 10:21:34 -0700 X-CSE-ConnectionGUID: 54JYejUrSaOsO1SvURqzVA== X-CSE-MsgGUID: Cf41YLqzRbqOKAqfoN/PMQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,249,1739865600"; d="scan'208";a="139073320" Received: from sschumil-mobl2.ger.corp.intel.com (HELO fdefranc-mobl3.intel.com) ([10.245.246.45]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 10:21:28 -0700 From: "Fabio M. De Francesco" To: "Rafael J . Wysocki" , Len Brown , Davidlohr Bueso , Jonathan Cameron , Dave Jiang , Alison Schofield , Vishal Verma , Ira Weiny , Dan Williams , Mahesh J Salgaonkar , Oliver O'Halloran , Bjorn Helgaas , Tony Luck , Borislav Petkov , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-cxl@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, linux-edac@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH 2/4 v2] PCI/AER: Modify pci_print_aer() to take log level Date: Tue, 29 Apr 2025 19:21:07 +0200 Message-ID: <20250429172109.3199192-3-fabio.m.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250429172109.3199192-1-fabio.m.de.francesco@linux.intel.com> References: <20250429172109.3199192-1-fabio.m.de.francesco@linux.intel.com> 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" Modify pci_print_aer() to take a printk() log level in preparation of a patch that logs PCIe Components and Link errors from ELOG. Cc: Dan Williams Acked-by: Bjorn Helgaas Signed-off-by: Fabio M. De Francesco Reviewed-by: Jonathan Cameron --- drivers/cxl/core/pci.c | 2 +- drivers/pci/pcie/aer.c | 16 ++++++++-------- include/linux/aer.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index 3b80e9a76ba8..ad8d7939c2e1 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -885,7 +885,7 @@ static void cxl_handle_rdport_errors(struct cxl_dev_sta= te *cxlds) if (!cxl_rch_get_aer_severity(&aer_regs, &severity)) return; =20 - pci_print_aer(pdev, severity, &aer_regs); + pci_print_aer(KERN_ERR, pdev, severity, &aer_regs); =20 if (severity =3D=3D AER_CORRECTABLE) cxl_handle_rdport_cor_ras(cxlds, dport); diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index a1cf8c7ef628..d0ebf7c15afa 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -760,7 +760,7 @@ int cper_severity_to_aer(int cper_severity) EXPORT_SYMBOL_GPL(cper_severity_to_aer); #endif =20 -void pci_print_aer(struct pci_dev *dev, int aer_severity, +void pci_print_aer(char *level, struct pci_dev *dev, int aer_severity, struct aer_capability_regs *aer) { int layer, agent, tlp_header_valid =3D 0; @@ -785,14 +785,15 @@ void pci_print_aer(struct pci_dev *dev, int aer_sever= ity, info.mask =3D mask; info.first_error =3D PCI_ERR_CAP_FEP(aer->cap_control); =20 - pci_err(dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", status, mask); + pci_printk(level, dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", + status, mask); __aer_print_error(dev, &info); - pci_err(dev, "aer_layer=3D%s, aer_agent=3D%s\n", - aer_error_layer[layer], aer_agent_string[agent]); + pci_printk(level, dev, "aer_layer=3D%s, aer_agent=3D%s\n", + aer_error_layer[layer], aer_agent_string[agent]); =20 if (aer_severity !=3D AER_CORRECTABLE) - pci_err(dev, "aer_uncor_severity: 0x%08x\n", - aer->uncor_severity); + pci_printk(level, dev, "aer_uncor_severity: 0x%08x\n", + aer->uncor_severity); =20 if (tlp_header_valid) pcie_print_tlp_log(dev, &aer->header_log, dev_fmt(" ")); @@ -1146,8 +1147,7 @@ static void aer_recover_work_func(struct work_struct = *work) PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); continue; } - pci_print_aer(pdev, entry.severity, entry.regs); - + pci_print_aer(KERN_ERR, pdev, entry.severity, entry.regs); /* * Memory for aer_capability_regs(entry.regs) is being * allocated from the ghes_estatus_pool to protect it from diff --git a/include/linux/aer.h b/include/linux/aer.h index 02940be66324..45d0fb2e2e75 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -64,8 +64,8 @@ static inline int pci_aer_clear_nonfatal_status(struct pc= i_dev *dev) static inline int pcie_aer_is_native(struct pci_dev *dev) { return 0; } #endif =20 -void pci_print_aer(struct pci_dev *dev, int aer_severity, - struct aer_capability_regs *aer); +void pci_print_aer(char *level, struct pci_dev *dev, int aer_severity, + struct aer_capability_regs *aer); int cper_severity_to_aer(int cper_severity); void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, int severity, struct aer_capability_regs *aer_regs); --=20 2.48.1