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 B6E7E45BB6 for ; Wed, 23 Oct 2024 23:20:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B154C40261; Wed, 23 Oct 2024 23:20:42 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 6D2E340261 for ; Wed, 23 Oct 2024 23:20:41 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4315f24a6bbso2103315e9.1 for ; Wed, 23 Oct 2024 14:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718441; x=1730323241; darn=dpdk.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=roqPMu0mO3CWsiLHHHQ7Lh36CBCdIm4LU2vFD0mWOcg=; b=GSNsuhUvLpdOsBnz7ZoWmATeeXisshTCXhqqtg8TOtI+PTx8ff5UiiT+yQIC5nszOT QKXDCiRc9j+UFxcGhCy6CWWHKuSzBDXMq7db4voQZrDba+9SLYzvHJzPGdK4LY4ShZCW 4FI1h34VJ5ZaGbVP1Btn1g8/fb96/MT+vPxikM9wNG5dK0XqIYIXoeFGza+uupcMx4MK IvNI0/HGiRi/VL8KY78LsLUV/Vbms+a+5/wB6APa3XzKEdlUP7JLeUUxL4iQMRHc4iaP ARqtXBNZSV9rCKA9bNO9cDQGO1etxG6RBS88zq9qBaEKveEyz+rbxjT1VQlBiCeNkOey ZrEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718441; x=1730323241; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=roqPMu0mO3CWsiLHHHQ7Lh36CBCdIm4LU2vFD0mWOcg=; b=Q18n/NeIQraDJqF6EnWmGYif4hrc/7ts10MEJ3skxoMsG0/Shc3qdMTH1kPRzJBV+/ FLk6Uu2ofK1GpfGiqH7x+7LuxkZ605D72ztFKS6v+znebcrVd4MAN/to7BBi2tnjr+uS zjCqI5IAJhoO72eP7lWt1mk80jTHcKvqAPPF7QOkX164zC4iHNbaDA2m04IT+3w8jVlB DQ/6dQOIebpDcETjstYQINwa4BoDMUoODsoB+Fvp5wNaYk3d/4sZB6/1DIynbJbLAUlW 4w59I7ZAjnLZWeE7tA6hHQmYS62Ul/8Neqx6Uxzq769wGYDVbgQvsPUWsrEsIMWhGs1N x5GQ== X-Gm-Message-State: AOJu0YzxB8Zud1QZKSk3PqdGXQt+k7I1lssINT99hkxXwqD1u5kfq6UY 9EPsXlZpyI0+zm257d2v5zBiWVFTKE+9+Q06hbLy4mkCcP/s0+n1TBEWGE33 X-Google-Smtp-Source: AGHT+IHGkfTZ5n75+BH6uUnTF0MCMJLlPu7T4/+0XWdniCZOCsoNUk5+qQimtX+/PpDsJdlqJfyPtg== X-Received: by 2002:a05:600c:524a:b0:431:12d0:746b with SMTP id 5b1f17b1804b1-431841af63amr26179395e9.35.1729718440817; Wed, 23 Oct 2024 14:20:40 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4317dde7b70sm52137665e9.1.2024.10.23.14.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:20:40 -0700 (PDT) From: luca.boccassi@gmail.com To: Hemant Agrawal Cc: dpdk stable Subject: patch 'bus/dpaa: fix VSP for 1G fm1-mac9 and 10' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:38 +0100 Message-ID: <20241023211704.1216956-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6770a35bbf822b5b56cb14180fde627c8f07aae1 Thanks. Luca Boccassi --- >From 6770a35bbf822b5b56cb14180fde627c8f07aae1 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 @@ -153,7 +153,7 @@ static void fman_if_vsp_init(struct __fman_if *__if) size_t lenp; 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") { prop = of_get_property(dev, "cell-index", &lenp); @@ -176,7 +176,32 @@ 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") { prop = of_get_property(dev, "cell-index", &lenp); -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.718119992 +0100 +++ 0058-bus-dpaa-fix-VSP-for-1G-fm1-mac9-and-10.patch 2024-10-23 22:16:40.519943519 +0100 @@ -1 +1 @@ -From 25434831ca958583fb79e1e8b06e83274c68fc93 Mon Sep 17 00:00:00 2001 +From 6770a35bbf822b5b56cb14180fde627c8f07aae1 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