Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH 01/10] bus/fsl-mc: Do no longer export the total number of
 irqs outside dprc_scan_objects
From:   Diana Craciun OSS <diana.craciun@oss.nxp.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Laurentiu Tudor <laurentiu.tudor@nxp.com>,
        "stuyoder@gmail.com" <stuyoder@gmail.com>,
        Leo Li <leoyang.li@nxp.com>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "bharatb.yadav@gmail.com" <bharatb.yadav@gmail.com>
References: <20200319154051.30609-1-diana.craciun@oss.nxp.com>
 <20200319154051.30609-2-diana.craciun@oss.nxp.com>
Message-ID: <6fbf30f3-9c45-dcef-b143-702c6ba017a6@oss.nxp.com>
Date:   Mon, 6 Apr 2020 17:46:19 +0300
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.6.0
In-Reply-To: <20200319154051.30609-2-diana.craciun@oss.nxp.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from [192.168.1.122] (86.127.44.112) by AM6P195CA0082.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.15 via Frontend Transport; Mon, 6 Apr 2020 14:46:28 +0000
X-Originating-IP: [86.127.44.112]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 4a0d37aa-5175-4bf9-2631-08d7da394a49
X-MS-TrafficTypeDiagnostic: VI1PR0402MB2798:|VI1PR0402MB2798:
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VI1PR0402MB2798E18BB382E9F93AB62FA4BEC20@VI1PR0402MB2798.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:5797;
X-Forefront-PRVS: 0365C0E14B
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB2815.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(366004)(396003)(376002)(346002)(136003)(39860400002)(31686004)(2906002)(81156014)(81166006)(8936002)(478600001)(6666004)(31696002)(52116002)(53546011)(316002)(16576012)(16526019)(26005)(186003)(6486002)(86362001)(66946007)(5660300002)(110136005)(2616005)(66556008)(66476007)(956004)(8676002);DIR:OUT;SFP:1101;
Received-SPF: None (protection.outlook.com: oss.nxp.com does not designate
 permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: KU3xwswjQRkkpDMdrU+xzny8etvYfpvC0k6aupfyGkix5Mwn716j6D/N1ZPfG9dvp7IUHFa2yS2yOTo1bCzIH9NX51ZUcbdYNA+gtlc7iqo5ODOWbFUsNwyPKaUfp/lmXyLAEBIdaFMyS8YAxYS9K9Ra3oUsQb+kF4BSox3aOwfEPzazNV1WKiVdedyL0vCAGFgeqBvLV+pCzz4myVL2YHEYudksdVm2AtjQdoZVY+7YxLVoCaBFQwfArt1vKaB1QeFNuplFwez4O4yhaW/ezAwQPKGo3qUN7svMJ1MteK/cpolleFKamRLXfU1YX+AVz7EeSq6bx3J3GABUDAtIbtm7AuQfExsDRKNfYCoKxG9f5Se0qKoqN7i9HHMk6AxLGBQ+7PbiiMi+hGif4BM8G2GMf9IFecapA0W5EuCNDQYDrTKHbY5xJozouDu0Aonq
X-MS-Exchange-AntiSpam-MessageData: hjkrtCqCfjaaGrQzQoufzimfgzTT2rj8b3i+pb3M+oL06kXVd/oBV+wkZqSwTIwi08pwvuVlgywTZm45vNlzlBO6bHU7Zr99OT3J+zwEwruT8NyLHDClQV+1JWgj0by6lIyVznsxj3ddKYPhxwcwIA==
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4a0d37aa-5175-4bf9-2631-08d7da394a49
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2020 14:46:29.6260
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: h36jLlphRS1HvRyLgggAN1RIiMuO4dAaPQolxre/qSK9yyRI5mrl/b+uvz1CgQRjHfXZaV7w7u7lsfVLZcaFnA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2798
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Please ignore these patches. I have sent them again by mistake. I apologize!

Diana

On 4/6/2020 5:27 PM, Diana Craciun wrote:
> 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.
>
> Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com>
> ---
>   drivers/bus/fsl-mc/dprc-driver.c | 30 ++++++++++--------------------
>   1 file changed, 10 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
> index c8b1c3842c1a..035b220779d0 100644
> --- a/drivers/bus/fsl-mc/dprc-driver.c
> +++ b/drivers/bus/fsl-mc/dprc-driver.c
> @@ -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>
>    *
>    */
> @@ -197,8 +198,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
> @@ -212,8 +211,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;
> @@ -294,22 +292,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);
>   
> @@ -342,7 +339,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);
> @@ -411,9 +408,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
> @@ -428,12 +424,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: