From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FA94CA9ED0 for ; Mon, 12 Oct 2026 20:14:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F35D10E3B6; Mon, 12 Oct 2026 20:14:37 +0000 (UTC) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6BFCB10E3B6 for ; Mon, 12 Oct 2026 20:14:31 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 6327D60142; Mon, 12 Oct 2026 20:14:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE3811F0089B; Mon, 12 Oct 2026 20:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791836070; bh=Yx1thZO4xaGAVViZWj+N8Em6w5rlQ/Osf1vZQ5BH4j4=; h=Date:From:To:Cc:Subject:In-Reply-To; b=F11sptdMftzjUb+31V2WdEi2rv3+DWHvmksPNN6y3j11bNoPN6B0ffWjvy/c7STqd YGl5JAs1zkgoqpFWRdjLiyG6Kf/ueGVh/04awWsKMfOC5iKUiK2frTgDLa1sgkOSdv rOCNxs2BbW7cy3Nn6L7Q7ZACMjywUWBsti71dXZEcppi5dgjqZ7D8xWnK+/R0e96Fg IUsYAnItXCBwgAp3vQNlbeihLocEOubhgEZwR+5HubbphT0K+hy8bW32lHzMn5RTDB m7Y9NBkj8wUXkA5PiE2WC0GID4GzrF4+oNafnc339TFj0dQiNdZZcDfFYuBhETYGLd 4l0o7mrmtKEAQ== Date: Mon, 12 Oct 2026 15:14:28 -0500 From: Bjorn Helgaas To: Aditya Garg Cc: linux-pci@vger.kernel.org, Mahesh J Salgaonkar , Oliver OHalloran , linuxppc-dev@lists.ozlabs.org, Alex Deucher , Christian Koenig , Vitaly Prosyak , amd-gfx@lists.freedesktop.org, Lukas Wunner , Jason Perlow Subject: Re: [PATCH for-linus] PCI/AER: Skip unmasking Advisory Non-Fatal Errors on T2 SEP Message-ID: <20261012201428.GA1377196@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20261012192933.GA1358008@bhelgaas> X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" On Mon, Oct 12, 2026 at 02:29:33PM -0500, Bjorn Helgaas wrote: > On Sat, Oct 10, 2026 at 10:53:01PM +0530, Aditya Garg wrote: > > Jason reported that since commit eddba19b8b5f ("PCI/AER: Support Advisory > > Non-Fatal Errors"), the Macs with Apple T2 Security Chip were powering > > off a few seconds after every boot. He also found the PCI Device > > 106b:1802, which corresponds to the Apple T2 Secure Enclave Processor was > > misbehaving and the most likely reason is that the device is ANFE > > incompatible due to Apple's custom hardware. > > > > Since its highly unlikely that Apple will release a firmware update to > > support ANFE, introduce a quirk as suggested by Lukas to blacklist the T2 > > SEP from ANFE. > > > > Fixes: eddba19b8b5f ("PCI/AER: Support Advisory Non-Fatal Errors") > > Reported-by: Jason Perlow > > Tested-by: Jason Perlow > > Closes: https://lore.kernel.org/linux-pci/CABZrw2HcaOh3DHTJtxU5dXrb3Vg19scr6+qR-xe_+R7rME35_Q@mail.gmail.com/ > > Signed-off-by: Aditya Garg > > Applied to pci/for-linus for v7.3, thank you! Replaced by Jason's very similar but slightly earlier patch at https://patch.msgid.link/CABZrw2H+3yt2Y7xiq6OyAWaJM7P9ox-2nJxoQuJMwoJHLgi+YQ@mail.gmail.com/ > I aligned the "!dev->no_aer_anfe" test as Lukas suggested and took a > stab at the "misbehaving" comment: > > Jason reported that since commit eddba19b8b5f ("PCI/AER: Support Advisory > Non-Fatal Errors"), the Macs with Apple T2 Security Chip were powering off > a few seconds after every boot. He also found that the power-off only > happens when Advisory Non-Fatal Errors are unmasked on the PCI Device > 106b:1802, the Apple T2 Secure Enclave Processor. > > I'll be happy to revise this if we can make it clearer or more > specific. > > > --- > > drivers/pci/pcie/aer.c | 3 ++- > > drivers/pci/quirks.c | 12 ++++++++++++ > > include/linux/pci.h | 1 + > > include/linux/pci_ids.h | 1 + > > 4 files changed, 16 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > > index 922a726a5..cab195f7c 100644 > > --- a/drivers/pci/pcie/aer.c > > +++ b/drivers/pci/pcie/aer.c > > @@ -428,7 +428,8 @@ void pci_aer_init(struct pci_dev *dev) > > * Advisory Non-Fatal Errors are masked by default (PCIe r7.0, sec > > * 7.8.4.6). > > */ > > - if (pcie_aer_is_native(dev) && dev->devcap & PCI_EXP_DEVCAP_RBER) > > + if (pcie_aer_is_native(dev) && dev->devcap & PCI_EXP_DEVCAP_RBER && > > + !dev->no_aer_anfe) > > pci_clear_and_set_config_dword(dev, > > dev->aer_cap + PCI_ERR_COR_MASK, > > PCI_ERR_COR_ADV_NFAT, 0); > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > > index de9bbccda..acca89532 100644 > > --- a/drivers/pci/quirks.c > > +++ b/drivers/pci/quirks.c > > @@ -6422,4 +6422,16 @@ static void pci_mask_replay_timer_timeout(struct pci_dev *pdev) > > } > > DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9750, pci_mask_replay_timer_timeout); > > DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9755, pci_mask_replay_timer_timeout); > > + > > +/* > > + * Unmasking Advisory Non-Fatal Errors on Apple T2 Secure Enclave > > + * processor leads to the Mac shutting down spontaneously. Avoid > > + * doing that. > > + */ > > +static void quirk_no_aer_anfe(struct pci_dev *dev) > > +{ > > + dev->no_aer_anfe = 1; > > +} > > + > > +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_T2_SEP, quirk_no_aer_anfe); > > #endif > > diff --git a/include/linux/pci.h b/include/linux/pci.h > > index d31a8d107..83ffa5058 100644 > > --- a/include/linux/pci.h > > +++ b/include/linux/pci.h > > @@ -514,6 +514,7 @@ struct pci_dev { > > unsigned int rom_bar_overlap:1; /* ROM BAR disable broken */ > > unsigned int rom_attr_enabled:1; /* Display of ROM attribute enabled? */ > > unsigned int non_mappable_bars:1; /* BARs can't be mapped by CPU or peers */ > > + unsigned int no_aer_anfe:1; /* Don't unmask Advisory Non-Fatal Errors */ > > pci_dev_flags_t dev_flags; > > atomic_t enable_cnt; /* pci_enable_device has been called */ > > > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > > index 63774ae2b..103024f74 100644 > > --- a/include/linux/pci_ids.h > > +++ b/include/linux/pci_ids.h > > @@ -1007,6 +1007,7 @@ > > #define PCI_DEVICE_ID_APPLE_IPID2_FW 0x006a > > #define PCI_DEVICE_ID_APPLE_IPID2_GMAC 0x006b > > #define PCI_DEVICE_ID_APPLE_TIGON3 0x1645 > > +#define PCI_DEVICE_ID_APPLE_T2_SEP 0x1802 > > > > #define PCI_VENDOR_ID_YAMAHA 0x1073 > > #define PCI_DEVICE_ID_YAMAHA_724 0x0004 > > -- > > 2.55.0 > >