Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <CALjTZvbzYfBuLB+H=fj2J+9=DxjQ2Uqcy0if_PvmJ-nU-qEgkg@mail.gmail.com>
 <87ee8yquyi.wl-maz@kernel.org> <CALjTZvakX8Hz+ow3UeAuQiicVXtbkXEDFnHU-+n8Ts6i1LRyHQ@mail.gmail.com>
 <87bl41qkrh.wl-maz@kernel.org> <CALjTZvbsvsD6abpw0H5D4ngUXPrgM2mDV0DX5BQi0z8cd-yxzA@mail.gmail.com>
 <878rz5qbee.wl-maz@kernel.org> <CALjTZvZZf25tqoQWM_HsBb84JgKpMKAxqfhUdpD_e5M-Bc_yzA@mail.gmail.com>
 <875yu8rj5t.wl-maz@kernel.org> <CALjTZvbZK3vxexyoEHmh9TPoceckvGV7ACHjOa0rJ9HH=YAyYA@mail.gmail.com>
 <874k9sri65.wl-maz@kernel.org>
In-Reply-To: <874k9sri65.wl-maz@kernel.org>
From:   Rui Salvaterra <rsalvaterra@gmail.com>
Date:   Thu, 7 Oct 2021 17:13:43 +0100
Message-ID: <CALjTZvYZcDS5HB=3h8u68jaTRNTXENQGV96reOeDS544fVceew@mail.gmail.com>
Subject: Re: [REGRESSION][BISECTED] 5.15-rc1: Broken AHCI on NVIDIA ION (MCP79)
To:     Marc Zyngier <maz@kernel.org>
Cc:     tglx@linutronix.de, linux-pci@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi, Marc,

On Thu, 7 Oct 2021 at 16:03, Marc Zyngier <maz@kernel.org> wrote:
>
> Duh. Make that:
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index dc7741431bf3..89c7c99cd1bb 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -5798,6 +5798,6 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
>
>  static void nvidia_ion_ahci_fixup(struct pci_dev *pdev)
>  {
> -       pdev->dev_flags |= PCI_MSI_FLAGS_MASKBIT;
> +       pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
>  }
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
>
>         M.
>
> --

The previous patch with this fixup on top also fixes the problem for
me. No issues on the GPU side (other than the existing ones, due to
NVIDIA uncooperativeness, regarding nouveau). Feel free to add my

Tested-by: Rui Salvaterra <rsalvaterra@gmail.com>

Thanks,
Rui