* Re: [PATCH v3] PCI: Declare quirk_huawei_pcie_sva() as pci_fixup_header
2025-03-17 1:13 ` [PATCH v3] PCI: Declare quirk_huawei_pcie_sva() as pci_fixup_header Zhangfei Gao
@ 2025-03-20 14:07 ` Zhangfei Gao
2025-04-07 11:56 ` Zhangfei Gao
2025-04-07 18:22 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Zhangfei Gao @ 2025-03-20 14:07 UTC (permalink / raw)
To: Bjorn Helgaas, Baolu Lu, Robin Murphy, Joerg Roedel,
Jason Gunthorpe, Krzysztof Wilczyński
Cc: iommu, linux-pci, linux-kernel
Hi, Joerg
On Mon, 17 Mar 2025 at 09:14, Zhangfei Gao <zhangfei.gao@linaro.org> wrote:
>
> The commit bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper
> probe path") fixed the iommu_probe_device() flow to correctly initialize
> firmware operations, allowing arm_smmu_probe_device() to be invoked
> earlier. This changes the invocation timing of arm_smmu_probe_device
> from the final fixup phase to the header fixup phase.
>
> pci_iov_add_virtfn
> pci_device_add
> pci_fixup_device(pci_fixup_header) <--
> device_add
> bus_notify
> iommu_bus_notifier
> + iommu_probe_device
> + arm_smmu_probe_device
> pci_bus_add_device
> pci_fixup_device(pci_fixup_final) <--
> device_attach
> driver_probe_device
> really_probe
> pci_dma_configure
> acpi_dma_configure_id
> - iommu_probe_device
> - arm_smmu_probe_device
>
> This is the pci_iov_add_virtfn(). The non-SR-IOV case is similar in
> that pci_device_add() is called from pci_scan_single_device() in the
> generic enumeration path, and pci_bus_add_device() is called later,
> after all a host bridge has been enumerated.
>
> Declare the fixup as pci_fixup_header to ensure the configuration
> happens before arm_smmu_probe_device.
>
> Fixes: bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Would you mind take a look at this patch
Bjorn suggested
"I think there's some value in keeping fixes close to whatever needs to
be fixed, so since bcb81ac6ae3c came via the iommu tree, I would tend
to merge the fix the same way."
Thanks
> ---
> v3: modify commit msg, add Acked-by
> v2: modify commit msg
>
> drivers/pci/quirks.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index f840d611c450..a9759889ff5e 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -1991,12 +1991,12 @@ static void quirk_huawei_pcie_sva(struct pci_dev *pdev)
> device_create_managed_software_node(&pdev->dev, properties, NULL))
> pci_warn(pdev, "could not add stall property");
> }
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa250, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa251, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa255, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa256, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa258, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa259, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa250, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa251, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa255, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa256, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa258, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa259, quirk_huawei_pcie_sva);
>
> /*
> * It's possible for the MSI to get corrupted if SHPC and ACPI are used
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v3] PCI: Declare quirk_huawei_pcie_sva() as pci_fixup_header
2025-03-17 1:13 ` [PATCH v3] PCI: Declare quirk_huawei_pcie_sva() as pci_fixup_header Zhangfei Gao
2025-03-20 14:07 ` Zhangfei Gao
@ 2025-04-07 11:56 ` Zhangfei Gao
2025-04-07 18:22 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Zhangfei Gao @ 2025-04-07 11:56 UTC (permalink / raw)
To: Bjorn Helgaas, Baolu Lu, Robin Murphy, Joerg Roedel,
Jason Gunthorpe, Krzysztof Wilczyński
Cc: iommu, linux-pci, linux-kernel
Hi, Bjorn
On Mon, 17 Mar 2025 at 09:14, Zhangfei Gao <zhangfei.gao@linaro.org> wrote:
>
> The commit bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper
> probe path") fixed the iommu_probe_device() flow to correctly initialize
> firmware operations, allowing arm_smmu_probe_device() to be invoked
> earlier. This changes the invocation timing of arm_smmu_probe_device
> from the final fixup phase to the header fixup phase.
>
> pci_iov_add_virtfn
> pci_device_add
> pci_fixup_device(pci_fixup_header) <--
> device_add
> bus_notify
> iommu_bus_notifier
> + iommu_probe_device
> + arm_smmu_probe_device
> pci_bus_add_device
> pci_fixup_device(pci_fixup_final) <--
> device_attach
> driver_probe_device
> really_probe
> pci_dma_configure
> acpi_dma_configure_id
> - iommu_probe_device
> - arm_smmu_probe_device
>
> This is the pci_iov_add_virtfn(). The non-SR-IOV case is similar in
> that pci_device_add() is called from pci_scan_single_device() in the
> generic enumeration path, and pci_bus_add_device() is called later,
> after all a host bridge has been enumerated.
>
> Declare the fixup as pci_fixup_header to ensure the configuration
> happens before arm_smmu_probe_device.
>
> Fixes: bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
As the commit bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper
probe path") already merged in 6.15-rc1, would you mind taking this
patch for rc?
Now 6.15-rc1 can not work without this patch.
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v3] PCI: Declare quirk_huawei_pcie_sva() as pci_fixup_header
2025-03-17 1:13 ` [PATCH v3] PCI: Declare quirk_huawei_pcie_sva() as pci_fixup_header Zhangfei Gao
2025-03-20 14:07 ` Zhangfei Gao
2025-04-07 11:56 ` Zhangfei Gao
@ 2025-04-07 18:22 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2025-04-07 18:22 UTC (permalink / raw)
To: Zhangfei Gao
Cc: Bjorn Helgaas, Baolu Lu, Robin Murphy, Joerg Roedel,
Jason Gunthorpe, Krzysztof Wilczyński, iommu, linux-pci,
linux-kernel
On Mon, Mar 17, 2025 at 01:13:52AM +0000, Zhangfei Gao wrote:
> The commit bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper
> probe path") fixed the iommu_probe_device() flow to correctly initialize
> firmware operations, allowing arm_smmu_probe_device() to be invoked
> earlier. This changes the invocation timing of arm_smmu_probe_device
> from the final fixup phase to the header fixup phase.
>
> pci_iov_add_virtfn
> pci_device_add
> pci_fixup_device(pci_fixup_header) <--
> device_add
> bus_notify
> iommu_bus_notifier
> + iommu_probe_device
> + arm_smmu_probe_device
> pci_bus_add_device
> pci_fixup_device(pci_fixup_final) <--
> device_attach
> driver_probe_device
> really_probe
> pci_dma_configure
> acpi_dma_configure_id
> - iommu_probe_device
> - arm_smmu_probe_device
>
> This is the pci_iov_add_virtfn(). The non-SR-IOV case is similar in
> that pci_device_add() is called from pci_scan_single_device() in the
> generic enumeration path, and pci_bus_add_device() is called later,
> after all a host bridge has been enumerated.
>
> Declare the fixup as pci_fixup_header to ensure the configuration
> happens before arm_smmu_probe_device.
>
> Fixes: bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Applied to pci/for-linus for v6.15, thanks!
Joerg, if you'd rather take it, let me know and I can drop it.
> ---
> v3: modify commit msg, add Acked-by
> v2: modify commit msg
>
> drivers/pci/quirks.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index f840d611c450..a9759889ff5e 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -1991,12 +1991,12 @@ static void quirk_huawei_pcie_sva(struct pci_dev *pdev)
> device_create_managed_software_node(&pdev->dev, properties, NULL))
> pci_warn(pdev, "could not add stall property");
> }
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa250, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa251, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa255, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa256, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa258, quirk_huawei_pcie_sva);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa259, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa250, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa251, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa255, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa256, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa258, quirk_huawei_pcie_sva);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, 0xa259, quirk_huawei_pcie_sva);
>
> /*
> * It's possible for the MSI to get corrupted if SHPC and ACPI are used
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread