From patchwork Mon Nov 6 11:47:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 161955 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2598224vqu; Mon, 6 Nov 2023 03:48:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IHTCYnIUSuTwp8qVy5/9TFJsOqJo80Lnw4GSV8xA8+HBDUH6g4mt18tmc5HTqVyz5jjMAlm X-Received: by 2002:a05:6a20:728f:b0:177:690a:7978 with SMTP id o15-20020a056a20728f00b00177690a7978mr35281607pzk.33.1699271282620; Mon, 06 Nov 2023 03:48:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1699271282; cv=pass; d=google.com; s=arc-20160816; b=ZnXNC9ol/Ev3nts13HEagVE1A6QTgoIpu8alV5Tt6HVyXRKnVfbYZmDW7hph0WSTg7 bupX8k7OPHlQqenrsJQZVeHvIv1VSiJKhr/FKaQdHAPwq9Tb7jj7QG1aLPzgTD63WQ5Q bXifmrqDZWbYAdtuGx2KJESfjPUN0eJzRc4irVdl9PJCSyWj3bO100BV1aARPmqfD9YN RCpPxek+AZNMsea3/zhymkt3L6Mp8Yx5CK3fqEujyqHjyzZFh0SlaSZ/gifCsEXRnMrf J1R0JF31Naen8+uWY7EzHQkyitkYc3q9f0dhPiFHyQiSgf5Pai/JvTynwfHlZ6sx3D/E VVGw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding:cc:to :content-language:subject:from:user-agent:date:message-id :dkim-signature; bh=SjHgu1gdsPjhOn8fV/3G0MCZGpSFSmjRG78+I0Cftws=; fh=go2hx8rUG2khDs5k0Oj30Hkcuv/Nyaq/ixoISoJ/KAE=; b=jbLBKEqdgiMGWOXkgu32pl4uwbwvzgnII1kJxbD0iOkEfJ5XE9dfHNwtbmhNJSNGDG e/i8URVkK7x/D8InFIp5aIbm37Dc0ezJ62ZIMXti5ufOB3ETJM+6KiD8Fm+Avc9WHBzH dEQz7V7uTlOtas40KoDQSFNZsEfA7Jp2Q1GHamGOZmgPkDLgcUVkKoAfHRaDTfZ7TtOo k/j+8/6D9PMihA7nm3wUWmDxRVCdTJRyXm2xpovYdY+Cdce1uhvbC/SPfYU16pFOzg5C 9k3eQhtCcBHHDd3jgH7X7ADD2c92ORxCLv84ztCmoqG4N+lRacj4BIQmpaL5ifrDU79v wVMQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=GyWZcncz; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u9-20020a656709000000b00563dfffe7b9si7925794pgf.810.2023.11.06.03.48.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 03:48:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=GyWZcncz; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D571A802CFD0; Mon, 6 Nov 2023 03:48:01 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231321AbjKFLrv (ORCPT + 36 others); Mon, 6 Nov 2023 06:47:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbjKFLru (ORCPT ); Mon, 6 Nov 2023 06:47:50 -0500 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2044.outbound.protection.outlook.com [40.107.20.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E095890; Mon, 6 Nov 2023 03:47:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gd6Dz5r+9Lr7wSDYYs/FPbLVXj8EuFd3bnxPuDGsDGqJOzP2e2ZYQamwSpOmiz5J5UwpkC4zvPjpxQgS4Hi31vqWuPEurUcuupYoXwM4oj1etGnTuo2zQ7C9gYiyY6c8RZVSiQ9uU2EsOr11Dfk+F6cWqNjbeLW2hFTADvihPp4FqCqr7ufg8rPS7j5uUc8R3CN9yDEaEBZhVdPdzH9rNbHAQ9mBX4sZoJkms+Fi5Kz+tkaAwy88045WnrW6CdiAdFaXQCnhpKu23fx0z6xv/Q6f3ZUbc2JuLapvW2VlzXjXpvqktbYqkxFsdBXLidNZ0wbBCbm5jjdzKtDkvUyL9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SjHgu1gdsPjhOn8fV/3G0MCZGpSFSmjRG78+I0Cftws=; b=ZKUDkjrLvrhIZAY4v+PkYLl9/mwpzH9dBmKlZr3Xhgz2SqQC10tjEiUf9qvfBGau/Y/bNwoZH3tSEX9nQtZD4stYwt/TPcSgU/HqnQfg7Hzxu0AV1VL66jxPpbarQn+EY7foCdrKIf9Uj2e4nTbNiZeVOKoxLd6yOio4esP/UEI0oXowvouMgr4Euoeb9ss/thtTe+JUef+tggJmHpXcJyVhZhbZsd38IBfOsF2i1W7HSfwFCtVEonyQSpLE+AMiKpmbwE09AT4bSWMVOpm+60hOmXCm2nIK5pi7ByZFSUGdpFGmRwD2YXBdS/4WdgO+NN2AxAESF/STV9zv62AVBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SjHgu1gdsPjhOn8fV/3G0MCZGpSFSmjRG78+I0Cftws=; b=GyWZcnczCKbO1x6ZbN9HA5zvE4YtyH6OY3+DhmhL96YXZT6GVhkxI9fFPC/LuyWMXxFuX3KE3XGJqqnGUh+oyduc3psRZn+ZeLX98xxKD/x4lBabGkDZhcmUtzBFqAOLXK7VkAsZD0j4NKKf5ueTuNo8hQTbaHtUfanuW/xNYVHPpdhcB1OzdOK2L2gu6bgZ2KsAZYQdonNML/CUPDMJPRWRLM9lDpQL5Uqbj3IyE4MW4qrHDGf+eJk1EYiqNFxJ+SBQB1G35o+8EgeFOZVsd+JuAeu/oEuGgMwotaEqGoQ7e9OSOxa4EfRsIeQ46OqO+K5T3x87VXsLYIzWqaywxA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS4PR10MB5370.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4ba::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.27; Mon, 6 Nov 2023 11:47:44 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8496:a3a3:d7a8:b24d]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8496:a3a3:d7a8:b24d%4]) with mapi id 15.20.6954.027; Mon, 6 Nov 2023 11:47:44 +0000 Message-ID: Date: Mon, 6 Nov 2023 12:47:42 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH net v3] net: ti: icssg-prueth: Add missing icss_iep_put to error path Content-Language: en-US To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , MD Danish Anwar Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Lopes Ivo, Diogo Miguel (T CED IFD-PT)" , Nishanth Menon , "Su, Bao Cheng (RC-CN DF FA R&D)" , Wojciech Drewek X-ClientProxiedBy: FR2P281CA0077.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::14) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS4PR10MB5370:EE_ X-MS-Office365-Filtering-Correlation-Id: 416ee883-df29-47cf-00bc-08dbdebe30ab X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 27ZSPTV2flgKiQEer0eOsIz3jaAgySZ5gnHDhmmIn6FuvMjxeycF94DWosFoexBtxta0ZhewOf7k+kGtsSBrUf2ncWsLL2WVvv4rDAtLiGRkvtSJ/ooh1vri7c5J9PfVTg5odUBCi77LqutDZibd5vyCrlizA2uQXDg6LGY0iE3iYBUocuV4NKplj/6DxFTJzLGIyuQk3M3x4yHcy8WXKD7WdhNmrxIAanBP7UIpAJ59hivG8fl3Md8Y18AodxcsyXmLuUOz5jXG+HDE1p4UmtWMmXZesrZtksGpT4giSxtWx1xgQSWMmtchjMlzjXens1zkcGHYSwloGOtDrjg22v8ICdWdBI6heyEY3xX1ugxqp5ICwuz1lgPQcT81r4U/CSXvr2KI9IfRMgVLqsMFT3dsgpkBTfqtOt+Ge7Ne1L8TkkGGiNM3N9MhuxmNvxxxGHXJwNnKZ5Ox5bErpnT9dLi/KI4101HyDp11rHg6vuyVxBG3gkPDBfqPm34T9eTUkBMxx+Be7fdj/A49Q5JA0MgaROYdDgKmhUxB566A9MO2zJ4Vsg6/hkzZ5zgbbAdja5rGJTDbvp96k84BMk6g3GH/H7PxER0Drb5yHRoRPIYbqC8o64dpw8x6FI/+0S4EzBNQfiDqb8QkASrEOGuv6w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(346002)(396003)(376002)(136003)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(31686004)(6512007)(6486002)(478600001)(6506007)(2616005)(2906002)(41300700001)(38100700002)(36756003)(82960400001)(86362001)(31696002)(66946007)(54906003)(5660300002)(66556008)(83380400001)(26005)(66476007)(44832011)(8936002)(110136005)(316002)(4326008)(8676002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?KKHjqNAOhG+qGbMbI1F3a0/BrWlk?= =?utf-8?q?OBLQhe7C6DgXtac+nIH1I9dra0V8sdjgvk9jZGZMAwUJDijueYYbIVGC0TZUERHEh?= =?utf-8?q?aPrvzblz+3OGew+GyeP19pqk/GOHeGevMRCqfcPm4p9L5MFQKmJ51rEhCNH5AaMA+?= =?utf-8?q?6Tmwf/4s34l8ft1hQuyULnS8Dx0WufJ9iuZk6jTBNG0E4Xnp9sgJwjji49Gb1vcLe?= =?utf-8?q?54IEpX1nEJDPZtZOPWQfOl+GfTGhqlzdS3YdN8LEFioN21Cp8k6Z6LXAnOkhRO4hI?= =?utf-8?q?yHK5Xm7Vin2GhXVcEzcsYJilxVOiQD7U4L4PKCTPKI5px327MurC5gHJxcqylyF2U?= =?utf-8?q?Pzh5z4aY6bckAcKhwk+k4f3/QznptnofzkTzafoNO4EtAUgiUs+Yrislamj/+ETWO?= =?utf-8?q?U8nJSkn9eHgJ585/C7JuN5j2LwHlT0XdvUIEmIT5hqRjPXElDPhbP6FsrQJKjSIgX?= =?utf-8?q?PvLuHgPqKksKmmaMMssy+Rws90+1AM+//HblZinBDZ1qBf30ALJJ93RRTTon/Qqtr?= =?utf-8?q?ToSlttx53Bw0DCGxvw/HWIiLENUtPYas7fG+oqqrhEmlfuxRPsr3YEMBnyLsWat38?= =?utf-8?q?HNGClU9XOG+XSrR5tIpgGrfdKObXE0S6ttkdi85e3vojNgYRocnDAfE1qVselYTF4?= =?utf-8?q?rgKKjqx/OtONug8Q9SQG2rb/IlGZWSrv04VS+Z6tanpbwMq7ywIVaIPGOsTs6Xn2L?= =?utf-8?q?iuZBTbk2L6f/jtXonJSaqIqJXA8o7mEt1qn9z7n5zU7FpyjgnC8y1v3WzQSWEVYBN?= =?utf-8?q?euFUxO5uIyjtGP5uxOqv1P0Ip9CcOBmBKs1iJ+1/h0Uk1br4yRDRZYM8kGOSmCcb1?= =?utf-8?q?bArdBEV/QgerjwlX46+FSXKGlm5jdr/y1woTXCuw1kYsQxwEQ23oo4+ayUEwEO6mt?= =?utf-8?q?9w4dVSULs2g8ISOFv7a6Qjk0JJF8H3Li2lhrrqy/SEB+j5tG7n4as6y1C011+Bour?= =?utf-8?q?KF8E1m67E3FcSpL5dKJyTypXW8f5a6oDDYHZjCKo/aId+zrwao8QpytUhQ03paaWS?= =?utf-8?q?d/5EszK/9+9hzcviCsW+zqK2Pi5drdRJXYfBzX2AgpeuaDN7Z7r/RHx14WiPCuBbx?= =?utf-8?q?Dtj3iDJI4+eJ1nHd9jp6xg/eqvWGthPhHGxr9ElcL0otuEjG6efxaDZlqzpotZLqb?= =?utf-8?q?kZuluVRy4I54pDtCpArWgeQbw+uxfeaNY8DDoHJPIvC+CMsPKOui9JbhVIRZwSto7?= =?utf-8?q?/z5CF1eXwFJ/1x5Jn7+b6oiyEpgLy+JIQRhZCAaQra5pAkkKkisKUghF7m3wl3N1v?= =?utf-8?q?RqTTHfs9IUxoB1utcPAsSSe+djfvbqE23tKqJqDje2wZP0JkXkM7ZCrZVE6jIYQKX?= =?utf-8?q?Cj+2rjlvILG4L2cSXzKn++Qrx962Pht3kRYl4O37xtLsmluxVLXyZ3+kMjqmXvEHw?= =?utf-8?q?CXSUTvaDcBuYVf8aNeGCe3u688vPoC9TxnqO5q0jZZQVC/y7r5xd9mYAhYqPqoIl/?= =?utf-8?q?wd7QoNJhXiJr0aP5QUzxA9m1VxiXOs1n8AAO+skZMe1UKSfCFi4IBnaSEiLcKdCRR?= =?utf-8?q?85/tz2IPna2T?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 416ee883-df29-47cf-00bc-08dbdebe30ab X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 11:47:44.5926 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NtAUmg4Ny/h0J5KBETjfqAO9hCdc51gPjX9Cee2bhWqXPRR2VaOZ6+Pbr2gH8nd7cliYa6REIgB4TL5qq+5z4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5370 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 06 Nov 2023 03:48:01 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781815084227707571 X-GMAIL-MSGID: 1781815084227707571 From: Jan Kiszka 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 Reviewed-by: Wojciech Drewek --- 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,