Message ID | 20140314141050.c8bedcb66532d277c496796d@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi KyongHo, On 14.03.2014 06:10, Cho KyongHo wrote: > Some master device descriptor like fimc-is which is an abstraction > of very complex H/W may have multiple System MMUs. For those devices, > the design of the link between System MMU and its master H/W is needed > to be reconsidered. > > A link structure, sysmmu_list_data is introduced that provides a link > to master H/W and that has a pointer to the device descriptor of a > System MMU. Given a device descriptor of a master H/W, it is possible > to traverse all System MMUs that must be controlled along with the > master H/W. NAK. A device driver should handle particular hardware instances separately, without abstracting a virtual hardware instance consisting of multiple physical ones. If such abstraction is needed, it should be done above the exynos-iommu driver, e.g. by something like iommu-composite driver that would aggregate several IOMMUs. Keep in mind that such IOMMUs in a group could be different, e.g. different Exynos SysMMU versions or even completely different IPs handled by different drivers. Still, I don't think there is a real need for such abstraction. Instead, related drivers shall be fixed to properly handle multiple memory masters and their IOMMUs. Best regards, Tomasz
On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: > Hi KyongHo, > > On 14.03.2014 06:10, Cho KyongHo wrote: > > Some master device descriptor like fimc-is which is an abstraction > > of very complex H/W may have multiple System MMUs. For those devices, > > the design of the link between System MMU and its master H/W is needed > > to be reconsidered. > > > > A link structure, sysmmu_list_data is introduced that provides a link > > to master H/W and that has a pointer to the device descriptor of a > > System MMU. Given a device descriptor of a master H/W, it is possible > > to traverse all System MMUs that must be controlled along with the > > master H/W. > > NAK. > > A device driver should handle particular hardware instances separately, > without abstracting a virtual hardware instance consisting of multiple > physical ones. > > If such abstraction is needed, it should be done above the exynos-iommu > driver, e.g. by something like iommu-composite driver that would > aggregate several IOMMUs. Keep in mind that such IOMMUs in a group could > be different, e.g. different Exynos SysMMU versions or even completely > different IPs handled by different drivers. > > Still, I don't think there is a real need for such abstraction. Instead, > related drivers shall be fixed to properly handle multiple memory > masters and their IOMMUs. > G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother SoC like Exynos5250 does not. I don't understand why you are negative to this approach. This is the simplest than the others. Let me show you an example. FIMC-IS driver just controls MCU in FIMC-IS subsystem and the firmware of the MCU controls all other peripherals in the subsystem. Each peripherals have their own System MMU. Moreover, the configuration of the peripherals varies according to the SoCs. If System MMU driver accepts multiple masters, everything is done in DT. But I worry that it is not easy if System MMU driver does not support multiple masters. Thank you. KyongHo
On 18.03.2014 14:01, Cho KyongHo wrote: > On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: >> Hi KyongHo, >> >> On 14.03.2014 06:10, Cho KyongHo wrote: >>> Some master device descriptor like fimc-is which is an abstraction >>> of very complex H/W may have multiple System MMUs. For those devices, >>> the design of the link between System MMU and its master H/W is needed >>> to be reconsidered. >>> >>> A link structure, sysmmu_list_data is introduced that provides a link >>> to master H/W and that has a pointer to the device descriptor of a >>> System MMU. Given a device descriptor of a master H/W, it is possible >>> to traverse all System MMUs that must be controlled along with the >>> master H/W. >> >> NAK. >> >> A device driver should handle particular hardware instances separately, >> without abstracting a virtual hardware instance consisting of multiple >> physical ones. >> >> If such abstraction is needed, it should be done above the exynos-iommu >> driver, e.g. by something like iommu-composite driver that would >> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group could >> be different, e.g. different Exynos SysMMU versions or even completely >> different IPs handled by different drivers. >> >> Still, I don't think there is a real need for such abstraction. Instead, >> related drivers shall be fixed to properly handle multiple memory >> masters and their IOMMUs. >> > > G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother SoC like > Exynos5250 does not. > > I don't understand why you are negative to this approach. > This is the simplest than the others. > > Let me show you an example. > FIMC-IS driver just controls MCU in FIMC-IS subsystem and the firmware of > the MCU controls all other peripherals in the subsystem. Each peripherals > have their own System MMU. Moreover, the configuration of the peripherals > varies according to the SoCs. > > If System MMU driver accepts multiple masters, everything is done in DT. > But I worry that it is not easy if System MMU driver does not support > multiple masters. I believe I have stated enough reasons why this kind of implementation is bad. I'm not going to waste time repeating myself. Your concerns presented above are valid, however they are not related to what is wrong with this patch. I have given you two proper ways to handle this, none should be forced upon particular IOMMU master drivers - their authors should have the chance to select the method that works best for them. Best regards, Tomasz
On Tue, 18 Mar 2014 15:26:48 +0100, Tomasz Figa wrote: > > > On 18.03.2014 14:01, Cho KyongHo wrote: > > On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: > >> Hi KyongHo, > >> > >> On 14.03.2014 06:10, Cho KyongHo wrote: > >>> Some master device descriptor like fimc-is which is an abstraction > >>> of very complex H/W may have multiple System MMUs. For those devices, > >>> the design of the link between System MMU and its master H/W is needed > >>> to be reconsidered. > >>> > >>> A link structure, sysmmu_list_data is introduced that provides a link > >>> to master H/W and that has a pointer to the device descriptor of a > >>> System MMU. Given a device descriptor of a master H/W, it is possible > >>> to traverse all System MMUs that must be controlled along with the > >>> master H/W. > >> > >> NAK. > >> > >> A device driver should handle particular hardware instances separately, > >> without abstracting a virtual hardware instance consisting of multiple > >> physical ones. > >> > >> If such abstraction is needed, it should be done above the exynos-iommu > >> driver, e.g. by something like iommu-composite driver that would > >> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group could > >> be different, e.g. different Exynos SysMMU versions or even completely > >> different IPs handled by different drivers. > >> > >> Still, I don't think there is a real need for such abstraction. Instead, > >> related drivers shall be fixed to properly handle multiple memory > >> masters and their IOMMUs. > >> > > > > G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother SoC like > > Exynos5250 does not. > > > > I don't understand why you are negative to this approach. > > This is the simplest than the others. > > > > Let me show you an example. > > FIMC-IS driver just controls MCU in FIMC-IS subsystem and the firmware of > > the MCU controls all other peripherals in the subsystem. Each peripherals > > have their own System MMU. Moreover, the configuration of the peripherals > > varies according to the SoCs. > > > > If System MMU driver accepts multiple masters, everything is done in DT. > > But I worry that it is not easy if System MMU driver does not support > > multiple masters. > > I believe I have stated enough reasons why this kind of implementation > is bad. I'm not going to waste time repeating myself. > > Your concerns presented above are valid, however they are not related to > what is wrong with this patch. I have given you two proper ways to > handle this, none should be forced upon particular IOMMU master drivers > - their authors should have the chance to select the method that works > best for them. > I don't still understand why you think this patch is wrong. I think this is the best way not to think for all the driver developers about other things than their business logic. This does not hurt anyone and I think this is good enough. If you want to provide another layer between master device and system mmu as you mentioned, you do that. This patch does not restrict it. Regards, KyongHo
On 19.03.2014 01:39, Cho KyongHo wrote: > On Tue, 18 Mar 2014 15:26:48 +0100, Tomasz Figa wrote: >> >> >> On 18.03.2014 14:01, Cho KyongHo wrote: >>> On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: >>>> Hi KyongHo, >>>> >>>> On 14.03.2014 06:10, Cho KyongHo wrote: >>>>> Some master device descriptor like fimc-is which is an abstraction >>>>> of very complex H/W may have multiple System MMUs. For those devices, >>>>> the design of the link between System MMU and its master H/W is needed >>>>> to be reconsidered. >>>>> >>>>> A link structure, sysmmu_list_data is introduced that provides a link >>>>> to master H/W and that has a pointer to the device descriptor of a >>>>> System MMU. Given a device descriptor of a master H/W, it is possible >>>>> to traverse all System MMUs that must be controlled along with the >>>>> master H/W. >>>> >>>> NAK. >>>> >>>> A device driver should handle particular hardware instances separately, >>>> without abstracting a virtual hardware instance consisting of multiple >>>> physical ones. >>>> >>>> If such abstraction is needed, it should be done above the exynos-iommu >>>> driver, e.g. by something like iommu-composite driver that would >>>> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group could >>>> be different, e.g. different Exynos SysMMU versions or even completely >>>> different IPs handled by different drivers. >>>> >>>> Still, I don't think there is a real need for such abstraction. Instead, >>>> related drivers shall be fixed to properly handle multiple memory >>>> masters and their IOMMUs. >>>> >>> >>> G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother SoC like >>> Exynos5250 does not. >>> >>> I don't understand why you are negative to this approach. >>> This is the simplest than the others. >>> >>> Let me show you an example. >>> FIMC-IS driver just controls MCU in FIMC-IS subsystem and the firmware of >>> the MCU controls all other peripherals in the subsystem. Each peripherals >>> have their own System MMU. Moreover, the configuration of the peripherals >>> varies according to the SoCs. >>> >>> If System MMU driver accepts multiple masters, everything is done in DT. >>> But I worry that it is not easy if System MMU driver does not support >>> multiple masters. >> >> I believe I have stated enough reasons why this kind of implementation >> is bad. I'm not going to waste time repeating myself. >> >> Your concerns presented above are valid, however they are not related to >> what is wrong with this patch. I have given you two proper ways to >> handle this, none should be forced upon particular IOMMU master drivers >> - their authors should have the chance to select the method that works >> best for them. >> > > I don't still understand why you think this patch is wrong. > I think this is the best way not to think for all the driver developers > about other things than their business logic. I agree, but one of the ways I proposed (an iommu-composite layer above the IOMMU low level drivers) doesn't add any extra responsibility of driver developers. Moreover, it's this kind of business logic in low level drivers that is adding more responsibility, because it introduces additional complexity and makes the driver harder to read, maintain and extend in future. > > This does not hurt anyone and I think this is good enough. > Well, it is barely good enough. It is a good practice to make a low level driver handle a single device instance and this is how Linux driver model is designed. Moreover, a single device tree node _must_ represent a single hardware block, so you can't group multiple SysMMUs into a single device tree node. Furthermore, if you force grouping of SysMMUs into a single virtual one, you enforce using the same address space for all masters of some particular hardware blocks, while potentially driver developers would like to separate them. A good interface design should not enforce any particular implementation and this is what we should stick to in this case as well. > If you want to provide another layer between master device and system mmu > as you mentioned, you do that. This patch does not restrict it. It does, as mentioned above. With a device tree listing multiple SysMMUs as one, you can't separate them. Best regards, Tomasz
On 19.03.2014 14:20, Tomasz Figa wrote: > On 19.03.2014 01:39, Cho KyongHo wrote: >> On Tue, 18 Mar 2014 15:26:48 +0100, Tomasz Figa wrote: >>> >>> >>> On 18.03.2014 14:01, Cho KyongHo wrote: >>>> On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: >>>>> Hi KyongHo, >>>>> >>>>> On 14.03.2014 06:10, Cho KyongHo wrote: >>>>>> Some master device descriptor like fimc-is which is an abstraction >>>>>> of very complex H/W may have multiple System MMUs. For those devices, >>>>>> the design of the link between System MMU and its master H/W is >>>>>> needed >>>>>> to be reconsidered. >>>>>> >>>>>> A link structure, sysmmu_list_data is introduced that provides a link >>>>>> to master H/W and that has a pointer to the device descriptor of a >>>>>> System MMU. Given a device descriptor of a master H/W, it is possible >>>>>> to traverse all System MMUs that must be controlled along with the >>>>>> master H/W. >>>>> >>>>> NAK. >>>>> >>>>> A device driver should handle particular hardware instances >>>>> separately, >>>>> without abstracting a virtual hardware instance consisting of multiple >>>>> physical ones. >>>>> >>>>> If such abstraction is needed, it should be done above the >>>>> exynos-iommu >>>>> driver, e.g. by something like iommu-composite driver that would >>>>> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group >>>>> could >>>>> be different, e.g. different Exynos SysMMU versions or even completely >>>>> different IPs handled by different drivers. >>>>> >>>>> Still, I don't think there is a real need for such abstraction. >>>>> Instead, >>>>> related drivers shall be fixed to properly handle multiple memory >>>>> masters and their IOMMUs. >>>>> >>>> >>>> G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother >>>> SoC like >>>> Exynos5250 does not. >>>> >>>> I don't understand why you are negative to this approach. >>>> This is the simplest than the others. >>>> >>>> Let me show you an example. >>>> FIMC-IS driver just controls MCU in FIMC-IS subsystem and the >>>> firmware of >>>> the MCU controls all other peripherals in the subsystem. Each >>>> peripherals >>>> have their own System MMU. Moreover, the configuration of the >>>> peripherals >>>> varies according to the SoCs. >>>> >>>> If System MMU driver accepts multiple masters, everything is done in >>>> DT. >>>> But I worry that it is not easy if System MMU driver does not support >>>> multiple masters. >>> >>> I believe I have stated enough reasons why this kind of implementation >>> is bad. I'm not going to waste time repeating myself. >>> >>> Your concerns presented above are valid, however they are not related to >>> what is wrong with this patch. I have given you two proper ways to >>> handle this, none should be forced upon particular IOMMU master drivers >>> - their authors should have the chance to select the method that works >>> best for them. >>> >> >> I don't still understand why you think this patch is wrong. >> I think this is the best way not to think for all the driver developers >> about other things than their business logic. > > I agree, but one of the ways I proposed (an iommu-composite layer above > the IOMMU low level drivers) doesn't add any extra responsibility of > driver developers. > > Moreover, it's this kind of business logic in low level drivers that is > adding more responsibility, because it introduces additional complexity > and makes the driver harder to read, maintain and extend in future. > >> >> This does not hurt anyone and I think this is good enough. >> > > Well, it is barely good enough. It is a good practice to make a low > level driver handle a single device instance and this is how Linux > driver model is designed. > > Moreover, a single device tree node _must_ represent a single hardware > block, so you can't group multiple SysMMUs into a single device tree node. > OK, you add nodes for single SysMMUs devices which is fine, sorry. I was under impression that one kernel device (struct device) corresponds to multiple SysMMUs, but this was before your patches, sorry. So one issue less, but it's still not good. > Furthermore, if you force grouping of SysMMUs into a single virtual one, > you enforce using the same address space for all masters of some > particular hardware blocks, while potentially driver developers would > like to separate them. Probably some clarification is needed. Your other patch adds: sysmmu_fimd0w04: sysmmu@14640000 { compatible = "samsung,sysmmu-v3.3"; reg = <0x14640000 0x1000>; interrupt-parent = <&combiner>; interrupts = <3 2>; clock-names = "sysmmu", "master"; clocks = <&clock 422>, <&clock 421>; samsung,power-domain = <&disp_pd>; mmu-masters = <&fimd>; }; sysmmu_fimd0w123: sysmmu@14680000 { compatible = "samsung,sysmmu-v3.3"; reg = <0x14680000 0x1000>; interrupt-parent = <&combiner>; interrupts = <3 0>; clock-names = "sysmmu", "master"; clocks = <&clock 423>, <&clock 421>; samsung,power-domain = <&disp_pd>; mmu-masters = <&fimd>; }; From such description, in future FIMD driver won't be able to determine which SysMMU is used for windows 0 and 4 and which for windows 1, 2 and 3. However it would be desirable to handle both SysMMUs separately, allowing each SysMMU to have only mappings for frame buffers needed by respective FIMD windows. > A good interface design should not enforce any particular implementation > and this is what we should stick to in this case as well. > >> If you want to provide another layer between master device and system mmu >> as you mentioned, you do that. This patch does not restrict it. > > It does, as mentioned above. With a device tree listing multiple SysMMUs > as one, you can't separate them. What I mean is that based on DT description, drivers should be able to control SysMMUs separately if they want to. Best regards, Tomasz
On Wed, 19 Mar 2014 16:14:57 +0100, Tomasz Figa wrote: > On 19.03.2014 14:20, Tomasz Figa wrote: > > On 19.03.2014 01:39, Cho KyongHo wrote: > >> On Tue, 18 Mar 2014 15:26:48 +0100, Tomasz Figa wrote: > >>> > >>> > >>> On 18.03.2014 14:01, Cho KyongHo wrote: > >>>> On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: > >>>>> Hi KyongHo, > >>>>> > >>>>> On 14.03.2014 06:10, Cho KyongHo wrote: > >>>>>> Some master device descriptor like fimc-is which is an abstraction > >>>>>> of very complex H/W may have multiple System MMUs. For those devices, > >>>>>> the design of the link between System MMU and its master H/W is > >>>>>> needed > >>>>>> to be reconsidered. > >>>>>> > >>>>>> A link structure, sysmmu_list_data is introduced that provides a link > >>>>>> to master H/W and that has a pointer to the device descriptor of a > >>>>>> System MMU. Given a device descriptor of a master H/W, it is possible > >>>>>> to traverse all System MMUs that must be controlled along with the > >>>>>> master H/W. > >>>>> > >>>>> NAK. > >>>>> > >>>>> A device driver should handle particular hardware instances > >>>>> separately, > >>>>> without abstracting a virtual hardware instance consisting of multiple > >>>>> physical ones. > >>>>> > >>>>> If such abstraction is needed, it should be done above the > >>>>> exynos-iommu > >>>>> driver, e.g. by something like iommu-composite driver that would > >>>>> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group > >>>>> could > >>>>> be different, e.g. different Exynos SysMMU versions or even completely > >>>>> different IPs handled by different drivers. > >>>>> > >>>>> Still, I don't think there is a real need for such abstraction. > >>>>> Instead, > >>>>> related drivers shall be fixed to properly handle multiple memory > >>>>> masters and their IOMMUs. > >>>>> > >>>> > >>>> G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother > >>>> SoC like > >>>> Exynos5250 does not. > >>>> > >>>> I don't understand why you are negative to this approach. > >>>> This is the simplest than the others. > >>>> > >>>> Let me show you an example. > >>>> FIMC-IS driver just controls MCU in FIMC-IS subsystem and the > >>>> firmware of > >>>> the MCU controls all other peripherals in the subsystem. Each > >>>> peripherals > >>>> have their own System MMU. Moreover, the configuration of the > >>>> peripherals > >>>> varies according to the SoCs. > >>>> > >>>> If System MMU driver accepts multiple masters, everything is done in > >>>> DT. > >>>> But I worry that it is not easy if System MMU driver does not support > >>>> multiple masters. > >>> > >>> I believe I have stated enough reasons why this kind of implementation > >>> is bad. I'm not going to waste time repeating myself. > >>> > >>> Your concerns presented above are valid, however they are not related to > >>> what is wrong with this patch. I have given you two proper ways to > >>> handle this, none should be forced upon particular IOMMU master drivers > >>> - their authors should have the chance to select the method that works > >>> best for them. > >>> > >> > >> I don't still understand why you think this patch is wrong. > >> I think this is the best way not to think for all the driver developers > >> about other things than their business logic. > > > > I agree, but one of the ways I proposed (an iommu-composite layer above > > the IOMMU low level drivers) doesn't add any extra responsibility of > > driver developers. > > > > Moreover, it's this kind of business logic in low level drivers that is > > adding more responsibility, because it introduces additional complexity > > and makes the driver harder to read, maintain and extend in future. > > > >> > >> This does not hurt anyone and I think this is good enough. > >> > > > > Well, it is barely good enough. It is a good practice to make a low > > level driver handle a single device instance and this is how Linux > > driver model is designed. > > > > Moreover, a single device tree node _must_ represent a single hardware > > block, so you can't group multiple SysMMUs into a single device tree node. > > > > OK, you add nodes for single SysMMUs devices which is fine, sorry. I was > under impression that one kernel device (struct device) corresponds to > multiple SysMMUs, but this was before your patches, sorry. So one issue > less, but it's still not good. > Ok. Understood why you have mentioned such. > > Furthermore, if you force grouping of SysMMUs into a single virtual one, > > you enforce using the same address space for all masters of some > > particular hardware blocks, while potentially driver developers would > > like to separate them. > > Probably some clarification is needed. Your other patch adds: > > sysmmu_fimd0w04: sysmmu@14640000 { > compatible = "samsung,sysmmu-v3.3"; > reg = <0x14640000 0x1000>; > interrupt-parent = <&combiner>; > interrupts = <3 2>; > clock-names = "sysmmu", "master"; > clocks = <&clock 422>, <&clock 421>; > samsung,power-domain = <&disp_pd>; > mmu-masters = <&fimd>; > }; > > sysmmu_fimd0w123: sysmmu@14680000 { > compatible = "samsung,sysmmu-v3.3"; > reg = <0x14680000 0x1000>; > interrupt-parent = <&combiner>; > interrupts = <3 0>; > clock-names = "sysmmu", "master"; > clocks = <&clock 423>, <&clock 421>; > samsung,power-domain = <&disp_pd>; > mmu-masters = <&fimd>; > }; > > From such description, in future FIMD driver won't be able to determine > which SysMMU is used for windows 0 and 4 and which for windows 1, 2 and > 3. However it would be desirable to handle both SysMMUs separately, > allowing each SysMMU to have only mappings for frame buffers needed by > respective FIMD windows. > If it is required to map frame buffers for the System MMU of a specific window, you can specify different phandles to mmu-masters of sysmmu_fimd0w04 and sysmmu_0w123. However, I think it is more convenient that all windows of a FIMD share the same virtual address space because - Exynos5250: FIMD has one System MMU - Exynos5420: FIMD has 2 System MMUs for Window 0,4 and 1,2,3 - Another SoC which is not ready for upstreaming: FIMD has 2 System MMUs for window 0,1 and 2,3,4 (I also discouraged when I found a new Soc has different H/W bus topology :) For this reason, I prefer allowing a single master to have multiple System MMU. > > A good interface design should not enforce any particular implementation > > and this is what we should stick to in this case as well. > > > >> If you want to provide another layer between master device and system mmu > >> as you mentioned, you do that. This patch does not restrict it. > > > > It does, as mentioned above. With a device tree listing multiple SysMMUs > > as one, you can't separate them. > > What I mean is that based on DT description, drivers should be able to > control SysMMUs separately if they want to. > As I mentioned above, drivers can control every System MMU separately. Thank you. KyongHo
On 20.03.2014 11:22, Cho KyongHo wrote: > On Wed, 19 Mar 2014 16:14:57 +0100, Tomasz Figa wrote: >> On 19.03.2014 14:20, Tomasz Figa wrote: >>> On 19.03.2014 01:39, Cho KyongHo wrote: >>>> On Tue, 18 Mar 2014 15:26:48 +0100, Tomasz Figa wrote: >>>>> >>>>> >>>>> On 18.03.2014 14:01, Cho KyongHo wrote: >>>>>> On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: >>>>>>> Hi KyongHo, >>>>>>> >>>>>>> On 14.03.2014 06:10, Cho KyongHo wrote: >>>>>>>> Some master device descriptor like fimc-is which is an abstraction >>>>>>>> of very complex H/W may have multiple System MMUs. For those devices, >>>>>>>> the design of the link between System MMU and its master H/W is >>>>>>>> needed >>>>>>>> to be reconsidered. >>>>>>>> >>>>>>>> A link structure, sysmmu_list_data is introduced that provides a link >>>>>>>> to master H/W and that has a pointer to the device descriptor of a >>>>>>>> System MMU. Given a device descriptor of a master H/W, it is possible >>>>>>>> to traverse all System MMUs that must be controlled along with the >>>>>>>> master H/W. >>>>>>> >>>>>>> NAK. >>>>>>> >>>>>>> A device driver should handle particular hardware instances >>>>>>> separately, >>>>>>> without abstracting a virtual hardware instance consisting of multiple >>>>>>> physical ones. >>>>>>> >>>>>>> If such abstraction is needed, it should be done above the >>>>>>> exynos-iommu >>>>>>> driver, e.g. by something like iommu-composite driver that would >>>>>>> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group >>>>>>> could >>>>>>> be different, e.g. different Exynos SysMMU versions or even completely >>>>>>> different IPs handled by different drivers. >>>>>>> >>>>>>> Still, I don't think there is a real need for such abstraction. >>>>>>> Instead, >>>>>>> related drivers shall be fixed to properly handle multiple memory >>>>>>> masters and their IOMMUs. >>>>>>> >>>>>> >>>>>> G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother >>>>>> SoC like >>>>>> Exynos5250 does not. >>>>>> >>>>>> I don't understand why you are negative to this approach. >>>>>> This is the simplest than the others. >>>>>> >>>>>> Let me show you an example. >>>>>> FIMC-IS driver just controls MCU in FIMC-IS subsystem and the >>>>>> firmware of >>>>>> the MCU controls all other peripherals in the subsystem. Each >>>>>> peripherals >>>>>> have their own System MMU. Moreover, the configuration of the >>>>>> peripherals >>>>>> varies according to the SoCs. >>>>>> >>>>>> If System MMU driver accepts multiple masters, everything is done in >>>>>> DT. >>>>>> But I worry that it is not easy if System MMU driver does not support >>>>>> multiple masters. >>>>> >>>>> I believe I have stated enough reasons why this kind of implementation >>>>> is bad. I'm not going to waste time repeating myself. >>>>> >>>>> Your concerns presented above are valid, however they are not related to >>>>> what is wrong with this patch. I have given you two proper ways to >>>>> handle this, none should be forced upon particular IOMMU master drivers >>>>> - their authors should have the chance to select the method that works >>>>> best for them. >>>>> >>>> >>>> I don't still understand why you think this patch is wrong. >>>> I think this is the best way not to think for all the driver developers >>>> about other things than their business logic. >>> >>> I agree, but one of the ways I proposed (an iommu-composite layer above >>> the IOMMU low level drivers) doesn't add any extra responsibility of >>> driver developers. >>> >>> Moreover, it's this kind of business logic in low level drivers that is >>> adding more responsibility, because it introduces additional complexity >>> and makes the driver harder to read, maintain and extend in future. >>> >>>> >>>> This does not hurt anyone and I think this is good enough. >>>> >>> >>> Well, it is barely good enough. It is a good practice to make a low >>> level driver handle a single device instance and this is how Linux >>> driver model is designed. >>> >>> Moreover, a single device tree node _must_ represent a single hardware >>> block, so you can't group multiple SysMMUs into a single device tree node. >>> >> >> OK, you add nodes for single SysMMUs devices which is fine, sorry. I was >> under impression that one kernel device (struct device) corresponds to >> multiple SysMMUs, but this was before your patches, sorry. So one issue >> less, but it's still not good. >> > > Ok. Understood why you have mentioned such. > >>> Furthermore, if you force grouping of SysMMUs into a single virtual one, >>> you enforce using the same address space for all masters of some >>> particular hardware blocks, while potentially driver developers would >>> like to separate them. >> >> Probably some clarification is needed. Your other patch adds: >> >> sysmmu_fimd0w04: sysmmu@14640000 { >> compatible = "samsung,sysmmu-v3.3"; >> reg = <0x14640000 0x1000>; >> interrupt-parent = <&combiner>; >> interrupts = <3 2>; >> clock-names = "sysmmu", "master"; >> clocks = <&clock 422>, <&clock 421>; >> samsung,power-domain = <&disp_pd>; >> mmu-masters = <&fimd>; >> }; >> >> sysmmu_fimd0w123: sysmmu@14680000 { >> compatible = "samsung,sysmmu-v3.3"; >> reg = <0x14680000 0x1000>; >> interrupt-parent = <&combiner>; >> interrupts = <3 0>; >> clock-names = "sysmmu", "master"; >> clocks = <&clock 423>, <&clock 421>; >> samsung,power-domain = <&disp_pd>; >> mmu-masters = <&fimd>; >> }; >> >> From such description, in future FIMD driver won't be able to determine >> which SysMMU is used for windows 0 and 4 and which for windows 1, 2 and >> 3. However it would be desirable to handle both SysMMUs separately, >> allowing each SysMMU to have only mappings for frame buffers needed by >> respective FIMD windows. >> > > If it is required to map frame buffers for the System MMU of a specific window, > you can specify different phandles to mmu-masters of sysmmu_fimd0w04 and > sysmmu_0w123. > > However, I think it is more convenient that all windows of a FIMD share the > same virtual address space because > - Exynos5250: FIMD has one System MMU > - Exynos5420: FIMD has 2 System MMUs for Window 0,4 and 1,2,3 > - Another SoC which is not ready for upstreaming: FIMD has 2 System MMUs for window 0,1 and 2,3,4 > (I also discouraged when I found a new Soc has different H/W bus topology :) > > For this reason, I prefer allowing a single master to have multiple System MMU. > Well, it sure can be more convenient from programming point of view, but there might be certain security-related aspects that would prefer more fine-granular control over memory accesses of IP blocks. >>> A good interface design should not enforce any particular implementation >>> and this is what we should stick to in this case as well. >>> >>>> If you want to provide another layer between master device and system mmu >>>> as you mentioned, you do that. This patch does not restrict it. >>> >>> It does, as mentioned above. With a device tree listing multiple SysMMUs >>> as one, you can't separate them. >> >> What I mean is that based on DT description, drivers should be able to >> control SysMMUs separately if they want to. >> > > As I mentioned above, drivers can control every System MMU separately. You are missing one point here - device tree stability. Once you specify the same phandle for both masters of FIMD (or any other multi-master IP block) and distribute such device tree, FIMD (or any other) driver will be able to support only shared address space mode on such board. Probably the preferred solution would be to reuse stream ID mechanism of ARM System MMU bindings and make such multi master devices specify #stream-id-cells = <1> and have IDs properly assigned for each of their masters. This would be the best choice for consistency reasons, as existing bindings would be reused, without reinventing the wheel. Best regards, Tomasz
On Thu, 20 Mar 2014 11:54:58 +0100, Tomasz Figa wrote: > On 20.03.2014 11:22, Cho KyongHo wrote: > > On Wed, 19 Mar 2014 16:14:57 +0100, Tomasz Figa wrote: > >> On 19.03.2014 14:20, Tomasz Figa wrote: > >>> On 19.03.2014 01:39, Cho KyongHo wrote: > >>>> On Tue, 18 Mar 2014 15:26:48 +0100, Tomasz Figa wrote: > >>>>> > >>>>> > >>>>> On 18.03.2014 14:01, Cho KyongHo wrote: > >>>>>> On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: > >>>>>>> Hi KyongHo, > >>>>>>> > >>>>>>> On 14.03.2014 06:10, Cho KyongHo wrote: > >>>>>>>> Some master device descriptor like fimc-is which is an abstraction > >>>>>>>> of very complex H/W may have multiple System MMUs. For those devices, > >>>>>>>> the design of the link between System MMU and its master H/W is > >>>>>>>> needed > >>>>>>>> to be reconsidered. > >>>>>>>> > >>>>>>>> A link structure, sysmmu_list_data is introduced that provides a link > >>>>>>>> to master H/W and that has a pointer to the device descriptor of a > >>>>>>>> System MMU. Given a device descriptor of a master H/W, it is possible > >>>>>>>> to traverse all System MMUs that must be controlled along with the > >>>>>>>> master H/W. > >>>>>>> > >>>>>>> NAK. > >>>>>>> > >>>>>>> A device driver should handle particular hardware instances > >>>>>>> separately, > >>>>>>> without abstracting a virtual hardware instance consisting of multiple > >>>>>>> physical ones. > >>>>>>> > >>>>>>> If such abstraction is needed, it should be done above the > >>>>>>> exynos-iommu > >>>>>>> driver, e.g. by something like iommu-composite driver that would > >>>>>>> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group > >>>>>>> could > >>>>>>> be different, e.g. different Exynos SysMMU versions or even completely > >>>>>>> different IPs handled by different drivers. > >>>>>>> > >>>>>>> Still, I don't think there is a real need for such abstraction. > >>>>>>> Instead, > >>>>>>> related drivers shall be fixed to properly handle multiple memory > >>>>>>> masters and their IOMMUs. > >>>>>>> > >>>>>> > >>>>>> G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother > >>>>>> SoC like > >>>>>> Exynos5250 does not. > >>>>>> > >>>>>> I don't understand why you are negative to this approach. > >>>>>> This is the simplest than the others. > >>>>>> > >>>>>> Let me show you an example. > >>>>>> FIMC-IS driver just controls MCU in FIMC-IS subsystem and the > >>>>>> firmware of > >>>>>> the MCU controls all other peripherals in the subsystem. Each > >>>>>> peripherals > >>>>>> have their own System MMU. Moreover, the configuration of the > >>>>>> peripherals > >>>>>> varies according to the SoCs. > >>>>>> > >>>>>> If System MMU driver accepts multiple masters, everything is done in > >>>>>> DT. > >>>>>> But I worry that it is not easy if System MMU driver does not support > >>>>>> multiple masters. > >>>>> > >>>>> I believe I have stated enough reasons why this kind of implementation > >>>>> is bad. I'm not going to waste time repeating myself. > >>>>> > >>>>> Your concerns presented above are valid, however they are not related to > >>>>> what is wrong with this patch. I have given you two proper ways to > >>>>> handle this, none should be forced upon particular IOMMU master drivers > >>>>> - their authors should have the chance to select the method that works > >>>>> best for them. > >>>>> > >>>> > >>>> I don't still understand why you think this patch is wrong. > >>>> I think this is the best way not to think for all the driver developers > >>>> about other things than their business logic. > >>> > >>> I agree, but one of the ways I proposed (an iommu-composite layer above > >>> the IOMMU low level drivers) doesn't add any extra responsibility of > >>> driver developers. > >>> > >>> Moreover, it's this kind of business logic in low level drivers that is > >>> adding more responsibility, because it introduces additional complexity > >>> and makes the driver harder to read, maintain and extend in future. > >>> > >>>> > >>>> This does not hurt anyone and I think this is good enough. > >>>> > >>> > >>> Well, it is barely good enough. It is a good practice to make a low > >>> level driver handle a single device instance and this is how Linux > >>> driver model is designed. > >>> > >>> Moreover, a single device tree node _must_ represent a single hardware > >>> block, so you can't group multiple SysMMUs into a single device tree node. > >>> > >> > >> OK, you add nodes for single SysMMUs devices which is fine, sorry. I was > >> under impression that one kernel device (struct device) corresponds to > >> multiple SysMMUs, but this was before your patches, sorry. So one issue > >> less, but it's still not good. > >> > > > > Ok. Understood why you have mentioned such. > > > >>> Furthermore, if you force grouping of SysMMUs into a single virtual one, > >>> you enforce using the same address space for all masters of some > >>> particular hardware blocks, while potentially driver developers would > >>> like to separate them. > >> > >> Probably some clarification is needed. Your other patch adds: > >> > >> sysmmu_fimd0w04: sysmmu@14640000 { > >> compatible = "samsung,sysmmu-v3.3"; > >> reg = <0x14640000 0x1000>; > >> interrupt-parent = <&combiner>; > >> interrupts = <3 2>; > >> clock-names = "sysmmu", "master"; > >> clocks = <&clock 422>, <&clock 421>; > >> samsung,power-domain = <&disp_pd>; > >> mmu-masters = <&fimd>; > >> }; > >> > >> sysmmu_fimd0w123: sysmmu@14680000 { > >> compatible = "samsung,sysmmu-v3.3"; > >> reg = <0x14680000 0x1000>; > >> interrupt-parent = <&combiner>; > >> interrupts = <3 0>; > >> clock-names = "sysmmu", "master"; > >> clocks = <&clock 423>, <&clock 421>; > >> samsung,power-domain = <&disp_pd>; > >> mmu-masters = <&fimd>; > >> }; > >> > >> From such description, in future FIMD driver won't be able to determine > >> which SysMMU is used for windows 0 and 4 and which for windows 1, 2 and > >> 3. However it would be desirable to handle both SysMMUs separately, > >> allowing each SysMMU to have only mappings for frame buffers needed by > >> respective FIMD windows. > >> > > > > If it is required to map frame buffers for the System MMU of a specific window, > > you can specify different phandles to mmu-masters of sysmmu_fimd0w04 and > > sysmmu_0w123. > > > > However, I think it is more convenient that all windows of a FIMD share the > > same virtual address space because > > - Exynos5250: FIMD has one System MMU > > - Exynos5420: FIMD has 2 System MMUs for Window 0,4 and 1,2,3 > > - Another SoC which is not ready for upstreaming: FIMD has 2 System MMUs for window 0,1 and 2,3,4 > > (I also discouraged when I found a new Soc has different H/W bus topology :) > > > > For this reason, I prefer allowing a single master to have multiple System MMU. > > > > Well, it sure can be more convenient from programming point of view, but > there might be certain security-related aspects that would prefer more > fine-granular control over memory accesses of IP blocks. > > >>> A good interface design should not enforce any particular implementation > >>> and this is what we should stick to in this case as well. > >>> > >>>> If you want to provide another layer between master device and system mmu > >>>> as you mentioned, you do that. This patch does not restrict it. > >>> > >>> It does, as mentioned above. With a device tree listing multiple SysMMUs > >>> as one, you can't separate them. > >> > >> What I mean is that based on DT description, drivers should be able to > >> control SysMMUs separately if they want to. > >> > > > > As I mentioned above, drivers can control every System MMU separately. > > You are missing one point here - device tree stability. Once you specify > the same phandle for both masters of FIMD (or any other multi-master IP > block) and distribute such device tree, FIMD (or any other) driver will > be able to support only shared address space mode on such board. Nothing is prepared for the relationship between FIMD and System MMU. I can remove all 'mmu-masters' property from the nodes of System MMU until master drivers define their way of the relationship control. But I think that the current driver must work with the smallest effort. If the driver developer feels that the separate address space for each System MMUs, they can do that with a bit modification to DT. > Probably the preferred solution would be to reuse stream ID mechanism of > ARM System MMU bindings and make such multi master devices specify > #stream-id-cells = <1> and have IDs properly assigned for each of their > masters. This would be the best choice for consistency reasons, as > existing bindings would be reused, without reinventing the wheel. Actually, the issue is not that a System MMU has multiple masters but a master has multiple System MMUs. Thank you KyongHo
On 21.03.2014 06:21, Cho KyongHo wrote: > On Thu, 20 Mar 2014 11:54:58 +0100, Tomasz Figa wrote: >> On 20.03.2014 11:22, Cho KyongHo wrote: >>> On Wed, 19 Mar 2014 16:14:57 +0100, Tomasz Figa wrote: >>>> On 19.03.2014 14:20, Tomasz Figa wrote: >>>>> On 19.03.2014 01:39, Cho KyongHo wrote: >>>>>> On Tue, 18 Mar 2014 15:26:48 +0100, Tomasz Figa wrote: >>>>>>> >>>>>>> >>>>>>> On 18.03.2014 14:01, Cho KyongHo wrote: >>>>>>>> On Fri, 14 Mar 2014 17:12:03 +0100, Tomasz Figa wrote: >>>>>>>>> Hi KyongHo, >>>>>>>>> >>>>>>>>> On 14.03.2014 06:10, Cho KyongHo wrote: >>>>>>>>>> Some master device descriptor like fimc-is which is an abstraction >>>>>>>>>> of very complex H/W may have multiple System MMUs. For those devices, >>>>>>>>>> the design of the link between System MMU and its master H/W is >>>>>>>>>> needed >>>>>>>>>> to be reconsidered. >>>>>>>>>> >>>>>>>>>> A link structure, sysmmu_list_data is introduced that provides a link >>>>>>>>>> to master H/W and that has a pointer to the device descriptor of a >>>>>>>>>> System MMU. Given a device descriptor of a master H/W, it is possible >>>>>>>>>> to traverse all System MMUs that must be controlled along with the >>>>>>>>>> master H/W. >>>>>>>>> >>>>>>>>> NAK. >>>>>>>>> >>>>>>>>> A device driver should handle particular hardware instances >>>>>>>>> separately, >>>>>>>>> without abstracting a virtual hardware instance consisting of multiple >>>>>>>>> physical ones. >>>>>>>>> >>>>>>>>> If such abstraction is needed, it should be done above the >>>>>>>>> exynos-iommu >>>>>>>>> driver, e.g. by something like iommu-composite driver that would >>>>>>>>> aggregate several IOMMUs. Keep in mind that such IOMMUs in a group >>>>>>>>> could >>>>>>>>> be different, e.g. different Exynos SysMMU versions or even completely >>>>>>>>> different IPs handled by different drivers. >>>>>>>>> >>>>>>>>> Still, I don't think there is a real need for such abstraction. >>>>>>>>> Instead, >>>>>>>>> related drivers shall be fixed to properly handle multiple memory >>>>>>>>> masters and their IOMMUs. >>>>>>>>> >>>>>>>> >>>>>>>> G2D, Scalers and FIMD of Exynos5420 has 2 System MMUs while aother >>>>>>>> SoC like >>>>>>>> Exynos5250 does not. >>>>>>>> >>>>>>>> I don't understand why you are negative to this approach. >>>>>>>> This is the simplest than the others. >>>>>>>> >>>>>>>> Let me show you an example. >>>>>>>> FIMC-IS driver just controls MCU in FIMC-IS subsystem and the >>>>>>>> firmware of >>>>>>>> the MCU controls all other peripherals in the subsystem. Each >>>>>>>> peripherals >>>>>>>> have their own System MMU. Moreover, the configuration of the >>>>>>>> peripherals >>>>>>>> varies according to the SoCs. >>>>>>>> >>>>>>>> If System MMU driver accepts multiple masters, everything is done in >>>>>>>> DT. >>>>>>>> But I worry that it is not easy if System MMU driver does not support >>>>>>>> multiple masters. >>>>>>> >>>>>>> I believe I have stated enough reasons why this kind of implementation >>>>>>> is bad. I'm not going to waste time repeating myself. >>>>>>> >>>>>>> Your concerns presented above are valid, however they are not related to >>>>>>> what is wrong with this patch. I have given you two proper ways to >>>>>>> handle this, none should be forced upon particular IOMMU master drivers >>>>>>> - their authors should have the chance to select the method that works >>>>>>> best for them. >>>>>>> >>>>>> >>>>>> I don't still understand why you think this patch is wrong. >>>>>> I think this is the best way not to think for all the driver developers >>>>>> about other things than their business logic. >>>>> >>>>> I agree, but one of the ways I proposed (an iommu-composite layer above >>>>> the IOMMU low level drivers) doesn't add any extra responsibility of >>>>> driver developers. >>>>> >>>>> Moreover, it's this kind of business logic in low level drivers that is >>>>> adding more responsibility, because it introduces additional complexity >>>>> and makes the driver harder to read, maintain and extend in future. >>>>> >>>>>> >>>>>> This does not hurt anyone and I think this is good enough. >>>>>> >>>>> >>>>> Well, it is barely good enough. It is a good practice to make a low >>>>> level driver handle a single device instance and this is how Linux >>>>> driver model is designed. >>>>> >>>>> Moreover, a single device tree node _must_ represent a single hardware >>>>> block, so you can't group multiple SysMMUs into a single device tree node. >>>>> >>>> >>>> OK, you add nodes for single SysMMUs devices which is fine, sorry. I was >>>> under impression that one kernel device (struct device) corresponds to >>>> multiple SysMMUs, but this was before your patches, sorry. So one issue >>>> less, but it's still not good. >>>> >>> >>> Ok. Understood why you have mentioned such. >>> >>>>> Furthermore, if you force grouping of SysMMUs into a single virtual one, >>>>> you enforce using the same address space for all masters of some >>>>> particular hardware blocks, while potentially driver developers would >>>>> like to separate them. >>>> >>>> Probably some clarification is needed. Your other patch adds: >>>> >>>> sysmmu_fimd0w04: sysmmu@14640000 { >>>> compatible = "samsung,sysmmu-v3.3"; >>>> reg = <0x14640000 0x1000>; >>>> interrupt-parent = <&combiner>; >>>> interrupts = <3 2>; >>>> clock-names = "sysmmu", "master"; >>>> clocks = <&clock 422>, <&clock 421>; >>>> samsung,power-domain = <&disp_pd>; >>>> mmu-masters = <&fimd>; >>>> }; >>>> >>>> sysmmu_fimd0w123: sysmmu@14680000 { >>>> compatible = "samsung,sysmmu-v3.3"; >>>> reg = <0x14680000 0x1000>; >>>> interrupt-parent = <&combiner>; >>>> interrupts = <3 0>; >>>> clock-names = "sysmmu", "master"; >>>> clocks = <&clock 423>, <&clock 421>; >>>> samsung,power-domain = <&disp_pd>; >>>> mmu-masters = <&fimd>; >>>> }; >>>> >>>> From such description, in future FIMD driver won't be able to determine >>>> which SysMMU is used for windows 0 and 4 and which for windows 1, 2 and >>>> 3. However it would be desirable to handle both SysMMUs separately, >>>> allowing each SysMMU to have only mappings for frame buffers needed by >>>> respective FIMD windows. >>>> >>> >>> If it is required to map frame buffers for the System MMU of a specific window, >>> you can specify different phandles to mmu-masters of sysmmu_fimd0w04 and >>> sysmmu_0w123. >>> >>> However, I think it is more convenient that all windows of a FIMD share the >>> same virtual address space because >>> - Exynos5250: FIMD has one System MMU >>> - Exynos5420: FIMD has 2 System MMUs for Window 0,4 and 1,2,3 >>> - Another SoC which is not ready for upstreaming: FIMD has 2 System MMUs for window 0,1 and 2,3,4 >>> (I also discouraged when I found a new Soc has different H/W bus topology :) >>> >>> For this reason, I prefer allowing a single master to have multiple System MMU. >>> >> >> Well, it sure can be more convenient from programming point of view, but >> there might be certain security-related aspects that would prefer more >> fine-granular control over memory accesses of IP blocks. >> >>>>> A good interface design should not enforce any particular implementation >>>>> and this is what we should stick to in this case as well. >>>>> >>>>>> If you want to provide another layer between master device and system mmu >>>>>> as you mentioned, you do that. This patch does not restrict it. >>>>> >>>>> It does, as mentioned above. With a device tree listing multiple SysMMUs >>>>> as one, you can't separate them. >>>> >>>> What I mean is that based on DT description, drivers should be able to >>>> control SysMMUs separately if they want to. >>>> >>> >>> As I mentioned above, drivers can control every System MMU separately. >> >> You are missing one point here - device tree stability. Once you specify >> the same phandle for both masters of FIMD (or any other multi-master IP >> block) and distribute such device tree, FIMD (or any other) driver will >> be able to support only shared address space mode on such board. > > Nothing is prepared for the relationship between FIMD and System MMU. > I can remove all 'mmu-masters' property from the nodes of System MMU until > master drivers define their way of the relationship control. > But I think that the current driver must work with the smallest effort. > If the driver developer feels that the separate address space for each > System MMUs, they can do that with a bit modification to DT. And so I proposed the scheme below. The stream ID parameter could be ignored at the moment, but in future the driver should be extended to support it properly. >> Probably the preferred solution would be to reuse stream ID mechanism of >> ARM System MMU bindings and make such multi master devices specify >> #stream-id-cells = <1> and have IDs properly assigned for each of their >> masters. This would be the best choice for consistency reasons, as >> existing bindings would be reused, without reinventing the wheel. > > Actually, the issue is not that a System MMU has multiple masters but > a master has multiple System MMUs. I mean "master" in the standard bus terminology, e.g. part of the IP that can issue bus requests. From this point of view, such FIMD variant has two bus masters, each with its own SysMMU. This relation should be included in DT. Best regards, Tomasz
Hi KyongHo Cho, On Fri, Mar 14, 2014 at 10:40 AM, Cho KyongHo <pullip.cho@samsung.com> wrote: > Some master device descriptor like fimc-is which is an abstraction > of very complex H/W may have multiple System MMUs. For those devices, > the design of the link between System MMU and its master H/W is needed > to be reconsidered. > > A link structure, sysmmu_list_data is introduced that provides a link > to master H/W and that has a pointer to the device descriptor of a > System MMU. Given a device descriptor of a master H/W, it is possible > to traverse all System MMUs that must be controlled along with the > master H/W. > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> > --- > drivers/iommu/exynos-iommu.c | 534 ++++++++++++++++++++++++++---------------- > 1 file changed, 333 insertions(+), 201 deletions(-) > > diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c > index 84ba29a..7489343 100644 > --- a/drivers/iommu/exynos-iommu.c > +++ b/drivers/iommu/exynos-iommu.c > @@ -128,6 +128,10 @@ > #define __master_clk_disable(data) __clk_gate_ctrl(data, clk_master, dis) > [snip] > +static int __init __sysmmu_init_master(struct device *dev) > +{ > + int ret; > + int i = 0; > + struct device_node *node; > + > + while ((node = of_parse_phandle(dev->of_node, "mmu-masters", i++))) { > struct platform_device *master = of_find_device_by_node(node); > + struct exynos_iommu_owner *owner; > + struct sysmmu_list_data *list_data; > > if (!master) { > dev_err(dev, "%s: mmu-master '%s' not found\n", > __func__, node->name); > - return -EINVAL; > + ret = -EINVAL; > + goto err; > } > > - if (master->dev.archdata.iommu != NULL) { > - dev_err(dev, "%s: '%s' is master of other MMU\n", > - __func__, node->name); > - return -EINVAL; > + owner = master->dev.archdata.iommu; > + if (!owner) { > + owner = devm_kzalloc(dev, sizeof(*owner), GFP_KERNEL); > + if (!owner) { > + dev_err(dev, > + "%s: Failed to allocate owner structure\n", > + __func__); > + ret = -ENOMEM; > + goto err; > + } > + > + INIT_LIST_HEAD(&owner->mmu_list); > + INIT_LIST_HEAD(&owner->client); > + owner->dev = &master->dev; > + spin_lock_init(&owner->lock); > + > + master->dev.archdata.iommu = owner; > } > > + list_data = devm_kzalloc(dev, sizeof(*list_data), GFP_KERNEL); > + if (!list_data) { > + dev_err(dev, > + "%s: Failed to allocate sysmmu_list_data\n", > + __func__); > + ret = -ENOMEM; > + goto err; > + } > + > + INIT_LIST_HEAD(&list_data->entry); > + list_data->sysmmu = dev; > + > /* > - * archdata.iommu will be initialized with exynos_iommu_client > - * in sysmmu_hook_driver_register(). > + * System MMUs are attached in the order of the presence > + * in device tree > */ > - master->dev.archdata.iommu = dev; > + list_add_tail(&list_data->entry, &owner->mmu_list); > } > > - data->sysmmu = dev; > - rwlock_init(&data->lock); > + return 0; > +err: > + while ((node = of_parse_phandle(dev->of_node, "mmu-masters", i++))) { Don't we need to reinitialize variable 'i' here before using? i = 0; Regards, Shaik Ameer Basha > + struct platform_device *master = of_find_device_by_node(node); > + struct exynos_iommu_owner *owner; > + struct sysmmu_list_data *list_data; > > - platform_set_drvdata(pdev, data); > + if (!master) > + continue; > > - pm_runtime_enable(dev); > - data->runtime_active = !pm_runtime_enabled(dev); > + owner = master->dev.archdata.iommu; > + if (!owner) > + continue; > > - dev_dbg(dev, "Probed and initialized\n"); > - return 0; > + for_each_sysmmu_list(owner->dev, list_data) { > + if (list_data->sysmmu == dev) { > + list_del(&list_data->entry); > + kfree(list_data); > + break; > + } > + } > + } > + > + return ret; > } > [snip]
On Tue, 22 Apr 2014 18:53:51 +0530, Shaik Ameer Basha wrote: > Hi KyongHo Cho, > > > > On Fri, Mar 14, 2014 at 10:40 AM, Cho KyongHo <pullip.cho@samsung.com> wrote: > > Some master device descriptor like fimc-is which is an abstraction > > of very complex H/W may have multiple System MMUs. For those devices, > > the design of the link between System MMU and its master H/W is needed > > to be reconsidered. > > > > A link structure, sysmmu_list_data is introduced that provides a link > > to master H/W and that has a pointer to the device descriptor of a > > System MMU. Given a device descriptor of a master H/W, it is possible > > to traverse all System MMUs that must be controlled along with the > > master H/W. > > > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> > > --- > > drivers/iommu/exynos-iommu.c | 534 ++++++++++++++++++++++++++---------------- > > 1 file changed, 333 insertions(+), 201 deletions(-) > > > > diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c > > index 84ba29a..7489343 100644 > > --- a/drivers/iommu/exynos-iommu.c > > +++ b/drivers/iommu/exynos-iommu.c > > @@ -128,6 +128,10 @@ > > #define __master_clk_disable(data) __clk_gate_ctrl(data, clk_master, dis) > > > > [snip] > > > +static int __init __sysmmu_init_master(struct device *dev) > > +{ > > + int ret; > > + int i = 0; > > + struct device_node *node; > > + > > + while ((node = of_parse_phandle(dev->of_node, "mmu-masters", i++))) { > > struct platform_device *master = of_find_device_by_node(node); > > + struct exynos_iommu_owner *owner; > > + struct sysmmu_list_data *list_data; > > > > if (!master) { > > dev_err(dev, "%s: mmu-master '%s' not found\n", > > __func__, node->name); > > - return -EINVAL; > > + ret = -EINVAL; > > + goto err; > > } > > > > - if (master->dev.archdata.iommu != NULL) { > > - dev_err(dev, "%s: '%s' is master of other MMU\n", > > - __func__, node->name); > > - return -EINVAL; > > + owner = master->dev.archdata.iommu; > > + if (!owner) { > > + owner = devm_kzalloc(dev, sizeof(*owner), GFP_KERNEL); > > + if (!owner) { > > + dev_err(dev, > > + "%s: Failed to allocate owner structure\n", > > + __func__); > > + ret = -ENOMEM; > > + goto err; > > + } > > + > > + INIT_LIST_HEAD(&owner->mmu_list); > > + INIT_LIST_HEAD(&owner->client); > > + owner->dev = &master->dev; > > + spin_lock_init(&owner->lock); > > + > > + master->dev.archdata.iommu = owner; > > } > > > > + list_data = devm_kzalloc(dev, sizeof(*list_data), GFP_KERNEL); > > + if (!list_data) { > > + dev_err(dev, > > + "%s: Failed to allocate sysmmu_list_data\n", > > + __func__); > > + ret = -ENOMEM; > > + goto err; > > + } > > + > > + INIT_LIST_HEAD(&list_data->entry); > > + list_data->sysmmu = dev; > > + > > /* > > - * archdata.iommu will be initialized with exynos_iommu_client > > - * in sysmmu_hook_driver_register(). > > + * System MMUs are attached in the order of the presence > > + * in device tree > > */ > > - master->dev.archdata.iommu = dev; > > + list_add_tail(&list_data->entry, &owner->mmu_list); > > } > > > > - data->sysmmu = dev; > > - rwlock_init(&data->lock); > > + return 0; > > +err: > > + while ((node = of_parse_phandle(dev->of_node, "mmu-masters", i++))) { > > Don't we need to reinitialize variable 'i' here before using? > i = 0; > Oh. You are right. Thanks. > > > > > + struct platform_device *master = of_find_device_by_node(node); > > + struct exynos_iommu_owner *owner; > > + struct sysmmu_list_data *list_data; > > > > - platform_set_drvdata(pdev, data); > > + if (!master) > > + continue; > > > > - pm_runtime_enable(dev); > > - data->runtime_active = !pm_runtime_enabled(dev); > > + owner = master->dev.archdata.iommu; > > + if (!owner) > > + continue; > > > > - dev_dbg(dev, "Probed and initialized\n"); > > - return 0; > > + for_each_sysmmu_list(owner->dev, list_data) { > > + if (list_data->sysmmu == dev) { > > + list_del(&list_data->entry); > > + kfree(list_data); > > + break; > > + } > > + } > > + } > > + > > + return ret; > > } > > > > [snip]
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 84ba29a..7489343 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -128,6 +128,10 @@ #define __master_clk_disable(data) __clk_gate_ctrl(data, clk_master, dis) #define has_sysmmu(dev) (dev->archdata.iommu != NULL) +#define for_each_sysmmu_list(dev, list_data) \ + list_for_each_entry(list_data, \ + &((struct exynos_iommu_owner *)dev->archdata.iommu)->mmu_list, \ + entry) static struct kmem_cache *lv2table_kmem_cache; @@ -181,7 +185,7 @@ static char *sysmmu_fault_name[SYSMMU_FAULTS_NUM] = { struct exynos_iommu_owner { struct list_head client; /* entry of exynos_iommu_domain.clients */ struct device *dev; - struct device *sysmmu; + struct list_head mmu_list; /* list of sysmmu_list_data.entry */ struct iommu_domain *domain; void *vmm_data; /* IO virtual memory manager's data */ spinlock_t lock; /* Lock to preserve consistency of System MMU */ @@ -195,6 +199,11 @@ struct exynos_iommu_domain { spinlock_t pgtablelock; /* lock for modifying page table @ pgtable */ }; +struct sysmmu_list_data { + struct list_head entry; /* entry of exynos_iommu_owner.mmu_list */ + struct device *sysmmu; +}; + struct sysmmu_drvdata { struct device *sysmmu; /* System MMU's device descriptor */ struct device *master; /* Owner of system MMU */ @@ -205,6 +214,7 @@ struct sysmmu_drvdata { rwlock_t lock; struct iommu_domain *domain; bool runtime_active; + bool suspended; unsigned long pgtable; }; @@ -471,28 +481,39 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, } /* __exynos_sysmmu_enable: Enables System MMU - * - * returns -error if an error occurred and System MMU is not enabled, - * 0 if the System MMU has been just enabled and 1 if System MMU was already - * enabled before. - */ +* +* returns -error if an error occurred and System MMU is not enabled, +* 0 if the System MMU has been just enabled and 1 if System MMU was already +* enabled before. +*/ static int __exynos_sysmmu_enable(struct device *dev, unsigned long pgtable, struct iommu_domain *domain) { int ret = 0; unsigned long flags; struct exynos_iommu_owner *owner = dev->archdata.iommu; - struct sysmmu_drvdata *data; + struct sysmmu_list_data *list; BUG_ON(!has_sysmmu(dev)); spin_lock_irqsave(&owner->lock, flags); - data = dev_get_drvdata(owner->sysmmu); - - ret = __sysmmu_enable(data, pgtable, domain); - if (ret >= 0) + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); data->master = dev; + ret = __sysmmu_enable(data, pgtable, domain); + if (ret < 0) { + struct sysmmu_list_data *iter; + for_each_sysmmu_list(dev, iter) { + if (iter->sysmmu == list->sysmmu) + break; + data = dev_get_drvdata(iter->sysmmu); + __sysmmu_disable(data); + data->master = NULL; + } + break; + } + } spin_unlock_irqrestore(&owner->lock, flags); @@ -511,17 +532,19 @@ static bool exynos_sysmmu_disable(struct device *dev) unsigned long flags; bool disabled = true; struct exynos_iommu_owner *owner = dev->archdata.iommu; - struct sysmmu_drvdata *data; + struct sysmmu_list_data *list; BUG_ON(!has_sysmmu(dev)); spin_lock_irqsave(&owner->lock, flags); - data = dev_get_drvdata(owner->sysmmu); - - disabled = __sysmmu_disable(data); - if (disabled) - data->master = NULL; + /* Every call to __sysmmu_disable() must return same result */ + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); + disabled = __sysmmu_disable(data); + if (disabled) + data->master = NULL; + } spin_unlock_irqrestore(&owner->lock, flags); @@ -533,185 +556,276 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, { struct exynos_iommu_owner *owner = dev->archdata.iommu; unsigned long flags; - struct sysmmu_drvdata *data; - - data = dev_get_drvdata(owner->sysmmu); - - read_lock_irqsave(&data->lock, flags); - if (is_sysmmu_active(data) && data->runtime_active) { - unsigned int num_inv = 1; + struct sysmmu_list_data *list; - __master_clk_enable(data); - - /* - * L2TLB invalidation required - * 4KB page: 1 invalidation - * 64KB page: 16 invalidation - * 1MB page: 64 invalidation - * because it is set-associative TLB - * with 8-way and 64 sets. - * 1MB page can be cached in one of all sets. - * 64KB page can be one of 16 consecutive sets. - */ - if (__sysmmu_version(data, NULL) == 2) /* major version number */ - num_inv = min_t(unsigned int, size / PAGE_SIZE, 64); + spin_lock_irqsave(&owner->lock, flags); - if (sysmmu_block(data->sfrbase)) { - __sysmmu_tlb_invalidate_entry(data->sfrbase, iova, - num_inv); - sysmmu_unblock(data->sfrbase); + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); + read_lock(&data->lock); + if (is_sysmmu_active(data) && data->runtime_active) { + unsigned int num_inv = 1; + + __master_clk_enable(data); + + /* + * L2TLB invalidation required + * 4KB page: 1 invalidation + * 64KB page: 16 invalidation + * 1MB page: 64 invalidation + * because it is set-associative TLB + * with 8-way and 64 sets. + * 1MB page can be cached in one of all sets. + * 64KB page can be one of 16 consecutive sets. + */ + if (__sysmmu_version(data, NULL) == 2) + num_inv = min_t(unsigned int, + size / PAGE_SIZE, 64); + + if (sysmmu_block(data->sfrbase)) { + __sysmmu_tlb_invalidate_entry(data->sfrbase, + iova, num_inv); + sysmmu_unblock(data->sfrbase); + } + __master_clk_disable(data); + } else { + dev_dbg(dev, + "disabled. Skipping TLB invalidation @ %#lx\n", + iova); } - __master_clk_disable(data); - } else { - dev_dbg(dev, "disabled. Skipping TLB invalidation @ %#lx\n", - iova); + + read_unlock(&data->lock); } - read_unlock_irqrestore(&data->lock, flags); + + spin_unlock_irqrestore(&owner->lock, flags); } void exynos_sysmmu_tlb_invalidate(struct device *dev) { struct exynos_iommu_owner *owner = dev->archdata.iommu; unsigned long flags; - struct sysmmu_drvdata *data; + struct sysmmu_list_data *list; - data = dev_get_drvdata(owner->sysmmu); + spin_lock_irqsave(&owner->lock, flags); - read_lock_irqsave(&data->lock, flags); - if (is_sysmmu_active(data) && data->runtime_active) { - __master_clk_enable(data); - if (sysmmu_block(data->sfrbase)) { - __sysmmu_tlb_invalidate(data->sfrbase); - sysmmu_unblock(data->sfrbase); + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); + read_lock(&data->lock); + if (is_sysmmu_active(data) && data->runtime_active) { + __master_clk_enable(data); + if (sysmmu_block(data->sfrbase)) { + __sysmmu_tlb_invalidate(data->sfrbase); + sysmmu_unblock(data->sfrbase); + } + __master_clk_disable(data); + } else { + dev_dbg(dev, "disabled. Skipping TLB invalidation\n"); } - __master_clk_disable(data); - } else { - dev_dbg(dev, "disabled. Skipping TLB invalidation\n"); + read_unlock(&data->lock); } - read_unlock_irqrestore(&data->lock, flags); + + spin_unlock_irqrestore(&owner->lock, flags); } -static int __init exynos_sysmmu_probe(struct platform_device *pdev) +static int __init __sysmmu_init_clock(struct device *sysmmu, + struct sysmmu_drvdata *data) { - int irq, ret; - struct device *dev = &pdev->dev; - struct sysmmu_drvdata *data; - struct resource *res; - struct device_node *node; - - data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(dev, "Unable to find IOMEM region\n"); - return -ENOENT; - } - - data->sfrbase = devm_ioremap_resource(dev, res); - if (IS_ERR(data->sfrbase)) - return PTR_ERR(data->sfrbase); - - irq = platform_get_irq(pdev, 0); - if (irq <= 0) { - dev_dbg(dev, "Unable to find IRQ resource\n"); - return irq; - } - - ret = devm_request_irq(dev, irq, exynos_sysmmu_irq, 0, - dev_name(dev), data); - if (ret) { - dev_err(dev, "Unabled to register handler of irq %d\n", irq); - return ret; - } + int ret; - data->clk = devm_clk_get(dev, "sysmmu"); + data->clk = devm_clk_get(sysmmu, "sysmmu"); if (IS_ERR(data->clk)) { - dev_info(dev, "No gate clock found!\n"); - data->clk = NULL; + if (PTR_ERR(data->clk) == -ENOENT) { + dev_info(sysmmu, "No gating clock found.\n"); + data->clk = NULL; + return 0; + } + + dev_err(sysmmu, "Failed get sysmmu clock\n"); + return PTR_ERR(data->clk); } ret = clk_prepare(data->clk); if (ret) { - dev_err(dev, "Failed to prepare clk\n"); + dev_err(sysmmu, "Failed to prepare sysmmu clock\n"); return ret; } - data->clk_master = devm_clk_get(dev, "master"); - if (IS_ERR(data->clk_master)) + data->clk_master = devm_clk_get(sysmmu, "master"); + if (PTR_ERR(data->clk_master) == -ENOENT) { data->clk_master = NULL; + return 0; + } else if (IS_ERR(data->clk_master)) { + dev_err(sysmmu, "Failed to get master clock\n"); + clk_unprepare(data->clk); + return PTR_ERR(data->clk_master); + } ret = clk_prepare(data->clk_master); if (ret) { clk_unprepare(data->clk); - dev_err(dev, "Failed to prepare master's clk\n"); + dev_err(sysmmu, "Failed to prepare master clock\n"); return ret; } - /* Relation between master and System MMU is 1:1. */ - node = of_parse_phandle(dev->of_node, "mmu-masters", 0); - if (node) { + return 0; +} + +static int __init __sysmmu_init_master(struct device *dev) +{ + int ret; + int i = 0; + struct device_node *node; + + while ((node = of_parse_phandle(dev->of_node, "mmu-masters", i++))) { struct platform_device *master = of_find_device_by_node(node); + struct exynos_iommu_owner *owner; + struct sysmmu_list_data *list_data; if (!master) { dev_err(dev, "%s: mmu-master '%s' not found\n", __func__, node->name); - return -EINVAL; + ret = -EINVAL; + goto err; } - if (master->dev.archdata.iommu != NULL) { - dev_err(dev, "%s: '%s' is master of other MMU\n", - __func__, node->name); - return -EINVAL; + owner = master->dev.archdata.iommu; + if (!owner) { + owner = devm_kzalloc(dev, sizeof(*owner), GFP_KERNEL); + if (!owner) { + dev_err(dev, + "%s: Failed to allocate owner structure\n", + __func__); + ret = -ENOMEM; + goto err; + } + + INIT_LIST_HEAD(&owner->mmu_list); + INIT_LIST_HEAD(&owner->client); + owner->dev = &master->dev; + spin_lock_init(&owner->lock); + + master->dev.archdata.iommu = owner; } + list_data = devm_kzalloc(dev, sizeof(*list_data), GFP_KERNEL); + if (!list_data) { + dev_err(dev, + "%s: Failed to allocate sysmmu_list_data\n", + __func__); + ret = -ENOMEM; + goto err; + } + + INIT_LIST_HEAD(&list_data->entry); + list_data->sysmmu = dev; + /* - * archdata.iommu will be initialized with exynos_iommu_client - * in sysmmu_hook_driver_register(). + * System MMUs are attached in the order of the presence + * in device tree */ - master->dev.archdata.iommu = dev; + list_add_tail(&list_data->entry, &owner->mmu_list); } - data->sysmmu = dev; - rwlock_init(&data->lock); + return 0; +err: + while ((node = of_parse_phandle(dev->of_node, "mmu-masters", i++))) { + struct platform_device *master = of_find_device_by_node(node); + struct exynos_iommu_owner *owner; + struct sysmmu_list_data *list_data; - platform_set_drvdata(pdev, data); + if (!master) + continue; - pm_runtime_enable(dev); - data->runtime_active = !pm_runtime_enabled(dev); + owner = master->dev.archdata.iommu; + if (!owner) + continue; - dev_dbg(dev, "Probed and initialized\n"); - return 0; + for_each_sysmmu_list(owner->dev, list_data) { + if (list_data->sysmmu == dev) { + list_del(&list_data->entry); + kfree(list_data); + break; + } + } + } + + return ret; } -#ifdef CONFIG_PM_SLEEP -static int sysmmu_suspend(struct device *dev) +static int __init __sysmmu_setup(struct device *sysmmu, + struct sysmmu_drvdata *data) { - struct sysmmu_drvdata *data = dev_get_drvdata(dev); - unsigned long flags; - read_lock_irqsave(&data->lock, flags); - if (is_sysmmu_active(data) && - (!pm_runtime_enabled(dev) || data->runtime_active)) - __sysmmu_disable_nocount(data); - read_unlock_irqrestore(&data->lock, flags); - return 0; + int ret; + + ret = __sysmmu_init_clock(sysmmu, data); + if (ret) { + dev_err(sysmmu, "Failed to initialize gating clocks\n"); + return ret; + } + + ret = __sysmmu_init_master(sysmmu); + if (ret) { + if (data->clk) + clk_unprepare(data->clk); + if (data->clk_master) + clk_unprepare(data->clk_master); + dev_err(sysmmu, "Failed to initialize master device.\n"); + } + + return ret; } -static int sysmmu_resume(struct device *dev) +static int __init exynos_sysmmu_probe(struct platform_device *pdev) { - struct sysmmu_drvdata *data = dev_get_drvdata(dev); - unsigned long flags; - read_lock_irqsave(&data->lock, flags); - if (is_sysmmu_active(data) && - (!pm_runtime_enabled(dev) || data->runtime_active)) - __sysmmu_enable_nocount(data); - read_unlock_irqrestore(&data->lock, flags); - return 0; -} -#endif + int irq, ret; + struct device *dev = &pdev->dev; + struct sysmmu_drvdata *data; + struct resource *res; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) { + dev_err(dev, "Not enough memory for driver data\n"); + return -ENOMEM; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(dev, "Unable to find IOMEM region\n"); + return -ENOENT; + } + + data->sfrbase = devm_request_and_ioremap(dev, res); + if (!data->sfrbase) { + dev_err(dev, "Unable to map IOMEM @ PA: %pa\n", &res->start); + return -EBUSY; + } + + irq = platform_get_irq(pdev, 0); + if (irq <= 0) { + dev_err(dev, "Unable to find IRQ resource\n"); + return irq; + } + + ret = devm_request_irq(dev, irq, exynos_sysmmu_irq, 0, + dev_name(dev), data); + if (ret) { + dev_err(dev, "Unabled to register handler of irq %d\n", irq); + return ret; + } + + pm_runtime_enable(dev); + + ret = __sysmmu_setup(dev, data); + if (!ret) { + data->runtime_active = !pm_runtime_enabled(dev); + data->sysmmu = dev; + rwlock_init(&data->lock); -static SIMPLE_DEV_PM_OPS(sysmmu_pm_ops, sysmmu_suspend, sysmmu_resume); + platform_set_drvdata(pdev, data); + } + + return ret; +} #ifdef CONFIG_OF static struct of_device_id sysmmu_of_match[] __initconst = { @@ -729,7 +843,6 @@ static struct platform_driver exynos_sysmmu_driver __refdata = { .driver = { .owner = THIS_MODULE, .name = "exynos-sysmmu", - .pm = &sysmmu_pm_ops, .of_match_table = of_match_ptr(sysmmu_of_match), } }; @@ -1146,52 +1259,78 @@ subsys_initcall(exynos_iommu_init); #ifdef CONFIG_PM_SLEEP static int sysmmu_pm_genpd_suspend(struct device *dev) { - struct exynos_iommu_owner *owner = dev->archdata.iommu; + struct sysmmu_list_data *list; int ret; ret = pm_generic_suspend(dev); if (ret) return ret; - return pm_generic_suspend(owner->sysmmu); + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); + unsigned long flags; + write_lock_irqsave(&data->lock, flags); + if (!data->suspended && is_sysmmu_active(data) && + (!pm_runtime_enabled(dev) || data->runtime_active)) + __sysmmu_disable_nocount(data); + data->suspended = true; + write_unlock_irqrestore(&data->lock, flags); + } + + return 0; } static int sysmmu_pm_genpd_resume(struct device *dev) { - struct exynos_iommu_owner *owner = dev->archdata.iommu; - int ret; - ret = pm_generic_resume(owner->sysmmu); - if (ret) - return ret; + struct sysmmu_list_data *list; + + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); + unsigned long flags; + write_lock_irqsave(&data->lock, flags); + if (data->suspended && is_sysmmu_active(data) && + (!pm_runtime_enabled(dev) || data->runtime_active)) + __sysmmu_enable_nocount(data); + data->suspended = false; + write_unlock_irqrestore(&data->lock, flags); + } return pm_generic_resume(dev); } #endif #ifdef CONFIG_PM_RUNTIME -static void sysmmu_restore_state(struct device *sysmmu) +static void sysmmu_restore_state(struct device *dev) { - struct sysmmu_drvdata *data = dev_get_drvdata(sysmmu); - unsigned long flags; + struct sysmmu_list_data *list; + + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); + unsigned long flags; - spin_lock_irqsave(&data->lock, flags); - data->runtime_active = true; - if (is_sysmmu_active(data)) - __sysmmu_enable_nocount(data); - spin_unlock_irqrestore(&data->lock, flags); + spin_lock_irqsave(&data->lock, flags); + if (!data->runtime_active && is_sysmmu_active(data)) + __sysmmu_enable_nocount(data); + data->runtime_active = true; + spin_unlock_irqrestore(&data->lock, flags); + } } -static void sysmmu_save_state(struct device *sysmmu) +static void sysmmu_save_state(struct device *dev) { - struct sysmmu_drvdata *data = dev_get_drvdata(sysmmu); - unsigned long flags; + struct sysmmu_list_data *list; - spin_lock_irqsave(&data->lock, flags); - if (is_sysmmu_active(data)) - __sysmmu_disable_nocount(data); - data->runtime_active = false; - spin_unlock_irqrestore(&data->lock, flags); + for_each_sysmmu_list(dev, list) { + struct sysmmu_drvdata *data = dev_get_drvdata(list->sysmmu); + unsigned long flags; + + spin_lock_irqsave(&data->lock, flags); + if (data->runtime_active && is_sysmmu_active(data)) + __sysmmu_disable_nocount(data); + data->runtime_active = false; + spin_unlock_irqrestore(&data->lock, flags); + } } static int sysmmu_pm_genpd_save_state(struct device *dev) @@ -1216,7 +1355,7 @@ static int sysmmu_pm_genpd_save_state(struct device *dev) ret = cb(dev); if (ret == 0) - sysmmu_save_state(client->sysmmu); + sysmmu_save_state(dev); return ret; } @@ -1239,13 +1378,13 @@ static int sysmmu_pm_genpd_restore_state(struct device *dev) if (!cb && dev->driver && dev->driver->pm) cb = dev->driver->pm->runtime_resume; - sysmmu_restore_state(client->sysmmu); + sysmmu_restore_state(dev); if (cb) ret = cb(dev); if (ret) - sysmmu_save_state(client->sysmmu); + sysmmu_restore_state(dev); return ret; } @@ -1280,58 +1419,51 @@ static int sysmmu_hook_driver_register(struct notifier_block *nb, switch (val) { case BUS_NOTIFY_BIND_DRIVER: { - struct exynos_iommu_owner *owner; - int ret; - - BUG_ON(!dev_get_drvdata(dev->archdata.iommu)); - - owner = devm_kzalloc(dev, sizeof(*owner), GFP_KERNEL); - if (!owner) { - dev_err(dev, "No Memory for exynos_iommu_owner\n"); - dev->archdata.iommu = NULL; - return -ENOMEM; - } - - owner->dev = dev; - INIT_LIST_HEAD(&owner->client); - owner->sysmmu = dev->archdata.iommu; - - ret = pm_genpd_add_callbacks(dev, &sysmmu_devpm_ops, NULL); - if (ret && (ret != -ENOSYS)) { - dev_err(dev, + if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS) && dev->pm_domain) { + int ret = pm_genpd_add_callbacks( + dev, &sysmmu_devpm_ops, NULL); + if (ret && (ret != -ENOSYS)) { + dev_err(dev, "Failed to register 'dev_pm_ops' for iommu\n"); - devm_kfree(dev, owner); - dev->archdata.iommu = NULL; - return ret; + return ret; + } } - dev->archdata.iommu = owner; break; } case BUS_NOTIFY_BOUND_DRIVER: { - struct exynos_iommu_owner *owner = dev->archdata.iommu; - if (!pm_runtime_enabled(dev)) { + struct sysmmu_list_data *list; + + /* OK if runtime PM is enabled with genpd for dev */ + if (pm_runtime_enabled(dev) && dev->pm_domain) + break; + + /* + * System MMU will be permanently enabled if the master H/W is + * neither registered to a power domain nor runtime PM enabled. + */ + for_each_sysmmu_list(dev, list) { struct sysmmu_drvdata *data = - dev_get_drvdata(owner->sysmmu); - if (pm_runtime_enabled(data->sysmmu)) { - data->runtime_active = true; - if (is_sysmmu_active(data)) - __sysmmu_enable_nocount(data); - pm_runtime_disable(data->sysmmu); - } + dev_get_drvdata(list->sysmmu); + unsigned long flags; + + write_lock_irqsave(&data->lock, flags); + if (is_sysmmu_active(data) && !data->runtime_active) + __sysmmu_enable_nocount(data); + data->runtime_active = true; + pm_runtime_disable(data->sysmmu); + write_unlock_irqrestore(&data->lock, flags); } + break; } case BUS_NOTIFY_UNBOUND_DRIVER: { struct exynos_iommu_owner *owner = dev->archdata.iommu; - struct device *sysmmu = owner->sysmmu; if (WARN_ON(!list_empty(&owner->client))) iommu_detach_device(owner->domain, dev); __pm_genpd_remove_callbacks(dev, false); - devm_kfree(dev, owner); - dev->archdata.iommu = sysmmu; break; } } /* switch (val) */
Some master device descriptor like fimc-is which is an abstraction of very complex H/W may have multiple System MMUs. For those devices, the design of the link between System MMU and its master H/W is needed to be reconsidered. A link structure, sysmmu_list_data is introduced that provides a link to master H/W and that has a pointer to the device descriptor of a System MMU. Given a device descriptor of a master H/W, it is possible to traverse all System MMUs that must be controlled along with the master H/W. Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> --- drivers/iommu/exynos-iommu.c | 534 ++++++++++++++++++++++++++---------------- 1 file changed, 333 insertions(+), 201 deletions(-)