From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lorenzo Pieralisi Subject: [PATCH v5 00/14] ACPI IORT ARM SMMU support Date: Fri, 9 Sep 2016 15:23:29 +0100 Message-ID: <20160909142343.13314-1-lorenzo.pieralisi@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Marc Zyngier , "Rafael J. Wysocki" , Will Deacon , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sinan Kaya , Dennis Chen , Tomasz Nowicki , Prem Mallappa , Jon Masters List-Id: linux-acpi@vger.kernel.org This patch series is v5 of a previous posting: https://lkml.org/lkml/2016/8/15/394 v4 -> v5 - Added SMMUv1/v2 support - Rebased against v4.8-rc5 and dependencies series - Consolidated IORT platform devices creation v3 -> v4 - Added single mapping API (for IORT named components) - Fixed arm_smmu_iort_xlate() return value - Reworked fwnode registration and platform device creation ordering to fix probe ordering dependencies - Added code to keep device_node ref count with new iommu fwspec API - Added patch to make iommu_fwspec arch agnostic - Dropped RFC status - Rebased against v4.8-rc2 v2 -> v3 - Rebased on top of dependencies series [1][2][3](v4.7-rc3) - Added back reliance on ACPI early probing infrastructure - Patch[1-3] merged through other dependent series - Added back IOMMU fwnode generalization - Move SMMU v3 static functions configuration to IORT code - Implemented generic IOMMU fwspec API - Added code to implement fwnode platform device look-up v1 -> v2: - Rebased on top of dependencies series [1][2][3](v4.7-rc1) - Removed IOMMU fwnode generalization - Implemented ARM SMMU v3 ACPI probing instead of ARM SMMU v2 owing to patch series dependencies [1] - Moved platform device creation logic to IORT code to generalize its usage for ARM SMMU v1-v2-v3 components - Removed reliance on ACPI early device probing - Created IORT specific iommu_xlate() translation hook leaving OF code unchanged according to v1 reviews The ACPI IORT table provides information that allows instantiating ARM SMMU devices and carrying out id mappings between components on ARM based systems (devices, IOMMUs, interrupt controllers). http://infocenter.arm.com/help/topic/com.arm.doc.den0049b/DEN0049B_IO_Remapping_Table.pdf Building on basic IORT support, available through [2], this patchset enables ARM SMMUs support on ACPI systems. Most of the code is aimed at building the required generic ACPI infrastructure to create and enable IOMMU components and to bring the IOMMU infrastructure for ACPI on par with DT, which is going to make future ARM SMMU components easier to integrate. PATCH (1) adds a FWNODE_IOMMU type to the struct fwnode_handle type. It is required to attach a fwnode identifier to platform devices allocated/detected through IORT tables entries; IOMMU devices have to have an identifier to look them up eg IOMMU core layer carrying out id translation. This can be done through a fwnode_handle (ie IOMMU platform devices created out of IORT tables are not ACPI devices hence they can't be allocated as such, otherwise they would have a fwnode_handle of type FWNODE_ACPI). PATCH (2) Add kernel infrastructure to make the struct iommu_fwspec handling arch agnostic and generic. PATCH (3) makes use of the ACPI early probing API to add a linker script section for probing devices via IORT ACPI kernel code. PATCH (4) provides IORT support for registering IOMMU IORT node through their fwnode handle. PATCH (5) extends iommu_fwspec so that it can be used on ACPI based system by creating a generic IOMMU fwspec kernel layer. PATCH (6) implements the of_dma_configure() API in ACPI world - acpi_dma_configure() - and patches PCI and ACPI core code to start making use of it. PATCH (7) creates the kernel infrastructure required to create ARM SMMU platform devices for IORT nodes. PATCH (8) refactors the ARM SMMU v3 driver so that the init functions are split in a way that groups together code that probes through DT and code that carries out HW registers FW agnostic probing, in preparation for adding the ACPI probing path. PATCH (9) Building on patch (7), it adds ARM SMMU v3 IORT IOMMU operations to create and probe ARM SMMU v3 components. PATCH (10) refactors the ARM SMMU v1/v2 driver so that the init functions are split in a way that groups together code that probes through DT and code that carries out HW registers FW agnostic probing, in preparation for adding the ACPI probing path. PATCH (11) Building on patch (7), it adds ARM SMMU v1/v2 IORT IOMMU operations to create and probe ARM SMMU v1/v2 components. PATCH (12) Extend the IORT iort_node_map_rid() to work on a type mask instead of a single type so that the translation API can be used on a range of components. PATCH (13) Add IORT API to carry out id mappings for components that do do not have an input identifier/RIDs (ie named components). PATCH (14) provides IORT infrastructure to carry out IOMMU configuration for devices and hook it up to the previously introduced ACPI DMA configure API. This patchset is built on top and depends on these two patch series: [1] R.Murphy "Generic DT bindings for PCI IOMMUS and ARM SMMU" v6 https://marc.info/?l=devicetree&m=147317605521320&w=2 [2] T.Nowicki "Introduce ACPI world to ITS irqchip" v10 https://marc.info/?l=linux-acpi&m=147315429713512&w=2 and is provided for review/testing purposes here: git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux.git acpi/iort-smmu-v5 Tested on Juno and FVP models for ARM SMMU v1 and v3 probing path. Lorenzo Pieralisi (14): drivers: iommu: add FWNODE_IOMMU fwnode type drivers: iommu: implement arch_{set/get}_iommu_fwspec API drivers: acpi: iort: introduce linker section for IORT entries probing drivers: acpi: iort: add support for IOMMU fwnode registration drivers: iommu: make iommu_fwspec OF agnostic drivers: acpi: implement acpi_dma_configure drivers: acpi: iort: add support for ARM SMMU platform devices creation drivers: iommu: arm-smmu-v3: split probe functions into DT/generic portions drivers: iommu: arm-smmu-v3: add IORT configuration drivers: iommu: arm-smmu: split probe functions into DT/generic portions drivers: iommu: arm-smmu: add IORT configuration drivers: acpi: iort: replace rid map type with type mask drivers: acpi: iort: add single mapping function drivers: acpi: iort: introduce iort_iommu_configure arch/arm/Kconfig | 1 + arch/arm/include/asm/iommu-fwspec.h | 30 ++ arch/arm64/Kconfig | 1 + arch/arm64/include/asm/iommu-fwspec.h | 30 ++ drivers/acpi/arm64/iort.c | 525 +++++++++++++++++++++++++++++++++- drivers/acpi/glue.c | 4 +- drivers/acpi/scan.c | 29 ++ drivers/iommu/Kconfig | 7 + drivers/iommu/Makefile | 1 + drivers/iommu/arm-smmu-v3.c | 141 +++++++-- drivers/iommu/arm-smmu.c | 209 +++++++++++--- drivers/iommu/iommu-fwspec.c | 126 ++++++++ drivers/iommu/of_iommu.c | 93 ------ drivers/pci/probe.c | 3 +- include/acpi/acpi_bus.h | 2 + include/asm-generic/vmlinux.lds.h | 1 + include/linux/acpi.h | 5 + include/linux/acpi_iort.h | 21 ++ include/linux/fwnode.h | 1 + include/linux/iommu-fwspec.h | 70 +++++ include/linux/iommu.h | 25 ++ include/linux/of_iommu.h | 28 +- 22 files changed, 1187 insertions(+), 166 deletions(-) create mode 100644 arch/arm/include/asm/iommu-fwspec.h create mode 100644 arch/arm64/include/asm/iommu-fwspec.h create mode 100644 drivers/iommu/iommu-fwspec.c create mode 100644 include/linux/iommu-fwspec.h -- 2.10.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751662AbcIIOXd (ORCPT ); Fri, 9 Sep 2016 10:23:33 -0400 Received: from foss.arm.com ([217.140.101.70]:44540 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744AbcIIOXa (ORCPT ); Fri, 9 Sep 2016 10:23:30 -0400 From: Lorenzo Pieralisi To: iommu@lists.linux-foundation.org Cc: Lorenzo Pieralisi , Will Deacon , Marc Zyngier , Robin Murphy , Joerg Roedel , "Rafael J. Wysocki" , Tomasz Nowicki , Hanjun Guo , Jon Masters , Eric Auger , Sinan Kaya , Nate Watterson , Prem Mallappa , Dennis Chen , linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 00/14] ACPI IORT ARM SMMU support Date: Fri, 9 Sep 2016 15:23:29 +0100 Message-Id: <20160909142343.13314-1-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.10.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch series is v5 of a previous posting: https://lkml.org/lkml/2016/8/15/394 v4 -> v5 - Added SMMUv1/v2 support - Rebased against v4.8-rc5 and dependencies series - Consolidated IORT platform devices creation v3 -> v4 - Added single mapping API (for IORT named components) - Fixed arm_smmu_iort_xlate() return value - Reworked fwnode registration and platform device creation ordering to fix probe ordering dependencies - Added code to keep device_node ref count with new iommu fwspec API - Added patch to make iommu_fwspec arch agnostic - Dropped RFC status - Rebased against v4.8-rc2 v2 -> v3 - Rebased on top of dependencies series [1][2][3](v4.7-rc3) - Added back reliance on ACPI early probing infrastructure - Patch[1-3] merged through other dependent series - Added back IOMMU fwnode generalization - Move SMMU v3 static functions configuration to IORT code - Implemented generic IOMMU fwspec API - Added code to implement fwnode platform device look-up v1 -> v2: - Rebased on top of dependencies series [1][2][3](v4.7-rc1) - Removed IOMMU fwnode generalization - Implemented ARM SMMU v3 ACPI probing instead of ARM SMMU v2 owing to patch series dependencies [1] - Moved platform device creation logic to IORT code to generalize its usage for ARM SMMU v1-v2-v3 components - Removed reliance on ACPI early device probing - Created IORT specific iommu_xlate() translation hook leaving OF code unchanged according to v1 reviews The ACPI IORT table provides information that allows instantiating ARM SMMU devices and carrying out id mappings between components on ARM based systems (devices, IOMMUs, interrupt controllers). http://infocenter.arm.com/help/topic/com.arm.doc.den0049b/DEN0049B_IO_Remapping_Table.pdf Building on basic IORT support, available through [2], this patchset enables ARM SMMUs support on ACPI systems. Most of the code is aimed at building the required generic ACPI infrastructure to create and enable IOMMU components and to bring the IOMMU infrastructure for ACPI on par with DT, which is going to make future ARM SMMU components easier to integrate. PATCH (1) adds a FWNODE_IOMMU type to the struct fwnode_handle type. It is required to attach a fwnode identifier to platform devices allocated/detected through IORT tables entries; IOMMU devices have to have an identifier to look them up eg IOMMU core layer carrying out id translation. This can be done through a fwnode_handle (ie IOMMU platform devices created out of IORT tables are not ACPI devices hence they can't be allocated as such, otherwise they would have a fwnode_handle of type FWNODE_ACPI). PATCH (2) Add kernel infrastructure to make the struct iommu_fwspec handling arch agnostic and generic. PATCH (3) makes use of the ACPI early probing API to add a linker script section for probing devices via IORT ACPI kernel code. PATCH (4) provides IORT support for registering IOMMU IORT node through their fwnode handle. PATCH (5) extends iommu_fwspec so that it can be used on ACPI based system by creating a generic IOMMU fwspec kernel layer. PATCH (6) implements the of_dma_configure() API in ACPI world - acpi_dma_configure() - and patches PCI and ACPI core code to start making use of it. PATCH (7) creates the kernel infrastructure required to create ARM SMMU platform devices for IORT nodes. PATCH (8) refactors the ARM SMMU v3 driver so that the init functions are split in a way that groups together code that probes through DT and code that carries out HW registers FW agnostic probing, in preparation for adding the ACPI probing path. PATCH (9) Building on patch (7), it adds ARM SMMU v3 IORT IOMMU operations to create and probe ARM SMMU v3 components. PATCH (10) refactors the ARM SMMU v1/v2 driver so that the init functions are split in a way that groups together code that probes through DT and code that carries out HW registers FW agnostic probing, in preparation for adding the ACPI probing path. PATCH (11) Building on patch (7), it adds ARM SMMU v1/v2 IORT IOMMU operations to create and probe ARM SMMU v1/v2 components. PATCH (12) Extend the IORT iort_node_map_rid() to work on a type mask instead of a single type so that the translation API can be used on a range of components. PATCH (13) Add IORT API to carry out id mappings for components that do do not have an input identifier/RIDs (ie named components). PATCH (14) provides IORT infrastructure to carry out IOMMU configuration for devices and hook it up to the previously introduced ACPI DMA configure API. This patchset is built on top and depends on these two patch series: [1] R.Murphy "Generic DT bindings for PCI IOMMUS and ARM SMMU" v6 https://marc.info/?l=devicetree&m=147317605521320&w=2 [2] T.Nowicki "Introduce ACPI world to ITS irqchip" v10 https://marc.info/?l=linux-acpi&m=147315429713512&w=2 and is provided for review/testing purposes here: git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux.git acpi/iort-smmu-v5 Tested on Juno and FVP models for ARM SMMU v1 and v3 probing path. Lorenzo Pieralisi (14): drivers: iommu: add FWNODE_IOMMU fwnode type drivers: iommu: implement arch_{set/get}_iommu_fwspec API drivers: acpi: iort: introduce linker section for IORT entries probing drivers: acpi: iort: add support for IOMMU fwnode registration drivers: iommu: make iommu_fwspec OF agnostic drivers: acpi: implement acpi_dma_configure drivers: acpi: iort: add support for ARM SMMU platform devices creation drivers: iommu: arm-smmu-v3: split probe functions into DT/generic portions drivers: iommu: arm-smmu-v3: add IORT configuration drivers: iommu: arm-smmu: split probe functions into DT/generic portions drivers: iommu: arm-smmu: add IORT configuration drivers: acpi: iort: replace rid map type with type mask drivers: acpi: iort: add single mapping function drivers: acpi: iort: introduce iort_iommu_configure arch/arm/Kconfig | 1 + arch/arm/include/asm/iommu-fwspec.h | 30 ++ arch/arm64/Kconfig | 1 + arch/arm64/include/asm/iommu-fwspec.h | 30 ++ drivers/acpi/arm64/iort.c | 525 +++++++++++++++++++++++++++++++++- drivers/acpi/glue.c | 4 +- drivers/acpi/scan.c | 29 ++ drivers/iommu/Kconfig | 7 + drivers/iommu/Makefile | 1 + drivers/iommu/arm-smmu-v3.c | 141 +++++++-- drivers/iommu/arm-smmu.c | 209 +++++++++++--- drivers/iommu/iommu-fwspec.c | 126 ++++++++ drivers/iommu/of_iommu.c | 93 ------ drivers/pci/probe.c | 3 +- include/acpi/acpi_bus.h | 2 + include/asm-generic/vmlinux.lds.h | 1 + include/linux/acpi.h | 5 + include/linux/acpi_iort.h | 21 ++ include/linux/fwnode.h | 1 + include/linux/iommu-fwspec.h | 70 +++++ include/linux/iommu.h | 25 ++ include/linux/of_iommu.h | 28 +- 22 files changed, 1187 insertions(+), 166 deletions(-) create mode 100644 arch/arm/include/asm/iommu-fwspec.h create mode 100644 arch/arm64/include/asm/iommu-fwspec.h create mode 100644 drivers/iommu/iommu-fwspec.c create mode 100644 include/linux/iommu-fwspec.h -- 2.10.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) Date: Fri, 9 Sep 2016 15:23:29 +0100 Subject: [PATCH v5 00/14] ACPI IORT ARM SMMU support Message-ID: <20160909142343.13314-1-lorenzo.pieralisi@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch series is v5 of a previous posting: https://lkml.org/lkml/2016/8/15/394 v4 -> v5 - Added SMMUv1/v2 support - Rebased against v4.8-rc5 and dependencies series - Consolidated IORT platform devices creation v3 -> v4 - Added single mapping API (for IORT named components) - Fixed arm_smmu_iort_xlate() return value - Reworked fwnode registration and platform device creation ordering to fix probe ordering dependencies - Added code to keep device_node ref count with new iommu fwspec API - Added patch to make iommu_fwspec arch agnostic - Dropped RFC status - Rebased against v4.8-rc2 v2 -> v3 - Rebased on top of dependencies series [1][2][3](v4.7-rc3) - Added back reliance on ACPI early probing infrastructure - Patch[1-3] merged through other dependent series - Added back IOMMU fwnode generalization - Move SMMU v3 static functions configuration to IORT code - Implemented generic IOMMU fwspec API - Added code to implement fwnode platform device look-up v1 -> v2: - Rebased on top of dependencies series [1][2][3](v4.7-rc1) - Removed IOMMU fwnode generalization - Implemented ARM SMMU v3 ACPI probing instead of ARM SMMU v2 owing to patch series dependencies [1] - Moved platform device creation logic to IORT code to generalize its usage for ARM SMMU v1-v2-v3 components - Removed reliance on ACPI early device probing - Created IORT specific iommu_xlate() translation hook leaving OF code unchanged according to v1 reviews The ACPI IORT table provides information that allows instantiating ARM SMMU devices and carrying out id mappings between components on ARM based systems (devices, IOMMUs, interrupt controllers). http://infocenter.arm.com/help/topic/com.arm.doc.den0049b/DEN0049B_IO_Remapping_Table.pdf Building on basic IORT support, available through [2], this patchset enables ARM SMMUs support on ACPI systems. Most of the code is aimed at building the required generic ACPI infrastructure to create and enable IOMMU components and to bring the IOMMU infrastructure for ACPI on par with DT, which is going to make future ARM SMMU components easier to integrate. PATCH (1) adds a FWNODE_IOMMU type to the struct fwnode_handle type. It is required to attach a fwnode identifier to platform devices allocated/detected through IORT tables entries; IOMMU devices have to have an identifier to look them up eg IOMMU core layer carrying out id translation. This can be done through a fwnode_handle (ie IOMMU platform devices created out of IORT tables are not ACPI devices hence they can't be allocated as such, otherwise they would have a fwnode_handle of type FWNODE_ACPI). PATCH (2) Add kernel infrastructure to make the struct iommu_fwspec handling arch agnostic and generic. PATCH (3) makes use of the ACPI early probing API to add a linker script section for probing devices via IORT ACPI kernel code. PATCH (4) provides IORT support for registering IOMMU IORT node through their fwnode handle. PATCH (5) extends iommu_fwspec so that it can be used on ACPI based system by creating a generic IOMMU fwspec kernel layer. PATCH (6) implements the of_dma_configure() API in ACPI world - acpi_dma_configure() - and patches PCI and ACPI core code to start making use of it. PATCH (7) creates the kernel infrastructure required to create ARM SMMU platform devices for IORT nodes. PATCH (8) refactors the ARM SMMU v3 driver so that the init functions are split in a way that groups together code that probes through DT and code that carries out HW registers FW agnostic probing, in preparation for adding the ACPI probing path. PATCH (9) Building on patch (7), it adds ARM SMMU v3 IORT IOMMU operations to create and probe ARM SMMU v3 components. PATCH (10) refactors the ARM SMMU v1/v2 driver so that the init functions are split in a way that groups together code that probes through DT and code that carries out HW registers FW agnostic probing, in preparation for adding the ACPI probing path. PATCH (11) Building on patch (7), it adds ARM SMMU v1/v2 IORT IOMMU operations to create and probe ARM SMMU v1/v2 components. PATCH (12) Extend the IORT iort_node_map_rid() to work on a type mask instead of a single type so that the translation API can be used on a range of components. PATCH (13) Add IORT API to carry out id mappings for components that do do not have an input identifier/RIDs (ie named components). PATCH (14) provides IORT infrastructure to carry out IOMMU configuration for devices and hook it up to the previously introduced ACPI DMA configure API. This patchset is built on top and depends on these two patch series: [1] R.Murphy "Generic DT bindings for PCI IOMMUS and ARM SMMU" v6 https://marc.info/?l=devicetree&m=147317605521320&w=2 [2] T.Nowicki "Introduce ACPI world to ITS irqchip" v10 https://marc.info/?l=linux-acpi&m=147315429713512&w=2 and is provided for review/testing purposes here: git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux.git acpi/iort-smmu-v5 Tested on Juno and FVP models for ARM SMMU v1 and v3 probing path. Lorenzo Pieralisi (14): drivers: iommu: add FWNODE_IOMMU fwnode type drivers: iommu: implement arch_{set/get}_iommu_fwspec API drivers: acpi: iort: introduce linker section for IORT entries probing drivers: acpi: iort: add support for IOMMU fwnode registration drivers: iommu: make iommu_fwspec OF agnostic drivers: acpi: implement acpi_dma_configure drivers: acpi: iort: add support for ARM SMMU platform devices creation drivers: iommu: arm-smmu-v3: split probe functions into DT/generic portions drivers: iommu: arm-smmu-v3: add IORT configuration drivers: iommu: arm-smmu: split probe functions into DT/generic portions drivers: iommu: arm-smmu: add IORT configuration drivers: acpi: iort: replace rid map type with type mask drivers: acpi: iort: add single mapping function drivers: acpi: iort: introduce iort_iommu_configure arch/arm/Kconfig | 1 + arch/arm/include/asm/iommu-fwspec.h | 30 ++ arch/arm64/Kconfig | 1 + arch/arm64/include/asm/iommu-fwspec.h | 30 ++ drivers/acpi/arm64/iort.c | 525 +++++++++++++++++++++++++++++++++- drivers/acpi/glue.c | 4 +- drivers/acpi/scan.c | 29 ++ drivers/iommu/Kconfig | 7 + drivers/iommu/Makefile | 1 + drivers/iommu/arm-smmu-v3.c | 141 +++++++-- drivers/iommu/arm-smmu.c | 209 +++++++++++--- drivers/iommu/iommu-fwspec.c | 126 ++++++++ drivers/iommu/of_iommu.c | 93 ------ drivers/pci/probe.c | 3 +- include/acpi/acpi_bus.h | 2 + include/asm-generic/vmlinux.lds.h | 1 + include/linux/acpi.h | 5 + include/linux/acpi_iort.h | 21 ++ include/linux/fwnode.h | 1 + include/linux/iommu-fwspec.h | 70 +++++ include/linux/iommu.h | 25 ++ include/linux/of_iommu.h | 28 +- 22 files changed, 1187 insertions(+), 166 deletions(-) create mode 100644 arch/arm/include/asm/iommu-fwspec.h create mode 100644 arch/arm64/include/asm/iommu-fwspec.h create mode 100644 drivers/iommu/iommu-fwspec.c create mode 100644 include/linux/iommu-fwspec.h -- 2.10.0