From patchwork Thu Feb 8 17:13:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 136547 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F83C43AE1; Thu, 8 Feb 2024 18:14:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1987142E66; Thu, 8 Feb 2024 18:13:46 +0100 (CET) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mails.dpdk.org (Postfix) with ESMTP id A28E840273 for ; Thu, 8 Feb 2024 18:13:44 +0100 (CET) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6e04ea51984so40830b3a.0 for ; Thu, 08 Feb 2024 09:13:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1707412423; x=1708017223; darn=dpdk.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=AXZx0GK16UmuqFgu2+pAXwf8u+XGY2nB1JsYNn2AwPQ=; b=f16c7u/Rp/Zw+Wc8d7PZHYWy1MOvRSyTUvn38g7gOpoW1PuGPRH5qG49UxnXWe17KS LWN5NTOLN8HCv2LSERULSfY5tZfETnkxonIrPX0ikcX8MO3QWoOzrmAk8dc3cw+jhg5D kd+rIsZOKNtYbtbeJ2iRAO9zH0FEDWDzCFeAs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707412423; x=1708017223; h=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=AXZx0GK16UmuqFgu2+pAXwf8u+XGY2nB1JsYNn2AwPQ=; b=jUWr3YHC+Psj7jQjm7h3ZNZNFq8mYueXim3iRAApC1m3xjXWN7ditXSkf6nDUGRukS i8h8Mt2Igu2F6+OSkRXHd1vBv3zquvaVXqSVmGI20oOG4xx7qrveniGm1J2LHD3uTt1H JFM3SlEaPGhnEnstSegWlP/79vz7r+hr7Bn9Wk8YclKAZKiVdY4+8s7C5vwWji+pc2f/ zRnO+Cxv1+PQuzwUC/bzywHUvfBNuIQOBdZw9jTDFbczVSiGJ/+DYv/7XpmMUB2qQq4r g0SmkEKE2Z1Z9ChXJyvc53I0bHf87OoVlfB3JRDqzK+ygX//FTosgCBwTDTihIv+cEaH 2RuA== X-Gm-Message-State: AOJu0Yx6HyikFax9TW3p7EYLw6F/yGvVrZeig7Foxz4dcedNI16QbxKJ FDlJrleAOeZxdWLwK6frKyaxFaz0DD3DXsndgHr1hcSx0B09YDV9QldVnTdvnXkcIvBYNoklEdG MKTGa+5gnQW83TRllAD5HJUroleE8Io6n6Rm/sVSGXHqxOrqBQ2Mnz8xQiprULBVrTLpDJZf4Is a41LSbyWSlI0XzfYu7nBe85QQ3cv4M X-Google-Smtp-Source: AGHT+IHd0X24H9393143I2Z+If6bv4kBoKIFKrKNhNIEHA852ffJGbtSukmVmjel6YZ4+Vj58D05nw== X-Received: by 2002:aa7:8757:0:b0:6de:1b57:ca8c with SMTP id g23-20020aa78757000000b006de1b57ca8cmr7362781pfo.23.1707412423167; Thu, 08 Feb 2024 09:13:43 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCV/Tbs5K8DD2Xw5faWQjhcD3EOK1W1LuQXy1Kmwx0+8WDfzSn3LtJbQX3gtpqS5ctPmM5O9SH/p+k2f1P6v47zTNM9p7A== Received: from C02GC2QQMD6T.wifi.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p15-20020aa79e8f000000b006e0527ffe88sm3966204pfq.213.2024.02.08.09.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 09:13:41 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: Shuanglin Wang , Shahaji Bhosle Subject: [PATCH 5/7] net/bnxt: adjust session name on multi host system Date: Thu, 8 Feb 2024 09:13:28 -0800 Message-Id: <20240208171330.31139-6-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240208171330.31139-1-ajit.khaparde@broadcom.com> References: <20240208171330.31139-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Shuanglin Wang On multi-host system, pci-id on PFs are same on each host. The currect code is using the pci-id as the session name to create a session. This would cause a name confliction on firmware then fw rejects the session creation. The patch will change the session name with parent pci_id for multi-host system. This solution works for single PF per EP only. Signed-off-by: Shuanglin Wang Signed-off-by: Ajit Khaparde Reviewed-by: Shahaji Bhosle --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_hwrm.c | 8 +++++ drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 58 ++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 3b3df6ba28..4203e6a055 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -825,6 +825,7 @@ struct bnxt { #define BNXT_TESTPMD_EN(bp) \ ((bp)->flags2 & BNXT_FLAGS2_TESTPMD_EN) + uint16_t multi_host_pf_pci_id; uint16_t chip_num; #define CHIP_NUM_58818 0xd818 #define BNXT_CHIP_SR2(bp) ((bp)->chip_num == CHIP_NUM_58818) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 1d523d6dec..2ceab555a5 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -4207,6 +4207,14 @@ int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp) bp->parent->port_id = rte_le_to_cpu_16(resp->port_id); flags = rte_le_to_cpu_16(resp->flags); + + /* check for the mulit-host support */ + if (flags & HWRM_FUNC_QCFG_OUTPUT_FLAGS_MULTI_HOST) { + bp->flags |= BNXT_FLAG_MULTI_HOST; + bp->multi_host_pf_pci_id = resp->pci_id; + PMD_DRV_LOG(INFO, "Mult-Host system Parent PCI-ID: 0x%x\n", resp->pci_id); + } + /* check for the multi-root support */ if (flags & HWRM_FUNC_QCFG_OUTPUT_FLAGS_MULTI_ROOT) { bp->flags2 |= BNXT_FLAGS2_MULTIROOT_EN; diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c index b696b6dc3e..274e935a1f 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c @@ -641,6 +641,49 @@ ulp_ctx_shared_session_close(struct bnxt *bp, bnxt_ulp_session_tfp_reset(session, session_type); } +static int32_t +ulp_ctx_mh_get_session_name(struct bnxt *bp, + struct tf_open_session_parms *parms) +{ + int32_t rc = 0; + unsigned int domain = 0, bus = 0, slot = 0, device = 0; + rc = sscanf(parms->ctrl_chan_name, + "%x:%x:%x.%u", + &domain, + &bus, + &slot, + &device); + if (rc != 4) { + /* PCI Domain not provided (optional in DPDK), thus we + * force domain to 0 and recheck. + */ + domain = 0; + /* Check parsing of bus/slot/device */ + rc = sscanf(parms->ctrl_chan_name, + "%x:%x.%u", + &bus, + &slot, + &device); + if (rc != 3) { + BNXT_TF_DBG(DEBUG, + "Failed to scan device ctrl_chan_name\n"); + return -EINVAL; + } + } + + /* change domain name for multi-host system */ + domain = domain + (0xf & bp->multi_host_pf_pci_id); + sprintf(parms->ctrl_chan_name, + "%x:%x:%x.%u", + domain, + bus, + slot, + device); + BNXT_TF_DBG(DEBUG, + "Session name for Multi-Host: ctrl_chan_name:%s\n", parms->ctrl_chan_name); + return 0; +} + static int32_t ulp_ctx_shared_session_open(struct bnxt *bp, enum bnxt_ulp_session_type session_type, @@ -664,6 +707,14 @@ ulp_ctx_shared_session_open(struct bnxt *bp, ethdev->data->port_id, rc); return rc; } + + /* On multi-host system, adjust ctrl_chan_name to avoid confliction */ + if (BNXT_MH(bp)) { + rc = ulp_ctx_mh_get_session_name(bp, &parms); + if (rc) + return rc; + } + resources = &parms.resources; /* @@ -835,6 +886,13 @@ ulp_ctx_session_open(struct bnxt *bp, return rc; } + /* On multi-host system, adjust ctrl_chan_name to avoid confliction */ + if (BNXT_MH(bp)) { + rc = ulp_ctx_mh_get_session_name(bp, ¶ms); + if (rc) + return rc; + } + rc = bnxt_ulp_cntxt_app_id_get(bp->ulp_ctx, &app_id); if (rc) { BNXT_TF_DBG(ERR, "Unable to get the app id from ulp.\n");