aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOfir Drang <ofir.drang@arm.com>2019-06-17 04:46:29 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2019-06-27 02:28:00 -0400
commit3db617e77ae2f8051fd6f5d3fff0e15f086d5b4c (patch)
treef44c64fa8ad02b19bd62575b3d5ba84ecd88c69a
parentd84f6269ce24eb4c468e246b24fc0fdce34ab6f6 (diff)
crypto: ccree - prevent isr handling in case driver is suspended
ccree irq may be shared with other devices, in order to prevent ccree isr handling while device maybe suspended we added a check to verify that the device is not suspended. Signed-off-by: Ofir Drang <ofir.drang@arm.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/ccree/cc_driver.c3
-rw-r--r--drivers/crypto/ccree/cc_pm.c6
-rw-r--r--drivers/crypto/ccree/cc_pm.h7
3 files changed, 16 insertions, 0 deletions
diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_driver.c
index 1e73d32148dd..667bc73d7a00 100644
--- a/drivers/crypto/ccree/cc_driver.c
+++ b/drivers/crypto/ccree/cc_driver.c
@@ -134,6 +134,9 @@ static irqreturn_t cc_isr(int irq, void *dev_id)
134 u32 imr; 134 u32 imr;
135 135
136 /* STAT_OP_TYPE_GENERIC STAT_PHASE_0: Interrupt */ 136 /* STAT_OP_TYPE_GENERIC STAT_PHASE_0: Interrupt */
137 /* if driver suspended return, probebly shared interrupt */
138 if (cc_pm_is_dev_suspended(dev))
139 return IRQ_NONE;
137 140
138 /* read the interrupt status */ 141 /* read the interrupt status */
139 irr = cc_ioread(drvdata, CC_REG(HOST_IRR)); 142 irr = cc_ioread(drvdata, CC_REG(HOST_IRR));
diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c
index 20f7f3d34e27..899a52f05b7a 100644
--- a/drivers/crypto/ccree/cc_pm.c
+++ b/drivers/crypto/ccree/cc_pm.c
@@ -106,6 +106,12 @@ int cc_pm_put_suspend(struct device *dev)
106 return rc; 106 return rc;
107} 107}
108 108
109bool cc_pm_is_dev_suspended(struct device *dev)
110{
111 /* check device state using runtime api */
112 return pm_runtime_suspended(dev);
113}
114
109int cc_pm_init(struct cc_drvdata *drvdata) 115int cc_pm_init(struct cc_drvdata *drvdata)
110{ 116{
111 struct device *dev = drvdata_to_dev(drvdata); 117 struct device *dev = drvdata_to_dev(drvdata);
diff --git a/drivers/crypto/ccree/cc_pm.h b/drivers/crypto/ccree/cc_pm.h
index 6190cdba5dad..a7d98a5da2e1 100644
--- a/drivers/crypto/ccree/cc_pm.h
+++ b/drivers/crypto/ccree/cc_pm.h
@@ -22,6 +22,7 @@ int cc_pm_suspend(struct device *dev);
22int cc_pm_resume(struct device *dev); 22int cc_pm_resume(struct device *dev);
23int cc_pm_get(struct device *dev); 23int cc_pm_get(struct device *dev);
24int cc_pm_put_suspend(struct device *dev); 24int cc_pm_put_suspend(struct device *dev);
25bool cc_pm_is_dev_suspended(struct device *dev);
25 26
26#else 27#else
27 28
@@ -54,6 +55,12 @@ static inline int cc_pm_put_suspend(struct device *dev)
54 return 0; 55 return 0;
55} 56}
56 57
58static inline bool cc_pm_is_dev_suspended(struct device *dev)
59{
60 /* if PM not supported device is never suspend */
61 return false;
62}
63
57#endif 64#endif
58 65
59#endif /*__POWER_MGR_H__*/ 66#endif /*__POWER_MGR_H__*/