From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 661943264DA for ; Mon, 27 Apr 2026 15:18:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777303083; cv=none; b=qVhJaQaUhbf5FUzVyFgdU7Su67dFjYK+GcU2hzSdTmiRfA/jlaLTUrzGhPy82ZkIUN9MZvzBnIFnXfNEUmgiIFZ2ituDxWpr2Z0jf2EwL9tuYB7StrV4+EwGIb/nUYXD9dADdhny2vtK+oI4F7XPZWXW73dERCjU9KXcHnYPGVI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777303083; c=relaxed/simple; bh=eI7uK9JgIZGXm+y6YPkBJPVNHd21oGhz4Zduel6JvOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eSNKuT/cku4L0TDUMAhNVbIN3vgTec3/wel/MB9mdHhjlGRgj/VeP+wfMRDNRb0NzZMzDacSWIRPQmy+s+BonQJfFd2V1ocdNZmoLUg7e0znqXjT4WYCiYLfKmDRDmE8q8HMJwap2QI0dgqqxuyXDu/9Grp1bhFeELmCQHCM0JU= 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=npWhnlGK; arc=none smtp.client-ip=209.85.210.172 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="npWhnlGK" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-824b03d9787so715203b3a.2 for ; Mon, 27 Apr 2026 08:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777303082; x=1777907882; 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=bzp2ryRQt9RDlOVSqTdsO/fnm73ORdbk3rSWRNH/Bqs=; b=npWhnlGKTkMcxt/XXencm/3AwOElSCJ9sIjk/ooQDe0Qvj8SUwVPqnwPN8JONjHi3i a/VHJZyDj9t3qQA8d7US/VBwIrELclUFutskEkOXdXrQJec0vsdb3vjqz2wTlOiOoSJB YWacyX7flocG3WDarFTKWqMMQ/crMwhq05RIzfeWDqQhSQ8r5OFbTtJYwmYAIwd1vU5F hG2JHBOWJs1ho8gSaTL7AbhnPk6G3ZfVsK9T8haKa5bSovlHwYrwOvoYhT+0qiAKGyzA R71MRmSmiQIN/fTJpxk28XnC62i++5WCZuvOnKdT7i6hfMBRzFLkZKAYzto1tqPBn4pZ sPBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777303082; x=1777907882; 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=bzp2ryRQt9RDlOVSqTdsO/fnm73ORdbk3rSWRNH/Bqs=; b=fhxrWD0d2fkMt9s6jsWyoB4xVrABgoipn6IITH4z96lqNu+ms6M0crCB4N0+LAQ5T0 w3UvN5uub/1RV1KTadkuAMofDsUHZmBU8ssfIPa6WFsc2aw13VmvnqjTi7y53F2ugZvr nMP19b+o6g8x2Azqjyuhl2QkvoAQnPLbEwyYp+mDH+C0fyFqKMJxDJVze7hy/vHVMYl5 us3V4ygMN30rnHTb3hS3Mp9zEKqgwmhkGd0d7zbhBuk7/LWuYrHCRe6+8ptCa7nW+pi8 E3rJRr/YEieDaG8EA02uTff/tMfUYuV113vikBhOgGgjmc30FmlyYCzUgN4qsmvrJ8Nh DOCw== X-Forwarded-Encrypted: i=1; AFNElJ/bAvSUzrz2XIvgJtdqwZCJeTxf50oufUBS2JvsYlfwmyxLN4iy5rfWZ5Hpi5KJwjXjZlO0/8gYOSwkWoM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9yoWEh2CbTDCUqwoBWnHvQ+V9WHXRlWKUUecNmDtLZ/sUhQRf kmTHBCJuBd9dLXKicy72dYapQt+h7Qj/t5CP5SGTikM32cWLlvA/9I69 X-Gm-Gg: AeBDieuX0afIlMs9sZfOV7diMo8Lqg5olt3RsHzmlA3kAu5a7a9+5uLdGPtlXf3sM6p gDE2f3He3NBABTBeid0TePiTAMMZC3XRL58yl+UOi8ceph4TY41Zyi2HBQSOSMtk046YXYQS0EK we06E+XTj5ryAWff3fxsoLMWHb2pp1VJ9uhap13xrLMwD8Nr9nolMFBUaYiYD2ECELLBjJO0EeW XyXOASiGwfBLu6tEc70Fh7OJGnDD16KpDU9koPPLzzk9pLhvdludybdaSSJ/zMTAZlASY6JOyf4 vbJpGNguJgwve5z0SPeqs36Uegn8WOJeaDAD8MEIqFCK2+BX3jlu9CepE0LE76k11N7+ir2OWjz 7rjpLPP7yvWUKI9lh7/YVX6HlmlxbBKH8MLopb2BHP2PcfU7AnX5E7xd18XQCKzc6omcImScwhA i3IvB0NUxb2V5ukXoAzvVoLZE0CxEEc/bYAlU29NWscVfkUGaFKyE/YG49w/1YKp+hb53Kto9Rb XScxv3rzUZoIZ8cnhVUYXluY5AdoBSh3MXWqQ== X-Received: by 2002:a05:6a00:bd86:b0:82f:1da:9781 with SMTP id d2e1a72fcca58-82f8c2c243emr23308200b3a.0.1777303081703; Mon, 27 Apr 2026 08:18:01 -0700 (PDT) Received: from fedora ([2401:4900:d824:7468:545f:3159:76d5:30ff]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ec06cbfsm37652931b3a.58.2026.04.27.08.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 08:18:01 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org Cc: error27@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, ayushmukkanwar@gmail.com Subject: [PATCH v5 1/4] staging: octeon: ethernet-mem: replace pr_warn with dev_warn in free functions Date: Mon, 27 Apr 2026 20:45:52 +0530 Message-ID: <20260427151556.91153-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260427151556.91153-1-ayushmukkanwar@gmail.com> References: <20260427151556.91153-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: 8bit Replace pr_warn() calls with dev_warn() in the hardware pool free functions (cvm_oct_free_hw_skbuff and cvm_oct_free_hw_memory) to include device information in log messages. The struct device pointer is passed from cvm_oct_remove() through cvm_oct_mem_empty_fpa() to the internal free functions. Signed-off-by: Ayush Mukkanwar --- drivers/staging/octeon/ethernet-mem.c | 30 +++++++++++++++------------ drivers/staging/octeon/ethernet-mem.h | 2 +- drivers/staging/octeon/ethernet.c | 6 +++--- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon/ethernet-mem.c index 532594957ebc..501a2f7487c1 100644 --- a/drivers/staging/octeon/ethernet-mem.c +++ b/drivers/staging/octeon/ethernet-mem.c @@ -40,11 +40,13 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements) /** * cvm_oct_free_hw_skbuff- free hardware pool skbuffs + * @dev: 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 device *dev, + int pool, int size, int elements) { char *memory; @@ -59,11 +61,11 @@ static void cvm_oct_free_hw_skbuff(int pool, int size, int elements) } while (memory); if (elements < 0) - pr_warn("Freeing of pool %u had too many skbuffs (%d)\n", - pool, elements); + dev_warn(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(dev, "Freeing of pool %u is missing %d skbuffs\n", + pool, elements); } /** @@ -107,11 +109,13 @@ static int cvm_oct_fill_hw_memory(int pool, int size, int elements) /** * cvm_oct_free_hw_memory - Free memory allocated by cvm_oct_fill_hw_memory + * @dev: 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 device *dev, + int pool, int size, int elements) { char *memory; char *fpa; @@ -127,11 +131,11 @@ static void cvm_oct_free_hw_memory(int pool, int size, int elements) } while (fpa); if (elements < 0) - pr_warn("Freeing of pool %u had too many buffers (%d)\n", - pool, elements); + dev_warn(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(dev, "Freeing of pool %u is missing %d buffers\n", + pool, elements); } int cvm_oct_mem_fill_fpa(int pool, int size, int elements) @@ -145,10 +149,10 @@ int cvm_oct_mem_fill_fpa(int pool, int size, int elements) return freed; } -void cvm_oct_mem_empty_fpa(int pool, int size, int elements) +void cvm_oct_mem_empty_fpa(struct device *dev, int pool, int size, int elements) { if (pool == CVMX_FPA_PACKET_POOL) - cvm_oct_free_hw_skbuff(pool, size, elements); + cvm_oct_free_hw_skbuff(dev, pool, size, elements); else - cvm_oct_free_hw_memory(pool, size, elements); + cvm_oct_free_hw_memory(dev, pool, size, elements); } diff --git a/drivers/staging/octeon/ethernet-mem.h b/drivers/staging/octeon/ethernet-mem.h index 692dcdb7154d..591e0bbb6f10 100644 --- a/drivers/staging/octeon/ethernet-mem.h +++ b/drivers/staging/octeon/ethernet-mem.h @@ -6,4 +6,4 @@ */ int cvm_oct_mem_fill_fpa(int pool, int size, int elements); -void cvm_oct_mem_empty_fpa(int pool, int size, int elements); +void cvm_oct_mem_empty_fpa(struct device *dev, int pool, int size, int elements); diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index eadb74fc14c8..9eed0a89a2f3 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 *pdev) cvmx_ipd_free_ptr(); /* Free the HW pools */ - cvm_oct_mem_empty_fpa(CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, + cvm_oct_mem_empty_fpa(&pdev->dev, CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, num_packet_buffers); - cvm_oct_mem_empty_fpa(CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, + cvm_oct_mem_empty_fpa(&pdev->dev, 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(CVMX_FPA_OUTPUT_BUFFER_POOL, + cvm_oct_mem_empty_fpa(&pdev->dev, CVMX_FPA_OUTPUT_BUFFER_POOL, CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE, 128); } -- 2.53.0