From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45]) (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 F02EF2D3ED2 for ; Sun, 28 Jun 2026 07:01:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782630118; cv=none; b=I1B1+RhzSVjpnpoFuzlx3AJDPuEXnJYMjk8uR/vTLCw4Se4/UHn68SeunK5jL+p38Sh72OZsBvxVxNfs/dT8bMw28dinvMcCBsYTcD6hKZIOliDtfl7ofwodgBRW3Cc5fTdWpi75ANk+EGfiQQvkHjdJVB2VC9k1ljC3yDnZmA0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782630118; c=relaxed/simple; bh=0Cj6wOJdILUOWABnwvYdl2Gz4eV0vxkMFlX+pQrPy/8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mY1G5ZeHEEelbsPZk0D9FlGHldXxF56MKT0PrM/GkQ2EcCoC48/sFNtPFRz33P4fAV9vxwiHlXxXplzyokCTqGhzbwz7ZOR49db2g67JA8UZZc1Ep2hVQJc+zdOpxm0VywWoKvshc2FLzgxmcYTzK3bxNjJXkTngInD/Rx8x6cs= 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=EOgxD2Rj; arc=none smtp.client-ip=74.125.82.45 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="EOgxD2Rj" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-13986d61b4eso5736719c88.0 for ; Sun, 28 Jun 2026 00:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782630116; x=1783234916; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ebr54NXoj/alJszP2J+8XnUT0XJSuCiSbPSA/7MjZ7E=; b=EOgxD2Rj5YT1Gdr6F6AO9fEWWH288QUa4FWsiuapH3LKximMDdcaxu1oegmFyLDLWL ZQHkMwmSY6YiiXIi0QV0fMfcC87xiDVdpRANi24i7wQWE/8Pn3H4NVcL6jeOIDa6aozR Xt2vZ2YfISyu1Qjk65RolgGrFZg7zWqMKnLwMhn7e3EG5ZzIolBD9/HQRWrqWPh/DFvc MkCQwuMwPhyNj+ixG7vr1hiRhUaGXFmi8NUMkDNuhuEthVsVI1GZP+RG22CYpC6Zoogx U57gwb3rO8WJDsCHpsrN9+w6U7tLuhqznLe+vR9qaVekfkqlUCNt4KGuVzR7i1w3uafs +5nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782630116; x=1783234916; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ebr54NXoj/alJszP2J+8XnUT0XJSuCiSbPSA/7MjZ7E=; b=NHSEPrnfhdDoXrYuC2b28O+QAX0kMwRQEU9bsdFblpHu/rmjURDHaoIEughiA1N2HQ nvOFJgGtMqRg2DvO69HYDfECxLu8mexrIQUK3FRIQ7//5cawJdlP89ovWyxXbl7Uip+c 99BdQOCXrw++H1jfqbXWcNa5Dx3jtbBihSsikrabH0gmMEXft6jx/Sgj3O+0/zUJghiP E1ENn7Rr61MTj429Igbj0cnw81BeOJneCC3biy/LqaEmFZdqINdQd1j0PncICIyyKgF7 9QZeaH2seQXrZz+Zl/CScpnTlQSOL+8lJGJLzFgI170/7DOjGxzPrvUbgj9nW8g+m9K6 Tzog== X-Forwarded-Encrypted: i=1; AHgh+RriGUcDnqdeuFW1rBhJo6xjaCt8nQx3/f2zCpf/qNcBDBPLbSSiSy+HuHP/rzzfcx6ZSZth8cTC6ju2HDE=@vger.kernel.org X-Gm-Message-State: AOJu0YzD/AXGvmA6lWjllTJyc1GFW4nWFo4CxfekopXDRB4+B8sm0S2x NGg9GeYQNWjnfSvVJoa45Ox3/Iu9auHF24w5ueJkgDxI9+Vvz1Y2fnDy X-Gm-Gg: AfdE7clcoNbM9sB2YReyMqieSJRE0erWhg+kDH+j1Nybg0ku4Exo1XX+ogiM8+8XOAP aZUq3C6YXI5BkagvhbWLyZHzYvjJ3u9rIQgmGUwGtWZ4hDqDcLxWxsre7MJi91FhAeujZOE0cZz Wbcwv4cfkrGbZbbWYgFHdovl9tG2EDIzUuif3pe/bc1WNH5elpMaBLUcHFAqAktIZXkLEoKGmlt HsOSatfjT8pySS96q4lqJkLFvEsMrTQyoICrBlufZ25FF8GosDCe+KXKZf0Nr+UAG4c3ACMUySN j6IdMtZ+4mdiLK4izBIdeLu6p02ncHkPgCq+arQ3AsShEtERzV2sIq6ch/5bLHr6VUjYFeB2Bsn /m4ffXsF/ERAiEM6N0G6Jz4esR4Zx5z0uKBBGG7QiwVgnDLUwW+6UeiPWHdSgR7Wxg4DKxFeT7U jcxvybk2bvRJtjoL5uRyPdcqOTS57rUSlfHewnRsc+QozERiJjqhMRN+TKMgMFPGNTEKylCjirA wbUJxinb7Y= X-Received: by 2002:a05:7300:8bab:b0:30c:6ac0:5d8c with SMTP id 5a478bee46e88-30caae2e94dmr6895784eec.7.1782630115956; Sun, 28 Jun 2026 00:01:55 -0700 (PDT) Received: from [192.168.1.45] ([45.64.226.42]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30c7c8b1ae5sm39878489eec.16.2026.06.28.00.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2026 00:01:55 -0700 (PDT) From: Prashant Rahul Date: Sun, 28 Jun 2026 12:31:27 +0530 Subject: [PATCH 4/4] staging: octeon: handle rx/tx initialization failures in probe Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260628-staging-driver-octeon-panic-v1-4-fe8c34989254@gmail.com> References: <20260628-staging-driver-octeon-panic-v1-0-fe8c34989254@gmail.com> In-Reply-To: <20260628-staging-driver-octeon-panic-v1-0-fe8c34989254@gmail.com> To: Greg Kroah-Hartman Cc: Shuah Khan , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Prashant Rahul X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2167; i=prashantrahul23@gmail.com; h=from:subject:message-id; bh=0Cj6wOJdILUOWABnwvYdl2Gz4eV0vxkMFlX+pQrPy/8=; b=owEBbQKS/ZANAwAKAWw+kajX8DhtAcsmYgBqQMbUxUQ0uxWyQMSfX9OH4k7IDVFHc9fztqBWg MvZN2+WSSqJAjMEAAEKAB0WIQRS5esR6MP3hQs0SsxsPpGo1/A4bQUCakDG1AAKCRBsPpGo1/A4 bYW7EACmz037MkLPiNiuDDjXnEZTDgv0CPAohwVxVKKDCM6WVaK1lfLUsHlI7RneDzdd7lwYD+B OpDDBH7hskj6FgD9D91Vx+xdFZ5Y0qde7MCPUXOm2iTdIQb4O9pd0s2mKAAAiQvyp21CXjKy6ND FoCj2L5iN4iKVuL9/cGnLYZU1EsMGm2HbRna9vs6iaY1qvjEt7DFisQoN2Tmrf3y8zp8NXpduH5 J09TSrwmPSI6uEe2mKkNu7q/xe0OOymBeeXcvFLi+2P6F2HxpGHRhsAcs4o67iwa0shXKVXOJ4+ x+8HNdZF9iEQ+X3frGYOrTkhxKBEoBbrCIJYnGLB6uMp/khffjnQChblXf1LJoVj7GKRcu9VdrE wtprL3OH8jbmPYoqhW0HVJFZwDLzrYC2kLgfAl5ywD/Wvi962f3HNth51CDlt1CYAk/e06u/q52 WkaU5syPWIYNj8EetxptOU/y67qXe0hFNuuXyfKsyijgDbZz/ABPcVRPa1okhSy6wozfUkuOIDs D/yYmGy78AKasPI58jtc39NPFhQ19DgmQAbrm7B7mCokf+3XgQrZBUEf0T7GG381CwlhFLvWqCZ PdV5WyZM803QgEr9/pcN2UE957bcN8vPTvk2N2ZZ5SPRh1kJoKV/935zdawyqnq1GPdyCFfcfc4 LwfdZqVp5z2SWUA== X-Developer-Key: i=prashantrahul23@gmail.com; a=openpgp; fpr=52E5EB11E8C3F7850B344ACC6C3E91A8D7F0386D Check return value of rx/tx initialization functions and abort probing if either one fails. Add error handling labels to deallocate resources before returning the error. Signed-off-by: Prashant Rahul --- drivers/staging/octeon/ethernet.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 1d3bf3c79598d..41be73b2ded91 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -688,6 +688,7 @@ static int cvm_oct_probe(struct platform_device *pdev) { int num_interfaces; int interface; + int ret = 0; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; struct device_node *pip; @@ -934,17 +935,50 @@ static int cvm_oct_probe(struct platform_device *pdev) } } - cvm_oct_tx_initialize(pdev); - cvm_oct_rx_initialize(pdev); + ret = cvm_oct_tx_initialize(pdev); + if (ret) + goto err_tx; + + ret = cvm_oct_rx_initialize(pdev); + if (ret) + goto err_rx; /* * 150 uS: about 10 1500-byte packets at 1GE. */ cvm_oct_tx_poll_interval = 150 * (octeon_get_clock_rate() / 1000000); schedule_delayed_work(&plat->rx_refill_work, HZ); return 0; + +err_rx: + cvm_oct_tx_shutdown(); +err_tx: + cvmx_ipd_disable(); + + atomic_inc_return(&cvm_oct_poll_queue_stopping); + + cvmx_pko_disable(); + + /* Free the ethernet devices */ + for (int port = 0; port < TOTAL_NUMBER_OF_PORTS; port++) + cvm_oct_remove_device(port); + + cvmx_pko_shutdown(); + + cvmx_ipd_free_ptr(); + + /* Free the HW pools */ + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, + num_packet_buffers); + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, + num_packet_buffers); + if (CVMX_FPA_OUTPUT_BUFFER_POOL != CVMX_FPA_PACKET_POOL) + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_OUTPUT_BUFFER_POOL, + CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE, 128); + + return ret; } static void cvm_oct_remove(struct platform_device *pdev) -- 2.54.0