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 E0E4D42B7A for ; Tue, 23 May 2023 05:50:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFE5440A80; Tue, 23 May 2023 05:50:02 +0200 (CEST) Received: from mail-yb1-f225.google.com (mail-yb1-f225.google.com [209.85.219.225]) by mails.dpdk.org (Postfix) with ESMTP id E7CF640A80 for ; Tue, 23 May 2023 05:50:01 +0200 (CEST) Received: by mail-yb1-f225.google.com with SMTP id 3f1490d57ef6-ba80dc46972so9983090276.2 for ; Mon, 22 May 2023 20:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1684813801; x=1687405801; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=P4ROWS/zevwR9CXJXLhTaZ3DeCPg57nGj+AKYSliVuM=; b=DbwgVsOL9ZGqBPJeFOnkZj2fjuak3gFl++VxEITuXi3tOvsZJn8Da8PnekKudMq5ji wIUDA2t64agNAF0vzTOT5ElWJtQccNjxssEqB5uP1OFTCGDEdl0OiMiurBWbIfHY+ZQ4 MupIysL8SzQrBK32lcITwIVb+9AnL6gS+F6eI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684813801; x=1687405801; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P4ROWS/zevwR9CXJXLhTaZ3DeCPg57nGj+AKYSliVuM=; b=EVZWD4/Qy1uGhwKOw08pCcVFeOQNaYUtm23+/hmXv9CwqdSaB8WyWs4P3KwDQHfQY7 2g8OqBFOnLl23VLAW9BrI+ICOz48sfUvPJU+Ku8ABMpqwmfBbPDGhwAWEodxSg1caPHP RASQaf68DcLJPcIvRuuBY6O9rF9dqjUnYdGv/Y80kFjNyKde22XAsmgGQW0RRKAkk1Fp Z/KiQOg6+Tj4mQTw6LSEwP0ZhdaylpEAooKJtE4g3v2lZaVsHKTQ/H9GVI2SZzMpCif3 C/x9/rcX8Q0n9k+Uyn9ivtRXDZx0ZNJj2s9RuKcUlW239HkJsLbHXDjNYMxKyFfyDKBH cNoQ== X-Gm-Message-State: AC+VfDxYrS679hrzQMEVFWn/MkqnxZD7r1kanubT4cEa4WuVpmWIJiDw K9Mm9PpTV2W1YdJkqzlQyAX2rq6STdZtv0eFtLzC5Gp17c/Cv6EQ31D1NV103gRn3/6pe8Duxg= = X-Google-Smtp-Source: ACHHUZ6lQpIpxVuEbSoEPkamqGUmKHYzJkUqzw5GaR1F8JmDIU7GURXU0Z6PLJeNJSLCXwQxgD9cLR2rSQpK X-Received: by 2002:a25:301:0:b0:bac:6812:88f9 with SMTP id 1-20020a250301000000b00bac681288f9mr450480ybd.36.1684813801357; Mon, 22 May 2023 20:50:01 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [2606:4100:3880:1234::84]) by smtp-relay.gmail.com with ESMTPS id i207-20020a25d1d8000000b00ba771366abcsm1369814ybg.35.2023.05.22.20.50.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2023 20:50:01 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Mon, 22 May 2023 20:50:01 -0700 (PDT) Message-ID: <646c37e9.250a0220.7d2f.82e9SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.2] (unknown [172.18.0.34]) by postal.iol.unh.edu (Postfix) with ESMTP id 0309E605246B; Mon, 22 May 2023 23:50:01 -0400 (EDT) Subject: |WARNING| pw127157-127158 [PATCH] [2/2] net/nfp: add support of showing firmware version From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu Content-Type: text/plain X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/127157 _apply patch failure_ Submitter: Chaoyong He Date: Monday, May 22 2023 11:40:09 Applied on: CommitID:a399d7b5a994e335c446d4b15d7622d71dd8848c Apply patch set 127157-127158 failed: Checking patch drivers/net/nfp/flower/nfp_flower.c... Hunk #1 succeeded at 649 (offset -1 lines). Hunk #2 succeeded at 660 (offset -1 lines). Checking patch drivers/net/nfp/nfp_common.c... Hunk #1 succeeded at 246 (offset -110 lines). error: while searching for: { uint16_t tx_dpp; switch (NFD_CFG_CLASS_VER_of(hw->ver)) { case NFP_NET_CFG_VERSION_DP_NFD3: tx_dpp = NFD3_TX_DESC_PER_PKT; break; case NFP_NET_CFG_VERSION_DP_NFDK: if (NFD_CFG_MAJOR_VERSION_of(hw->ver) < 5) { PMD_DRV_LOG(ERR, "NFDK must use ABI 5 or newer, found: %d", NFD_CFG_MAJOR_VERSION_of(hw->ver)); return -EINVAL; } tx_dpp = NFDK_TX_DESC_PER_SIMPLE_PKT; error: patch failed: drivers/net/nfp/nfp_common.c:1114 Hunk #3 succeeded at 1618 (offset -292 lines). Hunk #4 succeeded at 1636 (offset -292 lines). error: while searching for: hw->meta_format = NFP_NET_METAFORMAT_SINGLE; } } error: patch failed: drivers/net/nfp/nfp_common.c:1944 Checking patch drivers/net/nfp/nfp_common.h... Hunk #1 succeeded at 88 (offset 8 lines). Hunk #2 succeeded at 186 (offset 8 lines). Hunk #3 succeeded at 462 (offset -10 lines). Checking patch drivers/net/nfp/nfp_ctrl.h... Hunk #1 succeeded at 140 (offset 10 lines). Hunk #2 succeeded at 171 (offset 10 lines). Checking patch drivers/net/nfp/nfp_ethdev.c... Hunk #1 succeeded at 468 (offset 2 lines). error: while searching for: PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); PMD_INIT_LOG(DEBUG, "MAC stats: %p", hw->mac_stats); hw->ver = nn_cfg_readl(hw, NFP_NET_CFG_VERSION); if (nfp_net_check_dma_mask(hw, pci_dev->name) != 0) return -ENODEV; error: patch failed: drivers/net/nfp/nfp_ethdev.c:571 Hunk #3 succeeded at 611 (offset -18 lines). Checking patch drivers/net/nfp/nfp_ethdev_vf.c... Hunk #1 succeeded at 247 (offset 1 line). Hunk #2 succeeded at 299 (offset 1 line). Hunk #3 succeeded at 373 (offset -7 lines). Checking patch drivers/net/nfp/nfp_rxtx.c... Hunk #1 succeeded at 1289 (offset 525 lines). Applied patch drivers/net/nfp/flower/nfp_flower.c cleanly. Applying patch drivers/net/nfp/nfp_common.c with 2 rejects... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Rejected hunk #5. Applied patch drivers/net/nfp/nfp_common.h cleanly. Applied patch drivers/net/nfp/nfp_ctrl.h cleanly. Applying patch drivers/net/nfp/nfp_ethdev.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Applied patch drivers/net/nfp/nfp_ethdev_vf.c cleanly. Applied patch drivers/net/nfp/nfp_rxtx.c cleanly. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c (rejected hunks) @@ -1114,14 +1113,14 @@ nfp_net_tx_desc_limits(struct nfp_net_hw *hw, { uint16_t tx_dpp; - switch (NFD_CFG_CLASS_VER_of(hw->ver)) { + switch (hw->ver.extend) { case NFP_NET_CFG_VERSION_DP_NFD3: tx_dpp = NFD3_TX_DESC_PER_PKT; break; case NFP_NET_CFG_VERSION_DP_NFDK: - if (NFD_CFG_MAJOR_VERSION_of(hw->ver) < 5) { + if (hw->ver.major < 5) { PMD_DRV_LOG(ERR, "NFDK must use ABI 5 or newer, found: %d", - NFD_CFG_MAJOR_VERSION_of(hw->ver)); + hw->ver.major); return -EINVAL; } tx_dpp = NFDK_TX_DESC_PER_SIMPLE_PKT; @@ -1944,3 +1942,15 @@ nfp_net_init_metadata_format(struct nfp_net_hw *hw) hw->meta_format = NFP_NET_METAFORMAT_SINGLE; } } + +void +nfp_net_cfg_read_version(struct nfp_net_hw *hw) +{ + union { + uint32_t whole; + struct nfp_net_fw_ver split; + } version; + + version.whole = nn_cfg_readl(hw, NFP_NET_CFG_VERSION); + hw->ver = version.split; +} diff a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c (rejected hunks) @@ -571,7 +571,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); PMD_INIT_LOG(DEBUG, "MAC stats: %p", hw->mac_stats); - hw->ver = nn_cfg_readl(hw, NFP_NET_CFG_VERSION); + nfp_net_cfg_read_version(hw); if (nfp_net_check_dma_mask(hw, pci_dev->name) != 0) return -ENODEV; Checking patch drivers/net/nfp/flower/nfp_flower_representor.c... Hunk #1 succeeded at 530 (offset 5 lines). Hunk #2 succeeded at 552 (offset 5 lines). Checking patch drivers/net/nfp/nfp_common.c... error: drivers/net/nfp/nfp_common.c: does not match index Checking patch drivers/net/nfp/nfp_common.h... error: drivers/net/nfp/nfp_common.h: does not match index Checking patch drivers/net/nfp/nfp_ethdev.c... error: drivers/net/nfp/nfp_ethdev.c: does not match index Checking patch drivers/net/nfp/nfp_ethdev_vf.c... error: drivers/net/nfp/nfp_ethdev_vf.c: does not match index Applied patch drivers/net/nfp/flower/nfp_flower_representor.c cleanly. hint: Use 'git am --show-current-patch' to see the failed patch https://lab.dpdk.org/results/dashboard/patchsets/26327/ UNH-IOL DPDK Community Lab