From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67D7B476049 for ; Fri, 31 Jul 2026 16:35:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515717; cv=none; b=upoy16pnRxnWssxRfWLlCmtIj2G7SKcOaqLTlETFzIJZI9NzA2n1R/IgIYqE35DOYaBeTRToi8w1uMgX2dBQ0OBazhxRi45AOjHK9yIlHkEmkuFp4eU1jY9o5OqV6AVo5B7P9q5+S/y48E+fqjXntvbSd4hWif2EKSl1ALZgbxM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515717; c=relaxed/simple; bh=jNykJLEQDlNqYQG+bpp5ROotrJzmmj7gdBQzx4Q7zMc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K2nscs2VlVpfjTbLmYqDGpds+qpJwq3SoWCtVJqJp1nay+FhDMCSwT23uXsvglS91COmIHvP7M4+HzcIt2qPq/8YFNBbD8mpa6YS5z/fiZjZomHWXyVQxo9Y5/0t7fxlZHqWZPaShRKSidw8jRBjpr506jP/kVPFLZ43FXUflks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=hIy6lpVk; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="hIy6lpVk" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 8CF164E4104D; Fri, 31 Jul 2026 16:35:13 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 5F1786039A; Fri, 31 Jul 2026 16:35:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 9319611C16AEF; Fri, 31 Jul 2026 18:35:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1785515712; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=yoWy+iZTznN9ohT/iT8B4jKN4eiYqOf0vpXoWb+UFg0=; b=hIy6lpVk9+8/4mAZMLF40jE1OF34kn2Lh6cBXQapZJ9+XMNrzgdbwEksn+furozF8P8Xx7 oAnpWqNAEoSv6l+yBaiTrtaRmYGR9kFgUkyi+7LvAK9THNq14MQ+lXNJr3Lem7MyMOz09/ 5ZtXUq7xxKG3qMpj4clmUVeNYw3O82aL0nXVLkytbwn4k6feUi9xGPtuCYCzjtZu9jmdQ+ Ypa/yYexWPKI+sgVN7YwB9pij3SscXKpALowscN+J3KWN1iUWlBic+b0SX9JsPOflqWxTs WeaDLIWfJFPP8JsEW1q3v0fg9xHd7tAn1+1f97kWhjf1Xg8Vt8APqJ88tl4vDQ== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Fri, 31 Jul 2026 18:34:22 +0200 Subject: [PATCH net-next v6 12/16] net: macb: introduce macb_context_alloc() helper Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260731-macb-context-v6-12-49d5a1439d48@bootlin.com> References: <20260731-macb-context-v6-0-49d5a1439d48@bootlin.com> In-Reply-To: <20260731-macb-context-v6-0-49d5a1439d48@bootlin.com> To: =?utf-8?q?Th=C3=A9o_Lebrun?= , Conor Dooley , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Ferre , Claudiu Beznea , Paolo Valerio , Nicolai Buchwitz , Vladimir Kondratiev , Gregory CLEMENT , =?utf-8?q?Beno=C3=AEt_Monin?= , Tawfik Bayouk , Thomas Petazzoni , Maxime Chevallier X-Mailer: b4 0.15.2 X-Last-TLS-Session-Version: TLSv1.3 Move the context allocation sequence from inline macb_open() to its own helper function called macb_context_alloc(). All ops doing context swapping (set_ringparam, change_mtu, etc) will use this helper. Reviewed-by: Nicolai Buchwitz Signed-off-by: Théo Lebrun --- drivers/net/ethernet/cadence/macb_main.c | 55 +++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 8f8c952ffc74..987fafb2bf40 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2868,6 +2868,36 @@ static int macb_alloc(struct macb_context *ctx) return -ENOMEM; } +static struct macb_context *macb_context_alloc(struct macb *bp, + unsigned int mtu, + unsigned int rx_ring_size, + unsigned int tx_ring_size) +{ + struct macb_context *ctx; + int err; + + ctx = kzalloc_obj(*ctx); + if (!ctx) + return ERR_PTR(-ENOMEM); + + ctx->info = &bp->info; + ctx->rx_buffer_size = macb_rx_buffer_size(bp, mtu); + ctx->rx_ring_size = rx_ring_size; + ctx->tx_ring_size = tx_ring_size; + + err = macb_alloc(ctx); + if (err) { + netdev_err(bp->netdev, + "Unable to allocate DMA memory (error %d)\n", err); + kfree(ctx); + return ERR_PTR(err); + } + + bp->macbgem_ops.mog_init_rings(ctx); + + return ctx; +} + static void gem_init_rx_ring(struct macb_context *ctx, unsigned int q) { struct macb_rxq *rxq = &ctx->rxq[q]; @@ -3235,27 +3265,15 @@ static int macb_open(struct net_device *netdev) if (err < 0) return err; - bp->ctx = kzalloc_obj(*bp->ctx); - if (!bp->ctx) { - err = -ENOMEM; + bp->ctx = macb_context_alloc(bp, netdev->mtu, + bp->configured_rx_ring_size, + bp->configured_tx_ring_size); + if (IS_ERR(bp->ctx)) { + err = PTR_ERR(bp->ctx); + bp->ctx = NULL; goto pm_exit; } - bp->ctx->info = &bp->info; - - /* RX buffers initialization */ - bp->ctx->rx_buffer_size = macb_rx_buffer_size(bp, netdev->mtu); - bp->ctx->rx_ring_size = bp->configured_rx_ring_size; - bp->ctx->tx_ring_size = bp->configured_tx_ring_size; - - err = macb_alloc(bp->ctx); - if (err) { - netdev_err(netdev, "Unable to allocate DMA memory (error %d)\n", - err); - goto free_ctx; - } - - bp->macbgem_ops.mog_init_rings(bp->ctx); macb_init_buffers(bp); for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { @@ -3294,7 +3312,6 @@ static int macb_open(struct net_device *netdev) napi_disable(&queue->napi_tx); } macb_free(bp->ctx); -free_ctx: kfree(bp->ctx); bp->ctx = NULL; pm_exit: -- 2.55.0