github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 05:04:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

crypto: caam - simplify probe resource and IRQ handling

Browse Source 
Convert the interrupt acquisition from irq_of_parse_and_map() to
platform_get_irq(), which resolves the IRQ from the device's interrupts
property via of_irq_get(). Flip the error check from testing for zero to
testing for a negative errno, and drop the now-unused
caam_jr_irq_dispose_mapping() callback and its devm_add_action_or_reset()
cleanup, since platform_get_irq() manages the mapping internally.

Replace the open-coded platform_get_resource() plus devm_ioremap()
sequence with devm_platform_ioremap_resource(), which fetches the
resource, requests the region and maps it in one call.

Each fsl,sec-*-job-ring node has a distinct 0x10000 reg region and
interrupts property, so the region reservation added by
devm_ioremap_resource() is exclusive and does not introduce overlap
failures.

Assisted-by: opencode:hy3-free
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Rosen Penev 2026-07-30 13:47:22 -07:00 committed by Herbert Xu
parent aacf3a6c47
commit 9a955c0a7d
1 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/crypto/caam/jr.c
View File

@ -574,23 +574,25 @@ static int caam_jr_init(struct device *dev)
return error; return error;
} }
static void caam_jr_irq_dispose_mapping(void *data)
{
irq_dispose_mapping((unsigned long)data);
}
/* /*
* Probe routine for each detected JobR subsystem. * Probe routine for each detected JobR subsystem.
*/ */
static int caam_jr_probe(struct platform_device *pdev) static int caam_jr_probe(struct platform_device *pdev)
{ {
struct device *jrdev; struct device *jrdev;
struct device_node *nprop;
struct caam_job_ring __iomem *ctrl;
struct caam_drv_private_jr *jrpriv; struct caam_drv_private_jr *jrpriv;
static int total_jobrs; static int total_jobrs;
struct resource *r; void __iomem *ctrl;
int error; int error;
int irq;
ctrl = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(ctrl))
return PTR_ERR(ctrl);
irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;
jrdev = &pdev->dev; jrdev = &pdev->dev;
jrpriv = devm_kzalloc(jrdev, sizeof(*jrpriv), GFP_KERNEL); jrpriv = devm_kzalloc(jrdev, sizeof(*jrpriv), GFP_KERNEL);
@ -602,22 +604,7 @@ static int caam_jr_probe(struct platform_device *pdev)
/* save ring identity relative to detection */ /* save ring identity relative to detection */
jrpriv->ridx = total_jobrs++; jrpriv->ridx = total_jobrs++;
nprop = pdev->dev.of_node; jrpriv->rregs = ctrl;
/* Get configuration properties from device tree */
/* First, get register page */
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r) {
dev_err(jrdev, "platform_get_resource() failed\n");
return -ENOMEM;
}
ctrl = devm_ioremap(jrdev, r->start, resource_size(r));
if (!ctrl) {
dev_err(jrdev, "devm_ioremap() failed\n");
return -ENOMEM;
}
jrpriv->rregs = (struct caam_job_ring __iomem __force *)ctrl;
error = dma_set_mask_and_coherent(jrdev, caam_get_dma_mask(jrdev)); error = dma_set_mask_and_coherent(jrdev, caam_get_dma_mask(jrdev));
if (error) { if (error) {
@ -647,16 +634,7 @@ static int caam_jr_probe(struct platform_device *pdev)
} }
/* Identify the interrupt */ /* Identify the interrupt */
jrpriv->irq = irq_of_parse_and_map(nprop, 0); jrpriv->irq = irq;
if (!jrpriv->irq) {
dev_err(jrdev, "irq_of_parse_and_map failed\n");
return -EINVAL;
}
error = devm_add_action_or_reset(jrdev, caam_jr_irq_dispose_mapping,
(void *)(unsigned long)jrpriv->irq);
if (error)
return error;
/* Now do the platform independent part */ /* Now do the platform independent part */
error = caam_jr_init(jrdev); /* now turn on hardware */ error = caam_jr_init(jrdev); /* now turn on hardware */