soc: qcom: smsm: fix __iomem annotations
Subsystems (2)
PATCH 1/1 soc: qcom: smsm: fix __iomem annotations
There are a number of points in the driver which miss out on __iomem annotations, so add these to remove the following sparse warnings:
drivers/soc/qcom/smsm.c:159:32: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:159:32: expected void const volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:159:32: got unsigned int [usertype] *local_statedrivers/soc/qcom/smsm.c:171:25: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:171:25: expected void volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:171:25: got unsigned int [usertype] *local_statedrivers/soc/qcom/smsm.c:181:48: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:181:48: expected void const volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:181:48: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:219:26: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:219:26: expected void const volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:219:26: got unsigned int [usertype] *remote_statedrivers/soc/qcom/smsm.c:257:49: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:257:49: expected void const volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:257:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:259:49: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:259:49: expected void volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:259:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:280:24: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:280:24: expected void const volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:280:24: got unsigned int [usertype] *remote_statedrivers/soc/qcom/smsm.c:288:49: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:288:49: expected void const volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:288:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:290:49: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:290:49: expected void volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:290:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:330:26: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:330:26: expected void const volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:330:26: got unsigned int [usertype] *remote_statedrivers/soc/qcom/smsm.c:635:47: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:635:47: expected void volatile [noderef] __iomem *addrdrivers/soc/qcom/smsm.c:635:47: got unsigned int [usertype] *
Note, we don't fixup the qcom_smem_get() to return an __iomem annotated pointer.
--- drivers/soc/qcom/smsm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/soc/qcom/smsm.c +9 -9
@@ -82,8 +82,8 @@ struct qcom_smsm {u32 num_hosts;u32 num_entries; -u32 *local_state; -u32 *subscription; +u32 __iomem *local_state; +u32 __iomem *subscription;struct qcom_smem_state *state;spinlock_t lock;
@@ -115,8 +115,8 @@ struct smsm_entry {DECLARE_BITMAP (irq_falling,32 );unsigned long last_value; -u32 *remote_state; -u32 *subscription; +u32 __iomem *remote_state; +u32 __iomem *subscription; };/**
@@ -138,7 +138,7 @@ struct smsm_host {* smsm_update_bits() - change bit in outgoing entry and inform subscribers * @data: smsm context pointer * @mask: value mask -* @value: new value +* @Value: new value * * Used to set and clear the bits in the outgoing/local entry and inform * subscribers about the change.
@@ -513,9 +513,9 @@ static int qcom_smsm_probe(struct platform_device *pdev)struct device_node *node;struct smsm_entry *entry;struct qcom_smsm *smsm; -u32 *intr_mask; +u32 __iomem *intr_mask;size_t size; -u32 *states; +u32 __iomem *states;u32 id;int ret;
@@ -579,7 +579,7 @@ static int qcom_smsm_probe(struct platform_device *pdev) goto out_put; } - states =qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_SMSM_SHARED_STATE ,NULL ); + states = (u32 __iomem *)qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_SMSM_SHARED_STATE ,NULL );if (IS_ERR (states)) {dev_err (&pdev->dev,"Unable to acquire shared state entry\n" ); ret =PTR_ERR (states);
@@ -594,7 +594,7 @@ static int qcom_smsm_probe(struct platform_device *pdev) goto out_put; } - intr_mask =qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_SMSM_CPU_INTR_MASK ,NULL ); + intr_mask = (u32 __iomem *)qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_SMSM_CPU_INTR_MASK ,NULL );if (IS_ERR (intr_mask)) {dev_err (&pdev->dev,"unable to acquire shared memory interrupt mask\n" ); ret =PTR_ERR (intr_mask);
Signature · 1 line
2.37.2.352.g3c44437643
Quoted 38 lines · Ben Dooks
There are a number of points in the driver which miss out on
__iomemannotations, so add these to remove the following sparse warnings:
drivers/soc/qcom/smsm.c:159:32: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:159:32: expected void const volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:159:32: got unsigned int [usertype]*local_statedrivers/soc/qcom/smsm.c:171:25: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:171:25: expected void volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:171:25: got unsigned int [usertype]*local_statedrivers/soc/qcom/smsm.c:181:48: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:181:48: expected void const volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:181:48: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:219:26: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:219:26: expected void const volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:219:26: got unsigned int [usertype]*remote_statedrivers/soc/qcom/smsm.c:257:49: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:257:49: expected void const volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:257:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:259:49: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:259:49: expected void volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:259:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:280:24: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:280:24: expected void const volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:280:24: got unsigned int [usertype]*remote_statedrivers/soc/qcom/smsm.c:288:49: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:288:49: expected void const volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:288:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:290:49: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:290:49: expected void volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:290:49: got unsigned int [usertype] *drivers/soc/qcom/smsm.c:330:26: warning: incorrect type in argument 1 (different address spaces)drivers/soc/qcom/smsm.c:330:26: expected void const volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:330:26: got unsigned int [usertype]*remote_statedrivers/soc/qcom/smsm.c:635:47: warning: incorrect type in argument 2 (different address spaces)drivers/soc/qcom/smsm.c:635:47: expected void volatile [noderef]__iomem*addrdrivers/soc/qcom/smsm.c:635:47: got unsigned int [usertype] *
Quoted 1 line
[...]
Applied, thanks!
[1/1] soc: qcom: smsm: fix __iomem annotations
commit: c84cdd308471d6ae4f8121660436a4fed8126709
Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>