From patchwork Fri Apr 21 18:11:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Schacher X-Patchwork-Id: 126412 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 DC4C6429A8; Fri, 21 Apr 2023 20:13:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FA2942D6C; Fri, 21 Apr 2023 20:12:35 +0200 (CEST) Received: from mail-oa1-f97.google.com (mail-oa1-f97.google.com [209.85.160.97]) by mails.dpdk.org (Postfix) with ESMTP id 305D542D30 for ; Fri, 21 Apr 2023 20:12:32 +0200 (CEST) Received: by mail-oa1-f97.google.com with SMTP id 586e51a60fabf-187ec6a5504so1743977fac.2 for ; Fri, 21 Apr 2023 11:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1682100751; x=1684692751; 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=o5gYTkeXf3hjjvsRUAYj3+QZoc1chRJZOZhwt0/xIgM=; b=AxR1q3sIvwCw8WWQI6kHLUnAPu5vmE074ycZ8hdo+kB7XO1KYjmtVjGf5vFu8GDX3V o5r0s0DOJcLrzEzWnZuNdhHCGWXag8D+wYaO0RlJR2V501m7zBNCJOKDRwVUjFJelLE+ SGWZZHazeCg3dua21LV5j6X6CuK68dLf9x2IQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682100751; x=1684692751; 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=o5gYTkeXf3hjjvsRUAYj3+QZoc1chRJZOZhwt0/xIgM=; b=g8k7UNWeStU66+JpX8pBbC1m0IwmDWaHxG52y0SmBXEUTDghCfjbQQaoJw0vTlg9Jx PVSqs8PuW4WF7/HNf29JL8z5sHGQ+poWJFDHXq7cFJMfLxfzvi/kvdgnYBxu6O0X7wed 5ZnXlNOOmrHKskTQVejIssPulJHZMIFDL2uBLKU/y1QG7ZeHkVanE+LyVlY2jyL12SfU Z/oXNnTZ+/Gk0kGf/dP0pv3zb3d/qWOijyCdzOp/MpQAJ+G0hwxXV1y5FhvKYzB775v9 Mtp8DDyDLVoHIkUwX54wmavwaHgH4THXfdRmPJpSldBaXd88vgawIBOQs5AS4ZXBOAjN BICw== X-Gm-Message-State: AAQBX9f4PH3nH+U14K7E+7lPbmk7x3ID12EYdRhcBZk9etfUDE+DE7zg 0cgawMeQftCtcqRo42YatES03AMEt+6rn9TdYNN5rF0W1I7QgpczzXd6Cg9oaTFjgtpgaABHucM MeKYr1xuCOM1OxZzXvtimHaD8ENrnDZAvvbXKCw7IakzQwZeT4zjG6bdkqIV42EWXjwIPnLKHiW 78UMFyMoBiD1r6 X-Google-Smtp-Source: AKy350bYu+vNCNs29PXYmA1JeO4tChXkdB9LJ3jR0vA+CRwIj0IXMjOIgKGQZ2be9ZsQkyBcljVKGVCRGZSr X-Received: by 2002:a05:6870:c1c8:b0:184:cb2a:8a1d with SMTP id i8-20020a056870c1c800b00184cb2a8a1dmr4102698oad.45.1682100751241; Fri, 21 Apr 2023 11:12:31 -0700 (PDT) Received: from r650-k2.dhcp.broadcom.net ([192.19.144.250]) by smtp-relay.gmail.com with ESMTPS id o21-20020a056870e81500b0017eb57c3417sm397528oan.19.2023.04.21.11.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 11:12:31 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Randy Schacher To: dev@dpdk.org Cc: Kishore Padmanabha , Shahaji Bhosle Subject: [PATCH v2 09/11] net/bnxt: fix multi-root card support Date: Fri, 21 Apr 2023 18:11:53 +0000 Message-Id: <20230421181155.2160482-10-stuart.schacher@broadcom.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230421181155.2160482-1-stuart.schacher@broadcom.com> References: <20230421181155.2160482-1-stuart.schacher@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: Kishore Padmanabha Changed the logic to use device serial number to identify that different ports belong to same physical card instead of the PCI domain address. Signed-off-by: Kishore Padmanabha Reviewed-by: Shahaji Bhosle --- drivers/net/bnxt/bnxt.h | 3 +++ drivers/net/bnxt/bnxt_hwrm.c | 1 + drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 11 ++++++++--- drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 2 ++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 9dd663e0c2..ea678d40d2 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -138,6 +138,7 @@ #define BNXT_NUM_CMPL_DMA_AGGR 36 #define BNXT_CMPL_AGGR_DMA_TMR_DURING_INT 50 #define BNXT_NUM_CMPL_DMA_AGGR_DURING_INT 12 +#define BNXT_DEVICE_SERIAL_NUM_SIZE 8 #define BNXT_DEFAULT_VNIC_STATE_MASK \ HWRM_ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_DEF_VNIC_STATE_MASK @@ -874,6 +875,8 @@ struct bnxt { uint16_t num_reps; struct bnxt_rep_info *rep_info; uint16_t *cfa_code_map; + /* Device Serial Number */ + uint8_t dsn[BNXT_DEVICE_SERIAL_NUM_SIZE]; /* Struct to hold adapter error recovery related info */ struct bnxt_error_recovery_info *recovery_info; #define BNXT_MARK_TABLE_SZ (sizeof(struct bnxt_mark_info) * 64 * 1024) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 82679d1b32..edad84c262 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -863,6 +863,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) bp->max_l2_ctx, bp->max_vnics); bp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx); bp->max_mcast_addr = rte_le_to_cpu_32(resp->max_mcast_filters); + memcpy(bp->dsn, resp->device_serial_number, sizeof(bp->dsn)); if (BNXT_PF(bp)) bp->pf->total_vnics = rte_le_to_cpu_16(resp->max_vnics); diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c index 3459140f18..500c177039 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c @@ -1318,9 +1318,13 @@ ulp_get_session(struct bnxt *bp, struct rte_pci_addr *pci_addr) /* if multi root capability is enabled, then ignore the pci bus id */ STAILQ_FOREACH(session, &bnxt_ulp_session_list, next) { - if (session->pci_info.domain == pci_addr->domain && - (BNXT_MULTIROOT_EN(bp) || - session->pci_info.bus == pci_addr->bus)) { + if (BNXT_MULTIROOT_EN(bp)) { + if (!memcmp(bp->dsn, session->dsn, + sizeof(session->dsn))) { + return session; + } + } else if (session->pci_info.domain == pci_addr->domain && + session->pci_info.bus == pci_addr->bus) { return session; } } @@ -1364,6 +1368,7 @@ ulp_session_init(struct bnxt *bp, /* Add it to the queue */ session->pci_info.domain = pci_addr->domain; session->pci_info.bus = pci_addr->bus; + memcpy(session->dsn, bp->dsn, sizeof(session->dsn)); rc = pthread_mutex_init(&session->bnxt_ulp_mutex, NULL); if (rc) { BNXT_TF_DBG(ERR, "mutex create failed\n"); diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h index a6ad5c1eaa..92db7751fe 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h @@ -131,11 +131,13 @@ struct bnxt_ulp_pci_info { uint8_t bus; }; +#define BNXT_ULP_DEVICE_SERIAL_NUM_SIZE 8 struct bnxt_ulp_session_state { STAILQ_ENTRY(bnxt_ulp_session_state) next; bool bnxt_ulp_init; pthread_mutex_t bnxt_ulp_mutex; struct bnxt_ulp_pci_info pci_info; + uint8_t dsn[BNXT_ULP_DEVICE_SERIAL_NUM_SIZE]; struct bnxt_ulp_data *cfg_data; struct tf *g_tfp[BNXT_ULP_SESSION_MAX]; uint32_t session_opened[BNXT_ULP_SESSION_MAX];