mbox series

[v12,0/3] iommu/smmu-v3: Workaround for hisilicon 161010801 erratum(reserve HW MSI)

Message ID 20171214160957.13716-1-shameerali.kolothum.thodi@huawei.com
Headers show
Series iommu/smmu-v3: Workaround for hisilicon 161010801 erratum(reserve HW MSI) | expand

Message

Shameerali Kolothum Thodi Dec. 14, 2017, 4:09 p.m. UTC
On certain HiSilicon platforms (hip06/hip07) the GIC ITS and PCIe RC
deviates from the standard implementation and this breaks PCIe MSI
functionality when SMMU is enabled.

The HiSilicon erratum 161010801 describes this limitation of certain
HiSilicon platforms to support the SMMU mappings for MSI transactions.
On these platforms GICv3 ITS translator is presented with the deviceID
by extending the MSI payload data to 64 bits to include the deviceID.
Hence, the PCIe controller on this platforms has to differentiate the MSI
payload against other DMA payload and has to modify the MSI payload.
This basically makes it difficult for this platforms to have a SMMU
translation for MSI.

This patch implements an ACPI based quirk to reserve the hw msi regions
in the smmu-v3 driver which means these address regions will not be
translated and will be excluded from iova allocations.

To implement this quirk, the following changes are incorporated:
1. Added a generic helper function to IORT code to retrieve and reserve
   the associated ITS base address from a device IORT node. The function
   has a check for smmu model to determine whether the platform requires
   the HW MSI reservation or not.
2. Added smmu node entries and explicitly disabled them in hip06/hip07
    dts files so that users are warned about the non-DT support for this
    erratum.

Changelog:

v11--> v12
-Thanks to Lorenzo, Fixed !CONFIG_IOMMU_API compile error(patch #1).

v10 --> v11
-Addressed comments from Lorenzo(patch#1)
-Added Robin's Reviewed-by to patch #2

v9 --> v10
Addressed comments:
-Moved smmu model check to iort helper function to selectively apply
 the msi reservation which will make the fn call generic from iommu-dma.
-Removed PCI blacklisting patch, instead added smmu nodes(disabled)
 with comments to hip06/hip07 dts file.

v8 --> v9
-Thanks to Marc, fixed IORT helper function to reserve the ITS
 translater region only.
-Removed the DT support for MSI reservation and blacklisted
 HiSilicon PCIe controllers on DT based systems when SMMUv3 is
 enabled.

v7 --> v8
Addressed comments from Rob and Lorenzo:
 -Modified to use DT compatible string for errata.
 -Changed logic to retrieve the msi-parent for DT case.

v6 --> v7
Addressed request from Will to add DT support for the erratum:
 - added bt binding
 - add of_iommu_msi_get_resv_regions()
New arm64 silicon errata entry
Rename iort_iommu_{its->msi}_get_resv_regions

v5 --> v6
Addressed comments from Robin and Lorenzo:
-No change to patch#1 .
-Reverted v5 patch#2 as this might break the platforms where this quirk
  is not applicable. Provided a generic function in iommu code and added
  back the quirk implementation in SMMU v3 driver(patch#3)

v4 --> v5
Addressed comments from Robin and Lorenzo:
-Added a comment to make it clear that, for now, only straightforward
  HW topologies are handled while reserving ITS regions(patch #1).

v3 --> v4
Rebased on 4.13-rc1.
Addressed comments from Robin, Will and Lorenzo:
-As suggested by Robin, moved the ITS msi reservation into
  iommu_dma_get_resv_regions().
-Added its_count != resv region failure case(patch #1).

v2 --> v3
Addressed comments from Lorenzo and Robin:
-Removed dev_is_pci() check in smmuV3 driver.
-Don't treat device not having an ITS mapping as an error in
  iort helper function.

v1 --> v2
-patch 2/2: Invoke iort helper fn based on fwnode type(acpi).

RFCv2 -->PATCH
-Incorporated Lorenzo's review comments.

RFC v1 --> RFC v2
Based on Robin's review comments,
-Removed  the generic erratum framework.
-Using IORT/MADT tables to retrieve the ITS base addr instead
 of vendor specific CSRT table.

Shameer Kolothum (3):
  ACPI/IORT: Add msi address regions reservation helper
  iommu/dma: Add HW MSI(GICv3 ITS) address regions reservation
  arm64:dts:hisilicon Disable hisilicon smmu node on hip06/hip07

 arch/arm64/boot/dts/hisilicon/hip06.dtsi |  56 ++++++++++++++++
 arch/arm64/boot/dts/hisilicon/hip07.dtsi |  25 +++++++
 drivers/acpi/arm64/iort.c                | 111 ++++++++++++++++++++++++++++++-
 drivers/iommu/dma-iommu.c                |   8 ++-
 drivers/irqchip/irq-gic-v3-its.c         |   3 +-
 include/linux/acpi_iort.h                |   7 +-
 6 files changed, 204 insertions(+), 6 deletions(-)

-- 
1.9.1


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Shameerali Kolothum Thodi Dec. 15, 2017, 3:01 p.m. UTC | #1
Hi Lorenzo/Robin/Will,

Since this has all the necessary reviewed-by from all concerned now(Thanks to all),
just wondering how this will be picked up? through iort or iommu?

Please let me know.

Thanks,
Shameer

> -----Original Message-----

> From: Shameerali Kolothum Thodi

> Sent: Thursday, December 14, 2017 4:10 PM

> To: lorenzo.pieralisi@arm.com; robin.murphy@arm.com;

> marc.zyngier@arm.com; will.deacon@arm.com

> Cc: joro@8bytes.org; John Garry <john.garry@huawei.com>; xuwei (O)

> <xuwei5@hisilicon.com>; Guohanjun (Hanjun Guo) <guohanjun@huawei.com>;

> iommu@lists.linux-foundation.org; linux-arm-kernel@lists.infradead.org; linux-

> acpi@vger.kernel.org; devicetree@vger.kernel.org; Linuxarm

> <linuxarm@huawei.com>; Shameerali Kolothum Thodi

> <shameerali.kolothum.thodi@huawei.com>

> Subject: [PATCH v12 0/3] iommu/smmu-v3: Workaround for hisilicon

> 161010801 erratum(reserve HW MSI)

> 

> On certain HiSilicon platforms (hip06/hip07) the GIC ITS and PCIe RC

> deviates from the standard implementation and this breaks PCIe MSI

> functionality when SMMU is enabled.

> 

> The HiSilicon erratum 161010801 describes this limitation of certain

> HiSilicon platforms to support the SMMU mappings for MSI transactions.

> On these platforms GICv3 ITS translator is presented with the deviceID

> by extending the MSI payload data to 64 bits to include the deviceID.

> Hence, the PCIe controller on this platforms has to differentiate the MSI

> payload against other DMA payload and has to modify the MSI payload.

> This basically makes it difficult for this platforms to have a SMMU

> translation for MSI.

> 

> This patch implements an ACPI based quirk to reserve the hw msi regions

> in the smmu-v3 driver which means these address regions will not be

> translated and will be excluded from iova allocations.

> 

> To implement this quirk, the following changes are incorporated:

> 1. Added a generic helper function to IORT code to retrieve and reserve

>    the associated ITS base address from a device IORT node. The function

>    has a check for smmu model to determine whether the platform requires

>    the HW MSI reservation or not.

> 2. Added smmu node entries and explicitly disabled them in hip06/hip07

>     dts files so that users are warned about the non-DT support for this

>     erratum.

> 

> Changelog:

> 

> v11--> v12

> -Thanks to Lorenzo, Fixed !CONFIG_IOMMU_API compile error(patch #1).

> 

> v10 --> v11

> -Addressed comments from Lorenzo(patch#1)

> -Added Robin's Reviewed-by to patch #2

> 

> v9 --> v10

> Addressed comments:

> -Moved smmu model check to iort helper function to selectively apply

>  the msi reservation which will make the fn call generic from iommu-dma.

> -Removed PCI blacklisting patch, instead added smmu nodes(disabled)

>  with comments to hip06/hip07 dts file.

> 

> v8 --> v9

> -Thanks to Marc, fixed IORT helper function to reserve the ITS

>  translater region only.

> -Removed the DT support for MSI reservation and blacklisted

>  HiSilicon PCIe controllers on DT based systems when SMMUv3 is

>  enabled.

> 

> v7 --> v8

> Addressed comments from Rob and Lorenzo:

>  -Modified to use DT compatible string for errata.

>  -Changed logic to retrieve the msi-parent for DT case.

> 

> v6 --> v7

> Addressed request from Will to add DT support for the erratum:

>  - added bt binding

>  - add of_iommu_msi_get_resv_regions()

> New arm64 silicon errata entry

> Rename iort_iommu_{its->msi}_get_resv_regions

> 

> v5 --> v6

> Addressed comments from Robin and Lorenzo:

> -No change to patch#1 .

> -Reverted v5 patch#2 as this might break the platforms where this quirk

>   is not applicable. Provided a generic function in iommu code and added

>   back the quirk implementation in SMMU v3 driver(patch#3)

> 

> v4 --> v5

> Addressed comments from Robin and Lorenzo:

> -Added a comment to make it clear that, for now, only straightforward

>   HW topologies are handled while reserving ITS regions(patch #1).

> 

> v3 --> v4

> Rebased on 4.13-rc1.

> Addressed comments from Robin, Will and Lorenzo:

> -As suggested by Robin, moved the ITS msi reservation into

>   iommu_dma_get_resv_regions().

> -Added its_count != resv region failure case(patch #1).

> 

> v2 --> v3

> Addressed comments from Lorenzo and Robin:

> -Removed dev_is_pci() check in smmuV3 driver.

> -Don't treat device not having an ITS mapping as an error in

>   iort helper function.

> 

> v1 --> v2

> -patch 2/2: Invoke iort helper fn based on fwnode type(acpi).

> 

> RFCv2 -->PATCH

> -Incorporated Lorenzo's review comments.

> 

> RFC v1 --> RFC v2

> Based on Robin's review comments,

> -Removed  the generic erratum framework.

> -Using IORT/MADT tables to retrieve the ITS base addr instead

>  of vendor specific CSRT table.

> 

> Shameer Kolothum (3):

>   ACPI/IORT: Add msi address regions reservation helper

>   iommu/dma: Add HW MSI(GICv3 ITS) address regions reservation

>   arm64:dts:hisilicon Disable hisilicon smmu node on hip06/hip07

> 

>  arch/arm64/boot/dts/hisilicon/hip06.dtsi |  56 ++++++++++++++++

>  arch/arm64/boot/dts/hisilicon/hip07.dtsi |  25 +++++++

>  drivers/acpi/arm64/iort.c                | 111 ++++++++++++++++++++++++++++++-

>  drivers/iommu/dma-iommu.c                |   8 ++-

>  drivers/irqchip/irq-gic-v3-its.c         |   3 +-

>  include/linux/acpi_iort.h                |   7 +-

>  6 files changed, 204 insertions(+), 6 deletions(-)

> 

> --

> 1.9.1

> 


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Shameerali Kolothum Thodi Jan. 29, 2018, 4:41 p.m. UTC | #2
Hi Joerg,

> -----Original Message-----

> From: Will Deacon [mailto:will.deacon@arm.com]

> Sent: Monday, January 29, 2018 4:21 PM

> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>

> Cc: lorenzo.pieralisi@arm.com; robin.murphy@arm.com;

> marc.zyngier@arm.com; joro@8bytes.org; John Garry

> <john.garry@huawei.com>; xuwei (O) <xuwei5@huawei.com>; Guohanjun

> (Hanjun Guo) <guohanjun@huawei.com>; iommu@lists.linux-foundation.org;

> linux-arm-kernel@lists.infradead.org; linux-acpi@vger.kernel.org;

> devicetree@vger.kernel.org; Linuxarm <linuxarm@huawei.com>

> Subject: Re: [PATCH v12 0/3] iommu/smmu-v3: Workaround for hisilicon

> 161010801 erratum(reserve HW MSI)

> 

> On Mon, Jan 29, 2018 at 04:16:33PM +0000, Shameerali Kolothum Thodi wrote:

> > > -----Original Message-----

> > > From: Will Deacon [mailto:will.deacon@arm.com]

> > > Sent: Monday, January 29, 2018 3:40 PM

> > > To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>

> > > Cc: lorenzo.pieralisi@arm.com; robin.murphy@arm.com;

> > > marc.zyngier@arm.com; joro@8bytes.org; John Garry

> > > <john.garry@huawei.com>; xuwei (O) <xuwei5@huawei.com>; Guohanjun

> > > (Hanjun Guo) <guohanjun@huawei.com>; iommu@lists.linux-

> foundation.org;

> > > linux-arm-kernel@lists.infradead.org; linux-acpi@vger.kernel.org;

> > > devicetree@vger.kernel.org; Linuxarm <linuxarm@huawei.com>

> > > Subject: Re: [PATCH v12 0/3] iommu/smmu-v3: Workaround for hisilicon

> > > 161010801 erratum(reserve HW MSI)

> > > On Thu, Dec 14, 2017 at 04:09:54PM +0000, Shameer Kolothum wrote:

> > > > On certain HiSilicon platforms (hip06/hip07) the GIC ITS and PCIe RC

> > > > deviates from the standard implementation and this breaks PCIe MSI

> > > > functionality when SMMU is enabled.

> > > >

> > > > The HiSilicon erratum 161010801 describes this limitation of certain

> > > > HiSilicon platforms to support the SMMU mappings for MSI transactions.

> > > > On these platforms GICv3 ITS translator is presented with the deviceID

> > > > by extending the MSI payload data to 64 bits to include the deviceID.

> > > > Hence, the PCIe controller on this platforms has to differentiate the

> > > > MSI payload against other DMA payload and has to modify the MSI

> payload.

> > > > This basically makes it difficult for this platforms to have a SMMU

> > > > translation for MSI.

> > > >

> > > > This patch implements an ACPI based quirk to reserve the hw msi

> > > > regions in the smmu-v3 driver which means these address regions will

> > > > not be translated and will be excluded from iova allocations.

> > > >

> > > > To implement this quirk, the following changes are incorporated:

> > > > 1. Added a generic helper function to IORT code to retrieve and reserve

> > > >    the associated ITS base address from a device IORT node. The function

> > > >    has a check for smmu model to determine whether the platform

> requires

> > > >    the HW MSI reservation or not.

> > > > 2. Added smmu node entries and explicitly disabled them in hip06/hip07

> > > >     dts files so that users are warned about the non-DT support for this

> > > >     erratum.

> > >

> > > [...]

> > >

> > > >  arch/arm64/boot/dts/hisilicon/hip06.dtsi |  56 ++++++++++++++++

> > > > arch/arm64/boot/dts/hisilicon/hip07.dtsi |  25 +++++++

> > > >  drivers/acpi/arm64/iort.c                | 111

> > > ++++++++++++++++++++++++++++++-

> > > >  drivers/iommu/dma-iommu.c                |   8 ++-

> > > >  drivers/irqchip/irq-gic-v3-its.c         |   3 +-

> > > >  include/linux/acpi_iort.h                |   7 +-

> > > >  6 files changed, 204 insertions(+), 6 deletions(-)

> > >

> > > It occurred to me this morning that this series probably isn't queued

> anywhere

> > > because it's not obvious which tree is supposed to take it and I can't see it in

> -

> > > next.

> > >

> > > Is this one for arm64, IOMMU, irqchip or something else? It's probably

> missed

> > > the boat for 4.16 now...

> > >

> >

> > I have been trying to ping you guys on this[1]. My expectation was that it will

> be

> > through IOMMU. Anyway missed the boat now, I will re-spin for 4.17.

> 

> The problem with "ping" emails is that they don't really mean anything. In

> this case, everybody probably assumed somebody else was picking it up so you

> didn't get a reply.

> 

> Joerg may be ok pulling this, but it's odd to have dts changes going via his

> tree. You might want to split those out, at least. Talk to him.

> 


This series has all the necessary ACKs from all concerned and as mentioned above
somehow created a confusion regarding the pull request. My apologies.

Could you please take a look and send out a pull request, if it is ok.

Many thanks,
Shameer

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html