Skip to contentSkip to conversation

drivers/crypto: Convert timers to use timer_setup()

PATCH In review Kees Cook 4 participants 4 messages Oct 25, 2017 – Nov 3, 2017

Subsystems (2)
Crypto API Arm/artpec machine support
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 drivers/crypto: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.

Cc Herbert Xu <[email protected]>
Cc Jesper Nilsson <[email protected]>
Cc Lars Persson <[email protected]>
Cc Niklas Cassel <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Jamie Iles <[email protected]>
Cc linux-arm-kernel at axis.com
Cc linux-crypto at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Signed-off-by Kees Cook <[email protected]>
---
 drivers/crypto/axis/artpec6_crypto.c | 6 +++---
 drivers/crypto/mv_cesa.c             | 4 ++--
 drivers/crypto/picoxcell_crypto.c    | 7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)
drivers/crypto/axis/artpec6_crypto.c +3 -3
index 0f9754e07719..456278440863 100644
@@ -2072,9 +2072,9 @@ static void artpec6_crypto_process_queue(struct artpec6_crypto *ac)
 		del_timer(&ac->timer);
 }
 
-static void artpec6_crypto_timeout(unsigned long data)
+static void artpec6_crypto_timeout(struct timer_list *t)
 {
-	struct artpec6_crypto *ac = (struct artpec6_crypto *) data;
+	struct artpec6_crypto *ac = from_timer(ac, t, timer);
 
 	dev_info_ratelimited(artpec6_crypto_dev, "timeout\n");
 

@@ -3063,7 +3063,7 @@ static int artpec6_crypto_probe(struct platform_device *pdev)
 	spin_lock_init(&ac->queue_lock);
 	INIT_LIST_HEAD(&ac->queue);
 	INIT_LIST_HEAD(&ac->pending);
-	setup_timer(&ac->timer, artpec6_crypto_timeout, (unsigned long) ac);
+	timer_setup(&ac->timer, artpec6_crypto_timeout, 0);
 
 	ac->base = base;
drivers/crypto/mv_cesa.c +2 -2
index c3883b49f56e..6a8275f017a8 100644
@@ -149,7 +149,7 @@ struct mv_req_hash_ctx {
 	int count_add;
 };
 
-static void mv_completion_timer_callback(unsigned long unused)
+static void mv_completion_timer_callback(struct timer_list *unused)
 {
 	int active = readl(cpg->reg + SEC_ACCEL_CMD) & SEC_CMD_EN_SEC_ACCL0;
 

@@ -167,7 +167,7 @@ static void mv_completion_timer_callback(unsigned long unused)
 
 static void mv_setup_timer(void)
 {
-	setup_timer(&cpg->completion_timer, &mv_completion_timer_callback, 0);
+	timer_setup(&cpg->completion_timer, mv_completion_timer_callback, 0);
 	mod_timer(&cpg->completion_timer,
 			jiffies + msecs_to_jiffies(MV_CESA_EXPIRE));
 }
drivers/crypto/picoxcell_crypto.c +3 -4
index b6f14844702e..5a6dc53b2b9d 100644
@@ -1125,9 +1125,9 @@ static irqreturn_t spacc_spacc_irq(int irq, void *dev)
 	return IRQ_HANDLED;
 }
 
-static void spacc_packet_timeout(unsigned long data)
+static void spacc_packet_timeout(struct timer_list *t)
 {
-	struct spacc_engine *engine = (struct spacc_engine *)data;
+	struct spacc_engine *engine = from_timer(engine, t, packet_timeout);
 
 	spacc_process_done(engine);
 }

@@ -1714,8 +1714,7 @@ static int spacc_probe(struct platform_device *pdev)
 	writel(SPA_IRQ_EN_STAT_EN | SPA_IRQ_EN_GLBL_EN,
 	       engine->regs + SPA_IRQ_EN_REG_OFFSET);
 
-	setup_timer(&engine->packet_timeout, spacc_packet_timeout,
-		    (unsigned long)engine);
+	timer_setup(&engine->packet_timeout, spacc_packet_timeout, 0);
 
 	INIT_LIST_HEAD(&engine->pending);
 	INIT_LIST_HEAD(&engine->completed);
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security
Acked-by on v1 1/1
#1 lore raw
Quoted 14 lines · Kees Cook

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.

Cc Herbert Xu <[email protected]>
Cc Jesper Nilsson <[email protected]>
Cc Lars Persson <[email protected]>
Cc Niklas Cassel <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Jamie Iles <[email protected]>
Cc linux-arm-kernel at axis.com
Cc linux-crypto at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Signed-off-by Kees Cook <[email protected]>
Quoted 1 line

---

Acked-by Jamie Iles <[email protected]>

Thanks,

Jamie

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Kees Cook
Quoted 4 lines · Kees Cook

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.

Quoted 10 lines
Cc Herbert Xu <[email protected]>
Cc Jesper Nilsson <[email protected]>
Cc Lars Persson <[email protected]>
Cc Niklas Cassel <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Jamie Iles <[email protected]>
Cc linux-arm-kernel at axis.com
Cc linux-crypto at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Signed-off-by Kees Cook <[email protected]>

For drivers/crypto/axis:

Acked-by Lars Persson <[email protected]>

Thanks,
Lars

maintainer
#3 lore raw
In reply to Kees Cook
Quoted 4 lines · Kees Cook

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.

Quoted 10 lines
Cc Herbert Xu <[email protected]>
Cc Jesper Nilsson <[email protected]>
Cc Lars Persson <[email protected]>
Cc Niklas Cassel <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Jamie Iles <[email protected]>
Cc linux-arm-kernel at axis.com
Cc linux-crypto at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Signed-off-by Kees Cook <[email protected]>

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt