Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Message-ID: <2a5434e8-ece3-422b-99bf-d3f56750d408@intel.com>
Date:   Mon, 6 Nov 2023 13:01:53 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH net v3] net: ti: icssg-prueth: Add missing icss_iep_put to
 error path
Content-Language: en-US
To:     Jan Kiszka <jan.kiszka@siemens.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        MD Danish Anwar <danishanwar@ti.com>
CC:     <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        "Lopes Ivo, Diogo Miguel (T CED IFD-PT)" <diogo.ivo@siemens.com>,
        Nishanth Menon <nm@ti.com>,
        "Su, Bao Cheng (RC-CN DF FA R&D)" <baocheng.su@siemens.com>
References: <b2857e2c-cacf-4077-8e15-308dce8ccb0b@siemens.com>
From:   Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <b2857e2c-cacf-4077-8e15-308dce8ccb0b@siemens.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cFZLNEF2UHZGRHNDM3k1NmxoNGtMQzl5U0ROSG16MFBSbGRaN0NBVHVtNWYy?=
 =?utf-8?B?ZS9KQ1hBa0VLQnk3cnMydVltdVJHZDdvNyszcUJIKzgvejQvSDdGcGxyQkRJ?=
 =?utf-8?B?K2ptM2t2dWpGaGp1a3pMUmh4NkxWQWpvTEgyN01MdFF2bWcrUTVNenN0VTE0?=
 =?utf-8?B?RXZEM1B5VUNNWGFkTUlCL2gwekswWUJkMFVNOE5GK3lkOE1EN0ZLWVI3bmFM?=
 =?utf-8?B?M01jMHgzZTZaak4zdHVyUTQ0RmJNTXZ6aHllOTM3V3AzaGRUOHA0S1ZPNEU1?=
 =?utf-8?B?MmRXRUR0aE5qemdDS1hrMGVFNkFkOXBtZ29JQStaZSt2MStpVXozamdhaVNQ?=
 =?utf-8?B?M1hIRlhpdXZqRW5XWURCUnh3L1dRV0FtWko0b3JOMFRuK1FLeXFSTG80S0cw?=
 =?utf-8?B?eHQ0NEViQXphN210OFl6S0R3UzdUNGRUMUxFaVl1U2pjZ1VyUlFTT01WaVN6?=
 =?utf-8?B?WVYyVDhSOTFJTzczMkpYN3h4RnJ2aVZtL1ozRm1Eb3gwY2cvVS9mMFdlYXZX?=
 =?utf-8?B?dit0WFY5MHl6d3RoV01RUVloR1N5SHFtN29mTVdkRnVPaWRkSkNhUDBGV1hF?=
 =?utf-8?B?MXFvcnVOalpqdFhoN2UydURGeTNmUTlxOUZIMGtyOHFxdGY0TU5zK2VRamJG?=
 =?utf-8?B?N2RFRm9nT2VNbzBMdXp4Mmw0c0Y5cFI0V3djWE1vWkZxdENjMWVzQ09hY09M?=
 =?utf-8?B?NitYK0lYY0Z5bmFRYnZvZjlscXB4RkN4OGp1Z1ZhRm5IbU53cmZ3SWpwYkFR?=
 =?utf-8?B?Zm9sc2h0S2J3TVYwSStoM1hzZmIyQmlGejI0Z3VOYTlXOExKL3QrNER4S01k?=
 =?utf-8?B?K3VFK2VjKzloWHRHMzFFR1RjSUdQM1FpNW5XZlF5bTN6eVhMMEtqTXNwZEwr?=
 =?utf-8?B?RlFUUEF1T1dLUUxDMStQTWhCS1FkSVVDUVR6WTBSUnFLdkF0UGl0eEFSTzd3?=
 =?utf-8?B?QVIvdVoxeFNCU3lqM2VuSHJKdUtwcU5qODVtZTdMeXBxdGVuK1ZxVHhob0Zs?=
 =?utf-8?B?TU1uOTRmWDdjM2VaTkVqOWVTWUQyRWwvd0NhTWZnTVZuVUVtd25tWEQxL0Rl?=
 =?utf-8?B?RHFpMUdha2tKUEJVUGFsZFlIWXBvN1o4NlN4TzFkT0lDTDNNTVlrWW90K3RF?=
 =?utf-8?B?ME5WNDlmLytQRjlHNDh1bTdYdjFnbUU4ZS9STmx1Yno0TWpGalRoMnVLL1pX?=
 =?utf-8?B?TjhDbkVwblZlMWszUDFNYy9xNVllWVlzQm1WYm5RSG93eUNNM1hnNmQ0Q2pT?=
 =?utf-8?B?UkRabGdXTDY2UzVRWVdYVytRcUlUclZ2U0JwTU96NGdxVWl4NjBHY1FQTDlz?=
 =?utf-8?B?K1dIeDV0WmQwdDZUcndpZG9VYWNhajhwaE5rWjMvQ2FOakxWUllhNEczVXFN?=
 =?utf-8?B?WlRSaldpL29IS0h5NDF0a01CQ1UzSW9lZkVlWTJNMTNnVDFFTEhpNWc1dVJW?=
 =?utf-8?B?K2tkclUvZ2JDWXJLKzQ4MHV1SndOdmx5UFJLYkRrSUVvYUZHa0YvZ0U5YXAx?=
 =?utf-8?B?V1BIM3d2ajVjZCtzZWJNckRGLy9hZjVwNWpUTkN5QkxtenB5TEV5V0t1dmt1?=
 =?utf-8?B?YVBubnBMdjNwU3prSGIxT2hKc2pOdkJ0Nmo0akVGWEk5OFJKakhuYmM4c2sy?=
 =?utf-8?B?dERiVUJsSFRRV21hbFVxK1d0S0tsWEU2bUdjbTdNMHBiNHpaTzZCenVwbTJ1?=
 =?utf-8?B?MnRQbnliaXVFVlJtSTdUU2tCanJxeFRrODhUWUFYRTh0ekdTT0RjOGd6b2pU?=
 =?utf-8?B?QnVpRnljR1dlbmhHUDdhKzVhWUY4Z0Nlb0djcEVzUXlnZVN3aWt6UjVwN29o?=
 =?utf-8?B?RjVpYUYrRDFOcWVyTkE1MXRIem05TGJOK2RLaTdTbGpPQ0M5cHpYZ3BXRG11?=
 =?utf-8?B?cGk0aklJZXFDTEJidkJIS2tQZ3EwbnhtMnRoeTRERk4yTElkZWV2ckhqS05F?=
 =?utf-8?B?amFIRnFKQVcra3JWZ3hYMmtVU3djd0tLNkNOQ250OG9qMHdvTy8rWjcxODZX?=
 =?utf-8?B?TWp6YjZlMFJhRWhNWmN4UU1hR2g1ZFgxTStPMmF3NWIzWTUwSWwrR29SaElP?=
 =?utf-8?B?QlAwOGc1KzdqY0kySjk5TTdaY2pldW16YW9WUHl1RUcvVDF6emVMSVVFOTJk?=
 =?utf-8?B?MkJJellLOWRnaWJ3SkltVXcwRkJXV3BLUHJKN2J1MGxqWUlWVStZdnRDT0tq?=
 =?utf-8?B?blE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 6e8644b0-b9f9-48cb-514c-08dbdec02e9d
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 12:02:00.4452
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9DuYQ0+/77SGZaYHMLDezlR7dzDxgg8tUyJ8/TBL68tWmXfLW3XQ6HvLmF89Kwa82EwGcB6QpOi7WXG5X5UW8WTnprR7Mk2O8B/AWS3dpTs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4625
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 06 Nov 2023 04:02:19 -0800 (PST)


On 06.11.2023 12:47, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Analogously to prueth_remove, just also taking care for NULL'ing the
> iep pointers.
> 
> Fixes: 186734c15886 ("net: ti: icssg-prueth: add packet timestamping and ptp support")
> Fixes: 443a2367ba3c ("net: ti: icssg-prueth: am65x SR2.0 add 10M full duplex support")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---

Thanks!
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>

> 
> Changes in v3:
>  - consolidate cleanup logic further [Wojciech]
>  - make sure to NULL iep pointers
> 
> Changes in v2:
>  - add proper tags
> 
> This was lost from the TI SDK version while ripping out SR1.0 support - which we are currently restoring for upstream.
> 
>  drivers/net/ethernet/ti/icssg/icssg_prueth.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> index 6c4b64227ac8..3abbeba26f1b 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> @@ -2105,10 +2105,7 @@ static int prueth_probe(struct platform_device *pdev)
>  	prueth->iep1 = icss_iep_get_idx(np, 1);
>  	if (IS_ERR(prueth->iep1)) {
>  		ret = dev_err_probe(dev, PTR_ERR(prueth->iep1), "iep1 get failed\n");
> -		icss_iep_put(prueth->iep0);
> -		prueth->iep0 = NULL;
> -		prueth->iep1 = NULL;
> -		goto free_pool;
> +		goto put_iep0;
>  	}
>  
>  	if (prueth->pdata.quirk_10m_link_issue) {
> @@ -2205,6 +2202,12 @@ static int prueth_probe(struct platform_device *pdev)
>  exit_iep:
>  	if (prueth->pdata.quirk_10m_link_issue)
>  		icss_iep_exit_fw(prueth->iep1);
> +	icss_iep_put(prueth->iep1);
> +
> +put_iep0:
> +	icss_iep_put(prueth->iep0);
> +	prueth->iep0 = NULL;
> +	prueth->iep1 = NULL;
>  
>  free_pool:
>  	gen_pool_free(prueth->sram_pool,