From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 1CABE227EAF; Fri, 23 May 2025 09:56:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747994209; cv=none; b=DhTSEZcQ/min+YbFKJjdD4VIRG5lsvSXVmg/qaGocYhqxBe1n+MAWkjcr2eetvrE92VNEVgLrYLzDWtvgXFKpfz7TMNyEy/km7qFR9slGVKUgCo52e2DtjzK6og6bM2QnaNqI+49oJ3MDHJEF4OcJ3g5pG9Zt7EExNdl2X/oBT4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747994209; c=relaxed/simple; bh=JbxZhZlzZC1d54wodrzZn1J3iTj3tlK9lW0dMu8lctw=; h=From:Date:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type; b=hi/QUgS8xwJmyoWJOhxB5OILiVOkYk94zpmdo23J616lTC8ytAxVMOKVNAVO8kKPsxHiDeKcZWdkiCA685zqXM30Nt0vx0oRLoKzqEzIcV7ROz0AkwY3S379J7BQVZYobKwfiketgHRTFFlODRVvmnTscc8VZSzLNMPFPO65pGo= 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=iBrQ3jJQ; arc=none smtp.client-ip=192.198.163.16 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="iBrQ3jJQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747994208; x=1779530208; h=from:date:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=JbxZhZlzZC1d54wodrzZn1J3iTj3tlK9lW0dMu8lctw=; b=iBrQ3jJQGW6Amzi5IxO2Tt5QMzvfSDlPwPD9s4VGIdQoa4t34b2r3GPG Kn/84phHtGOQZEN4KNPbIux1f3efFmvtakxu6mSttpZyewCzzRtDTSMBc ctoMdIxBY1+yMvNTPjHVC+5YsVJBygj83gDjPIleoTL9TjhIJiZ4YbuYL ZtEFChdwRno2hJaaeYaSKrbEuow7Ai5s6o5HL4fEfTZUltefrHafIOsUC bbet/RUhHX8b4nCck29nUUR/fHOf6FlLkif7ZMeogEjcz5UO1hQl7WT9H lZQlXwA7B6pQij+lTtaNso1W7duXYu78Rt34gPHg9fj8o5/tsgTPsROj3 A==; X-CSE-ConnectionGUID: liSpU07WSh+iuPqcYs5n0w== X-CSE-MsgGUID: kE2K5jMIT9adk/8sfy4wgg== X-IronPort-AV: E=McAfee;i="6700,10204,11441"; a="37670357" X-IronPort-AV: E=Sophos;i="6.15,308,1739865600"; d="scan'208";a="37670357" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 May 2025 02:56:47 -0700 X-CSE-ConnectionGUID: yFtpiiTURPqBOqi3zo9T/A== X-CSE-MsgGUID: suIahlvJSs2wQTPTiC/a1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,308,1739865600"; d="scan'208";a="146063780" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.150]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 May 2025 02:56:39 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Fri, 23 May 2025 12:56:35 +0300 (EEST) To: Bjorn Helgaas cc: linux-pci@vger.kernel.org, Jon Pan-Doh , Karolina Stolarek , Weinan Liu , Martin Petersen , Ben Fuller , Drew Walton , Anil Agrawal , Tony Luck , 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 , LKML , linuxppc-dev@lists.ozlabs.org, Bjorn Helgaas Subject: Re: [PATCH v8 13/20] PCI/ERR: Add printk level to pcie_print_tlp_log() In-Reply-To: <20250522232339.1525671-14-helgaas@kernel.org> Message-ID: References: <20250522232339.1525671-1-helgaas@kernel.org> <20250522232339.1525671-14-helgaas@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323328-2019861423-1747994195=:933" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-2019861423-1747994195=:933 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: QUOTED-PRINTABLE On Thu, 22 May 2025, Bjorn Helgaas wrote: > From: Bjorn Helgaas >=20 > aer_print_error() produces output at a printk level (KERN_ERR/KERN_WARNIN= G/ > etc) that depends on the kind of error, and it calls pcie_print_tlp_log()= , > which previously always produced output at KERN_ERR. >=20 > Add a "level" parameter so aer_print_error() can control the level of the > pcie_print_tlp_log() output to match. >=20 > Signed-off-by: Bjorn Helgaas > --- > drivers/pci/pci.h | 3 ++- > drivers/pci/pcie/aer.c | 5 +++-- > drivers/pci/pcie/dpc.c | 2 +- > drivers/pci/pcie/tlp.c | 6 ++++-- > 4 files changed, 10 insertions(+), 6 deletions(-) >=20 > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > index 705f9ef58acc..1a9bfc708757 100644 > --- a/drivers/pci/pci.h > +++ b/drivers/pci/pci.h > @@ -613,7 +613,8 @@ int pcie_read_tlp_log(struct pci_dev *dev, int where,= int where2, > =09=09 struct pcie_tlp_log *log); > unsigned int aer_tlp_log_len(struct pci_dev *dev, u32 aercc); > void pcie_print_tlp_log(const struct pci_dev *dev, > -=09=09=09const struct pcie_tlp_log *log, const char *pfx); > +=09=09=09const struct pcie_tlp_log *log, const char *level, > +=09=09=09const char *pfx); > #endif=09/* CONFIG_PCIEAER */ > =20 > #ifdef CONFIG_PCIEPORTBUS > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index f80c78846a14..f0936759ba8b 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -734,7 +734,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_= err_info *info) > =09__aer_print_error(dev, info); > =20 > =09if (info->tlp_header_valid) > -=09=09pcie_print_tlp_log(dev, &info->tlp, dev_fmt(" ")); > +=09=09pcie_print_tlp_log(dev, &info->tlp, level, dev_fmt(" ")); > =20 > out: > =09if (info->id && info->error_dev_num > 1 && info->id =3D=3D id) > @@ -797,7 +797,8 @@ void pci_print_aer(struct pci_dev *dev, int aer_sever= ity, > =09=09=09aer->uncor_severity); > =20 > =09if (tlp_header_valid) > -=09=09pcie_print_tlp_log(dev, &aer->header_log, dev_fmt(" ")); > +=09=09pcie_print_tlp_log(dev, &aer->header_log, info.level, > +=09=09=09=09 dev_fmt(" ")); > } > EXPORT_SYMBOL_NS_GPL(pci_print_aer, "CXL"); > =20 > diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c > index 6c98fabdba57..7ae1590ea1da 100644 > --- a/drivers/pci/pcie/dpc.c > +++ b/drivers/pci/pcie/dpc.c > @@ -222,7 +222,7 @@ static void dpc_process_rp_pio_error(struct pci_dev *= pdev) > =09=09=09 dpc_tlp_log_len(pdev), > =09=09=09 pdev->subordinate->flit_mode, > =09=09=09 &tlp_log); > -=09pcie_print_tlp_log(pdev, &tlp_log, dev_fmt("")); > +=09pcie_print_tlp_log(pdev, &tlp_log, KERN_ERR, dev_fmt("")); > =20 > =09if (pdev->dpc_rp_log_size < PCIE_STD_NUM_TLP_HEADERLOG + 1) > =09=09goto clear_status; > diff --git a/drivers/pci/pcie/tlp.c b/drivers/pci/pcie/tlp.c > index 890d5391d7f5..71f8fc9ea2ed 100644 > --- a/drivers/pci/pcie/tlp.c > +++ b/drivers/pci/pcie/tlp.c > @@ -98,12 +98,14 @@ int pcie_read_tlp_log(struct pci_dev *dev, int where,= int where2, > * pcie_print_tlp_log - Print TLP Header / Prefix Log contents > * @dev: PCIe device > * @log: TLP Log structure > + * @level: Printk log level > * @pfx: String prefix > * > * Prints TLP Header and Prefix Log information held by @log. > */ > void pcie_print_tlp_log(const struct pci_dev *dev, > -=09=09=09const struct pcie_tlp_log *log, const char *pfx) > +=09=09=09const struct pcie_tlp_log *log, const char *level, > +=09=09=09const char *pfx) > { > =09/* EE_PREFIX_STR fits the extended DW space needed for the Flit mode = */ > =09char buf[11 * PCIE_STD_MAX_TLP_HEADERLOG + 1]; > @@ -130,6 +132,6 @@ void pcie_print_tlp_log(const struct pci_dev *dev, > =09=09} > =09} > =20 > -=09pci_err(dev, "%sTLP Header%s: %s\n", pfx, > +=09dev_printk(level, &dev->dev, "%sTLP Header%s: %s\n", pfx, > =09=09log->flit ? " (Flit)" : "", buf); > } >=20 Reviewed-by: Ilpo J=E4rvinen --=20 i. --8323328-2019861423-1747994195=:933--