[07/24] rtw88: 8822c: update efuse table as released

Commit Message

Tony Chuang Jan. 31, 2019, 12:21 p.m. UTC

From: Yan-Hsuan Chuang <[e-mail]>

Update efuse table layout as the document released.
From the newest released document, 8822c has RFE type 1 and type 2.
Without adding RFE 1 and 2 the user's efuse-programed chips will failed
to pass the chip info check and cannot power on hardware.
And 8822c has only 512 bytes for physical efuse.

Signed-off-by: Yan-Hsuan Chuang <[e-mail]>
---
 drivers/net/wireless/realtek/rtw88/rtw8822c.c | 12 ++----
 drivers/net/wireless/realtek/rtw88/rtw8822c.h | 53 ++++++++++++++-------------
 2 files changed, 31 insertions(+), 34 deletions(-)

Comments

Brian Norris Feb. 1, 2019, 2:26 a.m. UTC | #1

Hi,

On Thu, Jan 31, 2019 at 08:21:20PM +0800, [e-mail] wrote:
> From: Yan-Hsuan Chuang <[e-mail]>
> 
> Update efuse table layout as the document released.
> From the newest released document, 8822c has RFE type 1 and type 2.
> Without adding RFE 1 and 2 the user's efuse-programed chips will failed
> to pass the chip info check and cannot power on hardware.
> And 8822c has only 512 bytes for physical efuse.
> 
> Signed-off-by: Yan-Hsuan Chuang <[e-mail]>
> ---
>  drivers/net/wireless/realtek/rtw88/rtw8822c.c | 12 ++----
>  drivers/net/wireless/realtek/rtw88/rtw8822c.h | 53 ++++++++++++++-------------
>  2 files changed, 31 insertions(+), 34 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
> index 71f2af0..5c06e32 100644
> --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
> +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c

> @@ -1137,7 +1133,7 @@ struct rtw_chip_info rtw8822c_hw_spec = {
>  	.tx_buf_desc_sz = 16,
>  	.rx_pkt_desc_sz = 24,
>  	.rx_buf_desc_sz = 8,
> -	.phy_efuse_size = 1024,
> +	.phy_efuse_size = 512,

I realized that technically, I'm blaming your memory errors (writing
past the phy efuse buffer) on the original patchset, when you really
create the error here, when you shrink phy_efuse_size.

Regardless, the original series should be fixed to do better bounds
checking or to stop accessing a fixed value beyond 512 anyway.

Brian

>  	.log_efuse_size = 768,
>  	.ptct_efuse_size = 124,
>  	.txff_size = 262144,

Patch

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 71f2af0..5c06e32 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -16,12 +16,10 @@ 
 static void rtw8822c_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path,
 				     u8 rx_path, bool is_tx2_path);
 
-static u8 temp_addr[ETH_ALEN] = {0x00, 0xe0, 0x4c, 0x88, 0x22, 0xce};
-
 static void rtw8822ce_efuse_parsing(struct rtw_efuse *efuse,
 				    struct rtw8822c_efuse *map)
 {
-	ether_addr_copy(efuse->addr, temp_addr);
+	ether_addr_copy(efuse->addr, map->e.mac_addr);
 }
 
 static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
@@ -34,10 +32,6 @@  static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
 
 	efuse->rfe_option = map->rfe_option;
 	efuse->crystal_cap = map->xtal_k;
-	efuse->pa_type_2g = map->pa_type;
-	efuse->pa_type_5g = map->pa_type;
-	efuse->lna_type_2g = map->lna_type_2g[0];
-	efuse->lna_type_5g = map->lna_type_5g[0];
 	efuse->channel_plan = map->channel_plan;
 	efuse->country_code[0] = map->country_code[0];
 	efuse->country_code[1] = map->country_code[1];
@@ -1082,6 +1076,8 @@  static struct rtw_intf_phy_para_table phy_para_table_8822c = {
 
 static const struct rtw_rfe_def rtw8822c_rfe_defs[] = {
 	[0] = RTW_DEF_RFE(8822c, 0, 0),
+	[1] = RTW_DEF_RFE(8822c, 0, 0),
+	[2] = RTW_DEF_RFE(8822c, 0, 0),
 };
 
 static struct rtw_hw_reg rtw8822c_dig[] = {
@@ -1137,7 +1133,7 @@  struct rtw_chip_info rtw8822c_hw_spec = {
 	.tx_buf_desc_sz = 16,
 	.rx_pkt_desc_sz = 24,
 	.rx_buf_desc_sz = 8,
-	.phy_efuse_size = 1024,
+	.phy_efuse_size = 512,
 	.log_efuse_size = 768,
 	.ptct_efuse_size = 124,
 	.txff_size = 262144,
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
index e8abce0..d4806fd 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
@@ -8,27 +8,16 @@ 
 #include <asm/byteorder.h>
 
 struct rtw8822cu_efuse {
-	u8 res4[4];			/* 0xd0 */
-	u8 usb_optional_function;
-	u8 res5[0x1e];
-	u8 res6[2];
-	u8 serial[0x0b];		/* 0xf5 */
-	u8 vid;				/* 0x100 */
-	u8 res7;
-	u8 pid;
-	u8 res8[4];
-	u8 mac_addr[ETH_ALEN];		/* 0x107 */
-	u8 res9[2];
-	u8 vendor_name[0x07];
-	u8 res10[2];
-	u8 device_name[0x14];
-	u8 res11[0xcf];
-	u8 package_type;		/* 0x1fb */
-	u8 res12[0x4];
+	u8 res0[0x30];			/* 0x120 */
+	u8 vid[2];			/* 0x150 */
+	u8 pid[2];
+	u8 res1[3];
+	u8 mac_addr[ETH_ALEN];		/* 0x157 */
+	u8 res2[0x3d];
 };
 
 struct rtw8822ce_efuse {
-	u8 mac_addr[ETH_ALEN];		/* 0xd0 */
+	u8 mac_addr[ETH_ALEN];		/* 0x120 */
 	u8 vender_id[2];
 	u8 device_id[2];
 	u8 sub_vender_id[2];
@@ -36,20 +25,20 @@  struct rtw8822ce_efuse {
 	u8 pmc[2];
 	u8 exp_device_cap[2];
 	u8 msi_cap;
-	u8 ltr_cap;			/* 0xe3 */
+	u8 ltr_cap;			/* 0x133 */
 	u8 exp_link_control[2];
 	u8 link_cap[4];
 	u8 link_control[2];
 	u8 serial_number[8];
-	u8 res0:2;			/* 0xf4 */
+	u8 res0:2;			/* 0x144 */
 	u8 ltr_en:1;
 	u8 res1:2;
 	u8 obff:2;
 	u8 res2:3;
 	u8 obff_cap:2;
 	u8 res3:4;
-	u8 res4[3];
 	u8 class_code[3];
+	u8 res4;
 	u8 pci_pm_L1_2_supp:1;
 	u8 pci_pm_L1_1_supp:1;
 	u8 aspm_pm_L1_2_supp:1;
@@ -72,11 +61,9 @@  struct rtw8822c_efuse {
 
 	u8 channel_plan;		/* 0xb8 */
 	u8 xtal_k;
-	u8 thermal_meter;
+	u8 res1;
 	u8 iqk_lck;
-	u8 pa_type;			/* 0xbc */
-	u8 lna_type_2g[2];		/* 0xbd */
-	u8 lna_type_5g[2];
+	u8 res2[5];			/* 0xbc */
 	u8 rf_board_option;
 	u8 rf_feature_option;
 	u8 rf_bt_setting;
@@ -88,7 +75,21 @@  struct rtw8822c_efuse {
 	u8 rf_antenna_option;		/* 0xc9 */
 	u8 rfe_option;
 	u8 country_code[2];
-	u8 res[3];
+	u8 res3[3];
+	u8 path_a_thermal;		/* 0xd0 */
+	u8 path_b_thermal;
+	u8 res4[2];
+	u8 rx_gain_gap_2g_ofdm;
+	u8 res5;
+	u8 rx_gain_gap_2g_cck;
+	u8 res6;
+	u8 rx_gain_gap_5gl;
+	u8 res7;
+	u8 rx_gain_gap_5gm;
+	u8 res8;
+	u8 rx_gain_gap_5gh;
+	u8 res9;
+	u8 res10[0x42];
 	union {
 		struct rtw8822cu_efuse u;
 		struct rtw8822ce_efuse e;