From patchwork Sun Dec 10 01:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 134980 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 8EBFC436BE; Sun, 10 Dec 2023 02:31:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9CAA40395; Sun, 10 Dec 2023 02:31:45 +0100 (CET) Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by mails.dpdk.org (Postfix) with ESMTP id 2097940279 for ; Sun, 10 Dec 2023 02:31:42 +0100 (CET) Received: by mail-il1-f173.google.com with SMTP id e9e14a558f8ab-35d67599613so20546075ab.3 for ; Sat, 09 Dec 2023 17:31:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1702171901; x=1702776701; 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=vm4xKhkzr5G5ljEKTmdMEYvpQ6Er4O5ySBcQIl6fpfc=; b=gJ+guVQ9LTfUZ2r2S7rB765XCsPX5TWEAKfOHPf1ZvEO09k34tpG6vEpt9t5PslLt8 JoG4+dhFecvISyvMHFmNwz9/aPr+H9c3F1ZxaibT8IDikMcE/ik7J2iUvZ60A9u1SbRC BhHNZ5ld6PyYIUG/iGmee+uaogzr+SHMaO+ik= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702171901; x=1702776701; 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=vm4xKhkzr5G5ljEKTmdMEYvpQ6Er4O5ySBcQIl6fpfc=; b=SB393fRRVc9TfDFvkLBgliG4LdSc4958o32+PmE+DzflGkIowW6J/egHvVLVf7cEpb HRrorVGnYKqUeVBz47kmwydYjBDnsPQw5lkm0rBHkh6odccdq1nWsZ5Lzs/+f7aRoMIk HC7bKg7y7z4vMXfn6BKGY7bboiuR27Y2zG4TqISTkE3kr2CRsrILkzHAA6MUJhGiygLC rlHtqEDBa/I8FVJtWrdkPCf/Si94hVtrL+RiEaaPhhml4WvskJKPEZn0YqzQxk24NU1d JlMjtDJRG9s26lliTNZHFU71pymiDspi5dsoyyvys7MJ8o2XCsALDtKuIN5gHy9TfVhQ mF6g== X-Gm-Message-State: AOJu0YxUZCkztA3P5u9vurDk2cIB/OZbmnWwFaxOIrx2Lrdq4uLM9p8m HakqzhmyQP7m8fXNNhJYaDflIRXXNN7j+Mu21xbs/guZ3KaxAwM0V7Z7XMT0J0QVb9TGuthDkvd 9dKfnsmAJ1JB4jYvN2D5yGRa69zljDwZs0UO/2xxPq6bMgGbNF9cmNLe4TvfzNHSYkZaA X-Google-Smtp-Source: AGHT+IHlKGCsjYHClks+VL7jrJjeJg1Jhi6e/Bneq92LVMOsgcr1tW+ae5Mh7RG4ztJLrhBFPhmkvg== X-Received: by 2002:a92:c24a:0:b0:35d:59a2:2c7 with SMTP id k10-20020a92c24a000000b0035d59a202c7mr3691878ilo.103.1702171900816; Sat, 09 Dec 2023 17:31:40 -0800 (PST) Received: from localhost.localdomain ([2605:a601:a780:1400:6d20:fff:e413:282a]) by smtp.gmail.com with ESMTPSA id q3-20020a170902f78300b001d083fed5f3sm4006050pln.60.2023.12.09.17.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 17:31:39 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: Damodharam Ammepalli Subject: [PATCH v2 01/14] net/bnxt: refactor epoch setting Date: Sat, 9 Dec 2023 17:24:42 -0800 Message-Id: <20231210012455.20229-2-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20231210012455.20229-1-ajit.khaparde@broadcom.com> References: <20231210012455.20229-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 Fix epoch bit setting when we ring the doorbell. Epoch bit needs to toggle alternatively from 0 to 1 every time the ring indices wrap. Currently its value is everything but an alternating 0 and 1. Remove unnecessary field db_epoch_shift from bnxt_db_info structure. Signed-off-by: Ajit Khaparde Reviewed-by: Damodharam Ammepalli --- drivers/net/bnxt/bnxt_cpr.h | 5 ++--- drivers/net/bnxt/bnxt_ring.c | 9 ++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h index 2de154322d..26e81a6a7e 100644 --- a/drivers/net/bnxt/bnxt_cpr.h +++ b/drivers/net/bnxt/bnxt_cpr.h @@ -53,11 +53,10 @@ struct bnxt_db_info { bool db_64; uint32_t db_ring_mask; uint32_t db_epoch_mask; - uint32_t db_epoch_shift; }; -#define DB_EPOCH(db, idx) (((idx) & (db)->db_epoch_mask) << \ - ((db)->db_epoch_shift)) +#define DB_EPOCH(db, idx) (!!((idx) & (db)->db_epoch_mask) << \ + DBR_EPOCH_SFT) #define DB_RING_IDX(db, idx) (((idx) & (db)->db_ring_mask) | \ DB_EPOCH(db, idx)) diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c index 34b2510d54..6dacb1b37f 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -371,9 +371,10 @@ static void bnxt_set_db(struct bnxt *bp, db->db_key64 = DBR_PATH_L2; break; } - if (BNXT_CHIP_SR2(bp)) { + if (BNXT_CHIP_P7(bp)) { db->db_key64 |= DBR_VALID; db_offset = bp->legacy_db_size; + db->db_epoch_mask = ring_mask + 1; } else if (BNXT_VF(bp)) { db_offset = DB_VF_OFFSET; } @@ -397,12 +398,6 @@ static void bnxt_set_db(struct bnxt *bp, db->db_64 = false; } db->db_ring_mask = ring_mask; - - if (BNXT_CHIP_SR2(bp)) { - db->db_epoch_mask = db->db_ring_mask + 1; - db->db_epoch_shift = DBR_EPOCH_SFT - - rte_log2_u32(db->db_epoch_mask); - } } static int bnxt_alloc_cmpl_ring(struct bnxt *bp, int queue_index,