From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 BE9524BD0FB for ; Thu, 3 Sep 2026 15:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788447898; cv=none; b=ZggcWbFzjkcDE0d7O3RIIIvsq1JDUHLUyQ3pXVpXyCRkzKCVcFEFIIa28uGG9ALTgISoSHNVNYO+A1dNPtMVTVjSGMR87eoujM0fIhwPveUi/b0OZugdMmQC0NQK2CKqa5Qs0CLm+9ycDEvkCeCPM6QZDOymVLozXAS91DejLTw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788447898; c=relaxed/simple; bh=bKswIGKFjaqaHagMloTjn621I3ZgRS7OUIqctqidX5A=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=fPmdsiQT58FOteayho3i3SM94jEXfZTfhZpQHciDcQdrVZWsXg3aSCxdxDXX57jIIYTXFRCOcNxySN9odLQz0PlaWCJiNTuwLSnssKDo4jBIgprQ2KyOBWJ3ZkCzsP3z94jTF33K7gaYA4Ikcwqq1zC09zpHCyQ+bq4WBXb0wPU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NRDpcJDU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NRDpcJDU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 275501F000E9; Thu, 3 Sep 2026 15:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788447895; bh=fTdEP+JNGYPPCtBt50IWSRjPUH6JaE99AuHWfbAeqaE=; h=Subject:To:Cc:From:Date; b=NRDpcJDUZDcFnOxff2itragLN//K9m2sPEMfdaz2qyOaJwzUj9jCzPA8WB1CmPbz6 GRihTcEng6RZ7jzYNYX1Ww4WEkQTn5WjQLDqQMkhEkJnC2C8ey0AB9qoRQ4BLJT7lm htjOToERBHbhdzX+ALBzPqTcDLYQgzC01rcZmBt0= Subject: FAILED: patch "[PATCH] PCI/AER: Emit TLP Log only for unmasked errors" failed to apply to 6.6-stable tree To: lukas@wunner.de,bhelgaas@google.com Cc: From: Date: Thu, 03 Sep 2026 16:43:27 +0200 Message-ID: <2026090327-shy-dealmaker-b70c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x a8bf2dd750de7d682fdaa2127f4e3217ce9c4a82 # git commit -s git send-email --to '' --in-reply-to '2026090327-shy-dealmaker-b70c@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a8bf2dd750de7d682fdaa2127f4e3217ce9c4a82 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Fri, 24 Jul 2026 17:24:04 +0200 Subject: [PATCH] PCI/AER: Emit TLP Log only for unmasked errors Per PCIe r7.0 sec 6.2.5, the prefix and header of an offending TLP is only recorded for unmasked Uncorrectable Errors. Yet when the AER driver determines whether a prefix and header has been logged, it does not take the Uncorrectable Error Mask Register into account. Fix it. Fixes: 6c2b374d7485 ("PCI-Express AER implemetation: AER core and aerdriver") Signed-off-by: Lukas Wunner Signed-off-by: Bjorn Helgaas Cc: stable@vger.kernel.org # v2.6.19+ Link: https://patch.msgid.link/2e712b96ba5bfc729d78bfc23f7fb7d285aa3d6d.1784905909.git.lukas@wunner.de diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index c21139b9079b..4d1d99662086 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -954,7 +954,8 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, status = aer->uncor_status; mask = aer->uncor_mask; info.level = KERN_ERR; - tlp_header_valid = tlp_header_logged(status, aer->cap_control); + tlp_header_valid = tlp_header_logged(status & ~mask, + aer->cap_control); } info.status = status; @@ -1343,7 +1344,7 @@ int aer_get_device_error_info(struct aer_err_info *info, int i) pci_read_config_dword(dev, aer + PCI_ERR_CAP, &aercc); info->first_error = PCI_ERR_CAP_FEP(aercc); - if (tlp_header_logged(info->status, aercc)) { + if (tlp_header_logged(info->status & ~info->mask, aercc)) { info->tlp_header_valid = 1; pcie_read_tlp_log(dev, aer + PCI_ERR_HEADER_LOG, aer + PCI_ERR_PREFIX_LOG,