From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f54.google.com (mail-yx1-f54.google.com [74.125.224.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCFC23905F8 for ; Wed, 3 Jun 2026 14:07:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780495680; cv=none; b=kS6eLMPkBJAynd/7sFIo7Smi+oJGzETPffmJV7qjYNua+x5SHQRLWSyJVJVQjiY5GDEDoi8h510WPeILds2PdMrQy30GlziaWx9oYp05OMqMjdfYSZWaoiiExWslf4ylSKDFu/G91MgvgfikfVzYxwUBIo4skb7nu6fCSLxZ1Tw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780495680; c=relaxed/simple; bh=XGKzH9s+2q27a9w2p/I1TF7QHbREPEMPONGhf5bDR30=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=oMI+vRhOYrquxcEwvAQvGHPeKwNpiuM9v9jo34K3IMoI4y0sH8umguldIFJEV5AsjIb7wXX5ohxhsLzx8er7cfEcVnLuKvBh9UhFJf0xGhxLGdKBp0U5hZNBRyXarcWSEaGU9ye2zoZgzyvS2EDO730FPjEbyxcoonBl5hawhow= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bOQPueHa; arc=none smtp.client-ip=74.125.224.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bOQPueHa" Received: by mail-yx1-f54.google.com with SMTP id 956f58d0204a3-6603d8697d2so6270000d50.0 for ; Wed, 03 Jun 2026 07:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780495678; x=1781100478; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0zxTk+9izXoTQNzySWiMV38Wz1CdNNANMN1wpKE+69g=; b=bOQPueHagCodEiXtX/jnqQ1Q2rrPGs/B7KT+8kMTXtXgHKvinSV+b5P9QSBZ/e4nWh bm5h+VEzJRMTvv6KXZp2hPSQ7wDT92PtK9+gPWm8qfZE5rb+bg6yk60YL6wueCKsRnsy DLeLC26lW6N0dpYi/UtKJVtpr6jgFwzBa8g1SaMb259MOkymSAuuzlIpEFvWO/Ylsosk aY7Q4sSq4GOCrph4t3ElHaUVs9B1+iN4Go5LmbG893qUXOtgZSyT5Hqmhk40mxDPB2Pu 5uSpQ5tZcNtKrW8Pl78UlkLcoWQHK5Rdt2m/25RE76wujwOlh8VEWtM0vSFj8zzS9dC+ cMqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780495678; x=1781100478; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0zxTk+9izXoTQNzySWiMV38Wz1CdNNANMN1wpKE+69g=; b=phRKq68ZXxN1Xi3peX5qNewVzkVVmHSLRcB5TMQquQYJparyHAieoHIU44I2xROz0H ogdLW6uTlKln+lR4vquiBdZbLpuQVogBzeFwwJ4xLikl8sL5M4xRLka70VNJo3PI88nk N+Fz4wWV0pWi7OHUKvEE3GxQsm4lK+jfmLjwpEvMNy6jL+GdP5D3bbRTGeC7dGV0+EDX 3uM6Apajrmwx3PUtC0XAVfSuIhAohN5xtAtSX62eE566ngJAdpyaQmGUTLf5LCIuxjOf c/oJ8y4JU7D6+GTFQhxPjvzO/Yu+PwnaeRXwrffjodgav6xTZ9vOPl24TV53Ai1K4NRh FY/A== X-Forwarded-Encrypted: i=1; AFNElJ+lsKvgmWyvLuvdZTbbkNmu5VUzUQv42zMIxwlrq7YA4XBURvgj+2tBEUBayfZpBPnzdgFUXMIOXzCEN9s=@vger.kernel.org X-Gm-Message-State: AOJu0YxNRTV4pUjGeKuE/pBXfYjBN3Q2aPH/w9+e6T+dtYJAaO52Xe5E Y4oYbFyfSHU15SSm06Zgg+zw7pHUj/o0GToWZhEA6xoOWsM1YM+OWEL+ X-Gm-Gg: Acq92OHSTPuauTYVCNeZp0pzWPB0qJSzWdnjQtRCyQ538i6ExM9fJQU90+WHu1eRDlU JQhoTuxFl0DSuWdjm4P045YpZoppwljO6tDGpH8BIwu/FRcdDsnW7cKGckHvs8R75JxrOUvxYiE fEmnFLMfp+mfVqScsBWfW7pO+QX5fkUxAsJC55ZtwhBbkdZnj0r2rCvuUSWJ9E4fSQ92ZE6aIyg vHpeduj1zkEoxtLCkbcPtqmKCmqiZ4INcSFYWN1K2f8QTmGBWu0edC6Md0hRxdPmVJiktdU18xI Qg8OK7ebYUvUYUPr65PsHA5gSvhppiazoJLydaDknvzEuAKFwMDO5xRU5CmYOhGYHRvjJNMMsuj Gp5ERe3oP5mSDBkSgJzS3P+8oWRCRS45IgwmhhFRFQlLdxxjqmTHhi6B6Mf5AqCp7DYBEeAFtJI 5pAavt6TNiHFAYBTFlDgF8euA= X-Received: by 2002:a05:690e:4812:b0:650:3952:3d3d with SMTP id 956f58d0204a3-660dbfd0026mr1783021d50.44.1780495677652; Wed, 03 Jun 2026 07:07:57 -0700 (PDT) Received: from lgs.. ([118.193.39.24]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-660d647d3aesm1885466d50.18.2026.06.03.07.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 07:07:57 -0700 (PDT) From: Guangshuo Li To: Siddharth Vadapalli , Roger Quadros , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Kevin Hao , Alexander Sverdlin , Aleksandr Loktionov , Daniel Zahka , Guangshuo Li , Ilias Apalodimas , Murali Karicheri , Grygorii Strashko , linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: cpsw_new: unregister devlink on port registration failure Date: Wed, 3 Jun 2026 22:07:42 +0800 Message-ID: <20260603140742.1398659-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit cpsw_probe() registers devlink before registering the CPSW ports. If cpsw_register_ports() fails, the error path only unregisters the notifiers and then releases the lower level resources. It does not undo the successful cpsw_register_devlink() call, leaving the devlink instance and its parameters registered after probe has failed. Add a devlink cleanup label for the path where devlink registration has already succeeded, and use it when port registration fails. Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") Signed-off-by: Guangshuo Li --- drivers/net/ethernet/ti/cpsw_new.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index 7f42f58a4b03..95b3b58db6e0 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -2050,7 +2050,7 @@ static int cpsw_probe(struct platform_device *pdev) ret = cpsw_register_ports(cpsw); if (ret) - goto clean_unregister_notifiers; + goto clean_unregister_devlink; dev_notice(dev, "initialized (regs %pa, pool size %d) hw_ver:%08X %d.%d (%d)\n", &ss_res->start, descs_pool_size, @@ -2062,6 +2062,8 @@ static int cpsw_probe(struct platform_device *pdev) return 0; +clean_unregister_devlink: + cpsw_unregister_devlink(cpsw); clean_unregister_notifiers: cpsw_unregister_notifiers(cpsw); clean_cpts: -- 2.43.0