From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 DF4912D0622 for ; Sun, 5 Apr 2026 14:13:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775398432; cv=none; b=LMaynd7S2DrVH6bI7Xlz2r3gdN45Kw+cXQceufGsgOLG6Ho8/9pfq1og3LVaZ5Owb2TJd30t0tMWatig4/aUfR748zJF4R2mKW8bsLztJilcTPSm9rxh5zxHZQBt4NtNeBf7pk+Q+XGmhLo+HTi2WPNw5/8Vz14UcTv7ZBho1wc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775398432; c=relaxed/simple; bh=eI7uK9JgIZGXm+y6YPkBJPVNHd21oGhz4Zduel6JvOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R95HjpDPgNowmsTse8aeiOPIAEwm/EuBif6WCu9pgzIwaZ6T+5S/uWrQ6YDNR06pDXn1VUwpFaG2pYhkhR9zith6QsZBeOKVvx1sYfb+MBHKpY7Xz0BIVIru44g5rfd9Y4VWf82pvbVl7pzOrj0ZEaXzaEvMGcrBbHhvJPiL1JI= 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=DqGFoGa+; arc=none smtp.client-ip=209.85.215.180 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="DqGFoGa+" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-c76afacbb0bso226002a12.2 for ; Sun, 05 Apr 2026 07:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775398430; x=1776003230; 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=DqGFoGa+/wQRNDr4aupsdOpBMQrGah3HucZZgJqe6g2LdYed1gJsIvoHLKcTfoRIN6 YbY5lRznv74Z0Q4Id39uUP9Q7kEJ4Cl14oA6FAsqsWRSJIAaN0/j6XWZ+Lff9fny+AtA jqA5Expt9JYzqEilYAUvU7VH59qCcKMOSRyq0R/Wcg7L3PIRt6XgI+RGUtsso5gV2nvA N+KLkp1wAYnGn6vPcEBFHia7WYwzxRmlBSUjzIOxWVEJ8egZk9GfUSTgCZ3egBwJIzD3 Amweh08hen8HJdIul0IkL7rGMFhKBaOKRE+A2SYrJLQRYDzXfA4cNaJTp6Lf3AyB1gfk vlLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775398430; x=1776003230; 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=Os8TAYrjk5UBwbWAQrNY9TvozM763hkN9OK/7khkUybXVs3lMCxssRcVxBFxCzZU+2 sn+SoeIq+2S/DI+NKU7caZznAC4PIaah1MOleTd3cOifHu38VeVLCTLK17k5KMskj4jG ucFR2JgBc6uwl/nZeO7daMr9xEBP2tJIDSF0HXD28d0SzbraYdi3mPEqf79rt7ROtecW zG0EIfSHmo+GK3jygeZBiCn7F+1Wv6m9XTfRv75JSolxY4DCkJvYP4wkS6BjWi3vO5Ji eh59qtdEeZApOqMRP9lPAv0dJ3qfgJE5ortHA/TLOtlFGXKdZywmLZDM22Xp6xXnZPyW PNuQ== X-Forwarded-Encrypted: i=1; AJvYcCWRG/TP9DQvJKe5/LAIlR2NQgx8ZRHzPHY2BI7houy4j+WmR/huynGEubIKuFkfCqRt3GWUgULYZ2o4XLo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1KYZShAb6TE62/GHKqDIAzpQikftkEI2eTCVwcUXhnxljpatw KTqEmSPIzY2qG13/nzO00xoGgeWCtUlAadWfZXRkKGRPsK3TZlm1/ABU X-Gm-Gg: AeBDieu1I0lN+n0Rw6Vl2Q71LrX5KD+E7FzYfYupNw+ks6mrvL8y2p3oS7xjjkihynp cHI4aB4Fz+8O+gXTfGeRm7ypZ7KVw/e3oFXVX3gisAyPJFB0hVFLqU7DObQyLfnQen0/K4KOoc1 C/myqlsdKnB4jndE3TXm15ru1j6xpal2w9RuxhtsF4JjSmTfay1lqCbKu1gQfiDoxBFvBumi8C5 qcdde9GAeSYmW3OFU4mXwalw/cIckiKr2djvCPHCrdRqInuelVOMNWFIqtzNhbzsog8jvZrjDo4 Cptnch3YEHtZhYCRaaxCb+xLeXuX+1hBS6eKiaJnuIlYBkqA1qDxHR3fcv7PUYG5qJ9J+UYzJT8 pXVP0UtUXTHRa/8EdjdaezvSQjrqdumLERRdyvBQChLqwaTdduhKxGgZFZF8BNZwFwcWoZSKGnu 3dx/mk7CMND+oYskRWUowCWHnYdgUl X-Received: by 2002:a05:6a00:14c8:b0:82c:ae58:46a5 with SMTP id d2e1a72fcca58-82d0dbad46amr5686710b3a.5.1775398430045; Sun, 05 Apr 2026 07:13:50 -0700 (PDT) Received: from fedora ([2401:4900:82af:33ce:56b8:b90b:816d:c3d2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9a24039sm11244051b3a.0.2026.04.05.07.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 07:13:49 -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 v4 1/3] staging: octeon: ethernet-mem: replace pr_warn with dev_warn in free functions Date: Sun, 5 Apr 2026 19:41:08 +0530 Message-ID: <20260405141111.87925-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260405141111.87925-1-ayushmukkanwar@gmail.com> References: <20260405141111.87925-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