crypto: ux500 - Use platform_get_irq() to get the interrupt

platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
allocation of IRQ resources in DT core code, this causes an issue
when using hierarchical interrupt domains using "interrupts" property
in the node as this bypasses the hierarchical setup and messes up the
irq chaining.

In preparation for removal of static setup of IRQ resource from DT core
code use platform_get_irq() so that interrupt mapping is created on demand.

While at it also store the IRQ number in struct cryp_device_data so that
we don't have to call platform_get_irq() frequently.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ux500/cryp/cryp.h b/drivers/crypto/ux500/cryp/cryp.h
index db5713d7c9405d4f973c97436f4d5e677c6e2ea1..59e1557a620a99864c2ab09f880a98ded4cc5751 100644 (file)
--- a/drivers/crypto/ux500/cryp/cryp.h
+++ b/drivers/crypto/ux500/cryp/cryp.h
@@ -224,6 +224,7 @@ struct cryp_dma {
  * @phybase: Pointer to physical memory location of the cryp device.
  * @dev: Pointer to the devices dev structure.
  * @clk: Pointer to the device's clock control.
+ * @irq: IRQ number
  * @pwr_regulator: Pointer to the device's power control.
  * @power_status: Current status of the power.
  * @ctx_lock: Lock for current_ctx.
@@ -239,6 +240,7 @@ struct cryp_device_data {
        phys_addr_t phybase;
        struct device *dev;
        struct clk *clk;
+       int irq;
        struct regulator *pwr_regulator;
        int power_status;
        spinlock_t ctx_lock;

diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 30cdd5253929c4fc737498554186d36356834f95..97277b7150cb402aaaafe9be38c2d8d3df769358 100644 (file)
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -1257,7 +1257,6 @@ static int ux500_cryp_probe(struct platform_device *pdev)
 {
        int ret;
        struct resource *res;
-       struct resource *res_irq;
        struct cryp_device_data *device_data;
        struct cryp_protection_config prot = {
                .privilege_access = CRYP_STATE_ENABLE
@@ -1341,15 +1340,13 @@ static int ux500_cryp_probe(struct platform_device *pdev)
                goto out_power;
        }
 
-       res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!res_irq) {
-               dev_err(dev, "[%s]: IORESOURCE_IRQ unavailable",
-                       __func__);
-               ret = -ENODEV;
+       device_data->irq = platform_get_irq(pdev, 0);
+       if (device_data->irq <= 0) {
+               ret = device_data->irq ? device_data->irq : -ENXIO;
                goto out_power;
        }
 
-       ret = devm_request_irq(&pdev->dev, res_irq->start,
+       ret = devm_request_irq(&pdev->dev, device_data->irq,
                               cryp_interrupt_handler, 0, "cryp1", device_data);
        if (ret) {
                dev_err(dev, "[%s]: Unable to request IRQ", __func__);
@@ -1489,7 +1486,6 @@ static int ux500_cryp_suspend(struct device *dev)
        int ret;
        struct platform_device *pdev = to_platform_device(dev);
        struct cryp_device_data *device_data;
-       struct resource *res_irq;
        struct cryp_ctx *temp_ctx = NULL;
 
        dev_dbg(dev, "[%s]", __func__);
@@ -1501,11 +1497,7 @@ static int ux500_cryp_suspend(struct device *dev)
                return -ENOMEM;
        }
 
-       res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!res_irq)
-               dev_err(dev, "[%s]: IORESOURCE_IRQ, unavailable", __func__);
-       else
-               disable_irq(res_irq->start);
+       disable_irq(device_data->irq);
 
        spin_lock(&device_data->ctx_lock);
        if (!device_data->current_ctx)
@@ -1532,7 +1524,6 @@ static int ux500_cryp_resume(struct device *dev)
        int ret = 0;
        struct platform_device *pdev = to_platform_device(dev);
        struct cryp_device_data *device_data;
-       struct resource *res_irq;
        struct cryp_ctx *temp_ctx = NULL;
 
        dev_dbg(dev, "[%s]", __func__);
@@ -1556,11 +1547,8 @@ static int ux500_cryp_resume(struct device *dev)
 
        if (ret)
                dev_err(dev, "[%s]: cryp_enable_power() failed!", __func__);
-       else {
-               res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-               if (res_irq)
-                       enable_irq(res_irq->start);
-       }
+       else
+               enable_irq(device_data->irq);
 
        return ret;
 }