From patchwork Tue Jun 3 15:54:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 895265 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 B029323C518; Tue, 3 Jun 2025 15:56:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748966163; cv=none; b=HvPFPqw97dJschlZkS168yiZfE0bYrrj2LtckwGyjN+Z64Su5GUj4qzhIOgzVCqduOE88UFz9qAPPA86NHnONIrSrmw7ILU5g6WaR2NYy7oWsLH04Bt2HlpUpGjzXO0TTX9BNqj8n52nTbJIPLBOCWdrTbp4yBOry9Lokq7+t4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748966163; c=relaxed/simple; bh=KTvphffgUyV88Xl6ztOB/XDHgUpzbH4eHZRN6x7EybU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q1WftJyI8dQJpNY+vEk+GWlvE2bwMS6FmIjMYlcXWijuCyb81Vzq7zERjNlVwWNTlyofj4hgHALOHxDk8RC1XBSk2in3ijv/ld5cwTzluEMd2Du4Hr5RkxUzWjk2zOwhqyWbJGwJX32qHzCFPsCoawipo0CvCAthUYhXfl5BOZ8= 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=e7EPjCMw; arc=none smtp.client-ip=198.175.65.13 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="e7EPjCMw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1748966162; x=1780502162; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KTvphffgUyV88Xl6ztOB/XDHgUpzbH4eHZRN6x7EybU=; b=e7EPjCMw8al3hxvVBokSNfOv3nhDSOeDFHU4DMS0kVsBfRwHmVDEnEnS /Eav9P9Pdinb/N4hRowoZoBQsIDSSYuwZZJPxNMd7qpY0RZj525/WhZy2 x5P4tqae2z/YAlJUBRXb4yGikwZjNFoOsQjKdflEjuFj4bOfxmE70nPzH 0h3H/+o0s/ELbyMO3cxVjwPM+Ky/uPB8Iy2AW88yZDMfI4TY7uyJUsQ/u GduMJbSGNLhupgt3EJr9ioWiVQKltoJwOfo1IwnqLnyAGi5/Z2M4Uwhuy 7C02t7QAp6n6lom6QyoKINyp51xka5LCVm7KKT3CqRlmh1XbZsl3y+rFf g==; X-CSE-ConnectionGUID: AdTpFQtMSFSUGkWhNP7FHg== X-CSE-MsgGUID: /6JkdtPOSnqt2DnS5jbu+Q== X-IronPort-AV: E=McAfee;i="6700,10204,11453"; a="62066991" X-IronPort-AV: E=Sophos;i="6.16,206,1744095600"; d="scan'208";a="62066991" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2025 08:56:01 -0700 X-CSE-ConnectionGUID: Yw5wF3zoRo6/IKmOFyuUiw== X-CSE-MsgGUID: ipi757xUSb6gmEB5EZypyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,206,1744095600"; d="scan'208";a="175766105" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.intel.com) ([10.245.246.29]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2025 08:55:55 -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: Yazen Ghannam , "Fabio M. De Francesco" , Jonathan Cameron Subject: [PATCH 2/4 v3] PCI/AER: Modify pci_print_aer() to take log level Date: Tue, 3 Jun 2025 17:54:37 +0200 Message-ID: <20250603155536.577493-3-fabio.m.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603155536.577493-1-fabio.m.de.francesco@linux.intel.com> References: <20250603155536.577493-1-fabio.m.de.francesco@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Modify pci_print_aer() to take a printk() log level in preparation of a patch that logs PCIe Components and Link errors from ELOG. Reviewed-by: Jonathan Cameron Signed-off-by: Fabio M. De Francesco --- 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 3b80e9a76ba86..ad8d7939c2e1c 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_state *cxlds) if (!cxl_rch_get_aer_severity(&aer_regs, &severity)) return; - pci_print_aer(pdev, severity, &aer_regs); + pci_print_aer(KERN_ERR, pdev, severity, &aer_regs); if (severity == AER_CORRECTABLE) cxl_handle_rdport_cor_ras(cxlds, dport); diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index a1cf8c7ef628a..d0ebf7c15afa9 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 -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 = 0; @@ -785,14 +785,15 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, info.mask = mask; info.first_error = PCI_ERR_CAP_FEP(aer->cap_control); - 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=%s, aer_agent=%s\n", - aer_error_layer[layer], aer_agent_string[agent]); + pci_printk(level, dev, "aer_layer=%s, aer_agent=%s\n", + aer_error_layer[layer], aer_agent_string[agent]); if (aer_severity != 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); 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 02940be66324e..45d0fb2e2e759 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -64,8 +64,8 @@ static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev) static inline int pcie_aer_is_native(struct pci_dev *dev) { return 0; } #endif -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);