From: Beilei Xing <beilei.xing@intel.com>
To: helin.zhang@intel.com
Cc: dev@dpdk.org, Beilei Xing <beilei.xing@intel.com>
Subject: [PATCH 19/29] ixgbe/base: fix register access error
Date: Fri, 6 May 2016 14:07:31 +0800 [thread overview]
Message-ID: <1462514861-29419-20-git-send-email-beilei.xing@intel.com> (raw)
In-Reply-To: <1462514861-29419-1-git-send-email-beilei.xing@intel.com>
This patch corrects the FLA/GSCL/GSCN access offset value according
to the datasheet.
Fixes: 0790adeb5675 ("ixgbe/base: support X550em_a device")
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
drivers/net/ixgbe/base/ixgbe_type.h | 42 ++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index f40580d..ec1f4e0 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -196,7 +196,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define IXGBE_FLA_X540 IXGBE_FLA
#define IXGBE_FLA_X550 IXGBE_FLA
#define IXGBE_FLA_X550EM_x IXGBE_FLA
-#define IXGBE_FLA_X550EM_a 0x15F6C
+#define IXGBE_FLA_X550EM_a 0x15F68
#define IXGBE_FLA_BY_MAC(_hw) IXGBE_BY_MAC((_hw), FLA)
#define IXGBE_EEMNGCTL 0x10110
@@ -1080,16 +1080,40 @@ struct ixgbe_dmac_config {
#define IXGBE_PCIEPIPEDAT 0x11008
#define IXGBE_GSCL_1 0x11010
#define IXGBE_GSCL_2 0x11014
+#define IXGBE_GSCL_1_X540 IXGBE_GSCL_1
+#define IXGBE_GSCL_2_X540 IXGBE_GSCL_2
#define IXGBE_GSCL_3 0x11018
#define IXGBE_GSCL_4 0x1101C
#define IXGBE_GSCN_0 0x11020
#define IXGBE_GSCN_1 0x11024
#define IXGBE_GSCN_2 0x11028
#define IXGBE_GSCN_3 0x1102C
+#define IXGBE_GSCN_0_X540 IXGBE_GSCN_0
+#define IXGBE_GSCN_1_X540 IXGBE_GSCN_1
+#define IXGBE_GSCN_2_X540 IXGBE_GSCN_2
+#define IXGBE_GSCN_3_X540 IXGBE_GSCN_3
#define IXGBE_FACTPS 0x10150
#define IXGBE_FACTPS_X540 IXGBE_FACTPS
+#define IXGBE_GSCL_1_X550 0x11800
+#define IXGBE_GSCL_2_X550 0x11804
+#define IXGBE_GSCL_1_X550EM_x IXGBE_GSCL_1_X550
+#define IXGBE_GSCL_2_X550EM_x IXGBE_GSCL_2_X550
+#define IXGBE_GSCN_0_X550 0x11820
+#define IXGBE_GSCN_1_X550 0x11824
+#define IXGBE_GSCN_2_X550 0x11828
+#define IXGBE_GSCN_3_X550 0x1182C
+#define IXGBE_GSCN_0_X550EM_x IXGBE_GSCN_0_X550
+#define IXGBE_GSCN_1_X550EM_x IXGBE_GSCN_1_X550
+#define IXGBE_GSCN_2_X550EM_x IXGBE_GSCN_2_X550
+#define IXGBE_GSCN_3_X550EM_x IXGBE_GSCN_3_X550
#define IXGBE_FACTPS_X550 IXGBE_FACTPS
#define IXGBE_FACTPS_X550EM_x IXGBE_FACTPS
+#define IXGBE_GSCL_1_X550EM_a IXGBE_GSCL_1_X550
+#define IXGBE_GSCL_2_X550EM_a IXGBE_GSCL_2_X550
+#define IXGBE_GSCN_0_X550EM_a IXGBE_GSCN_0_X550
+#define IXGBE_GSCN_1_X550EM_a IXGBE_GSCN_1_X550
+#define IXGBE_GSCN_2_X550EM_a IXGBE_GSCN_2_X550
+#define IXGBE_GSCN_3_X550EM_a IXGBE_GSCN_3_X550
#define IXGBE_FACTPS_X550EM_a 0x15FEC
#define IXGBE_FACTPS_BY_MAC(_hw) IXGBE_BY_MAC((_hw), FACTPS)
@@ -1126,6 +1150,10 @@ struct ixgbe_dmac_config {
#define IXGBE_GSCL_6_82599 0x11034
#define IXGBE_GSCL_7_82599 0x11038
#define IXGBE_GSCL_8_82599 0x1103C
+#define IXGBE_GSCL_5_X540 IXGBE_GSCL_5_82599
+#define IXGBE_GSCL_6_X540 IXGBE_GSCL_6_82599
+#define IXGBE_GSCL_7_X540 IXGBE_GSCL_7_82599
+#define IXGBE_GSCL_8_X540 IXGBE_GSCL_8_82599
#define IXGBE_PHYADR_82599 0x11040
#define IXGBE_PHYDAT_82599 0x11044
#define IXGBE_PHYCTL_82599 0x11048
@@ -1136,10 +1164,22 @@ struct ixgbe_dmac_config {
#define IXGBE_CIAD_82599 IXGBE_CIAD
#define IXGBE_CIAA_X540 IXGBE_CIAA
#define IXGBE_CIAD_X540 IXGBE_CIAD
+#define IXGBE_GSCL_5_X550 0x11810
+#define IXGBE_GSCL_6_X550 0x11814
+#define IXGBE_GSCL_7_X550 0x11818
+#define IXGBE_GSCL_8_X550 0x1181C
+#define IXGBE_GSCL_5_X550EM_x IXGBE_GSCL_5_X550
+#define IXGBE_GSCL_6_X550EM_x IXGBE_GSCL_6_X550
+#define IXGBE_GSCL_7_X550EM_x IXGBE_GSCL_7_X550
+#define IXGBE_GSCL_8_X550EM_x IXGBE_GSCL_8_X550
#define IXGBE_CIAA_X550 0x11508
#define IXGBE_CIAD_X550 0x11510
#define IXGBE_CIAA_X550EM_x IXGBE_CIAA_X550
#define IXGBE_CIAD_X550EM_x IXGBE_CIAD_X550
+#define IXGBE_GSCL_5_X550EM_a IXGBE_GSCL_5_X550
+#define IXGBE_GSCL_6_X550EM_a IXGBE_GSCL_6_X550
+#define IXGBE_GSCL_7_X550EM_a IXGBE_GSCL_7_X550
+#define IXGBE_GSCL_8_X550EM_a IXGBE_GSCL_8_X550
#define IXGBE_CIAA_X550EM_a IXGBE_CIAA_X550
#define IXGBE_CIAD_X550EM_a IXGBE_CIAD_X550
#define IXGBE_CIAA_BY_MAC(_hw) IXGBE_BY_MAC((_hw), CIAA)
--
2.5.0
next prev parent reply other threads:[~2016-05-06 6:08 UTC|newest]
Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-06 6:07 [PATCH 00/29] ixgbe/base: update base driver Beilei Xing
2016-05-06 6:07 ` [PATCH 01/29] ixgbe/base: add new VF requests for mailbox API Beilei Xing
2016-05-19 7:41 ` Gu, YongjieX
2016-05-06 6:07 ` [PATCH 02/29] ixgbe/base: add sgmii link for X550 Beilei Xing
2016-06-13 16:27 ` Ferruh Yigit
2016-05-06 6:07 ` [PATCH 03/29] ixgbe/base: fix problematic return value Beilei Xing
2016-05-06 6:07 ` [PATCH 04/29] ixgbe/base: add mac link setup for x550a SFP Beilei Xing
2016-05-06 6:07 ` [PATCH 05/29] ixgbe/base: fix checksum error of checking PHY token Beilei Xing
2016-05-06 6:07 ` [PATCH 06/29] ixgbe/base: refactor eee setup for x550 Beilei Xing
2016-05-06 6:07 ` [PATCH 07/29] ixgbe/base: change access method Beilei Xing
2016-05-06 6:07 ` [PATCH 08/29] ixgbe/base: add KR support for X550EM_A devices Beilei Xing
2016-05-06 6:07 ` [PATCH 09/29] ixgbe/base: add link mac setup for x550a SFP+ Beilei Xing
2016-05-06 6:07 ` [PATCH 10/29] ixgbe/base: clear stale pool mappings Beilei Xing
2016-05-06 6:07 ` [PATCH 11/29] ixgbe/base: rename macro of TDL Beilei Xing
2016-05-06 6:07 ` [PATCH 12/29] ixgbe/base: fix error path to release lock Beilei Xing
2016-05-06 6:07 ` [PATCH 13/29] ixgbe/base: refactor NW management interface ops Beilei Xing
2016-05-06 6:07 ` [PATCH 14/29] ixgbe/base: fix for code style Beilei Xing
2016-05-06 6:07 ` [PATCH 15/29] ixgbe/base: fix firmware commands on x550em_a Beilei Xing
2016-05-06 6:07 ` [PATCH 16/29] ixgbe/base: add new phy definitions Beilei Xing
2016-05-06 6:07 ` [PATCH 17/29] ixgbe/base: change device IDs Beilei Xing
2016-05-06 6:07 ` [PATCH 18/29] ixgbe/base: update swfw semaphore function Beilei Xing
2016-06-13 16:26 ` Ferruh Yigit
2016-06-13 16:28 ` Ferruh Yigit
2016-05-06 6:07 ` Beilei Xing [this message]
2016-05-06 6:07 ` [PATCH 20/29] ixgbe/base: limit PHY token accessing to MDIO only Beilei Xing
2016-05-06 6:07 ` [PATCH 21/29] ixgbe/base: smplify add/remove VLANs Beilei Xing
2016-06-13 16:26 ` Ferruh Yigit
2016-05-06 6:07 ` [PATCH 22/29] ixgbe/base: add bypassing VLVF Beilei Xing
2016-06-13 14:46 ` Ferruh Yigit
2016-05-06 6:07 ` [PATCH 23/29] ixgbe/base: unify coding style Beilei Xing
2016-05-06 6:07 ` [PATCH 24/29] ixgbe/base: use u8 to replace u16 for a variable Beilei Xing
2016-05-06 6:07 ` [PATCH 25/29] ixgbe/base: fix endianness issues Beilei Xing
2016-05-06 6:07 ` [PATCH 26/29] ixgbe/base: allow setting mac anti spoofing per vf Beilei Xing
2016-05-06 6:07 ` [PATCH 27/29] ixgbe/base: add flow control autoneg for x550a Beilei Xing
2016-05-06 6:07 ` [PATCH 28/29] ixgbe/base: define if enable crosstalk work around Beilei Xing
2016-06-13 16:27 ` Ferruh Yigit
2016-05-06 6:07 ` [PATCH 29/29] ixgbe/base: update README Beilei Xing
2016-06-13 16:28 ` Ferruh Yigit
2016-06-14 1:00 ` Xing, Beilei
2016-06-06 1:24 ` [PATCH 00/29] ixgbe/base: update base driver Zhang, Helin
2016-06-14 6:59 ` [PATCH v2 00/30] " Beilei Xing
2016-06-14 6:59 ` [PATCH v2 01/30] ixgbe/base: add new VF requests for mailbox API Beilei Xing
2016-06-14 6:59 ` [PATCH v2 02/30] ixgbe/base: add sgmii link for X550 Beilei Xing
2016-06-14 6:59 ` [PATCH v2 03/30] ixgbe/base: fix problematic return value Beilei Xing
2016-06-14 6:59 ` [PATCH v2 04/30] ixgbe/base: add mac link setup for x550a SFP Beilei Xing
2016-06-14 6:59 ` [PATCH v2 05/30] ixgbe/base: fix checksum error of checking PHY token Beilei Xing
2016-06-14 6:59 ` [PATCH v2 06/30] ixgbe/base: refactor eee setup for x550 Beilei Xing
2016-06-14 6:59 ` [PATCH v2 07/30] ixgbe/base: change access method Beilei Xing
2016-06-14 6:59 ` [PATCH v2 08/30] ixgbe/base: add KR support for X550EM_A devices Beilei Xing
2016-06-14 6:59 ` [PATCH v2 09/30] ixgbe/base: add link mac setup for x550a SFP+ Beilei Xing
2016-06-14 6:59 ` [PATCH v2 10/30] ixgbe/base: clear stale pool mappings Beilei Xing
2016-06-14 6:59 ` [PATCH v2 11/30] ixgbe/base: rename macro of TDL Beilei Xing
2016-06-14 6:59 ` [PATCH v2 12/30] ixgbe/base: fix error path to release lock Beilei Xing
2016-06-14 6:59 ` [PATCH v2 13/30] ixgbe/base: fix for code style Beilei Xing
2016-06-14 6:59 ` [PATCH v2 14/30] ixgbe/base: fix firmware commands on x550em_a Beilei Xing
2016-06-14 6:59 ` [PATCH v2 15/30] ixgbe/base: refactor NW management interface ops Beilei Xing
2016-06-14 6:59 ` [PATCH v2 16/30] ixgbe/base: add new phy definitions Beilei Xing
2016-06-14 6:59 ` [PATCH v2 17/30] ixgbe/base: change device IDs Beilei Xing
2016-06-14 6:59 ` [PATCH v2 18/30] ixgbe/base: add function to reset swfw semaphore Beilei Xing
2016-06-14 6:59 ` [PATCH v2 19/30] ixgbe/base: fix possible race issue Beilei Xing
2016-06-14 6:59 ` [PATCH v2 20/30] ixgbe/base: fix register access error Beilei Xing
2016-06-14 6:59 ` [PATCH v2 21/30] ixgbe/base: limit PHY token accessing to MDIO only Beilei Xing
2016-06-14 6:59 ` [PATCH v2 22/30] ixgbe/base: simplify add/remove VLANs Beilei Xing
2016-06-14 6:59 ` [PATCH v2 23/30] ixgbe/base: add bypassing VLVF Beilei Xing
2016-06-14 6:59 ` [PATCH v2 24/30] ixgbe/base: unify coding style Beilei Xing
2016-06-14 6:59 ` [PATCH v2 25/30] ixgbe/base: use u8 to replace u16 for a variable Beilei Xing
2016-06-14 6:59 ` [PATCH v2 26/30] ixgbe/base: fix endianness issues Beilei Xing
2016-06-14 6:59 ` [PATCH v2 27/30] ixgbe/base: allow setting mac anti spoofing per vf Beilei Xing
2016-06-14 6:59 ` [PATCH v2 28/30] ixgbe/base: add flow control autoneg for x550a Beilei Xing
2016-06-14 6:59 ` [PATCH v2 29/30] ixgbe/base: define if enable crosstalk work around Beilei Xing
2016-06-14 6:59 ` [PATCH v2 30/30] ixgbe/base: update README Beilei Xing
2016-06-14 10:36 ` [PATCH v2 00/30] ixgbe/base: update base driver Ferruh Yigit
2016-06-14 10:54 ` Ferruh Yigit
2016-06-15 2:56 ` Xing, Beilei
2016-06-15 8:07 ` Thomas Monjalon
2016-06-15 7:53 ` [PATCH v3 00/30] Beilei Xing
2016-06-15 7:53 ` [PATCH v3 01/30] ixgbe/base: add new VF requests for mailbox API Beilei Xing
2016-06-21 14:39 ` Bruce Richardson
2016-06-15 7:53 ` [PATCH v3 02/30] ixgbe/base: add sgmii link for X550 Beilei Xing
2016-06-21 14:40 ` Bruce Richardson
2016-06-15 7:53 ` [PATCH v3 03/30] ixgbe/base: fix problematic return value Beilei Xing
2016-06-15 7:53 ` [PATCH v3 04/30] ixgbe/base: add MAC link setup for X550a SFP Beilei Xing
2016-06-15 7:53 ` [PATCH v3 05/30] ixgbe/base: fix checksum error of checking PHY token Beilei Xing
2016-06-21 14:35 ` Bruce Richardson
2016-06-15 7:53 ` [PATCH v3 06/30] ixgbe/base: refactor eee setup for X550 Beilei Xing
2016-06-15 7:53 ` [PATCH v3 07/30] ixgbe/base: change access method Beilei Xing
2016-06-15 7:53 ` [PATCH v3 08/30] ixgbe/base: add KR support for X550em_a devices Beilei Xing
2016-06-21 14:53 ` Bruce Richardson
2016-06-15 7:53 ` [PATCH v3 09/30] ixgbe/base: add link MAC setup for X550a SFP+ Beilei Xing
2016-06-15 7:53 ` [PATCH v3 10/30] ixgbe/base: clear stale pool mappings Beilei Xing
2016-06-15 7:53 ` [PATCH v3 11/30] ixgbe/base: rename macro of TDL Beilei Xing
2016-06-15 7:53 ` [PATCH v3 12/30] ixgbe/base: fix error path to release lock Beilei Xing
2016-06-15 7:53 ` [PATCH v3 13/30] ixgbe/base: fix for code style Beilei Xing
2016-06-15 7:53 ` [PATCH v3 14/30] ixgbe/base: fix firmware commands on X550em_a Beilei Xing
2016-06-15 7:53 ` [PATCH v3 15/30] ixgbe/base: refactor NW management interface ops Beilei Xing
2016-06-21 16:19 ` Bruce Richardson
2016-06-15 7:53 ` [PATCH v3 16/30] ixgbe/base: add new phy definitions Beilei Xing
2016-06-15 7:53 ` [PATCH v3 17/30] ixgbe/base: change device IDs Beilei Xing
2016-06-15 7:53 ` [PATCH v3 18/30] ixgbe/base: add function to reset swfw semaphore Beilei Xing
2016-06-15 7:53 ` [PATCH v3 19/30] ixgbe/base: fix possible race issue Beilei Xing
2016-06-15 7:53 ` [PATCH v3 20/30] ixgbe/base: fix register access error Beilei Xing
2016-06-15 7:53 ` [PATCH v3 21/30] ixgbe/base: limit PHY token accessing to MDIO only Beilei Xing
2016-06-15 7:53 ` [PATCH v3 22/30] ixgbe/base: simplify add/remove VLANs Beilei Xing
2016-06-15 7:53 ` [PATCH v3 23/30] ixgbe/base: add bypassing VLVF Beilei Xing
2016-06-15 7:53 ` [PATCH v3 24/30] ixgbe/base: unify coding style Beilei Xing
2016-06-15 7:53 ` [PATCH v3 25/30] ixgbe/base: use u8 to replace u16 for a variable Beilei Xing
2016-06-15 7:53 ` [PATCH v3 26/30] ixgbe/base: fix endianness issues Beilei Xing
2016-06-15 7:53 ` [PATCH v3 27/30] ixgbe/base: allow setting MAC anti spoofing per VF Beilei Xing
2016-06-15 7:53 ` [PATCH v3 28/30] ixgbe/base: add flow control autoneg for X550a Beilei Xing
2016-06-15 7:53 ` [PATCH v3 29/30] ixgbe/base: define if enable crosstalk work around Beilei Xing
2016-06-15 7:53 ` [PATCH v3 30/30] ixgbe/base: update README Beilei Xing
2016-06-23 7:22 ` [PATCH v4 00/29] ixgbe/base: update base driver Beilei Xing
2016-06-23 7:22 ` [PATCH v4 01/29] ixgbe/base: add new VF requests for mailbox API Beilei Xing
2016-06-23 7:22 ` [PATCH v4 02/29] ixgbe/base: add sgmii link for X550 Beilei Xing
2016-06-23 7:22 ` [PATCH v4 03/29] ixgbe/base: fix problematic return value Beilei Xing
2016-06-23 7:22 ` [PATCH v4 04/29] ixgbe/base: add MAC link setup for X550a SFP Beilei Xing
2016-06-23 7:22 ` [PATCH v4 05/29] ixgbe/base: fix firmware command checksum error Beilei Xing
2016-06-23 7:22 ` [PATCH v4 06/29] ixgbe/base: refactor eee setup for X550 Beilei Xing
2016-06-23 7:22 ` [PATCH v4 07/29] ixgbe/base: add KR support for X550em_a devices Beilei Xing
2016-06-23 7:22 ` [PATCH v4 08/29] ixgbe/base: change access method Beilei Xing
2016-06-23 7:22 ` [PATCH v4 09/29] ixgbe/base: add link MAC setup for X550a SFP+ Beilei Xing
2016-06-23 7:22 ` [PATCH v4 10/29] ixgbe/base: clear stale pool mappings Beilei Xing
2016-06-23 7:22 ` [PATCH v4 11/29] ixgbe/base: rename macro of TDL Beilei Xing
2016-06-23 7:22 ` [PATCH v4 12/29] ixgbe/base: fix error path to release lock Beilei Xing
2016-06-23 7:22 ` [PATCH v4 13/29] ixgbe/base: fix for code style Beilei Xing
2016-06-23 7:22 ` [PATCH v4 14/29] ixgbe/base: optimize internal PHY mode determination Beilei Xing
2016-06-23 7:22 ` [PATCH v4 15/29] ixgbe/base: add new phy definitions Beilei Xing
2016-06-23 7:22 ` [PATCH v4 16/29] ixgbe/base: change device IDs Beilei Xing
2016-06-23 7:22 ` [PATCH v4 17/29] ixgbe/base: add function to reset swfw semaphore Beilei Xing
2016-06-23 7:22 ` [PATCH v4 18/29] ixgbe/base: fix possible race issue Beilei Xing
2016-06-23 7:22 ` [PATCH v4 19/29] ixgbe/base: fix register access error Beilei Xing
2016-06-23 7:22 ` [PATCH v4 20/29] ixgbe/base: limit PHY token accessing to MDIO only Beilei Xing
2016-06-23 7:22 ` [PATCH v4 21/29] ixgbe/base: simplify add/remove VLANs Beilei Xing
2016-06-23 7:22 ` [PATCH v4 22/29] ixgbe/base: add bypassing VLVF Beilei Xing
2016-06-23 7:22 ` [PATCH v4 23/29] ixgbe/base: unify coding style Beilei Xing
2016-06-23 7:22 ` [PATCH v4 24/29] ixgbe/base: use u8 to replace u16 for a variable Beilei Xing
2016-06-23 7:22 ` [PATCH v4 25/29] ixgbe/base: fix endianness issues Beilei Xing
2016-06-23 7:22 ` [PATCH v4 26/29] ixgbe/base: allow setting MAC anti spoofing per VF Beilei Xing
2016-06-23 7:22 ` [PATCH v4 27/29] ixgbe/base: add flow control autoneg for X550a Beilei Xing
2016-06-23 7:22 ` [PATCH v4 28/29] ixgbe/base: define if enable crosstalk work around Beilei Xing
2016-06-23 7:22 ` [PATCH v4 29/29] ixgbe/base: update README Beilei Xing
2016-06-27 14:20 ` [PATCH v4 00/29] ixgbe/base: update base driver Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462514861-29419-20-git-send-email-beilei.xing@intel.com \
--to=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.