iommu: Always define struct iommu_fwspec
Subsystems (4)
PATCH 1/1 iommu: Always define struct iommu_fwspec
From: Thierry Reding <[email protected]>
In order to fully make use of the !IOMMU_API stub functions, make the struct iommu_fwspec always available so that users of the stubs can keep using the structure's internals without causing compile failures.
---
Hi Joerg,
this is a rebased patch extracted from an ancient series that never ended up getting applied:
https://lore.kernel.org/all/[email protected]/
You had already acked this particular patch, so maybe you can pick this up. I've seen at least two discussions where this was brought up again, so I figured it'd be worth sending this out again because it can help remove a number of #ifdef blocks throughout the kernel.
include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
include/linux/iommu.h +19 -20
@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /**
@@ -598,25 +617,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */
@@ -680,7 +680,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {};
Signature · 1 line
2.37.3
Quoted 8 lines · Thierry Reding
From: Thierry Reding <[email protected]>
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Signed-off-by Thierry Reding <[email protected]>
Quoted 6 lines
---
Hi Joerg,this is a rebased patch extracted from an ancient series that never ended up getting applied:
Quoted 6 lines
https://lore.kernel.org/all/[email protected]/You had already acked this particular patch, so maybe you can pick this up. I've seen at least two discussions where this was brought up again, so I figured it'd be worth sending this out again because it can help remove a number of #ifdef blocks throughout the kernel.
Yes, this would certainly help to improve the code. To me, it looks like the current stub functions, like dev_iommu_fwspec_get() for example, aren't really useful without $subject patch.
Note that, I have a pending patch for mmc that would benefit from this. To prevent me from delaying that, an easy way forward, assuming there are no objections of course, would be to send this for 6.1-rc.
Quoted 69 lines
include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)include/linux/iommu.h +19
-21@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /** @@ -598,25 +617,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */ @@ -680,7 +680,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {}; --
Quoted 2 lines
2.37.3
Kind regards
Uffe
Quoted 25 lines · Ulf Hansson
Quoted 8 lines · Thierry Reding
From: Thierry Reding <[email protected]>
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Signed-off-by Thierry Reding <[email protected]>Reviewed-by Ulf Hansson <[email protected]>Quoted 6 lines
---
Hi Joerg,this is a rebased patch extracted from an ancient series that never ended up getting applied:
Quoted 6 lines
https://lore.kernel.org/all/[email protected]/You had already acked this particular patch, so maybe you can pick this up. I've seen at least two discussions where this was brought up again, so I figured it'd be worth sending this out again because it can help remove a number of #ifdef blocks throughout the kernel.
Quoted 7 lines
Yes, this would certainly help to improve the code. To me, it looks like the current stub functions, like
dev_iommu_fwspec_get()for example, aren't really useful without $subject patch.Note that, I have a pending patch for mmc that would benefit from this. To prevent me from delaying that, an easy way forward, assuming there are no objections of course, would be to send this for 6.1-rc.
Adding Prathamesh for visibility. Another alternative would be to prepend this to Prathamesh's series with an Acked-by from Joerg.
Joerg, any preference on how to move forward with this?
Thierry
Quoted 75 lines
Quoted 70 lines
include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)include/linux/iommu.h +19
-21@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /** @@ -598,25 +617,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */ @@ -680,7 +680,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {}; --Quoted 2 lines
2.37.3
Kind regards
Uffe
Quoted 31 lines · Thierry Reding
Quoted 29 lines · Ulf Hansson
Quoted 8 lines · Thierry Reding
From: Thierry Reding <[email protected]>
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Signed-off-by Thierry Reding <[email protected]>Reviewed-by Ulf Hansson <[email protected]>Quoted 6 lines
---
Hi Joerg,this is a rebased patch extracted from an ancient series that never ended up getting applied:
Quoted 6 lines
https://lore.kernel.org/all/[email protected]/You had already acked this particular patch, so maybe you can pick this up. I've seen at least two discussions where this was brought up again, so I figured it'd be worth sending this out again because it can help remove a number of #ifdef blocks throughout the kernel.
Yes, this would certainly help to improve the code. To me, it looks like the current stub functions, like
dev_iommu_fwspec_get()for example, aren't really useful without $subject patch.
Quoted 6 lines
Quoted 3 lines
Note that, I have a pending patch for mmc that would benefit from this. To prevent me from delaying that, an easy way forward, assuming there are no objections of course, would be to send this for 6.1-rc.
Adding Prathamesh for visibility. Another alternative would be to prepend this to Prathamesh's series with an Acked-by from Joerg.
Good idea!
I will then be awaiting a new version from Prathamesh's series, that includes $subject patch too.
Quoted 5 lines
Joerg, any preference on how to move forward with this?
Thierry
Kind regards
Uffe
Quoted 75 lines
Quoted 75 lines
Quoted 70 lines
include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)include/linux/iommu.h +19
-21@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /** @@ -598,25 +617,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */ @@ -680,7 +680,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {}; --Quoted 2 lines
2.37.3
Kind regards
Uffe
PATCH v9 1/4 iommu: Add dummy dev_iommu_fwspec_get() helper
This dummy implementation is useful to avoid a dependency on the IOMMU_API Kconfig symbol in drivers that can optionally use the IOMMU API.
In order to fully use this, also move the struct iommu_fwspec definition out of the IOMMU_API protected region.
--- include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
include/linux/iommu.h +19 -20
@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /**
@@ -600,25 +619,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */
@@ -682,7 +682,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {};
Signature · 1 line
2.17.1
PATCH v9 2/4 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data
Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.
--- drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = { .max_tap_delay = 139, }; +static const struct sdhci_tegra_soc_data soc_data_tegra234 = { + .pdata = &sdhci_tegra186_pdata, + .dma_mask =DMA_BIT_MASK (39 ), + .nvquirks =NVQUIRK_NEEDS_PAD_CONTROL | +NVQUIRK_HAS_PADCALIB | +NVQUIRK_DIS_CARD_CLK_CONFIG_TAP | +NVQUIRK_ENABLE_SDR50 | +NVQUIRK_ENABLE_SDR104 | +NVQUIRK_HAS_TMCLK , + .min_tap_delay =95 , + .max_tap_delay =111 , +}; +static const struct of_device_id sdhci_tegra_dt_match[] = { + { .compatible ="nvidia,tegra234-sdhci" , .data = &soc_data_tegra234 }, { .compatible ="nvidia,tegra194-sdhci" , .data = &soc_data_tegra194 }, { .compatible ="nvidia,tegra186-sdhci" , .data = &soc_data_tegra186 }, { .compatible ="nvidia,tegra210-sdhci" , .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
PATCH v9 3/4 mmc: sdhci-tegra: Add support to program MC stream ID
In reply to Prathamesh SheteSMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.
--- drivers/mmc/host/sdhci-tegra.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/mmc/host/sdhci-tegra.c +34 -0
@@ -25,6 +25,8 @@#include <linux/mmc/slot-gpio.h> #include <linux/gpio/consumer.h> #include <linux/ktime.h> +#include <linux/iommu.h> +#include <linux/bitops.h> #include <soc/tegra/common.h>
@@ -94,6 +96,8 @@#define SDHCI_TEGRA_AUTO_CAL_STATUS 0x1ec#define SDHCI_TEGRA_AUTO_CAL_ACTIVE BIT(31) +#define SDHCI_TEGRA_CIF2AXI_CTRL_0 0x1fc +#define NVQUIRK_FORCE_SDHCI_SPEC_200 BIT(0)#define NVQUIRK_ENABLE_BLOCK_GAP_DET BIT(1)#define NVQUIRK_ENABLE_SDHCI_SPEC_300 BIT(2)
@@ -121,6 +125,7 @@#define NVQUIRK_HAS_TMCLK BIT(10)#define NVQUIRK_HAS_ANDROID_GPT_SECTOR BIT(11) +#define NVQUIRK_PROGRAM_STREAMID BIT(12)/* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */ #define SDHCI_TEGRA_CQE_BASE_ADDR 0xF000
@@ -177,6 +182,7 @@ struct sdhci_tegra {bool enable_hwcq;unsigned long curr_clk_rate;u8 tuned_tap_delay; +u32 streamid; };static u16 tegra_sdhci_readw (struct sdhci_host *host,int reg)
@@ -1564,6 +1570,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |NVQUIRK_ENABLE_SDR50 |NVQUIRK_ENABLE_SDR104 | +NVQUIRK_PROGRAM_STREAMID | NVQUIRK_HAS_TMCLK, .min_tap_delay = 95, .max_tap_delay = 111,
@@ -1630,6 +1637,29 @@ static int sdhci_tegra_add_host(struct sdhci_host *host)return ret; } +/* Program MC streamID for DMA transfers */ +static void program_stream_id (struct device *dev) +{ +struct sdhci_host *host =dev_get_drvdata (dev); +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct sdhci_tegra *tegra_host =sdhci_pltfm_priv (pltfm_host); +struct iommu_fwspec *fwspec; + +if (tegra_host->soc_data->nvquirks &NVQUIRK_PROGRAM_STREAMID ) { + fwspec =dev_iommu_fwspec_get (dev); +if (!fwspec) { +dev_warn (mmc_dev (host->mmc), +"iommu fwspec is NULL, continue without stream ID\n" ); + }else { + tegra_host->streamid = fwspec->ids[0 ] &0xff ; +tegra_sdhci_writel (host, tegra_host->streamid | +FIELD_PREP (GENMASK (15 ,8 ), + tegra_host->streamid), +SDHCI_TEGRA_CIF2AXI_CTRL_0 ); + } + } +} +static int sdhci_tegra_probe (struct platform_device *pdev) {const struct sdhci_tegra_soc_data *soc_data;
@@ -1775,6 +1805,8 @@ static int sdhci_tegra_probe(struct platform_device *pdev)if (rc) goto err_add_host; +program_stream_id (&pdev->dev); +return 0 ; err_add_host:
@@ -1871,6 +1903,8 @@ static int sdhci_tegra_resume(struct device *dev)if (ret)return ret; +program_stream_id (dev); + ret =sdhci_resume_host (host);if (ret) goto disable_clk;
Signature · 1 line
2.17.1
PATCH v9 4/4 mmc: sdhci-tegra: Issue CMD and DAT resets together
In reply to Prathamesh SheteIn case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.
--- drivers/mmc/host/sdhci-tegra.c | 3 ++- drivers/mmc/host/sdhci.c | 5 +++++ drivers/mmc/host/sdhci.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
@@ -1531,7 +1531,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {SDHCI_QUIRK_NO_HISPD_BIT |SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC | SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, + .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN | + SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER, .ops = &tegra186_sdhci_ops, };
drivers/mmc/host/sdhci.c +5 -0
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {static void sdhci_reset_for_reason (struct sdhci_host *host,enum sdhci_reset_reason reason) { +if (host->quirks2 & +SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER ) { +sdhci_do_reset (host,SDHCI_RESET_CMD |SDHCI_RESET_DATA ); +return ; + }switch (reason) {case SDHCI_RESET_FOR_INIT :sdhci_do_reset (host,SDHCI_RESET_CMD |SDHCI_RESET_DATA );
drivers/mmc/host/sdhci.h +2 -0
@@ -478,6 +478,8 @@ struct sdhci_host {* block count. */ #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT (1<<18) +/* Issue CMD and DATA reset together */ +#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER (1<<19)int irq;/* Device IRQ */ void __iomem *ioaddr;/* Mapped address */
Signature · 1 line
2.17.1
Re: [PATCH v9 1/4] iommu: Add dummy dev_iommu_fwspec_get() helper
In reply to Prathamesh SheteQuoted 10 lines · Prathamesh Shete
This dummy implementation is useful to avoid a dependency on the
IOMMU_APIKconfigsymbol in drivers that can optionally use the IOMMU API.In order to fully use this, also move the struct
iommu_fwspecdefinition out of theIOMMU_APIprotected region.Signed-off-by Thierry Reding <[email protected]>Reviewed-by Ulf Hansson <[email protected]>
It seems like you claimed authorship of the patch [1], that was authored by Thierry and updated the commit message header.
Can you please restore the patch to its original that was posted by Thierry?
Kind regards
Uffe
[1]
https://lore.kernel.org/linux-mmc/[email protected]/
Quoted 71 lines
--- include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)include/linux/iommu.h +19
-21@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /** @@ -600,25 +619,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */ @@ -682,7 +682,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {}; --2.17.1
PATCH v10 1/4 iommu: Always define struct iommu_fwspec
In order to fully make use of the !IOMMU_API stub functions, make the struct iommu_fwspec always available so that users of the stubs can keep using the structure's internals without causing compile failures.
--- include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
include/linux/iommu.h +19 -20
@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /**
@@ -600,25 +619,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */
@@ -682,7 +682,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {};
Signature · 1 line
2.17.1
PATCH v10 2/4 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data
Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.
--- drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = { .max_tap_delay = 139, }; +static const struct sdhci_tegra_soc_data soc_data_tegra234 = { + .pdata = &sdhci_tegra186_pdata, + .dma_mask =DMA_BIT_MASK (39 ), + .nvquirks =NVQUIRK_NEEDS_PAD_CONTROL | +NVQUIRK_HAS_PADCALIB | +NVQUIRK_DIS_CARD_CLK_CONFIG_TAP | +NVQUIRK_ENABLE_SDR50 | +NVQUIRK_ENABLE_SDR104 | +NVQUIRK_HAS_TMCLK , + .min_tap_delay =95 , + .max_tap_delay =111 , +}; +static const struct of_device_id sdhci_tegra_dt_match[] = { + { .compatible ="nvidia,tegra234-sdhci" , .data = &soc_data_tegra234 }, { .compatible ="nvidia,tegra194-sdhci" , .data = &soc_data_tegra194 }, { .compatible ="nvidia,tegra186-sdhci" , .data = &soc_data_tegra186 }, { .compatible ="nvidia,tegra210-sdhci" , .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
PATCH v10 3/4 mmc: sdhci-tegra: Add support to program MC stream ID
In reply to Prathamesh SheteSMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.
--- drivers/mmc/host/sdhci-tegra.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/mmc/host/sdhci-tegra.c +34 -0
@@ -25,6 +25,8 @@#include <linux/mmc/slot-gpio.h> #include <linux/gpio/consumer.h> #include <linux/ktime.h> +#include <linux/iommu.h> +#include <linux/bitops.h> #include <soc/tegra/common.h>
@@ -94,6 +96,8 @@#define SDHCI_TEGRA_AUTO_CAL_STATUS 0x1ec#define SDHCI_TEGRA_AUTO_CAL_ACTIVE BIT(31) +#define SDHCI_TEGRA_CIF2AXI_CTRL_0 0x1fc +#define NVQUIRK_FORCE_SDHCI_SPEC_200 BIT(0)#define NVQUIRK_ENABLE_BLOCK_GAP_DET BIT(1)#define NVQUIRK_ENABLE_SDHCI_SPEC_300 BIT(2)
@@ -121,6 +125,7 @@#define NVQUIRK_HAS_TMCLK BIT(10)#define NVQUIRK_HAS_ANDROID_GPT_SECTOR BIT(11) +#define NVQUIRK_PROGRAM_STREAMID BIT(12)/* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */ #define SDHCI_TEGRA_CQE_BASE_ADDR 0xF000
@@ -177,6 +182,7 @@ struct sdhci_tegra {bool enable_hwcq;unsigned long curr_clk_rate;u8 tuned_tap_delay; +u32 streamid; };static u16 tegra_sdhci_readw (struct sdhci_host *host,int reg)
@@ -1564,6 +1570,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |NVQUIRK_ENABLE_SDR50 |NVQUIRK_ENABLE_SDR104 | +NVQUIRK_PROGRAM_STREAMID | NVQUIRK_HAS_TMCLK, .min_tap_delay = 95, .max_tap_delay = 111,
@@ -1630,6 +1637,29 @@ static int sdhci_tegra_add_host(struct sdhci_host *host)return ret; } +/* Program MC streamID for DMA transfers */ +static void program_stream_id (struct device *dev) +{ +struct sdhci_host *host =dev_get_drvdata (dev); +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct sdhci_tegra *tegra_host =sdhci_pltfm_priv (pltfm_host); +struct iommu_fwspec *fwspec; + +if (tegra_host->soc_data->nvquirks &NVQUIRK_PROGRAM_STREAMID ) { + fwspec =dev_iommu_fwspec_get (dev); +if (!fwspec) { +dev_warn (mmc_dev (host->mmc), +"iommu fwspec is NULL, continue without stream ID\n" ); + }else { + tegra_host->streamid = fwspec->ids[0 ] &0xff ; +tegra_sdhci_writel (host, tegra_host->streamid | +FIELD_PREP (GENMASK (15 ,8 ), + tegra_host->streamid), +SDHCI_TEGRA_CIF2AXI_CTRL_0 ); + } + } +} +static int sdhci_tegra_probe (struct platform_device *pdev) {const struct sdhci_tegra_soc_data *soc_data;
@@ -1775,6 +1805,8 @@ static int sdhci_tegra_probe(struct platform_device *pdev)if (rc) goto err_add_host; +program_stream_id (&pdev->dev); +return 0 ; err_add_host:
@@ -1871,6 +1903,8 @@ static int sdhci_tegra_resume(struct device *dev)if (ret)return ret; +program_stream_id (dev); + ret =sdhci_resume_host (host);if (ret) goto disable_clk;
Signature · 1 line
2.17.1
Robin Murphy
reviewerRe: [PATCH v10 3/4] mmc: sdhci-tegra: Add support to program MC stream ID
Quoted 66 lines · Prathamesh Shete
SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define
NVQUIRK_PROGRAM_STREAMIDand use it to program SMMU stream ID from the SDMMC client address space.Signed-off-by Aniruddha TVS Rao <[email protected]>Signed-off-by Prathamesh Shete <[email protected]>Acked-by Adrian Hunter <[email protected]>Acked-by Thierry Reding <[email protected]>--- drivers/mmc/host/sdhci-tegra.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)drivers/mmc/host/sdhci-tegra.c +10
-0@@ -25,6 +25,8 @@#include <linux/mmc/slot-gpio.h> #include <linux/gpio/consumer.h> #include <linux/ktime.h> +#include <linux/iommu.h> +#include <linux/bitops.h> #include <soc/tegra/common.h> @@ -94,6 +96,8 @@#define SDHCI_TEGRA_AUTO_CAL_STATUS 0x1ec#define SDHCI_TEGRA_AUTO_CAL_ACTIVE BIT(31) +#define SDHCI_TEGRA_CIF2AXI_CTRL_0 0x1fc +#define NVQUIRK_FORCE_SDHCI_SPEC_200 BIT(0)#define NVQUIRK_ENABLE_BLOCK_GAP_DET BIT(1)#define NVQUIRK_ENABLE_SDHCI_SPEC_300 BIT(2)@@ -121,6 +125,7 @@#define NVQUIRK_HAS_TMCLK BIT(10)#define NVQUIRK_HAS_ANDROID_GPT_SECTOR BIT(11) +#define NVQUIRK_PROGRAM_STREAMID BIT(12)/* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */ #define SDHCI_TEGRA_CQE_BASE_ADDR 0xF000@@ -177,6 +182,7 @@ struct sdhci_tegra {bool enable_hwcq;unsigned long curr_clk_rate;u8 tuned_tap_delay; +u32 streamid; };static u16 tegra_sdhci_readw (struct sdhci_host *host,int reg)@@ -1564,6 +1570,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |NVQUIRK_ENABLE_SDR50 |NVQUIRK_ENABLE_SDR104 | +NVQUIRK_PROGRAM_STREAMID | NVQUIRK_HAS_TMCLK, .min_tap_delay = 95, .max_tap_delay = 111,@@ -1630,6 +1637,29 @@ static int sdhci_tegra_add_host(struct sdhci_host *host)return ret; } +/* Program MC streamID for DMA transfers */ +static void program_stream_id (struct device *dev) +{
drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_add_host(struct sdhci_host *host) · line 1652
Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +10
-0+struct sdhci_host *host =dev_get_drvdata (dev); +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct sdhci_tegra *tegra_host =sdhci_pltfm_priv (pltfm_host); +struct iommu_fwspec *fwspec; + +if (tegra_host->soc_data->nvquirks &NVQUIRK_PROGRAM_STREAMID ) { + fwspec =dev_iommu_fwspec_get (dev); +if (!fwspec) { +dev_warn (mmc_dev (host->mmc), +"iommu fwspec is NULL, continue without stream ID\n" );
Not sure that really warrants a warning - if there's no IOMMU driver present then StreamIDs are going to be irrelevant anyway. And repeating the same warning on every PM resume seems even less useful.
drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_add_host(struct sdhci_host *host) · line 1655
Quoted 3 lines
drivers/mmc/host/sdhci-tegra.c +3
-0+ }else { + tegra_host->streamid = fwspec->ids[0 ] &0xff ; + tegra_sdhci_writel(host, tegra_host->streamid |
Why bother storing streamid in tegra_host if it's never consumed from anywhere other than the same place it's assigned?
Robin.
Quoted 28 lines
drivers/mmc/host/sdhci-tegra.c +11
-0+FIELD_PREP (GENMASK (15 ,8 ), + tegra_host->streamid), + SDHCI_TEGRA_CIF2AXI_CTRL_0); + } + } +} +static int sdhci_tegra_probe (struct platform_device *pdev) {const struct sdhci_tegra_soc_data *soc_data;@@ -1775,6 +1805,8 @@ static int sdhci_tegra_probe(struct platform_device *pdev)if (rc) goto err_add_host; +program_stream_id (&pdev->dev); +return 0 ; err_add_host:@@ -1871,6 +1903,8 @@ static int sdhci_tegra_resume(struct device *dev)if (ret)return ret; +program_stream_id (dev); + ret =sdhci_resume_host (host);if (ret) goto disable_clk;
PATCH v10 4/4 mmc: sdhci-tegra: Issue CMD and DAT resets together
In reply to Prathamesh SheteIn case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.
--- drivers/mmc/host/sdhci-tegra.c | 3 ++- drivers/mmc/host/sdhci.c | 5 +++++ drivers/mmc/host/sdhci.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
@@ -1531,7 +1531,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {SDHCI_QUIRK_NO_HISPD_BIT |SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC | SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, + .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN | + SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER, .ops = &tegra186_sdhci_ops, };
drivers/mmc/host/sdhci.c +5 -0
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {static void sdhci_reset_for_reason (struct sdhci_host *host,enum sdhci_reset_reason reason) { +if (host->quirks2 & +SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER ) { +sdhci_do_reset (host,SDHCI_RESET_CMD |SDHCI_RESET_DATA ); +return ; + }switch (reason) {case SDHCI_RESET_FOR_INIT :sdhci_do_reset (host,SDHCI_RESET_CMD |SDHCI_RESET_DATA );
drivers/mmc/host/sdhci.h +2 -0
@@ -478,6 +478,8 @@ struct sdhci_host {* block count. */ #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT (1<<18) +/* Issue CMD and DATA reset together */ +#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER (1<<19)int irq;/* Device IRQ */ void __iomem *ioaddr;/* Mapped address */
Signature · 1 line
2.17.1
Quoted 7 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Signed-off-by Thierry Reding <[email protected]>Reviewed-by Ulf Hansson <[email protected]>
Joerg, Will, Robin - may I have an ack from some of you for $subject patch, so I can funnel it via my mmc tree for v6.2?
Kind regards
Uffe
Quoted 71 lines
--- include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)include/linux/iommu.h +19
-21@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /** @@ -600,25 +619,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */ @@ -682,7 +682,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {}; --2.17.1
Robin Murphy
reviewerQuoted 3 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.
I'm really in two minds about this... fwspecs are an internal detail of the IOMMU API that are meant to be private between individual drivers and firmware code, so anything poking at them arguably does and should depend on CONFIG_IOMMU_API. It looks like the stub for dev_iommu_fwspec_get() was only added for the sake of one driver that was misusing it where it really wanted device_iommu_mapped(), and has since been fixed, so if anything my preference would be to remove that stub :/
I don't technically have much objection to this patch in isolation, but what I don't like is the direction of travel it implies. I see the anti-pattern is only spread across Tegra drivers, making Tegra-specific assumptions, so in my view the best answer would be to abstract that fwpsec dependency into a single Tegra-specific helper, which would better represent the nature of what's really going on here.
Thanks,
Robin.
Quoted 70 lines
Signed-off-by Thierry Reding <[email protected]>Reviewed-by Ulf Hansson <[email protected]>--- include/linux/iommu.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)include/linux/iommu.h +19
-20@@ -173,6 +173,25 @@ enum iommu_dev_features {#define IOMMU_PASID_INVALID (-1U) +/** +* struct iommu_fwspec - per-device IOMMU instance data +* @ops: ops for this device's IOMMU +* @iommu_fwnode: firmware handle for this device's IOMMU +* @flags: IOMMU_FWSPEC_* flags +* @num_ids: number of associated device IDs +* @ids: IDs which this device may present to the IOMMU +*/ +struct iommu_fwspec { +const struct iommu_ops *ops; +struct fwnode_handle *iommu_fwnode; +u32 flags; +unsigned int num_ids; +u32 ids[]; +}; + +/* ATS is supported */ +#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) +#ifdef CONFIG_IOMMU_API /** @@ -600,25 +619,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);/* FSL-MC device grouping function */ struct iommu_group *fsl_mc_device_group (struct device *dev); -/** -* struct iommu_fwspec - per-device IOMMU instance data -* @ops: ops for this device's IOMMU -* @iommu_fwnode: firmware handle for this device's IOMMU -* @flags: IOMMU_FWSPEC_* flags -* @num_ids: number of associated device IDs -* @ids: IDs which this device may present to the IOMMU -*/ -struct iommu_fwspec { -const struct iommu_ops *ops; -struct fwnode_handle *iommu_fwnode; -u32 flags; -unsigned int num_ids; -u32 ids[]; -}; - -/* ATS is supported */ -#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0) -/** * struct iommu_sva - handle to a device-mm bond */ @@ -682,7 +682,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);struct iommu_ops {};struct iommu_group {}; -struct iommu_fwspec {};struct iommu_device {};struct iommu_fault_param {};struct iommu_iotlb_gather {};
Quoted 5 lines · Robin Murphy
Quoted 3 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.
Quoted 7 lines
I'm really in two minds about this... fwspecs are an internal detail of the IOMMU API that are meant to be private between individual drivers and firmware code, so anything poking at them arguably does and should depend on
CONFIG_IOMMU_API. It looks like the stub fordev_iommu_fwspec_get()was only added for the sake of one driver that was misusing it where it really wanteddevice_iommu_mapped(), and has since been fixed, so if anything my preference would be to remove that stub :/
Tegra has been using this type of weak dependency on IOMMU_API mainly in order to allow building without the IOMMU support on some old platforms where people may actually care about the kernel size (Tegra20 systems were sometimes severely constrained and don't have anything that we'd call an IOMMU today).
We have similar stubs in place for most other major subsystems in order to allow code to simply compile out if the subsystem is disabled, which is quite convenient for sharing code between platforms that may want a given feature and other platforms that may not want it, without causing too much of a hassle with compile-testing.
Quoted 6 lines
I don't technically have much objection to this patch in isolation, but what I don't like is the direction of travel it implies. I see the anti-pattern is only spread across Tegra drivers, making Tegra-specific assumptions, so in my view the best answer would be to abstract that fwpsec dependency into a single Tegra-specific helper, which would better represent the nature of what's really going on here.
I don't see how this is an anti-pattern. It might not be common for drivers to need to reach into iommu_fwspec, so that might indeed be specific to Tegra (for whatever reason our IP seems to want extra flexibility), but the general pattern of using stubs is wide-spread, so I don't see why IOMMU_API would need to be special.
Of course we could get rid of the stubs and make these hard dependencies, but I suspect some people may then get mad that they can no longer disable the IOMMU dependency.
Thierry
Quoted 21 lines · Thierry Reding
Quoted 5 lines · Robin Murphy
Quoted 3 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Quoted 7 lines
I'm really in two minds about this... fwspecs are an internal detail of the IOMMU API that are meant to be private between individual drivers and firmware code, so anything poking at them arguably does and should depend on
CONFIG_IOMMU_API. It looks like the stub fordev_iommu_fwspec_get()was only added for the sake of one driver that was misusing it where it really wanteddevice_iommu_mapped(), and has since been fixed, so if anything my preference would be to remove that stub :/Tegra has been using this type of weak dependency on
IOMMU_APImainly in order to allow building without the IOMMU support on some old platforms where people may actually care about the kernel size (Tegra20 systems were sometimes severely constrained and don't have anything that we'd call an IOMMU today).
Quoted 5 lines
We have similar stubs in place for most other major subsystems in order to allow code to simply compile out if the subsystem is disabled, which is quite convenient for sharing code between platforms that may want a given feature and other platforms that may not want it, without causing too much of a hassle with compile-testing.
I agree with the above.
Moreover, the stubs make the code more portable/scalable and so it becomes easier to maintain.
Quoted 8 lines
Quoted 7 lines
I don't technically have much objection to this patch in isolation, but what I don't like is the direction of travel it implies. I see the anti-pattern is only spread across Tegra drivers, making Tegra-specific assumptions, so in my view the best answer would be to abstract that fwpsec dependency into a single Tegra-specific helper, which would better represent the nature of what's really going on here.
Quoted 5 lines
I don't see how this is an anti-pattern. It might not be common for drivers to need to reach into
iommu_fwspec, so that might indeed be specific to Tegra (for whatever reason our IP seems to want extra flexibility), but the general pattern of using stubs is wide-spread, so I don't see whyIOMMU_APIwould need to be special.
Again, I agree.
Moreover, a "git grep CONFIG_IOMMU_API" indicates that the problem isn't specific to Tegra. The "#ifdef CONFIG_IOMMU_API" seems to be sprinkled across the kernel. I think it would be nice if we could improve the situation. So far, using stubs along with what the $subject patch proposes, seems to me to be the best approach.
[...]
Kind regards
Uffe
Robin Murphy
reviewerQuoted 28 lines · Ulf Hansson
Quoted 21 lines · Thierry Reding
Quoted 5 lines · Robin Murphy
Quoted 3 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Quoted 7 lines
I'm really in two minds about this... fwspecs are an internal detail of the IOMMU API that are meant to be private between individual drivers and firmware code, so anything poking at them arguably does and should depend on
CONFIG_IOMMU_API. It looks like the stub fordev_iommu_fwspec_get()was only added for the sake of one driver that was misusing it where it really wanteddevice_iommu_mapped(), and has since been fixed, so if anything my preference would be to remove that stub :/Tegra has been using this type of weak dependency on
IOMMU_APImainly in order to allow building without the IOMMU support on some old platforms where people may actually care about the kernel size (Tegra20 systems were sometimes severely constrained and don't have anything that we'd call an IOMMU today).Quoted 5 lines
We have similar stubs in place for most other major subsystems in order to allow code to simply compile out if the subsystem is disabled, which is quite convenient for sharing code between platforms that may want a given feature and other platforms that may not want it, without causing too much of a hassle with compile-testing.
Quoted 4 lines
I agree with the above.
Moreover, the stubs make the code more portable/scalable and so it becomes easier to maintain.
Are you suggesting that having the same thing open-coded slightly differently (with bugs) in 8 different places is somehow more maintainable than abstracting it into a single centralised implementation?
Is it "easier to maintain" when already seemingly every thing I try to clean up or refactor in the IOMMU API at the moment is stymied by finding Tegra drivers doing unexpected (and often questionable) things? Is it "more scalable" to make it even easier for people to copy questionable code without a second thought, leaving API maintainers to play an ever-expanding game of whack-a-mole to clean it up? No. No it chuffing well isn't :(
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
I don't technically have much objection to this patch in isolation, but what I don't like is the direction of travel it implies. I see the anti-pattern is only spread across Tegra drivers, making Tegra-specific assumptions, so in my view the best answer would be to abstract that fwpsec dependency into a single Tegra-specific helper, which would better represent the nature of what's really going on here.
Quoted 7 lines
Quoted 5 lines
I don't see how this is an anti-pattern. It might not be common for drivers to need to reach into
iommu_fwspec, so that might indeed be specific to Tegra (for whatever reason our IP seems to want extra flexibility), but the general pattern of using stubs is wide-spread, so I don't see whyIOMMU_APIwould need to be special.Again, I agree.
The anti-pattern is reaching into some other driver's private data assuming a particular format, with zero indication of the huge degree of assumption involved, and half the time not even checking that what's being dereferenced is valid.
Quoted 5 lines
Moreover, a "git grep
CONFIG_IOMMU_API" indicates that the problem isn't specific to Tegra. The "#ifdefCONFIG_IOMMU_API" seems to be sprinkled across the kernel. I think it would be nice if we could improve the situation. So far, using stubs along with what the $subject patch proposes, seems to me to be the best approach.
Yes, there is plenty of code through the tree that is only relevant to the IOMMU API and would be a complete waste of space without it, that is not the point in question here. Grep for dev_iommu_fwspec_get; outside drivers/iommu, the only users are IOMMU-API-specific parts of ACPI code, as intended, plus 8 random Tegra drivers.
Now, there does happen to be a tacit contract between the ACPI IORT code and the Arm SMMU drivers for how SMMU StreamIDs are encoded in their respective fwspecs, but it was never intended for wider consumption. If Tegra drivers want to have a special relationship with arm-smmu then fair enough, but they can do the same as MSM and formalise it somewhere that the SMMU driver maintainers are at least aware of, rather than holding the whole generic IOMMU API hostage.
Since apparently it wasn't clear, what I was proposing is a driver helper at least something like this:
int tegra_arm_smmu_streamid(struct device *dev)
{
#ifdef CONFIG_IOMMU_API struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev) if (fwspec && fwspec->num_ids == 1) return fwspec->ids[0] & 0xffff; #endif return -EINVAL; }
Now THAT is scalable and maintainable; any number of random drivers can call it without any preconditions, it's a lot clearer what's going on, and I won't have to swear profusely while herding patches through half a dozen different trees if, when my ops rework gets to the point of refactoring iommu_fwspec with dev_iommu, it ends up changing anything significant.
Thanks,
Robin.
Quoted 39 lines · Robin Murphy
Quoted 28 lines · Ulf Hansson
Quoted 21 lines · Thierry Reding
Quoted 5 lines · Robin Murphy
Quoted 3 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Quoted 7 lines
I'm really in two minds about this... fwspecs are an internal detail of the IOMMU API that are meant to be private between individual drivers and firmware code, so anything poking at them arguably does and should depend on
CONFIG_IOMMU_API. It looks like the stub fordev_iommu_fwspec_get()was only added for the sake of one driver that was misusing it where it really wanteddevice_iommu_mapped(), and has since been fixed, so if anything my preference would be to remove that stub :/Tegra has been using this type of weak dependency on
IOMMU_APImainly in order to allow building without the IOMMU support on some old platforms where people may actually care about the kernel size (Tegra20 systems were sometimes severely constrained and don't have anything that we'd call an IOMMU today).Quoted 5 lines
We have similar stubs in place for most other major subsystems in order to allow code to simply compile out if the subsystem is disabled, which is quite convenient for sharing code between platforms that may want a given feature and other platforms that may not want it, without causing too much of a hassle with compile-testing.
Quoted 4 lines
I agree with the above.
Moreover, the stubs make the code more portable/scalable and so it becomes easier to maintain.
Are you suggesting that having the same thing open-coded slightly differently (with bugs) in 8 different places is somehow more maintainable than abstracting it into a single centralised implementation?
Quoted 7 lines
Is it "easier to maintain" when already seemingly every thing I try to clean up or refactor in the IOMMU API at the moment is stymied by finding Tegra drivers doing unexpected (and often questionable) things? Is it "more scalable" to make it even easier for people to copy questionable code without a second thought, leaving API maintainers to play an ever-expanding game of whack-a-mole to clean it up? No. No it chuffing well isn't :(
Ohh, I wasn't aware of these kinds of issues for the IOMMU interface.
Abusing interfaces is an orthogonal problem to what I was suggesting to solve here. The main problem I was trying to address was to prevent sprinkling subsystems/drivers with "#ifdefs" all over the place, as that doesn't scale.
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
Quoted 7 lines
I don't technically have much objection to this patch in isolation, but what I don't like is the direction of travel it implies. I see the anti-pattern is only spread across Tegra drivers, making Tegra-specific assumptions, so in my view the best answer would be to abstract that fwpsec dependency into a single Tegra-specific helper, which would better represent the nature of what's really going on here.
I don't see how this is an anti-pattern. It might not be common for drivers to need to reach into
iommu_fwspec, so that might indeed be specific to Tegra (for whatever reason our IP seems to want extra flexibility), but the general pattern of using stubs is wide-spread, so I don't see whyIOMMU_APIwould need to be special.
Quoted 6 lines
Quoted 1 line
Again, I agree.
The anti-pattern is reaching into some other driver's private data assuming a particular format, with zero indication of the huge degree of assumption involved, and half the time not even checking that what's being dereferenced is valid.
I see.
Quoted 13 lines
Quoted 6 lines
Moreover, a "git grep
CONFIG_IOMMU_API" indicates that the problem isn't specific to Tegra. The "#ifdefCONFIG_IOMMU_API" seems to be sprinkled across the kernel. I think it would be nice if we could improve the situation. So far, using stubs along with what the $subject patch proposes, seems to me to be the best approach.Yes, there is plenty of code through the tree that is only relevant to the IOMMU API and would be a complete waste of space without it, that is not the point in question here. Grep for
dev_iommu_fwspec_get; outsidedrivers/iommu, the only users are IOMMU-API-specific parts of ACPI code, as intended, plus 8 random Tegra drivers.
Quoted 7 lines
Now, there does happen to be a tacit contract between the ACPI IORT code and the Arm SMMU drivers for how SMMU StreamIDs are encoded in their respective fwspecs, but it was never intended for wider consumption. If Tegra drivers want to have a special relationship with arm-smmu then fair enough, but they can do the same as MSM and formalise it somewhere that the SMMU driver maintainers are at least aware of, rather than holding the whole generic IOMMU API hostage.
Thanks for clarifying this. I certainly understand your concern better now.
Quoted 15 lines
Since apparently it wasn't clear, what I was proposing is a driver helper at least something like this:
int
tegra_arm_smmu_streamid(struct device *dev)
{#ifdef CONFIG_IOMMU_API struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev) if (fwspec && fwspec->num_ids == 1) return fwspec->ids[0] & 0xffff; #endif return -EINVAL; }
Quoted 6 lines
Now THAT is scalable and maintainable; any number of random drivers can call it without any preconditions, it's a lot clearer what's going on, and I won't have to swear profusely while herding patches through half a dozen different trees if, when my ops rework gets to the point of refactoring
iommu_fwspecwithdev_iommu, it ends up changing anything significant.
It sure sounds like we need another level of abstraction for iommus, to avoid the interface from being abused. Perhaps something along the lines of what we have for clocks (providers and consumers use different interfaces).
Anyway, to simplify future potential rework in this direction, I can agree and understand your points.
What you propose above, with one or a few Tegra specific helper functions, seems like the best we can do for now.
Kind regards
Uffe
Quoted 123 lines · Ulf Hansson
Quoted 39 lines · Robin Murphy
Quoted 28 lines · Ulf Hansson
Quoted 21 lines · Thierry Reding
Quoted 5 lines · Robin Murphy
Quoted 3 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Quoted 7 lines
I'm really in two minds about this... fwspecs are an internal detail of the IOMMU API that are meant to be private between individual drivers and firmware code, so anything poking at them arguably does and should depend on
CONFIG_IOMMU_API. It looks like the stub fordev_iommu_fwspec_get()was only added for the sake of one driver that was misusing it where it really wanteddevice_iommu_mapped(), and has since been fixed, so if anything my preference would be to remove that stub :/Tegra has been using this type of weak dependency on
IOMMU_APImainly in order to allow building without the IOMMU support on some old platforms where people may actually care about the kernel size (Tegra20 systems were sometimes severely constrained and don't have anything that we'd call an IOMMU today).Quoted 5 lines
We have similar stubs in place for most other major subsystems in order to allow code to simply compile out if the subsystem is disabled, which is quite convenient for sharing code between platforms that may want a given feature and other platforms that may not want it, without causing too much of a hassle with compile-testing.
Quoted 4 lines
I agree with the above.
Moreover, the stubs make the code more portable/scalable and so it becomes easier to maintain.
Are you suggesting that having the same thing open-coded slightly differently (with bugs) in 8 different places is somehow more maintainable than abstracting it into a single centralised implementation?
Quoted 7 lines
Is it "easier to maintain" when already seemingly every thing I try to clean up or refactor in the IOMMU API at the moment is stymied by finding Tegra drivers doing unexpected (and often questionable) things? Is it "more scalable" to make it even easier for people to copy questionable code without a second thought, leaving API maintainers to play an ever-expanding game of whack-a-mole to clean it up? No. No it chuffing well isn't :(
Ohh, I wasn't aware of these kinds of issues for the IOMMU interface.
Abusing interfaces is an orthogonal problem to what I was suggesting to solve here. The main problem I was trying to address was to prevent sprinkling subsystems/drivers with "#ifdefs" all over the place, as that doesn't scale.
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
Quoted 7 lines
I don't technically have much objection to this patch in isolation, but what I don't like is the direction of travel it implies. I see the anti-pattern is only spread across Tegra drivers, making Tegra-specific assumptions, so in my view the best answer would be to abstract that fwpsec dependency into a single Tegra-specific helper, which would better represent the nature of what's really going on here.
I don't see how this is an anti-pattern. It might not be common for drivers to need to reach into
iommu_fwspec, so that might indeed be specific to Tegra (for whatever reason our IP seems to want extra flexibility), but the general pattern of using stubs is wide-spread, so I don't see whyIOMMU_APIwould need to be special.Quoted 6 lines
Quoted 1 line
Again, I agree.
The anti-pattern is reaching into some other driver's private data assuming a particular format, with zero indication of the huge degree of assumption involved, and half the time not even checking that what's being dereferenced is valid.
I see.
Quoted 13 lines
Quoted 6 lines
Moreover, a "git grep
CONFIG_IOMMU_API" indicates that the problem isn't specific to Tegra. The "#ifdefCONFIG_IOMMU_API" seems to be sprinkled across the kernel. I think it would be nice if we could improve the situation. So far, using stubs along with what the $subject patch proposes, seems to me to be the best approach.Yes, there is plenty of code through the tree that is only relevant to the IOMMU API and would be a complete waste of space without it, that is not the point in question here. Grep for
dev_iommu_fwspec_get; outsidedrivers/iommu, the only users are IOMMU-API-specific parts of ACPI code, as intended, plus 8 random Tegra drivers.Quoted 7 lines
Now, there does happen to be a tacit contract between the ACPI IORT code and the Arm SMMU drivers for how SMMU StreamIDs are encoded in their respective fwspecs, but it was never intended for wider consumption. If Tegra drivers want to have a special relationship with arm-smmu then fair enough, but they can do the same as MSM and formalise it somewhere that the SMMU driver maintainers are at least aware of, rather than holding the whole generic IOMMU API hostage.
Thanks for clarifying this. I certainly understand your concern better now.
Quoted 15 lines
Since apparently it wasn't clear, what I was proposing is a driver helper at least something like this:
int
tegra_arm_smmu_streamid(struct device *dev)
{#ifdef CONFIG_IOMMU_API struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev) if (fwspec && fwspec->num_ids == 1) return fwspec->ids[0] & 0xffff; #endif return -EINVAL; }Quoted 6 lines
Now THAT is scalable and maintainable; any number of random drivers can call it without any preconditions, it's a lot clearer what's going on, and I won't have to swear profusely while herding patches through half a dozen different trees if, when my ops rework gets to the point of refactoring
iommu_fwspecwithdev_iommu, it ends up changing anything significant.
Quoted 4 lines
It sure sounds like we need another level of abstraction for iommus, to avoid the interface from being abused. Perhaps something along the lines of what we have for clocks (providers and consumers use different interfaces).
Yeah, I was thinking along the same lines. It seems a bit odd to me that Tegra would be the only chip that ever needs access to the stream IDs outside of the IOMMU driver), so a generic function that would allow a device to retrieve its stream ID seems like it would be useful.
We have a few cases where a device can have multiple stream IDs where we currently force them all to be the same for simplicity. One case where this can happen is when a device is both a DMA engine and a DMA-capable microcontroller in one, where the microcontroller can then use a stream ID separate from that of the DMA engine.
We have another case where a device has multiple contexts for isolation where things are a bit trickier, but we already have an implementation using multiple logical devices and iommu-map to take care of that, so it basically boils down to the above use-case.
Quoted 5 lines
Anyway, to simplify future potential rework in this direction, I can agree and understand your points.
What you propose above, with one or a few Tegra specific helper functions, seems like the best we can do for now.
If this is really a Tegra-specific need, I guess we can start with a Tegra-specific helper. We could always generalize from that at a later point.
Thierry
Quoted 58 lines · Robin Murphy
Quoted 28 lines · Ulf Hansson
Quoted 21 lines · Thierry Reding
Quoted 5 lines · Robin Murphy
Quoted 3 lines · Prathamesh Shete
In order to fully make use of the !IOMMU_API stub functions, make the struct
iommu_fwspecalways available so that users of the stubs can keep using the structure's internals without causing compile failures.Quoted 7 lines
I'm really in two minds about this... fwspecs are an internal detail of the IOMMU API that are meant to be private between individual drivers and firmware code, so anything poking at them arguably does and should depend on
CONFIG_IOMMU_API. It looks like the stub fordev_iommu_fwspec_get()was only added for the sake of one driver that was misusing it where it really wanteddevice_iommu_mapped(), and has since been fixed, so if anything my preference would be to remove that stub :/Tegra has been using this type of weak dependency on
IOMMU_APImainly in order to allow building without the IOMMU support on some old platforms where people may actually care about the kernel size (Tegra20 systems were sometimes severely constrained and don't have anything that we'd call an IOMMU today).Quoted 5 lines
We have similar stubs in place for most other major subsystems in order to allow code to simply compile out if the subsystem is disabled, which is quite convenient for sharing code between platforms that may want a given feature and other platforms that may not want it, without causing too much of a hassle with compile-testing.
Quoted 4 lines
I agree with the above.
Moreover, the stubs make the code more portable/scalable and so it becomes easier to maintain.
Are you suggesting that having the same thing open-coded slightly differently (with bugs) in 8 different places is somehow more maintainable than abstracting it into a single centralised implementation?
Is it "easier to maintain" when already seemingly every thing I try to clean up or refactor in the IOMMU API at the moment is stymied by finding Tegra drivers doing unexpected (and often questionable) things? Is it "more scalable" to make it even easier for people to copy questionable code without a second thought, leaving API maintainers to play an ever-expanding game of whack-a-mole to clean it up? No. No it chuffing well isn't :(
Quoted 13 lines
Quoted 12 lines
Quoted 6 lines
I don't technically have much objection to this patch in isolation, but what I don't like is the direction of travel it implies. I see the anti-pattern is only spread across Tegra drivers, making Tegra-specific assumptions, so in my view the best answer would be to abstract that fwpsec dependency into a single Tegra-specific helper, which would better represent the nature of what's really going on here.
I don't see how this is an anti-pattern. It might not be common for drivers to need to reach into
iommu_fwspec, so that might indeed be specific to Tegra (for whatever reason our IP seems to want extra flexibility), but the general pattern of using stubs is wide-spread, so I don't see whyIOMMU_APIwould need to be special.
Quoted 6 lines
Quoted 1 line
Again, I agree.
The anti-pattern is reaching into some other driver's private data assuming a particular format, with zero indication of the huge degree of assumption involved, and half the time not even checking that what's being dereferenced is valid.
If this is really driver private data that nobody else should be accessing, then this certainly is lacking documentation. And quite frankly, perhaps it should really be hidden from other drivers in that case.
Remember the reason why we want to make this change is because we can already get access to all this data if we depend on IOMMU_API, while all the rest is also already available for !IOMMU_API configurations. This change removes that inconsistency.
Quoted 12 lines
Quoted 5 lines
Moreover, a "git grep
CONFIG_IOMMU_API" indicates that the problem isn't specific to Tegra. The "#ifdefCONFIG_IOMMU_API" seems to be sprinkled across the kernel. I think it would be nice if we could improve the situation. So far, using stubs along with what the $subject patch proposes, seems to me to be the best approach.Yes, there is plenty of code through the tree that is only relevant to the IOMMU API and would be a complete waste of space without it, that is not the point in question here. Grep for
dev_iommu_fwspec_get; outsidedrivers/iommu, the only users are IOMMU-API-specific parts of ACPI code, as intended, plus 8 random Tegra drivers.
Quoted 3 lines
Now, there does happen to be a tacit contract between the ACPI IORT code and the Arm SMMU drivers for how SMMU StreamIDs are encoded in their respective fwspecs, but it was never intended for wider consumption.
Again, if iommu_fwspec and its accessors were somehow hidden, or if it was documented that this was not meant for wider consumption, then perhaps we wouldn't have started using it in the first place.
Quoted 20 lines
If Tegra drivers
want to have a special relationship with arm-smmu then fair enough, but they can do the same as MSM and formalise it somewhere that the SMMU driver maintainers are at least aware of, rather than holding the whole generic IOMMU API hostage.Since apparently it wasn't clear, what I was proposing is a driver helper at least something like this:
int
tegra_arm_smmu_streamid(struct device *dev)
{#ifdef CONFIG_IOMMU_API struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev) if (fwspec && fwspec->num_ids == 1) return fwspec->ids[0] & 0xffff; #endif return -EINVAL; }
Quoted 5 lines
Now THAT is scalable and maintainable; any number of random drivers can call it without any preconditions, it's a lot clearer what's going on, and I won't have to swear profusely while herding patches through half a dozen different trees if, when my ops rework gets to the point of refactoring
iommu_fwspecwithdev_iommu, it ends up changing anything significant.
I don't have any objection to making that change. It's not like we're doing all of this just for fun. We need to do this in order for the hardware to work correctly. If the above is an acceptable way to do this and preferable to using the more generic API then we can move ahead with that.
In order to keep things moving, do we want to merge the change as-is for now and then subsequently do a pass over all Tegra drivers and use a common function for stream ID access? Or do you want me to make that change prior to getting the SDHCI series merged?
Thierry
On Thu, Nov 03, 2022 at 05:35:19PM +0000, Robin Murphy wrote:
[...]
Quoted 7 lines
Now, there does happen to be a tacit contract between the ACPI IORT code and the Arm SMMU drivers for how SMMU StreamIDs are encoded in their respective fwspecs, but it was never intended for wider consumption. If Tegra drivers want to have a special relationship with arm-smmu then fair enough, but they can do the same as MSM and formalise it somewhere that the SMMU driver maintainers are at least aware of, rather than holding the whole generic IOMMU API hostage.
Are you talking about qcom_adrena_smmu_is_gpu_device()? That's the only place I can find where MSM uses iommu_fwspec directly and in a "special" way.
Quoted 5 lines
Since apparently it wasn't clear, what I was proposing is a driver helper at least something like this:
int
tegra_arm_smmu_streamid(struct device *dev)
{
Quoted 8 lines
#ifdef CONFIG_IOMMU_API struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev) if (fwspec && fwspec->num_ids == 1) return fwspec->ids[0] & 0xffff; #endif return -EINVAL; }
We actually also use this mechanism on devices that predate the ARM SMMU, so it'd need to be even more generic. Also, since we need to access this from a wide range of subsystems, it'd need to be in a centralized place. Do you think iommu.h would be acceptable for this?
How about if I also add a comment to struct iommu_fwspec about the intended use?
Thierry
Quoted 4 lines · Thierry Reding
Adding Prathamesh for visibility. Another alternative would be to prepend this to Prathamesh's series with an Acked-by from Joerg.
Joerg, any preference on how to move forward with this?
Sorry, missed the discussion until now. Adding this patch to Prathamesh's series is fine with me. Feel free to add my