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 874B3A04AF for ; Thu, 20 Aug 2020 17:34:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7C8CD1C0BC; Thu, 20 Aug 2020 17:34:56 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 8752D1E2B for ; Thu, 20 Aug 2020 17:34:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0QK5V2VsKXz+dnzbWad/H0AuC1fs84PiNGt4RRN1uG8=; b=RZ+XH6XMiPQ+YrexY4+GzCtjoHMov9Xnhh3OsaVAKHkiyUgaCFPeM4GoppUwZXLq1atkbo M5gaLhcWGgDcFcWFMWpPyNIrNe9RmxivADDCFL9ACwzl6ABY/Gxyctxxa0LitXqykDdy0a Xxubo5dZCIYatmqoBBUIxQ4GY+BEOk8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-138-76sgFOSzM2CCDFEOZNuc-A-1; Thu, 20 Aug 2020 11:34:49 -0400 X-MC-Unique: 76sgFOSzM2CCDFEOZNuc-A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 522938030C4; Thu, 20 Aug 2020 15:34:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1528C10027A6; Thu, 20 Aug 2020 15:34:46 +0000 (UTC) From: Kevin Traynor To: Guinan Sun Cc: Mateusz Kowalski , Wei Zhao , dpdk stable Date: Thu, 20 Aug 2020 16:33:32 +0100 Message-Id: <20200820153341.171927-27-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/2517cab65dffeb61dc4f2ea0c4ca5c5cd9f42368 Thanks. Kevin. --- >From 2517cab65dffeb61dc4f2ea0c4ca5c5cd9f42368 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 4eb98dc198..5889410f98 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -4601,5 +4601,6 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, * 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, diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h index 15e9370105..bc927a34ee 100644 --- a/drivers/net/ixgbe/base/ixgbe_type.h +++ b/drivers/net/ixgbe/base/ixgbe_type.h @@ -4365,3 +4365,15 @@ struct ixgbe_hw { (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.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.791021086 +0100 +++ 0027-net-ixgbe-base-fix-host-interface-shadow-RAM-read.patch 2020-08-20 16:26:15.817324260 +0100 @@ -1 +1 @@ -From 713fc4dd340e5eadd3bfa9a468446afaa5188624 Mon Sep 17 00:00:00 2001 +From 2517cab65dffeb61dc4f2ea0c4ca5c5cd9f42368 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 713fc4dd340e5eadd3bfa9a468446afaa5188624 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org