Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753934AbdIEW53 (ORCPT ); Tue, 5 Sep 2017 18:57:29 -0400 Received: from fllnx209.ext.ti.com ([198.47.19.16]:36161 "EHLO fllnx209.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752824AbdIEW5Y (ORCPT ); Tue, 5 Sep 2017 18:57:24 -0400 From: Suman Anna To: Joerg Roedel CC: , Tony Lindgren , Tero Kristo , Laurent Pinchart , , , Suman Anna Subject: [PATCH v2 0/2] Dual MMU support for TI DRA7xx DSPs Date: Tue, 5 Sep 2017 17:56:16 -0500 Message-ID: <20170905225618.912-1-s-anna@ti.com> X-Mailer: git-send-email 2.13.1 MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7796 Lines: 123 Hi Joerg, The following is v2 of the patch series that enhances the OMAP IOMMU driver to support the mirror-programming of the two MMUs present within the DSP subsystems on TI DRA7xx/AM57xx family of SoCs. The main changes are to address the review comments on the registration of the MMU devices with the IOMMU core. I have added logic in omap_iommu_probe function to not register the second MMU device with the IOMMU core. There is also only one iommu_group now and the iommu sysfs entries do not show the second core anymore. Example output log given below. I have chosen to make the modifications in the probe rather than the .add_device callback as this is much simpler. It eliminates the need for additional logic for refcounting (need the iommu_group allocation only for the first client) and moving the iommu_group allocation out of probe. This also ensures the IOMMU device and group registration is done during probe itself irrespective of whether there are client nodes defined or not in the DTS (for the .add_device callbacks to be effective). Patches still based on your 4.13 arm/omap branch. DT representation and usage details are the same as described in v1 [1]. regards Suman [1] https://marc.info/?l=linux-omap&m=150418532431811&w=2 Following is the output of sysfs with these MMUs exercised with additional patches now: root@am57xx-evm:~# dmesg | grep mmu [ 0.520328] omap-iommu 40d01000.mmu: 40d01000.mmu registered [ 0.520676] omap-iommu 40d02000.mmu: 40d02000.mmu registered [ 0.521148] omap-iommu 58882000.mmu: 58882000.mmu registered [ 0.521638] omap-iommu 55082000.mmu: 55082000.mmu registered [ 0.522226] omap-iommu 41501000.mmu: 41501000.mmu registered [ 0.522575] omap-iommu 41502000.mmu: 41502000.mmu registered [ 0.523040] iommu: Adding device 58820000.ipu to group 1 [ 0.523192] iommu: Adding device 55020000.ipu to group 2 [ 0.523444] iommu: Adding device 40800000.dsp to group 0 [ 0.523841] iommu: Adding device 41000000.dsp to group 3 root@am57xx-evm:~# ls -l /sys/class/iommu/ lrwxrwxrwx 1 root root 0 Aug 8 03:59 40d01000.mmu -> ../../devices/platform/44000000.ocp/40d01000.mmu/iommu/40d01000.mmu lrwxrwxrwx 1 root root 0 Aug 8 03:59 41501000.mmu -> ../../devices/platform/44000000.ocp/41501000.mmu/iommu/41501000.mmu lrwxrwxrwx 1 root root 0 Aug 8 03:59 55082000.mmu -> ../../devices/platform/44000000.ocp/55082000.mmu/iommu/55082000.mmu lrwxrwxrwx 1 root root 0 Aug 8 03:59 58882000.mmu -> ../../devices/platform/44000000.ocp/58882000.mmu/iommu/58882000.mmu root@am57xx-evm:~# ls -l /sys/kernel/iommu_groups/ drwxr-xr-x 3 root root 0 Aug 8 03:59 0 drwxr-xr-x 3 root root 0 Aug 8 03:59 1 drwxr-xr-x 3 root root 0 Aug 8 03:59 2 drwxr-xr-x 3 root root 0 Aug 8 03:59 3 root@am57xx-evm:~# ls -l /sys/kernel/iommu_groups/*/devices /sys/kernel/iommu_groups/0/devices: lrwxrwxrwx 1 root root 0 Aug 8 03:59 40800000.dsp -> ../../../../devices/platform/44000000.ocp/40800000.dsp /sys/kernel/iommu_groups/1/devices: lrwxrwxrwx 1 root root 0 Aug 8 03:59 58820000.ipu -> ../../../../devices/platform/44000000.ocp/58820000.ipu /sys/kernel/iommu_groups/2/devices: lrwxrwxrwx 1 root root 0 Aug 8 03:59 55020000.ipu -> ../../../../devices/platform/44000000.ocp/55020000.ipu /sys/kernel/iommu_groups/3/devices: lrwxrwxrwx 1 root root 0 Aug 8 03:59 41000000.dsp -> ../../../../devices/platform/44000000.ocp/41000000.dsp root@am57xx-evm:~# ls -l /sys/kernel/iommu_groups/*/devices/*/ /sys/kernel/iommu_groups/0/devices/40800000.dsp/: lrwxrwxrwx 1 root root 0 Aug 8 04:04 driver -> ../../../../bus/platform/drivers/omap-rproc -rw-r--r-- 1 root root 4096 Aug 8 03:59 driver_override lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu -> ../40d01000.mmu/iommu/40d01000.mmu lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu_group -> ../../../../kernel/iommu_groups/0 -r--r--r-- 1 root root 4096 Aug 8 03:59 modalias lrwxrwxrwx 1 root root 0 Aug 8 03:59 of_node -> ../../../../firmware/devicetree/base/ocp/dsp@40800000 drwxr-xr-x 2 root root 0 Aug 8 03:59 power drwxr-xr-x 3 root root 0 Aug 8 04:04 remoteproc lrwxrwxrwx 1 root root 0 Aug 8 03:59 subsystem -> ../../../../bus/platform -rw-r--r-- 1 root root 4096 Aug 8 03:59 uevent /sys/kernel/iommu_groups/1/devices/58820000.ipu/: lrwxrwxrwx 1 root root 0 Aug 8 04:04 driver -> ../../../../bus/platform/drivers/omap-rproc -rw-r--r-- 1 root root 4096 Aug 8 03:59 driver_override lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu -> ../58882000.mmu/iommu/58882000.mmu lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu_group -> ../../../../kernel/iommu_groups/1 -r--r--r-- 1 root root 4096 Aug 8 03:59 modalias lrwxrwxrwx 1 root root 0 Aug 8 03:59 of_node -> ../../../../firmware/devicetree/base/ocp/ipu@58820000 drwxr-xr-x 2 root root 0 Aug 8 03:59 power drwxr-xr-x 3 root root 0 Aug 8 04:04 remoteproc lrwxrwxrwx 1 root root 0 Aug 8 03:59 subsystem -> ../../../../bus/platform -rw-r--r-- 1 root root 4096 Aug 8 03:59 uevent /sys/kernel/iommu_groups/2/devices/55020000.ipu/: lrwxrwxrwx 1 root root 0 Aug 8 04:04 driver -> ../../../../bus/platform/drivers/omap-rproc -rw-r--r-- 1 root root 4096 Aug 8 03:59 driver_override lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu -> ../55082000.mmu/iommu/55082000.mmu lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu_group -> ../../../../kernel/iommu_groups/2 -r--r--r-- 1 root root 4096 Aug 8 03:59 modalias lrwxrwxrwx 1 root root 0 Aug 8 03:59 of_node -> ../../../../firmware/devicetree/base/ocp/ipu@55020000 drwxr-xr-x 2 root root 0 Aug 8 03:59 power drwxr-xr-x 3 root root 0 Aug 8 04:04 remoteproc lrwxrwxrwx 1 root root 0 Aug 8 03:59 subsystem -> ../../../../bus/platform -rw-r--r-- 1 root root 4096 Aug 8 03:59 uevent /sys/kernel/iommu_groups/3/devices/41000000.dsp/: lrwxrwxrwx 1 root root 0 Aug 8 04:04 driver -> ../../../../bus/platform/drivers/omap-rproc -rw-r--r-- 1 root root 4096 Aug 8 03:59 driver_override lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu -> ../41501000.mmu/iommu/41501000.mmu lrwxrwxrwx 1 root root 0 Aug 8 03:59 iommu_group -> ../../../../kernel/iommu_groups/3 -r--r--r-- 1 root root 4096 Aug 8 03:59 modalias lrwxrwxrwx 1 root root 0 Aug 8 03:59 of_node -> ../../../../firmware/devicetree/base/ocp/dsp@41000000 drwxr-xr-x 2 root root 0 Aug 8 03:59 power drwxr-xr-x 3 root root 0 Aug 8 04:04 remoteproc lrwxrwxrwx 1 root root 0 Aug 8 03:59 subsystem -> ../../../../bus/platform -rw-r--r-- 1 root root 4096 Aug 8 03:59 uevent Suman Anna (2): iommu/omap: Change the attach detection logic iommu/omap: Add support to program multiple iommus drivers/iommu/omap-iommu.c | 375 ++++++++++++++++++++++++++++++++++----------- drivers/iommu/omap-iommu.h | 30 ++-- 2 files changed, 296 insertions(+), 109 deletions(-) -- 2.13.1