From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 68FC4A0518 for ; Fri, 24 Jul 2020 14:09:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 51DEC1C1EB; Fri, 24 Jul 2020 14:09:27 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 88FF01C1D0 for ; Fri, 24 Jul 2020 14:09:26 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id f1so7543545wro.2 for ; Fri, 24 Jul 2020 05:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FC0zOB8BJCOyVF2XrtkEOn2kwUiHIqaf06Isk0z5VHY=; b=Mca6kAfHNlDubB4o0PrxWX6nO79QZvPjxN/pxFDo2GcF4hNMg6bA08s0bZSQbc+UmI 5lShVf+NmcTZNNzHdMZSdzDWwoLYwFCZvpttVBge4kyBYO4Leo/xi/7Gsqtaq/3SZ6dH gU9YmO/40qeiDk+KNeVzl3iUZms1ve2NjUiILoRVWKJbE6GOnpCfSqjuiZ6LIiKwFWis mDfA88IKNhgHGF0yDe9tHLngvEHwIPLLOWdZKaIM+deSSJY8jMrlJ3M2Pqlmo7dLxGZx 8V/HzN9zGJhvPBZvC/wTc9QFMEorkiFf07MD+CSuR7UCBVKPZzRvlHcVtXZJxc/gLzbY 1jIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FC0zOB8BJCOyVF2XrtkEOn2kwUiHIqaf06Isk0z5VHY=; b=Ng/lK3f4f0fxYPz1yInTkZwsDIvy4jpsiuJTH1axSDrnpAGXJEDYbdDzbZaWIgHLQf hIScV909hNoSeap8PMYGElwwyWeZIK0r1PtxuxDRXm+Ns7rQ1jkkyOMsGb4hJF6bR1ro 7g/Fi4lfv0W3y6uCp7zcgCQH6+1Y592HvekGGGWr2wdRU6YdjSSHYY1To4BNuLoW6/4N JbzmrQpgxQaaxY6fegDeSQQu287cdMxWCDp+YfuBZG0zNzOxDHMw5+DC60PbPDlj2Cg9 vecC/QUIPLWYbMSk2A0VhKb0lVpusoaH0M1Yi4/MB6JPfDv6KOn5Oo73l25fyKERZrHd gCfg== X-Gm-Message-State: AOAM532ELhyhomNpukbSvfcr/5fdhShBu1aLcYXPpV4b/oFotGMkID/a wy/s79C5/fIYrutSeeekHb4= X-Google-Smtp-Source: ABdhPJxplreuIZTBiAaHq2Gx9XDN6drtpln10QBsuu02pdm6If72/XaoeJA9GZIovVkkkopWnq3VXw== X-Received: by 2002:adf:9ec1:: with SMTP id b1mr8205305wrf.171.1595592566320; Fri, 24 Jul 2020 05:09:26 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 12sm6704995wmg.6.2020.07.24.05.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Mateusz Kowalski , Wei Zhao , dpdk stable Date: Fri, 24 Jul 2020 12:59:32 +0100 Message-Id: <20200724120030.1863487-134-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. Thanks. Luca Boccassi --- >From e15dd6bff3f8c0b6ce51cbe7062db5f00c20ff39 Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Thu, 9 Jul 2020 08:00:28 +0000 Subject: [PATCH] net/ixgbe/base: fix host interface shadow RAM read [ upstream commit 713fc4dd340e5eadd3bfa9a468446afaa5188624 ] Host interface Shadow RAM Read (0x31) command response buffer length should be stored in two bytes, instead of one byte. This patch fixes it. Fixes: e6102361b1d4 ("net/ixgbe/base: use 2 bytes for flash read command") Signed-off-by: Mateusz Kowalski Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao --- drivers/net/ixgbe/base/ixgbe_common.c | 3 ++- drivers/net/ixgbe/base/ixgbe_type.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c index 4eb98dc19..5889410f9 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -4600,7 +4600,8 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, * Read Flash command requires reading buffer length from * two byes instead of one byte */ - if (resp->cmd == 0x30) { + if (resp->cmd == IXGBE_HOST_INTERFACE_FLASH_READ_CMD || + resp->cmd == IXGBE_HOST_INTERFACE_SHADOW_RAM_READ_CMD) { for (; bi < dword_len + 2; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h index 15e937010..bc927a34e 100644 --- a/drivers/net/ixgbe/base/ixgbe_type.h +++ b/drivers/net/ixgbe/base/ixgbe_type.h @@ -4364,4 +4364,16 @@ struct ixgbe_hw { #define IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD \ (0x1F << IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD_SHIFT) +/* Code Command (Flash I/F Interface) */ +#define IXGBE_HOST_INTERFACE_FLASH_READ_CMD 0x30 +#define IXGBE_HOST_INTERFACE_SHADOW_RAM_READ_CMD 0x31 +#define IXGBE_HOST_INTERFACE_FLASH_WRITE_CMD 0x32 +#define IXGBE_HOST_INTERFACE_SHADOW_RAM_WRITE_CMD 0x33 +#define IXGBE_HOST_INTERFACE_FLASH_MODULE_UPDATE_CMD 0x34 +#define IXGBE_HOST_INTERFACE_FLASH_BLOCK_EREASE_CMD 0x35 +#define IXGBE_HOST_INTERFACE_SHADOW_RAM_DUMP_CMD 0x36 +#define IXGBE_HOST_INTERFACE_FLASH_INFO_CMD 0x37 +#define IXGBE_HOST_INTERFACE_APPLY_UPDATE_CMD 0x38 +#define IXGBE_HOST_INTERFACE_MASK_CMD 0x000000FF + #endif /* _IXGBE_TYPE_H_ */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.690520459 +0100 +++ 0134-net-ixgbe-base-fix-host-interface-shadow-RAM-read.patch 2020-07-24 12:53:48.435009217 +0100 @@ -1,14 +1,15 @@ -From 713fc4dd340e5eadd3bfa9a468446afaa5188624 Mon Sep 17 00:00:00 2001 +From e15dd6bff3f8c0b6ce51cbe7062db5f00c20ff39 Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Thu, 9 Jul 2020 08:00:28 +0000 Subject: [PATCH] net/ixgbe/base: fix host interface shadow RAM read +[ upstream commit 713fc4dd340e5eadd3bfa9a468446afaa5188624 ] + Host interface Shadow RAM Read (0x31) command response buffer length should be stored in two bytes, instead of one byte. This patch fixes it. Fixes: e6102361b1d4 ("net/ixgbe/base: use 2 bytes for flash read command") -Cc: stable@dpdk.org Signed-off-by: Mateusz Kowalski Signed-off-by: Guinan Sun