| Message ID | bf04adfd1dae519cb9377bcc7222089399690a22.1655147787.git.thomas.lendacky@amd.com |
|---|---|
| State | Accepted |
| Commit | 87d044096ea62f1f230e8c4679ee8abf03266f64 |
| Headers | show |
| Series | crypto: ccp - Fix device IRQ counting by using platform_irq_count() | expand |
On Mon, Jun 13, 2022 at 02:16:27PM -0500, Tom Lendacky wrote: > The ccp driver loops through the platform device resources array to get > the IRQ count for the device. With commit a1a2b7125e10 ("of/platform: Drop > static setup of IRQ resource from DT core"), the IRQ resources are no > longer stored in the platform device resource array. As a result, the IRQ > count is now always zero. This causes the driver to issue a second call to > platform_get_irq(), which fails if the IRQ count is really 1, causing the > loading of the driver to fail. > > Replace looping through the resources array to count the number of IRQs > with a call to platform_irq_count(). > > Fixes: a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core") > Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> > --- > drivers/crypto/ccp/sp-platform.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) Patch applied. Thanks.
diff --git a/drivers/crypto/ccp/sp-platform.c b/drivers/crypto/ccp/sp-platform.c index 9dba52fbee99..7d79a8744f9a 100644 --- a/drivers/crypto/ccp/sp-platform.c +++ b/drivers/crypto/ccp/sp-platform.c @@ -85,17 +85,9 @@ static int sp_get_irqs(struct sp_device *sp) struct sp_platform *sp_platform = sp->dev_specific; struct device *dev = sp->dev; struct platform_device *pdev = to_platform_device(dev); - unsigned int i, count; int ret; - for (i = 0, count = 0; i < pdev->num_resources; i++) { - struct resource *res = &pdev->resource[i]; - - if (resource_type(res) == IORESOURCE_IRQ) - count++; - } - - sp_platform->irq_count = count; + sp_platform->irq_count = platform_irq_count(pdev); ret = platform_get_irq(pdev, 0); if (ret < 0) { @@ -104,7 +96,7 @@ static int sp_get_irqs(struct sp_device *sp) } sp->psp_irq = ret; - if (count == 1) { + if (sp_platform->irq_count == 1) { sp->ccp_irq = ret; } else { ret = platform_get_irq(pdev, 1);
The ccp driver loops through the platform device resources array to get the IRQ count for the device. With commit a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core"), the IRQ resources are no longer stored in the platform device resource array. As a result, the IRQ count is now always zero. This causes the driver to issue a second call to platform_get_irq(), which fails if the IRQ count is really 1, causing the loading of the driver to fail. Replace looping through the resources array to count the number of IRQs with a call to platform_irq_count(). Fixes: a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core") Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> --- drivers/crypto/ccp/sp-platform.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)