bus/fsl-mc: Do no longer export the total number of irqs outside dprc_scan_objects
The total number of interrupts is only used for some checks outside the dprc_scan_objects function. Furthermore, in some situations the check is made twice. Move the bounds check inside the function for all situations. Reviewed-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> Acked-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com> Link: https://lore.kernel.org/r/20200929085441.17448-2-diana.craciun@oss.nxp.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
675f0ad404
commit
7490cf5e18
|
@ -3,6 +3,7 @@
|
|||
* Freescale data path resource container (DPRC) driver
|
||||
*
|
||||
* Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
|
||||
* Copyright 2019-2020 NXP
|
||||
* Author: German Rivera <German.Rivera@freescale.com>
|
||||
*
|
||||
*/
|
||||
|
@ -220,8 +221,6 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev,
|
|||
* dprc_scan_objects - Discover objects in a DPRC
|
||||
*
|
||||
* @mc_bus_dev: pointer to the fsl-mc device that represents a DPRC object
|
||||
* @total_irq_count: If argument is provided the function populates the
|
||||
* total number of IRQs created by objects in the DPRC.
|
||||
*
|
||||
* Detects objects added and removed from a DPRC and synchronizes the
|
||||
* state of the Linux bus driver, MC by adding and removing
|
||||
|
@ -235,8 +234,7 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev,
|
|||
* populated before they can get allocation requests from probe callbacks
|
||||
* of the device drivers for the non-allocatable devices.
|
||||
*/
|
||||
static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
|
||||
unsigned int *total_irq_count)
|
||||
static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev)
|
||||
{
|
||||
int num_child_objects;
|
||||
int dprc_get_obj_failures;
|
||||
|
@ -317,22 +315,21 @@ static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
|
|||
* Allocate IRQ's before binding the scanned devices with their
|
||||
* respective drivers.
|
||||
*/
|
||||
if (dev_get_msi_domain(&mc_bus_dev->dev) && !mc_bus->irq_resources) {
|
||||
if (dev_get_msi_domain(&mc_bus_dev->dev)) {
|
||||
if (irq_count > FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS) {
|
||||
dev_warn(&mc_bus_dev->dev,
|
||||
"IRQs needed (%u) exceed IRQs preallocated (%u)\n",
|
||||
irq_count, FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS);
|
||||
}
|
||||
|
||||
error = fsl_mc_populate_irq_pool(mc_bus,
|
||||
if (!mc_bus->irq_resources) {
|
||||
error = fsl_mc_populate_irq_pool(mc_bus,
|
||||
FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS);
|
||||
if (error < 0)
|
||||
return error;
|
||||
if (error < 0)
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
if (total_irq_count)
|
||||
*total_irq_count = irq_count;
|
||||
|
||||
dprc_remove_devices(mc_bus_dev, child_obj_desc_array,
|
||||
num_child_objects);
|
||||
|
||||
|
@ -365,7 +362,7 @@ static int dprc_scan_container(struct fsl_mc_device *mc_bus_dev)
|
|||
* Discover objects in the DPRC:
|
||||
*/
|
||||
mutex_lock(&mc_bus->scan_mutex);
|
||||
error = dprc_scan_objects(mc_bus_dev, NULL);
|
||||
error = dprc_scan_objects(mc_bus_dev);
|
||||
mutex_unlock(&mc_bus->scan_mutex);
|
||||
if (error < 0) {
|
||||
fsl_mc_cleanup_all_resource_pools(mc_bus_dev);
|
||||
|
@ -434,9 +431,8 @@ static irqreturn_t dprc_irq0_handler_thread(int irq_num, void *arg)
|
|||
DPRC_IRQ_EVENT_CONTAINER_DESTROYED |
|
||||
DPRC_IRQ_EVENT_OBJ_DESTROYED |
|
||||
DPRC_IRQ_EVENT_OBJ_CREATED)) {
|
||||
unsigned int irq_count;
|
||||
|
||||
error = dprc_scan_objects(mc_dev, &irq_count);
|
||||
error = dprc_scan_objects(mc_dev);
|
||||
if (error < 0) {
|
||||
/*
|
||||
* If the error is -ENXIO, we ignore it, as it indicates
|
||||
|
@ -451,12 +447,6 @@ static irqreturn_t dprc_irq0_handler_thread(int irq_num, void *arg)
|
|||
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (irq_count > FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS) {
|
||||
dev_warn(dev,
|
||||
"IRQs needed (%u) exceed IRQs preallocated (%u)\n",
|
||||
irq_count, FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS);
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
|
|
Loading…
Reference in a new issue