From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 E38A13AD503 for ; Thu, 4 Jun 2026 04:41:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780548069; cv=none; b=m4AOMMdH4/8fIXbF865odoEqG6rI8CrL3+/ZbMZOnYgq12s9f8QEZA1PYbMLeUXMBnU9KukYcZzo0ZkSkaqx3Qh5YitHZpATqm8xIzRNTZdLTwMk8l2vaZgtoFYfLJu3hj5xjfoD2pp9Hoq5sLlGvZWadytX2c2RkovL+zeJQLE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780548069; c=relaxed/simple; bh=0eh0KIQbs1qSSAuQkd0I9L7iFhTklV6ijuBWROey6iE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=r3AOhFYxUQLGhXigq3ONATOJd9DhyTOM9Kh0Z8UNccRX19z5eeV+TIBFrswrLYjVvJjR1NCW7MiDw2fSin1o5czP5VQNojweqD4O/MUPccWz4uM58fZQFeoXPYprHFm/p7UDBOOZIjug2K3KD5e13IeyPfSbGtzlM1BV/HtgoYo= 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=WKkcjl4r; arc=none smtp.client-ip=209.85.214.173 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="WKkcjl4r" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2c0b944f6edso2901185ad.2 for ; Wed, 03 Jun 2026 21:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780548067; x=1781152867; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=yYdWhysklbTaMq+vmdQBdY8EoKqbkXlWNN3QS92WACE=; b=WKkcjl4rEo0R/2bVQHQhF+2KrgYUhQxFwDO0nrd5ggTAnbkaYiuhg7oB92ZKBNjevj vfTvgz93bYw0az1N5L1zaR7GkwpSpwBuSS+bkxy+DAowNYnMOXUds9oqW2xS71jtcbJ6 L+fTYm+SX4fvoqp6wZNgpOQVt598M0AcP6CiOyfPEXOZLzqk6o0oa8R/q1YVo3A1XMUB k37fufOQ1OnVAG/sDyyQUS/T8GBJ1AWHu9N4jJGpqWv3AwFTKsZ405s9Ig8LejyR9E/O gLrYHXf1qhr2fySrEF2lUZEYGh3UKYDv6cHKE3RxQkEm3n3KJOX/kGUmVuBLiUgswkCZ yh3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780548067; x=1781152867; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yYdWhysklbTaMq+vmdQBdY8EoKqbkXlWNN3QS92WACE=; b=Y6GRIPyTi3J1Py5Qog/oS9R5c3uYYRwFHOCOM3IaRs9CYQNtBWV1q1x4ELFPTsjNe4 Flg+2fNU8JDoqrPJnHsB28AcWfn7o1smlgKe8XcREe5E2htmlwiDZwuTxsK39d3vBP4T PKBvQzANVKhf59aRgI1xs5ky8MbeTqlaTw8hojQLf+LwP3w4wEJqnW+1NJgYsJwwXKGZ 1xgo3gOmK2mHlhumXj0qx74664INI394506A2JKeJK2edJGUlZv4aMCGVEYnOmKVjgEr SAoJtb8iiwYIMUE2Lc5e5IpBNIMkwDyrJtmgzcQqfkMZXbgsW3Q1NNI2G5eJ6xkrn7Xt jsmg== X-Forwarded-Encrypted: i=1; AFNElJ9XcEDkw4np5aXnnfA0NqkDEP+HzMF2TOGFr3hUrWg4ypT5aPbONU16ek+jvC8u9GHXaQLgbmRmM1GlIw0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxabiu+vyB9ZSmWmqVAoG99oAEtsReJKnj5f+QcjcZ3wJtwZ+7U 2eTOOKaardlQufRNe4dFTJtalR98CRZPJ9vomzucHd594INb0+CIOr3SwTLmAK3tOow= X-Gm-Gg: Acq92OHnqeivLGtr3Z5l358j/YDKeIHgcp/ownw2NrPvF1SQHtK17YdL5eKD8Q7Dzcj lVZAhA/F0H8EWGepj6EIQONZtKw6SY8iV6Z2xs6yhGDGntJwyUFWvnoyp8jk5LUPd+clWHYgQ3b 8edA2ACQsAh3tMZ+LNOkaS9YnIG2alWVf8XVwr/UDrW0k43IbMMn9kGDVfavGQRkda38LfIcZC5 7No76vrX6HLbmgCZZ/bk+rVyCh2P6fZZS4Qcr60zUY35INnp5sB75F6xC9yHMBaR9o7A8fhw/wj vH0NBpjeMjWnjYXLJXvYDwDwzbnSF9SJ4L0W7a9KweR11tivswy+fETBYbEOUr40MxAUQAgr+Sx Xf6JdnkWX81rSBkwUXNbiCuy2bUmuVJCxM2xGZuasVTyc+y5HmLiyaNJQqInAhKW0akKKVymTty tT/bl0S9/8x93Chh1H X-Received: by 2002:a17:902:d2c2:b0:2bf:21e6:baee with SMTP id d9443c01a7336-2c1641be20dmr70162455ad.28.1780548067020; Wed, 03 Jun 2026 21:41:07 -0700 (PDT) Received: from lgs.. ([2001:250:5800:1000::f280]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16609e096sm42344025ad.44.2026.06.03.21.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 21:41:06 -0700 (PDT) From: Guangshuo Li To: Siddharth Vadapalli , Roger Quadros , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexander Sverdlin , Kevin Hao , Aleksandr Loktionov , Daniel Zahka , Guangshuo Li , linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alexander Sverdlin Subject: [PATCH net-next v2] net: cpsw_new: unregister devlink on port registration failure Date: Thu, 4 Jun 2026 12:31:15 +0800 Message-ID: <20260604043115.1409134-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. Reviewed-by: Aleksandr Loktionov Reviewed-by: Alexander Sverdlin Signed-off-by: Guangshuo Li --- v2: - Updated the subject for net-next. - Dropped the Fixes tag. 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