From nobody Sat Jun 13 02:03:56 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 C66BE3E63BA for ; Mon, 11 May 2026 15:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512350; cv=none; b=IS/KK/LupnAIQmIZythwnt+QC02MYEqMYyYt32NQMjyAHxE6IkECWRJ2MPynxQQX9KT5AVUmQy6qygz1FPeIZuPUzkBErwEjFfJQ3ImMVV0vHif3FJI+Fq5CBPudFO81oNxZSS0yVtwnvbpzQVVnxUFWn2uQm8xYuA7lj9TXkrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512350; c=relaxed/simple; bh=vwvnf6ebNn/NdvRMiSmEWSC8RhjdM5BZPGxzZ8bBLlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qka55sR8sR5cT+k+m9amK75OdCKjc2fpML2taUUddHYojHNYpU4ZGLAof6ybnObA7z0qYTxaNIp5XUYVOUgTHhdOl9Egk/cZog+V9CYPfttXUGlUYnGdvYFB1a2W2tk5/JR2ehVPw/TtgBW5tMJfKjToq0prGwxO4nWTKnxw/YY= 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=oe6o2xn0; arc=none smtp.client-ip=209.85.216.46 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="oe6o2xn0" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-36648a5f38bso482720a91.3 for ; Mon, 11 May 2026 08:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778512347; x=1779117147; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K0LAxw+DkAOqO35713IXuk7e1h9XlRq1lhurgaJrZFk=; b=oe6o2xn0jw9IrMmoKayx1VOFeKsXIR9PFPpcjRkduPsJuuQ9sXv8faf8Fn9EFwClRF 4crc9cLqyTx9cY4rigvGiLRdeQhsMyuDUndnMIInkJnrmxta1GBrRxoajI/EwFTiQq1L hEsdldZulpd7N5ZgxbkWw6PL19eIavGhf62vStu7PkG2AFzGMI3yJzG3kY+UPysLu3kF YBADwEs6kH4sk9oshcGq8tttYJWX3sfdQ9I5xS7xBzaTsoyRZYzczeQQuzifKSrl/u7X HZ2Dvxi9IpyoVxSCEDVMJpdjXmUDNHrSoHFpftDajOgF8WfykWgIW8fO7u4K7DYF/ARe IQLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778512347; x=1779117147; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=K0LAxw+DkAOqO35713IXuk7e1h9XlRq1lhurgaJrZFk=; b=VoP20OMJQABDVcbRlTWzYqIBFaLE++nErtnOJVmwWd2rXAAcG+EGFymCIOrcW4QDKo GRVSUzJc5iEnAO5JPCq0X37qkykoPgXEbBH71yMR2ZochGI558kHkQtLUh/7rK9uUU72 FJ0Nl6KNUBlultiENzxPoNA7URsWdFMg7Ms5C3gO6BK3J+0s6JHgn0vtEZYk9y5YJHH1 HrpEWl91U+t6/nh+wTvL/aAHsCjJzm4a9LjqxIMz+a9XU8hh7fRcoty9XgZd3VbwyGhM 1nKMLRPQI2peE6b06FtEsxJyqCD33qTiYj08ijFB9mO1Zn61ZBNCPsjWm6hsI3/PdEpV nxLA== X-Forwarded-Encrypted: i=1; AFNElJ9UwCvdPXFLVc55MG3AoTeDyo/rTvX/DbZemE+26d10xW1vrWIvl5/cZ/EFJJvPzm/ch8z0zZUOAgH0n3I=@vger.kernel.org X-Gm-Message-State: AOJu0YyzoOJwfJ2yHEx8mjdKdKqLyG3Ixlwo6RiPV/Dmn1lwRYQMHAl5 5Ntr5FPbRMQtb9Nn75gJzJ/xGnxJ2I3Nvt1renOW5zS/J9KTu4rDRg0s X-Gm-Gg: Acq92OF2/86nHFHpuMiorygu3zWLi+JWctlW+q02XubHvx+YmmDlDjkClPYkBysY443 rT0LqUzXkynJCQa8FREGTyZWALJwsMk0qLxk2Quiv8+R80a0KUNDIa74IsgdfKI/BJeRF3DGSYs zDVTOr9pcUQWPLRNo6IssPoGYcB0kHNbKz+W+cd0QjbK0pk+CtqFuHc62nK7vdjZ9rhybM0qX+1 f+PEWOIhX2SydI0tngEjdGIbSDfRkFprr2dxJm4ME+P/ajGNrbGTQ14OQY44eHMUk/IK7DjAZpC aSM2TujpVMnrgoveRnMX3a5GYRsp9153BSy904dusuq11Hi0ofgSOiHwMaK1VnI7R57ZORfUm61 bLKie8W5DXlaeKo0hiSGFoupNRHrvPlylGBQNdh0TT3XjF5aJZRnLGWuLZYMvQlpW2DpvQBiT8Y ck3YxkImuF1ufWcqXKeM4qioO1sV6hi+quqzaF2zNn7wvHqoUDjfruFeHm3JumXNB/YKnLbmTg9 Y+a7QtV6VJJL8jAdA== X-Received: by 2002:a17:90b:2246:b0:362:be3b:c8d4 with SMTP id 98e67ed59e1d1-365ad70fe5fmr13683480a91.3.1778512346904; Mon, 11 May 2026 08:12:26 -0700 (PDT) Received: from fedora ([2401:4900:bffc:e9a7:49ca:5a41:a2bb:6936]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-367d683fa7asm9932363a91.10.2026.05.11.08.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 08:12:26 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org Cc: error27@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v7 1/3] staging: octeon: ethernet-mem: replace pr_warn with dev_warn in free functions Date: Mon, 11 May 2026 20:39:29 +0530 Message-ID: <20260511150931.93382-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260511150931.93382-1-ayushmukkanwar@gmail.com> References: <20260511150931.93382-1-ayushmukkanwar@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add struct platform_device parameter to cvm_oct_free_hw_skbuff, cvm_oct_free_hw_memory and cvm_oct_mem_empty_fpa. Replace pr_warn calls with dev_warn, using &pdev->dev for device-aware logging. Signed-off-by: Ayush Mukkanwar --- drivers/staging/octeon/ethernet-mem.c | 31 ++++++++++++++++----------- drivers/staging/octeon/ethernet-mem.h | 5 ++++- drivers/staging/octeon/ethernet.c | 6 +++--- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon= /ethernet-mem.c index 532594957ebc..af79b2bdac27 100644 --- a/drivers/staging/octeon/ethernet-mem.c +++ b/drivers/staging/octeon/ethernet-mem.c @@ -5,6 +5,7 @@ * Copyright (c) 2003-2010 Cavium Networks */ =20 +#include #include #include #include @@ -40,11 +41,13 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, i= nt elements) =20 /** * cvm_oct_free_hw_skbuff- free hardware pool skbuffs + * @pdev: Platform device for logging * @pool: Pool to allocate an skbuff for * @size: Size of the buffer needed for the pool * @elements: Number of buffers to allocate */ -static void cvm_oct_free_hw_skbuff(int pool, int size, int elements) +static void cvm_oct_free_hw_skbuff(struct platform_device *pdev, + int pool, int size, int elements) { char *memory; =20 @@ -59,11 +62,11 @@ static void cvm_oct_free_hw_skbuff(int pool, int size, = int elements) } while (memory); =20 if (elements < 0) - pr_warn("Freeing of pool %u had too many skbuffs (%d)\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u had too many skbuffs (%d)\n", + pool, elements); else if (elements > 0) - pr_warn("Freeing of pool %u is missing %d skbuffs\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u is missing %d skbuffs\n", + pool, elements); } =20 /** @@ -107,11 +110,13 @@ static int cvm_oct_fill_hw_memory(int pool, int size,= int elements) =20 /** * cvm_oct_free_hw_memory - Free memory allocated by cvm_oct_fill_hw_memory + * @pdev: Platform device for logging * @pool: FPA pool to free * @size: Size of each buffer in the pool * @elements: Number of buffers that should be in the pool */ -static void cvm_oct_free_hw_memory(int pool, int size, int elements) +static void cvm_oct_free_hw_memory(struct platform_device *pdev, + int pool, int size, int elements) { char *memory; char *fpa; @@ -127,11 +132,11 @@ static void cvm_oct_free_hw_memory(int pool, int size= , int elements) } while (fpa); =20 if (elements < 0) - pr_warn("Freeing of pool %u had too many buffers (%d)\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u had too many buffers (%d)\n", + pool, elements); else if (elements > 0) - pr_warn("Warning: Freeing of pool %u is missing %d buffers\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u is missing %d buffers\n", + pool, elements); } =20 int cvm_oct_mem_fill_fpa(int pool, int size, int elements) @@ -145,10 +150,10 @@ int cvm_oct_mem_fill_fpa(int pool, int size, int elem= ents) return freed; } =20 -void cvm_oct_mem_empty_fpa(int pool, int size, int elements) +void cvm_oct_mem_empty_fpa(struct platform_device *pdev, int pool, int siz= e, int elements) { if (pool =3D=3D CVMX_FPA_PACKET_POOL) - cvm_oct_free_hw_skbuff(pool, size, elements); + cvm_oct_free_hw_skbuff(pdev, pool, size, elements); else - cvm_oct_free_hw_memory(pool, size, elements); + cvm_oct_free_hw_memory(pdev, pool, size, elements); } diff --git a/drivers/staging/octeon/ethernet-mem.h b/drivers/staging/octeon= /ethernet-mem.h index 692dcdb7154d..ff10ba4525ee 100644 --- a/drivers/staging/octeon/ethernet-mem.h +++ b/drivers/staging/octeon/ethernet-mem.h @@ -6,4 +6,7 @@ */ =20 int cvm_oct_mem_fill_fpa(int pool, int size, int elements); -void cvm_oct_mem_empty_fpa(int pool, int size, int elements); +struct platform_device; + +void cvm_oct_mem_empty_fpa(struct platform_device *pdev, int pool, int siz= e, + int elements); diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/eth= ernet.c index d85a9991faf6..31464ed63b58 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -958,12 +958,12 @@ static void cvm_oct_remove(struct platform_device *pd= ev) cvmx_ipd_free_ptr(); =20 /* Free the HW pools */ - cvm_oct_mem_empty_fpa(CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SI= ZE, num_packet_buffers); - cvm_oct_mem_empty_fpa(CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, num_packet_buffers); if (CVMX_FPA_OUTPUT_BUFFER_POOL !=3D CVMX_FPA_PACKET_POOL) - cvm_oct_mem_empty_fpa(CVMX_FPA_OUTPUT_BUFFER_POOL, + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_OUTPUT_BUFFER_POOL, CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE, 128); } =20 --=20 2.53.0 From nobody Sat Jun 13 02:03:56 2026 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.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 B8C003FF88A for ; Mon, 11 May 2026 15:12:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512353; cv=none; b=scLcYZiESOrx95Zg7AYlJMdOG9vNnckGqJJcyWLUYNpLd6lkC1989OLUqoRWw7H9ndclwuy4gv+bMRqq5bNpnzxEdLFEPjurRpgPgzlvm0pIWCaiTRFFbwNNHvUysVPcMEQEOjytmkFrUC3gksv3/1kjkp6WuWpAtrSaY1BH1DU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512353; c=relaxed/simple; bh=iQC233ObFQR/90YxKD9y724eQmyLFjIZfp3RWHo/ye8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EUw0U0/6Af/ozxqE8Vo9FVKCv0sHYRgpQVPFzsKiQlhHvuMZbKuuISyVCF9v/viq8q54YCQM5n7qT6hOQMkOOgaIuFWfcwfHj/Fe4AwckqXd5JzHk7v6GWQZibb1AXULDyB2lS8a0ImC6C2sYZoSqjefpCokZwOblHr+BHryOlE= 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=Ix82eUaJ; arc=none smtp.client-ip=209.85.216.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="Ix82eUaJ" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-3665640a55aso112048a91.0 for ; Mon, 11 May 2026 08:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778512352; x=1779117152; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vcvoM5yhRfse1l84YXFUTPi+JFMcUZ44W2hrGEOy/hI=; b=Ix82eUaJ95i9xKJZx8XI2V56GM6sT90rkb/40AuLkJCfWFgGpovO2jBBYji2BFfvNq CF+s8za4p1r7iyRJOJ8iA1ZscjlECWL7UGsg9d0+MfFLBpRGX4m6fWcGWca1+aS/7n2O 57wttxT8Fe6nJKrX5rYsykmzJmfj+ONluqyJ+xKgLXT8Gjbqu2+eyDekfIobShrFXa/E bsIucMPxrZ4dLINlL6Zj5COuj91mhVNCqjccmjymv0qkreqFMXXzyKxFfkvSIwFce23v arih9bwqvfup9RcHtHO1rwNvuLpmNYbN1rOJLUdnueNiQ+QUyKGTogukPpkE+M9obE4Q tnLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778512352; x=1779117152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vcvoM5yhRfse1l84YXFUTPi+JFMcUZ44W2hrGEOy/hI=; b=Pr6nutnC+zH/9AGkjFeuRauN4QkA/YBHXpxaW+y8WRa9kSLxOTiGgOkg3MYeGixZr3 4LCyypMVVi6WSjblKW/yI7Y3Zzhksc6bLq+y5bXLqgAfFuDXb8OhgvVqi2Db6VW51dRT +o2aVvFXVB5vhsU12Ax/pdCpvJFIC9i9+x5jhytAo2b/A5KOWlNz7S6Ta8bmgTy7Erdu QLcznab3+yALbG/qqcRRNkzsyiu/E2rV6Jt4FjIbwNXnEMPaT21zmb4VwY8q72WfKA8N w6z++JU5mS9vA7znXZ97zKRIoavEOyXnj71XlytGL7RQRx1aFVbrf2pHhNE2xP/L4nD3 XApA== X-Forwarded-Encrypted: i=1; AFNElJ+m7fy+HhdsvoQe8vHne54HQfIV6d+jwplg6/pJ9MCFFrTHFYKqoDTzaoKxxQ9JEcT0Ut1GXdz76kusQ7w=@vger.kernel.org X-Gm-Message-State: AOJu0YyUFNq06lY8dd1uWuOwlwCCagf07TXMvcdAXgPWLsBlr9eMeGHI d3IdH82/spo6+4LJD88GFkAtBD2qy2tCd3psChG4czs9D41OyWF/itoE X-Gm-Gg: Acq92OGvS+HIjZ2WutJOJ2gh1X07XicgfT4TRDR8yULV3lMNEp1rT9QEAX78nOUhngD ATBqU7S35AVEnp6BLbW12ohQRkuMEYEvtFkyRMGJATdlgH+YqKtfUq564ZN/uGQHoGUw/JCK/SF alAVphSx85VkLEIuQAv7KLiOC6MFBCqTr31yVm48ZjUR+naFVPhBu/TW+6fEIzdYH8jCFbNidvO s6f2InP+2PzsbZRTNsW5u799vDcap0vjG5/fqBVEeOCg8IzzS/pjlsfKeU8FB1vjv9Mky7vvw4q c7WVtYA+JF3PTBfJv7SR/VirnaTIUHIwAiOFPVscDlXdyjBcZXUrWTUtUlYsi+J7c/kueOhy3sJ zzoIGTx7f39qnoOCA7hf9J+wxuV0NIy/vrFExzdMrat5ouhaWx2ZM+1nhoS8eDgIyd6iVbVapp1 RerQ7zGZ5PgZXu4cdYOPCVvvCaiuth05/zn4WgA0ommkdb2twp1xSqtRahHLZLLQnmaLAv3b40s onGFncUQF5EahI9ID1Ga8FGms0d X-Received: by 2002:a17:90b:5808:b0:35f:c796:ca60 with SMTP id 98e67ed59e1d1-365acb8a956mr14322757a91.7.1778512351991; Mon, 11 May 2026 08:12:31 -0700 (PDT) Received: from fedora ([2401:4900:bffc:e9a7:49ca:5a41:a2bb:6936]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-367d683fa7asm9932363a91.10.2026.05.11.08.12.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 08:12:31 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org Cc: error27@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v7 2/3] staging: octeon: ethernet: replace pr_err and pr_info with dev_err and netdev_err Date: Mon, 11 May 2026 20:39:30 +0530 Message-ID: <20260511150931.93382-3-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260511150931.93382-1-ayushmukkanwar@gmail.com> References: <20260511150931.93382-1-ayushmukkanwar@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace pr_err() and pr_info() calls in cvm_oct_probe() with dev_err(), netdev_err(), and netdev_info() to include device information in log messages. Use dev_err() where no net_device is available (allocation failures), and netdev_err()/netdev_info() where a net_device exists. Signed-off-by: Ayush Mukkanwar --- drivers/staging/octeon/ethernet.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/eth= ernet.c index 31464ed63b58..eaa4f04093b8 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -685,7 +685,7 @@ static int cvm_oct_probe(struct platform_device *pdev) =20 pip =3D pdev->dev.of_node; if (!pip) { - pr_err("Error: No 'pip' in /aliases\n"); + dev_err(&pdev->dev, "No 'pip' in /aliases\n"); return -EINVAL; } =20 @@ -783,16 +783,16 @@ static int cvm_oct_probe(struct platform_device *pdev) dev->max_mtu =3D OCTEON_MAX_MTU - mtu_overhead; =20 if (register_netdev(dev) < 0) { - pr_err("Failed to register ethernet device for POW\n"); + netdev_err(dev, "Failed to register ethernet device for POW\n"); free_netdev(dev); } else { cvm_oct_device[CVMX_PIP_NUM_INPUT_PORTS] =3D dev; - pr_info("%s: POW send group %d, receive group %d\n", - dev->name, pow_send_group, - pow_receive_group); + netdev_info(dev, "POW send group %d, receive group %d\n", + pow_send_group, + pow_receive_group); } } else { - pr_err("Failed to allocate ethernet device for POW\n"); + dev_err(&pdev->dev, "Failed to allocate ethernet device for POW\n"); } } =20 @@ -812,8 +812,8 @@ static int cvm_oct_probe(struct platform_device *pdev) struct net_device *dev =3D alloc_etherdev(sizeof(struct octeon_ethernet)); if (!dev) { - pr_err("Failed to allocate ethernet device for port %d\n", - port); + dev_err(&pdev->dev, "Failed to allocate ethernet device for port %d\n", + port); continue; } =20 @@ -897,8 +897,8 @@ static int cvm_oct_probe(struct platform_device *pdev) if (!dev->netdev_ops) { free_netdev(dev); } else if (register_netdev(dev) < 0) { - pr_err("Failed to register ethernet device for interface %d, port %d\n= ", - interface, priv->port); + netdev_err(dev, "Failed to register ethernet device for interface %d, = port %d\n", + interface, priv->port); free_netdev(dev); } else { cvm_oct_device[priv->port] =3D dev; --=20 2.53.0 From nobody Sat Jun 13 02:03:56 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 615BD401A08 for ; Mon, 11 May 2026 15:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512359; cv=none; b=sQCndqlMeXayQfQ9b8LK8niXNiUVt0+e1tyMhYQe4pwPjanYWrB8jJiGncF7/t4KGOQ5tNu2sIRz7J8KQKomYqsadfgM5O6lIwfooAp/qga/SQsz8xuz3Wei0qIdK20poRkWYn+2duQuJ9i0gfz6md9wreRT1GwPF6VztfVmZf8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512359; c=relaxed/simple; bh=dibEfRJQAAQ6VviNvxQCfCopr2iEI6E0kMVAlYkOKNU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q1tP5eutpRVrQDcCUmBqNVTovGpYOO5FIcA1EQb4M3L4K+IsES3+ZOWgwGVU8MM8Z4FZHCZ8WbkKqR+9ZZC7XLVbEtP1Co4le7zHu1Iec/awiNhdBmFOEJg7vaRt6Or+gTbpICI+bssBaUiaKx739OPnKUTBdvoeBlp2JHPhqN8= 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=Gzx+YdoR; arc=none smtp.client-ip=209.85.216.52 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="Gzx+YdoR" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-367bb5e6a30so515916a91.1 for ; Mon, 11 May 2026 08:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778512358; x=1779117158; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1sBhKymfoa53+BWx1fdfpFgEaNftPVpdPmVnVKy6yRE=; b=Gzx+YdoRZIJimOQnLpEi7t0KB6ZnDEVyBAplv7oWAK2LpKY1INyqYbG98WMeSJKRjs sHRBTbI8ze7fYJt5hhShbw4OMZJyu/xu1bAJLy8fQ+766OvvraROjeqwuKFWiGTdxFYp HJ0lgBpIbzhmiJZCff/1qdAXrradcTSgC8YeJ4yTZsF2jLzeLM/maAPevEkuomWHrdZN nEUkr3Hw4OrEzULP42lpcXkeX0W4t9ZwRo1tl8nQsnyzooX0CxYhnptnJWTVBhRndUFr yY/NSHl22Mon8yoZ8sUeY8ZGfYjPjmi5GEnMfLcasvkyzHcSmmgz3BA2OCC6kfDmClhY o+SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778512358; x=1779117158; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1sBhKymfoa53+BWx1fdfpFgEaNftPVpdPmVnVKy6yRE=; b=EQdLz68ThgyqA6hRVEbzwNfEZth76mEjVqreVZmww5oehYX85/UXrrLt8lMPYAQsDd 6Vkon5GyXpy2310H7Q8+zKRRSylVjIHhkxv5JdR/ZkY9bO19KauziywkP6nIkwikEfq/ qw9aEvhIrNu4xkhmCQVbPSpu2ozyawrpQ46hmgrAAfV+rwQzrwkHNvjGxgaSEkoYCAz7 NY1xuZKi1Z4VC4v/ZewXKjJyGYXHj4LRLLECJrnescsSZYtCtKtoC61icmQsHFx9jjVE zDUyeUQ7B16n02JABmFPACL2foPw1KPsKDJoEJBTF5cipNwS6CT8DpWpl+TbwTBXbp5t E8jQ== X-Forwarded-Encrypted: i=1; AFNElJ+123EgqB9NSasuBsVcCzpgYYSr6ZN4QObp6scpDxKO2d83xFYb6niyM3mXfrY71MdKxXYGMyE7en+Rwtc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyk3SBW1ZEXk8m66tTrEH/uBF9d0CwMotBovW+EKumXauZ+sqiI U/7o9TTZ0ku3DRBnVVHIohuBInjaEumfgGCq0IH/u42M12Qy4zpCQznb X-Gm-Gg: Acq92OHgtA21J1Pw8pSMELVfrUZ/Kgn3cyXWnpfPRDM9YPB2MAwPDpC7+J2zRwkItJS efG9wYmKOdVhQaGxjIJ8BuMD3HqDZRYVlN3Us+320FxX+QSqr90yS9lFnTbY5aOcGsnWRYY9RsA YpcgJD6Bx/R53tapvD0gdkPAaCSqyJuuTUYqDHKyaFXttJr3XtGoJLmUH+8AnTDDlhE4aE0e6D5 gtrGuXJkuDsO8QhlYZjQXsT2mpfXVPYWywc+HlHk1apspMiPCkMHqPu4joleSTp4np4xM0OgOs5 6yhABFdoXsFSyJKzDkUe6vsqhGQlsivQcDd+SEsAunfSlWFN441yTtJI8GQrqI41zMvvJEkkPO2 K0cYUqE3CkYmMV5Jtvr8IZ43YdIVv5mGj0KS7ie4N8iscQQStzR8bv6hUSylJgWtGBW0Iho+NIk WlnhEbOTuGSsvijM81lgCLd1Z3qV/M/fPCi0FWaA4M5TQO4axkiurd6kiIlozCglo9FPrMMxYIS wEZRgN27Esv2h+wTg== X-Received: by 2002:a17:90b:41:b0:366:3b34:774e with SMTP id 98e67ed59e1d1-3663b3478a5mr8619117a91.4.1778512357528; Mon, 11 May 2026 08:12:37 -0700 (PDT) Received: from fedora ([2401:4900:bffc:e9a7:49ca:5a41:a2bb:6936]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-367d683fa7asm9932363a91.10.2026.05.11.08.12.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 08:12:37 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org Cc: error27@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v7 3/3] staging: octeon: replace pr_warn with dev_warn in fill and rx paths Date: Mon, 11 May 2026 20:39:31 +0530 Message-ID: <20260511150931.93382-4-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260511150931.93382-1-ayushmukkanwar@gmail.com> References: <20260511150931.93382-1-ayushmukkanwar@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add struct platform_device parameter to cvm_oct_fill_hw_memory, cvm_oct_mem_fill_fpa, cvm_oct_rx_refill_pool and cvm_oct_rx_initialize to support device-aware logging. Replace pr_warn with dev_warn using &pdev->dev. To avoid passing these parameters through global state, introduce struct octeon_ethernet_platform to hold per-device state including the rx_refill_work and the oct_rx_group array. This ensures all receive group state and workers are correctly associated with the platform device. Define struct oct_rx_group and struct octeon_ethernet_platform in octeon-ethernet.h so they are shared across compilation units. Signed-off-by: Ayush Mukkanwar --- drivers/staging/octeon/ethernet-mem.c | 12 +++--- drivers/staging/octeon/ethernet-mem.h | 3 +- drivers/staging/octeon/ethernet-rx.c | 49 ++++++++++++------------ drivers/staging/octeon/ethernet-rx.h | 11 ++++-- drivers/staging/octeon/ethernet.c | 37 +++++++++++------- drivers/staging/octeon/octeon-ethernet.h | 14 +++++++ 6 files changed, 78 insertions(+), 48 deletions(-) diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon= /ethernet-mem.c index af79b2bdac27..68c3ef984e56 100644 --- a/drivers/staging/octeon/ethernet-mem.c +++ b/drivers/staging/octeon/ethernet-mem.c @@ -71,13 +71,15 @@ static void cvm_oct_free_hw_skbuff(struct platform_devi= ce *pdev, =20 /** * cvm_oct_fill_hw_memory - fill a hardware pool with memory. + * @pdev: Platform device for logging * @pool: Pool to populate * @size: Size of each buffer in the pool * @elements: Number of buffers to allocate * * Returns the actual number of buffers allocated. */ -static int cvm_oct_fill_hw_memory(int pool, int size, int elements) +static int cvm_oct_fill_hw_memory(struct platform_device *pdev, int pool, = int size, + int elements) { char *memory; char *fpa; @@ -96,8 +98,8 @@ static int cvm_oct_fill_hw_memory(int pool, int size, int= elements) */ memory =3D kmalloc(size + 256, GFP_ATOMIC); if (unlikely(!memory)) { - pr_warn("Unable to allocate %u bytes for FPA pool %d\n", - elements * size, pool); + dev_warn(&pdev->dev, "Unable to allocate %u bytes for FPA pool %d\n", + elements * size, pool); break; } fpa =3D (char *)(((unsigned long)memory + 256) & ~0x7fUL); @@ -139,14 +141,14 @@ static void cvm_oct_free_hw_memory(struct platform_de= vice *pdev, pool, elements); } =20 -int cvm_oct_mem_fill_fpa(int pool, int size, int elements) +int cvm_oct_mem_fill_fpa(struct platform_device *pdev, int pool, int size,= int elements) { int freed; =20 if (pool =3D=3D CVMX_FPA_PACKET_POOL) freed =3D cvm_oct_fill_hw_skbuff(pool, size, elements); else - freed =3D cvm_oct_fill_hw_memory(pool, size, elements); + freed =3D cvm_oct_fill_hw_memory(pdev, pool, size, elements); return freed; } =20 diff --git a/drivers/staging/octeon/ethernet-mem.h b/drivers/staging/octeon= /ethernet-mem.h index ff10ba4525ee..9279bb0de2db 100644 --- a/drivers/staging/octeon/ethernet-mem.h +++ b/drivers/staging/octeon/ethernet-mem.h @@ -5,8 +5,9 @@ * Copyright (c) 2003-2007 Cavium Networks */ =20 -int cvm_oct_mem_fill_fpa(int pool, int size, int elements); struct platform_device; =20 +int cvm_oct_mem_fill_fpa(struct platform_device *pdev, int pool, int size, + int elements); void cvm_oct_mem_empty_fpa(struct platform_device *pdev, int pool, int siz= e, int elements); diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/= ethernet-rx.c index d0b43d50b83c..cd36b5ba6f6c 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c @@ -5,6 +5,7 @@ * Copyright (c) 2003-2010 Cavium Networks */ =20 +#include #include #include #include @@ -31,12 +32,6 @@ =20 static atomic_t oct_rx_ready =3D ATOMIC_INIT(0); =20 -static struct oct_rx_group { - int irq; - int group; - struct napi_struct napi; -} oct_rx_group[16]; - /** * cvm_oct_do_interrupt - interrupt handler. * @irq: Interrupt number. @@ -397,7 +392,7 @@ static int cvm_oct_poll(struct oct_rx_group *rx_group, = int budget) /* Restore the scratch area */ cvmx_scratch_write64(CVMX_SCR_SCRATCH, old_scratch); } - cvm_oct_rx_refill_pool(0); + cvm_oct_rx_refill_pool(rx_group->pdev, 0); =20 return rx_count; } @@ -434,24 +429,28 @@ static int cvm_oct_napi_poll(struct napi_struct *napi= , int budget) */ void cvm_oct_poll_controller(struct net_device *dev) { + struct platform_device *pdev =3D to_platform_device(dev->dev.parent); + struct octeon_ethernet_platform *plat =3D platform_get_drvdata(pdev); int i; =20 if (!atomic_read(&oct_rx_ready)) return; =20 - for (i =3D 0; i < ARRAY_SIZE(oct_rx_group); i++) { + for (i =3D 0; i < ARRAY_SIZE(plat->rx_group); i++) { if (!(pow_receive_groups & BIT(i))) continue; =20 - cvm_oct_poll(&oct_rx_group[i], 16); + cvm_oct_poll(&plat->rx_group[i], 16); } } #endif =20 -void cvm_oct_rx_initialize(void) +void cvm_oct_rx_initialize(struct platform_device *pdev) { int i; struct net_device *dev_for_napi =3D NULL; + struct octeon_ethernet_platform *plat =3D platform_get_drvdata(pdev); + struct oct_rx_group *rx_group =3D plat->rx_group; =20 for (i =3D 0; i < TOTAL_NUMBER_OF_PORTS; i++) { if (cvm_oct_device[i]) { @@ -463,27 +462,28 @@ void cvm_oct_rx_initialize(void) if (!dev_for_napi) panic("No net_devices were allocated."); =20 - for (i =3D 0; i < ARRAY_SIZE(oct_rx_group); i++) { + for (i =3D 0; i < ARRAY_SIZE(plat->rx_group); i++) { int ret; =20 if (!(pow_receive_groups & BIT(i))) continue; =20 - netif_napi_add_weight(dev_for_napi, &oct_rx_group[i].napi, + netif_napi_add_weight(dev_for_napi, &rx_group[i].napi, cvm_oct_napi_poll, rx_napi_weight); - napi_enable(&oct_rx_group[i].napi); + napi_enable(&rx_group[i].napi); =20 - oct_rx_group[i].irq =3D OCTEON_IRQ_WORKQ0 + i; - oct_rx_group[i].group =3D i; + rx_group[i].irq =3D OCTEON_IRQ_WORKQ0 + i; + rx_group[i].group =3D i; + rx_group[i].pdev =3D pdev; =20 /* Register an IRQ handler to receive POW interrupts */ - ret =3D request_irq(oct_rx_group[i].irq, cvm_oct_do_interrupt, 0, - "Ethernet", &oct_rx_group[i].napi); + ret =3D request_irq(rx_group[i].irq, cvm_oct_do_interrupt, 0, + "Ethernet", &rx_group[i].napi); if (ret) panic("Could not acquire Ethernet IRQ %d\n", - oct_rx_group[i].irq); + rx_group[i].irq); =20 - disable_irq_nosync(oct_rx_group[i].irq); + disable_irq_nosync(rx_group[i].irq); =20 /* Enable POW interrupt when our port has at least one packet */ if (OCTEON_IS_MODEL(OCTEON_CN68XX)) { @@ -515,16 +515,17 @@ void cvm_oct_rx_initialize(void) /* Schedule NAPI now. This will indirectly enable the * interrupt. */ - napi_schedule(&oct_rx_group[i].napi); + napi_schedule(&rx_group[i].napi); } atomic_inc(&oct_rx_ready); } =20 -void cvm_oct_rx_shutdown(void) +void cvm_oct_rx_shutdown(struct platform_device *pdev) { + struct octeon_ethernet_platform *plat =3D platform_get_drvdata(pdev); int i; =20 - for (i =3D 0; i < ARRAY_SIZE(oct_rx_group); i++) { + for (i =3D 0; i < ARRAY_SIZE(plat->rx_group); i++) { if (!(pow_receive_groups & BIT(i))) continue; =20 @@ -535,8 +536,8 @@ void cvm_oct_rx_shutdown(void) cvmx_write_csr(CVMX_POW_WQ_INT_THRX(i), 0); =20 /* Free the interrupt handler */ - free_irq(oct_rx_group[i].irq, &oct_rx_group[i].napi); + free_irq(plat->rx_group[i].irq, &plat->rx_group[i].napi); =20 - netif_napi_del(&oct_rx_group[i].napi); + netif_napi_del(&plat->rx_group[i].napi); } } diff --git a/drivers/staging/octeon/ethernet-rx.h b/drivers/staging/octeon/= ethernet-rx.h index ff6482fa20d6..6093694326cb 100644 --- a/drivers/staging/octeon/ethernet-rx.h +++ b/drivers/staging/octeon/ethernet-rx.h @@ -5,11 +5,14 @@ * Copyright (c) 2003-2007 Cavium Networks */ =20 +struct platform_device; + void cvm_oct_poll_controller(struct net_device *dev); -void cvm_oct_rx_initialize(void); -void cvm_oct_rx_shutdown(void); +void cvm_oct_rx_initialize(struct platform_device *pdev); +void cvm_oct_rx_shutdown(struct platform_device *pdev); =20 -static inline void cvm_oct_rx_refill_pool(int fill_threshold) +static inline void cvm_oct_rx_refill_pool(struct platform_device *pdev, + int fill_threshold) { int number_to_free; int num_freed; @@ -20,7 +23,7 @@ static inline void cvm_oct_rx_refill_pool(int fill_thresh= old) if (number_to_free > fill_threshold) { cvmx_fau_atomic_add32(FAU_NUM_PACKET_BUFFERS_TO_FREE, -number_to_free); - num_freed =3D cvm_oct_mem_fill_fpa(CVMX_FPA_PACKET_POOL, + num_freed =3D cvm_oct_mem_fill_fpa(pdev, CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, number_to_free); if (num_freed !=3D number_to_free) { diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/eth= ernet.c index eaa4f04093b8..f3fa221f452e 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -104,11 +104,10 @@ struct net_device *cvm_oct_device[TOTAL_NUMBER_OF_POR= TS]; =20 u64 cvm_oct_tx_poll_interval; =20 -static void cvm_oct_rx_refill_worker(struct work_struct *work); -static DECLARE_DELAYED_WORK(cvm_oct_rx_refill_work, cvm_oct_rx_refill_work= er); - static void cvm_oct_rx_refill_worker(struct work_struct *work) { + struct octeon_ethernet_platform *plat =3D container_of(work, + struct octeon_ethernet_platform, rx_refill_work.work); /* * FPA 0 may have been drained, try to refill it if we need * more than num_packet_buffers / 2, otherwise normal receive @@ -116,10 +115,10 @@ static void cvm_oct_rx_refill_worker(struct work_stru= ct *work) * could be received so cvm_oct_napi_poll would never be * invoked to do the refill. */ - cvm_oct_rx_refill_pool(num_packet_buffers / 2); + cvm_oct_rx_refill_pool(plat->pdev, num_packet_buffers / 2); =20 if (!atomic_read(&cvm_oct_poll_queue_stopping)) - schedule_delayed_work(&cvm_oct_rx_refill_work, HZ); + schedule_delayed_work(&plat->rx_refill_work, HZ); } =20 static void cvm_oct_periodic_worker(struct work_struct *work) @@ -138,16 +137,16 @@ static void cvm_oct_periodic_worker(struct work_struc= t *work) schedule_delayed_work(&priv->port_periodic_work, HZ); } =20 -static void cvm_oct_configure_common_hw(void) +static void cvm_oct_configure_common_hw(struct platform_device *pdev) { /* Setup the FPA */ cvmx_fpa_enable(); - cvm_oct_mem_fill_fpa(CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, + cvm_oct_mem_fill_fpa(pdev, CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZ= E, num_packet_buffers); - cvm_oct_mem_fill_fpa(CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, + cvm_oct_mem_fill_fpa(pdev, CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, num_packet_buffers); if (CVMX_FPA_OUTPUT_BUFFER_POOL !=3D CVMX_FPA_PACKET_POOL) - cvm_oct_mem_fill_fpa(CVMX_FPA_OUTPUT_BUFFER_POOL, + cvm_oct_mem_fill_fpa(pdev, CVMX_FPA_OUTPUT_BUFFER_POOL, CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE, 1024); =20 #ifdef __LITTLE_ENDIAN @@ -678,6 +677,15 @@ static int cvm_oct_probe(struct platform_device *pdev) int qos; struct device_node *pip; int mtu_overhead =3D ETH_HLEN + ETH_FCS_LEN; + struct octeon_ethernet_platform *plat; + + plat =3D devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL); + if (!plat) + return -ENOMEM; + + plat->pdev =3D pdev; + INIT_DELAYED_WORK(&plat->rx_refill_work, cvm_oct_rx_refill_worker); + platform_set_drvdata(pdev, plat); =20 #if IS_ENABLED(CONFIG_VLAN_8021Q) mtu_overhead +=3D VLAN_HLEN; @@ -689,7 +697,7 @@ static int cvm_oct_probe(struct platform_device *pdev) return -EINVAL; } =20 - cvm_oct_configure_common_hw(); + cvm_oct_configure_common_hw(pdev); =20 cvmx_helper_initialize_packet_io_global(); =20 @@ -912,28 +920,29 @@ static int cvm_oct_probe(struct platform_device *pdev) } =20 cvm_oct_tx_initialize(); - cvm_oct_rx_initialize(); + cvm_oct_rx_initialize(pdev); =20 /* * 150 uS: about 10 1500-byte packets at 1GE. */ cvm_oct_tx_poll_interval =3D 150 * (octeon_get_clock_rate() / 1000000); =20 - schedule_delayed_work(&cvm_oct_rx_refill_work, HZ); + schedule_delayed_work(&plat->rx_refill_work, HZ); =20 return 0; } =20 static void cvm_oct_remove(struct platform_device *pdev) { + struct octeon_ethernet_platform *plat =3D platform_get_drvdata(pdev); int port; =20 cvmx_ipd_disable(); =20 atomic_inc_return(&cvm_oct_poll_queue_stopping); - cancel_delayed_work_sync(&cvm_oct_rx_refill_work); + cancel_delayed_work_sync(&plat->rx_refill_work); =20 - cvm_oct_rx_shutdown(); + cvm_oct_rx_shutdown(pdev); cvm_oct_tx_shutdown(); =20 cvmx_pko_disable(); diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/oct= eon/octeon-ethernet.h index a6140705706f..0ac430db1e6e 100644 --- a/drivers/staging/octeon/octeon-ethernet.h +++ b/drivers/staging/octeon/octeon-ethernet.h @@ -11,6 +11,7 @@ #ifndef OCTEON_ETHERNET_H #define OCTEON_ETHERNET_H =20 +#include #include #include =20 @@ -74,6 +75,19 @@ struct octeon_ethernet { struct device_node *of_node; }; =20 +struct oct_rx_group { + int irq; + int group; + struct napi_struct napi; + struct platform_device *pdev; +}; + +struct octeon_ethernet_platform { + struct platform_device *pdev; + struct delayed_work rx_refill_work; + struct oct_rx_group rx_group[16]; +}; + int cvm_oct_free_work(void *work_queue_entry); =20 int cvm_oct_rgmii_open(struct net_device *dev); --=20 2.53.0