From nobody Sun Jun 14 01:35:13 2026 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 3F9753E5EC1 for ; Mon, 4 May 2026 17:44:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916663; cv=none; b=MCp10W9xEyG0c0/Ig/tsyzgOQGX1wZ1oMT0MoKJ7QO++x1+MInkvaBc+0KI/DWKaBPtwhW4jmuBGxOsTvkc5BFMSttnNdJvSG8sDleQ/adsCrqx2Ry8SnyraVFpuVvU6wPMYruS6fM/bKHO2fAs4tiQxJkuJvsmAbgWXKWKslt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916663; c=relaxed/simple; bh=UVPIF+sdrfM6NBHHlN4FeC/sqESWRpaMVlGigUdv/SY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q+YAhkpFhuR945yFyViypQM9g0qXNH7jJ6boS95ZgWusOiKFhgudI70qTwLcb63Rm6QA1SJjOgjxetU+fAGNitEtnberNm9o67yUG3YnahH2eEvAcTNE3v5LpAlK2+uV90o8UOBus77ecaISKr7feZGdYAayCZcCR1xTkrsBxas= 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=sWkRG4KY; arc=none smtp.client-ip=209.85.210.181 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="sWkRG4KY" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-8296e257735so300543b3a.1 for ; Mon, 04 May 2026 10:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777916662; x=1778521462; 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=/3r7HpB0/DU/QpLYQMcgaK+OCH5zehE0tbXldsuLb0A=; b=sWkRG4KYJYpyxwvyIQCYlbss5rjHo8QYN/X/JpRbnRGbnrnRoT6Hxr2BVGRrPuE6cb jfWxtwM3m1QuE9WJ3SYm7ygSppvxXjuwZNZ78eAxeQqrdn7PXNNupbqeSF5vnSkeNqw3 6XbRNWdp/mBami6JMCEKpPlclhMWeW68qWyzeRNq7n/KSLKngJc7KZ/Z1uPRJRXLuHPG Vv8Jq8NmLPg4DjsbflXdMAclOesLTDuJO+2U6RNLHxDl9WvIWCM/jMlGB8zeswE63wtT COY21CVhbzk1BE5q+//ToPuh7QdW1igEXdfvgOiZCVAh5ZzS2pU65gbVHcnTdGa1Rs4t 1wpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777916662; x=1778521462; 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=/3r7HpB0/DU/QpLYQMcgaK+OCH5zehE0tbXldsuLb0A=; b=QHQbskchJNU7jmO7a9UhAZj3ldXE2p+YZTJBdid0iFRgZsfZaFNWtWKmfXRWL43INm +UF0JwVr9q4oEogyxWS2FRr3xs3TAZUAWqY4nORjxsaIpw9OT7AU5xB3eKGbMufqMiIi /rB1hEEtWgDbeHtCpFrdHqxDzvlPCMBqGGE2MKQLxbhQwoOxtj2Tuw/6yUeeRmBDgiDT 0kHqMTcoYsx5wP0au+ix6gwucZkH7qDWy/Ngyx4ls4k+d8GupgzOgl423VJPZY88WpzS bta6nLLASpknYzyfO83cyxgBGkBQAVt7Xp43HgEBykPmK1wVbpWKYWPSRZHbitO6jJub NozA== X-Forwarded-Encrypted: i=1; AFNElJ844ufHAOq2c/VZxWy0Vkh5QaRuyfXTURyqZaCQZrTUZxaqD1b6LaHfiPI6yXpjbYuoKz6GM2Q0vyPmJP8=@vger.kernel.org X-Gm-Message-State: AOJu0YxiLkb+/UeszxKuMS9Xo3/v3vHK9moSrtgw5762c7q6+/zbeZiY onrQuQsvsl7LnYNKpz3Ndqw7loXSlvHy08soQDDSdewS74CdzZB39lBLAFIWoQ== X-Gm-Gg: AeBDieuZd9ynFO0bQxemHDra6cEF0vfKatnFlVd6BDDroxq1xoKvfIx2dzSnlzXUJGz LEnXynzdElNY6/YPH/oqVwXZV90TvZ7sKzNSzOyZogU1/EfFByo3E1v6s8knU/GiLrvIGrIzf2T +Q76sznqzWpTN2/sIQTgr8YmOhBgMQrbPfBQoZd118Rggc1xdKFqPa5PS/i/ZbGQ7dJG+Or+LzB TQ9Jo1tLpbEfCxT4UpF2pf7JSJRkcBQkfNgiCeuvVLPgz6wCskcR5m7EqROPaq6q5iK0hckmUQg EuOm6S94DHo/3Ol9yQx+vuzv+lGD2bNNeXcUC6nmE7XPCNP7/5nZ5GpFeObwiNw6x45RZ/VIgi2 JtIJGTrl1wu7ctnAj7lhIEKqSUL24Y7SyIXRgweeWIOH6CypUKBjeNql8PU0wR20DNOIXmmKZNM SJFQgmg2wYtW8g+V92DesfI40kj5iFhx5uaYizUP2GjzbjgERQpmw39YgZ6llybZ9nHYH899LIL 35Bd4G/1BqRvYLuTB3AoDlJMec= X-Received: by 2002:aa7:88c8:0:b0:837:42a6:58a8 with SMTP id d2e1a72fcca58-83742b5accdmr2731386b3a.2.1777916661377; Mon, 04 May 2026 10:44:21 -0700 (PDT) Received: from fedora ([2401:4900:a3fd:82cb:c080:4c49:655c:41ba]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83707fab756sm5923388b3a.44.2026.05.04.10.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 10:44:21 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org, dan.carpenter@linaro.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v6 1/3] staging: octeon: ethernet-mem: replace pr_warn with dev_warn in free functions Date: Mon, 4 May 2026 23:11:44 +0530 Message-ID: <20260504174146.117026-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260504174146.117026-1-ayushmukkanwar@gmail.com> References: <20260504174146.117026-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..11036c6eb36f 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 eadb74fc14c8..badf5ceaf5b4 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 Sun Jun 14 01:35:13 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 466B63E6DC1 for ; Mon, 4 May 2026 17:44:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916666; cv=none; b=iwqwY9Fb0Tgld9HNTonUl6WDCv3Zt79oLsgCQWHB0zUBXAHPa5P0cIbbp8kOUvY8Rl/uvSOoHPs/0i8hhIOnFYEgo6rnj6zmyL7rWty3NZXL/SXl/zA6qBq7B01ETSMAP4PimPP6Iff07ym2nH5X+E9ptjI9SUGx5TTYz/YHy+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916666; c=relaxed/simple; bh=YYvpgqkGcESzblP9Rg0okEYFQUZWUrc2vIkh5JgCDog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ceS/rS4AICRIRuYo+0mEJOR1HNXWW6V5thMxM2E3dyEvuwzkCgwpvN+yHmpbKQqKX9zxc2R3bSbQyV9bIp05b7vpvURVd+a/xG1wZNopFW5l9VwOIIoxtwB59JAOW0sy9+dcO4wYkUd52K/m8GUp6hP1hO3KI3POWMj4ly7saFU= 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=PRdfW5vI; arc=none smtp.client-ip=209.85.210.171 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="PRdfW5vI" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-8385cbaab7bso137448b3a.1 for ; Mon, 04 May 2026 10:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777916665; x=1778521465; 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=S9NrbK7+XvJgPClZ1GqtV5IQNzES6CwjBK/rud9MZ0Q=; b=PRdfW5vI6OIRJHX/k7MdQyUXtWIsLulJGR0yXguJIZQglnxFhNmF/k/EZWc3JVo39W cMgxcpfCBE85558KEd2ZRbdC3E1mbGDP6Fp4siHqWpEHzkJZlYxYXMZ/BXIrTOsku0iD 0yQrxEKYvoly6TrzHSY26tUg/0sHkoPI4z4IA8tlUJx3m58b/FZWtacX8ew7AAnQQ5l9 OnOVb2AQt/2u5QgH4qdwgtuJcXpHYSDZQLnfOf+uSi08kHePlTcsawNgaP8Xbiy/Jcpi JNcJJeRTtv+dx7gZKaClNTGoMTYjg/TFPdGqjm+FghrTgL9jWBp2lqO9Ir5V2Yc7M+jR Jqqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777916665; x=1778521465; 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=S9NrbK7+XvJgPClZ1GqtV5IQNzES6CwjBK/rud9MZ0Q=; b=K3MMxUcIBfwmOBxjtdumImv5POp4g0Xp9DMyWcmIWXiOaO5Krxvv5oHFI7daqyo2OH A/bc0opR2RZYg5gV5TA1rW504l/didL52CA5nE30LjGouJSdEUdKcK1OkIFb/PFNFziR 94w3Ebee104tfYKSFeNTuS8xXfwwSezdK389imOaU5UNhf5cwKjPBPjAsC3RzQo/gmh8 fYf6urcEn4z1N4WzJllHjYYrz9bJPQvIQ8VzUjUn9U46sqKtMUxq+k8Os2Ttl5RSxNW1 fJYY8Cw/5YsTBQrTBoG15l1elPz8xPIE4khOSjIYSuohjgj3INxm3So8pFuane8WGLj8 dyxQ== X-Forwarded-Encrypted: i=1; AFNElJ+Tvbr2lGQJwHvTpPAaKQ0i+WusOoTEwhfRje9/VS4+bAFLnLnf3UY1rsh8GPICyDFMPnK0Xojr0BkFEig=@vger.kernel.org X-Gm-Message-State: AOJu0YyE7r4EFBPIzgrfePF/8U9jZXB63ZuaFhUYOxxXxEIuTSOc9z/h NOfv4I6ZdariFi4oFAUrjmIZZtVYQr63GQLoWXLzl67lhayz87yNzbPx6Cr9AQ== X-Gm-Gg: AeBDiets6QLhLGNzqYbkgEaiA77AsNezodyNNAVzKU7tyCjGCW0f3YJfV+kXzPyLn2H bUFA7Mk2GYlBc55F/bBriNnw92vZ/pT/RoSa13tcJO9HBpVTMiNtr9ARK2fAyMe7UvuhalUuBBh Hdx/Y8/C+VYmpYERXwLqV+nNlV/WHcIAnQ08rZWgBrb7ynsy43QG9ljsNmWdOAXoeTw2BAQrU8B PKR9a+CibSmCM8H7H2rQhiP67bQQFBNNw5EPir4xpccLaK0pA61kFrIzG88dvOjcYqkqnaN2FSc +Ok7wE8YNFpOK/v3AzHJ9T0rgjGjq3FA7lklMiAADrS+9qJO4AJUvxK9lQ6ZsrCExuDOg6sFLQ5 HPRHj/ZZUTc7Dv6u1iRMihZDMN/WxmeHdMRjBoRU0m9cTpgJZ7rqULEh2m2XPTaIfiMZP4iISLR i75dNj3yJf1+tzgn8lGAWnwBbOa4T0a5KMb2Hmif5DzKim3rkPpUpMrSN/XkYYUb8Yy4lJfuLvI 6SWbFSfiwPfJS7/dceGaHyJeQA= X-Received: by 2002:a05:6a21:a510:b0:3a3:2819:5d41 with SMTP id adf61e73a8af0-3a7f1c8590amr6200524637.5.1777916664548; Mon, 04 May 2026 10:44:24 -0700 (PDT) Received: from fedora ([2401:4900:a3fd:82cb:c080:4c49:655c:41ba]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83707fab756sm5923388b3a.44.2026.05.04.10.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 10:44:24 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org, dan.carpenter@linaro.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v6 2/3] staging: octeon: ethernet: replace pr_err and pr_info with dev_err and netdev_err Date: Mon, 4 May 2026 23:11:45 +0530 Message-ID: <20260504174146.117026-3-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260504174146.117026-1-ayushmukkanwar@gmail.com> References: <20260504174146.117026-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 badf5ceaf5b4..27c282ef64dd 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 Sun Jun 14 01:35:13 2026 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 5F9083E8C46 for ; Mon, 4 May 2026 17:44:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916671; cv=none; b=dfRbzebGOAprCu7Mx5QsJIW9Iq7LFTrflYUjewfph+WS/VaWQfuG/FkhQMHoQwEYWw0vpOBBVKnBlfO2cicgwMcns+pclZTl55k8s4UreK60csLhPp1ww/1fqLGBU9qqMM7ZrQKBW2b716xgBaWVWW/W7E5zSsJ9z2XJkVsh/Ys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916671; c=relaxed/simple; bh=ljXu06prXqeM8aN+pDkYcTLkd9uj3USoTErBoJjULMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CR3uBUOK2Lpwk+6pcOHOER6XzWcYZpb0kvt/VO4a/uGEehxLJoUm7punGman9jaKKuVdmwfAMP4xTuuJpyqD/DEalijGwl56XVO7bkArgf/uoF6Eph/iERaYa87St9o/sQYQXajj1aqNz+JixM3+41vxsUTFDgKTKzyXT/n/X90= 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=mGpu629E; arc=none smtp.client-ip=209.85.216.44 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="mGpu629E" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-364d13df3ccso616821a91.3 for ; Mon, 04 May 2026 10:44:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777916669; x=1778521469; 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=8guKFW09aWcQMysukiayjmHpzsRdkyFcerbXkZ1AaIE=; b=mGpu629ExEka+TDXY2LhEWthrhfvlNhThWIKrhg2+6TDmcqL2GyLqLFM0KRjWzCDDf rytlHcYIT4KKDvzSwQPvLOEYajo+FPnbSnz3MP3Aa1XGPPwPxokCHJKoAE2Q9pAqr/pO v9bnCMjBfElVw/lKtjHChSWveE900TWKaHwwbQfSmZF3qC6JBmKvfFyhgX5oyxMqLylC GgXfKWL8Eh2AvqBnkSUyV3Er+XwTRc67KLcR+H/uql94RGnxI/mjzPl7rK16gQc84NTp vDWO+z/LW6kMwamuTK7foUAokwvX3bnLlYZDjb48E5LDcbcELXotsmWqaRIgVrUmJX1D Jkmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777916669; x=1778521469; 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=8guKFW09aWcQMysukiayjmHpzsRdkyFcerbXkZ1AaIE=; b=e8VZkAMXfsCkkhd1RjCVd1AdgkqOo/4wVSIfv6dEGcUCRLaKZqxtRgUq4ADL/3Jc2R 82AxEdQ1R1btWfkkXzl/xy32WovjAu6fVwfaYOLiBQ4fct+MBpiSSZ/F3UpQmMKZMDCj aeJvqcp9wJmCDqNUqPxtlrVf2uOIG5bfNrZMBqjJXQcFW1gzqGOZ0qpbZ5rmlj0/CluZ PWDDFha1zv0MJB5Dk4bPk4cKuws+nDYDH3HaSDMhJADNL8f9uWk3D3GzlKA0uKbdiFfa gG5qrgxttjuzN+3Ur57Iepayb/eUUpNoLPTGLR8cQBKwRj5XLU44Kpn70434zt68k+Sw B/wA== X-Forwarded-Encrypted: i=1; AFNElJ/m/ARWXV2zdCVkl/5kkjD8cyiBIxDVJjJCiTWz6AkR0sUIHPREkViV+Ccnam626YgMbbC0IP5uTFGW0HI=@vger.kernel.org X-Gm-Message-State: AOJu0YyT2qcpLeffiIeMUx8w1ScdOlZbJ7NnZPVRnD5DeWcrXN2rTHvw 0GIRQ1KF9aBEyOfYofQR2v3hBDNahzCLb3i3hfo0lqD8ulMDJ6Wy6Hqa X-Gm-Gg: AeBDies2VW1sllnYm0AWhw1VsU5QK8NeNNlQC0tq+SK5IYozSj0b1aksvNYOIEPDlEQ AK1FUfXnNQdML4f6gjnClZqSZvA4ZJlCuza0Z5tvvKb1Mw5rOF0yZ8h0cyLC0DpWhXxMZErPI8Y dqMSqSGavf08wGk/hGkyhu6NbDhE7s3WdRcA4Kf4VQhPL97U+Z8Vt27FpGQtgkZ30l9y6L/9lqG 5C2NIDSBMUsdX+pOH86+VhIC/zpcifOb3KblGZ0/VDvg1ca8kOmKdOHhOppVF5G8mjJcz4DBnpS XAi264oyLIGocDSvDqB+8JyXIgdhC7PDRKCDOaQ4sWKiFzcUAwWqfTDhpt31row0TtBZW9XrXeA KpnALJYY7Dy34j3SONmpYG12JXMMPpM9ebqab18cF5RaBEMPvn4k41RGsWL+LhRCXHGyqXVRiHp qybNIuoWDqI5XXHc59Ph/88o2E+RBTTrFI2qX/TRXBJNYfbuS7K2Y0Er3rpciXia1fpf4VR1m+o vElMrLAqNLk7fwOncsjfxfLMeg= X-Received: by 2002:a05:6a21:3202:b0:38b:d93f:bbf5 with SMTP id adf61e73a8af0-3a7f177d8b1mr5873992637.0.1777916668662; Mon, 04 May 2026 10:44:28 -0700 (PDT) Received: from fedora ([2401:4900:a3fd:82cb:c080:4c49:655c:41ba]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83707fab756sm5923388b3a.44.2026.05.04.10.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 10:44:28 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org, dan.carpenter@linaro.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v6 3/3] staging: octeon: replace pr_warn with dev_warn in fill path and refactor rx group to per-device state Date: Mon, 4 May 2026 23:11:46 +0530 Message-ID: <20260504174146.117026-4-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260504174146.117026-1-ayushmukkanwar@gmail.com> References: <20260504174146.117026-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 | 16 ++++---- 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 | 38 +++++++++++------- drivers/staging/octeon/octeon-ethernet.h | 14 +++++++ 6 files changed, 81 insertions(+), 50 deletions(-) diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon= /ethernet-mem.c index 11036c6eb36f..68c3ef984e56 100644 --- a/drivers/staging/octeon/ethernet-mem.c +++ b/drivers/staging/octeon/ethernet-mem.c @@ -41,7 +41,7 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int= elements) =20 /** * cvm_oct_free_hw_skbuff- free hardware pool skbuffs - * @pdev: Platform device for logging + * @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 @@ -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); @@ -110,7 +112,7 @@ static int cvm_oct_fill_hw_memory(int pool, int size, i= nt elements) =20 /** * cvm_oct_free_hw_memory - Free memory allocated by cvm_oct_fill_hw_memory - * @pdev: Platform device for logging + * @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 @@ -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 27c282ef64dd..d0e5ac426e41 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,30 @@ 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); =20 - cvm_oct_rx_shutdown(); + cancel_delayed_work_sync(&plat->rx_refill_work); + + 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