From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DE41345DB9 for ; Wed, 27 Nov 2024 18:21:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5956402DE; Wed, 27 Nov 2024 18:21:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id BD204402DE for ; Wed, 27 Nov 2024 18:21:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zrkXaq5BTM7dB1qdwjVYK1jBY4QFEp9uxf8agrlhcGM=; b=YXIHU2E3ZEnh1MVwZ84il8m9hLbAAh/RuSOlOQu0u3YEypzbCyZYuKok8KpS3S0MMdv0qt p0XhA6u1S74RISH8BVS9aeVxTX5YNImmCOsjYyj/pV2yK8+BSiuJzOgOZwAUSJBazQ8To0 n1w1iqVlLHRCgRkQvkxT88uf5kv4/oc= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-LET6w70dNhyFccjXwMYOUA-1; Wed, 27 Nov 2024 12:21:22 -0500 X-MC-Unique: LET6w70dNhyFccjXwMYOUA-1 X-Mimecast-MFC-AGG-ID: LET6w70dNhyFccjXwMYOUA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 117A01955F57; Wed, 27 Nov 2024 17:21:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C719B300019E; Wed, 27 Nov 2024 17:21:19 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: dpdk stable Subject: patch 'bus/dpaa: fix VSP for 1G fm1-mac9 and 10' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:58 +0000 Message-ID: <20241127171916.690404-51-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: zrrn5-nFEDOUzXRqWg5oDvaabLOTiSK9c5zLt-ZU2pk_1732728081 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f6dbc295bc9f56a59616841d3e99dcfd0163c409 Thanks. Kevin --- >From f6dbc295bc9f56a59616841d3e99dcfd0163c409 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Tue, 1 Oct 2024 16:33:10 +0530 Subject: [PATCH] bus/dpaa: fix VSP for 1G fm1-mac9 and 10 [ upstream commit 25434831ca958583fb79e1e8b06e83274c68fc93 ] No need to classify interface separately for 1G and 10G Note that VSP or Virtual storage profile are DPAA equivalent for SRIOV config to logically divide a physical ports in virtual ports. Fixes: e0718bb2ca95 ("bus/dpaa: add virtual storage profile port init") Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/fman/fman.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index 1814372a40..8263d42bed 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -154,5 +154,5 @@ static void fman_if_vsp_init(struct __fman_if *__if) const uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1}; - if (__if->__if.mac_type == fman_mac_1g) { + if (__if->__if.mac_idx <= 8) { for_each_compatible_node(dev, NULL, "fsl,fman-port-1g-rx-extended-args") { @@ -177,5 +177,30 @@ static void fman_if_vsp_init(struct __fman_if *__if) } } - } else if (__if->__if.mac_type == fman_mac_10g) { + + for_each_compatible_node(dev, NULL, + "fsl,fman-port-op-extended-args") { + prop = of_get_property(dev, "cell-index", &lenp); + + if (prop) { + cell_index = of_read_number(&prop[0], + lenp / sizeof(phandle)); + + if (cell_index == __if->__if.mac_idx) { + prop = of_get_property(dev, + "vsp-window", + &lenp); + + if (prop) { + __if->__if.num_profiles = + of_read_number(&prop[0], + 1); + __if->__if.base_profile_id = + of_read_number(&prop[1], + 1); + } + } + } + } + } else { for_each_compatible_node(dev, NULL, "fsl,fman-port-10g-rx-extended-args") { -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.880087901 +0000 +++ 0051-bus-dpaa-fix-VSP-for-1G-fm1-mac9-and-10.patch 2024-11-27 17:17:38.225269373 +0000 @@ -1 +1 @@ -From 25434831ca958583fb79e1e8b06e83274c68fc93 Mon Sep 17 00:00:00 2001 +From f6dbc295bc9f56a59616841d3e99dcfd0163c409 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 25434831ca958583fb79e1e8b06e83274c68fc93 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 41195eb0a7..beeb03dbf2 100644 +index 1814372a40..8263d42bed 100644