Commit 30645118 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtw89: reduce export symbol number of mac size and quota 



An export symbol costs about 40 bytes (in x86 with gcc), so use a structure
containing these small arrays to reduce code size.

   text	   data	    bss	    dec	    hex	filename
  34932	   1410	      0	  36342	   8df6	mac.o (before)
  34276	   1258	      0	  35534	   8ace	mac.o (after)

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220315015522.11366-1-pkshih@realtek.com
parent edb89629

drivers/net/wireless/realtek/rtw89/mac.c

+41 −117
Original line number Diff line number Diff line
@@ -510,11 +510,6 @@ int rtw89_mac_set_err_status(struct rtw89_dev *rtwdev, u32 err) 
}

EXPORT_SYMBOL(rtw89_mac_set_err_status);



const struct rtw89_hfc_prec_cfg rtw89_hfc_preccfg_pcie = {

	2, 40, 0, 0, 1, 0, 0, 0

};

EXPORT_SYMBOL(rtw89_hfc_preccfg_pcie);



static int hfc_reset_param(struct rtw89_dev *rtwdev)

{

	struct rtw89_hfc_param *param = &rtwdev->mac.hfc_param;
@@ -1216,119 +1211,48 @@ static int rtw89_mac_sys_init(struct rtw89_dev *rtwdev) 
	return ret;

}



const struct rtw89_mac_size_set rtw89_mac_size = {

	.hfc_preccfg_pcie = {2, 40, 0, 0, 1, 0, 0, 0},

	/* PCIE 64 */

const struct rtw89_dle_size rtw89_wde_size0 = {

	RTW89_WDE_PG_64, 4095, 1,

};

EXPORT_SYMBOL(rtw89_wde_size0);



	.wde_size0 = {RTW89_WDE_PG_64, 4095, 1,},

	/* DLFW */

const struct rtw89_dle_size rtw89_wde_size4 = {

	RTW89_WDE_PG_64, 0, 4096,

};

EXPORT_SYMBOL(rtw89_wde_size4);



	.wde_size4 = {RTW89_WDE_PG_64, 0, 4096,},

	/* 8852C DLFW */

const struct rtw89_dle_size rtw89_wde_size18 = {

	RTW89_WDE_PG_64, 0, 2048,

};

EXPORT_SYMBOL(rtw89_wde_size18);



	.wde_size18 = {RTW89_WDE_PG_64, 0, 2048,},

	/* 8852C PCIE SCC */

const struct rtw89_dle_size rtw89_wde_size19 = {

	RTW89_WDE_PG_64, 3328, 0,

};

EXPORT_SYMBOL(rtw89_wde_size19);



	.wde_size19 = {RTW89_WDE_PG_64, 3328, 0,},

	/* PCIE */

const struct rtw89_dle_size rtw89_ple_size0 = {

	RTW89_PLE_PG_128, 1520, 16,

};

EXPORT_SYMBOL(rtw89_ple_size0);



	.ple_size0 = {RTW89_PLE_PG_128, 1520, 16,},

	/* DLFW */

const struct rtw89_dle_size rtw89_ple_size4 = {

	RTW89_PLE_PG_128, 64, 1472,

};

EXPORT_SYMBOL(rtw89_ple_size4);



	.ple_size4 = {RTW89_PLE_PG_128, 64, 1472,},

	/* 8852C DLFW */

const struct rtw89_dle_size rtw89_ple_size18 = {

	RTW89_PLE_PG_128, 2544, 16,

};

EXPORT_SYMBOL(rtw89_ple_size18);



	.ple_size18 = {RTW89_PLE_PG_128, 2544, 16,},

	/* 8852C PCIE SCC */

const struct rtw89_dle_size rtw89_ple_size19 = {

	RTW89_PLE_PG_128, 1904, 16,

};

EXPORT_SYMBOL(rtw89_ple_size19);



	.ple_size19 = {RTW89_PLE_PG_128, 1904, 16,},

	/* PCIE 64 */

const struct rtw89_wde_quota rtw89_wde_qt0 = {

	3792, 196, 0, 107,

};

EXPORT_SYMBOL(rtw89_wde_qt0);



	.wde_qt0 = {3792, 196, 0, 107,},

	/* DLFW */

const struct rtw89_wde_quota rtw89_wde_qt4 = {

	0, 0, 0, 0,

};

EXPORT_SYMBOL(rtw89_wde_qt4);



	.wde_qt4 = {0, 0, 0, 0,},

	/* 8852C DLFW */

const struct rtw89_wde_quota rtw89_wde_qt17 = {

	0, 0, 0,  0,

};

EXPORT_SYMBOL(rtw89_wde_qt17);



	.wde_qt17 = {0, 0, 0,  0,},

	/* 8852C PCIE SCC */

const struct rtw89_wde_quota rtw89_wde_qt18 = {

	3228, 60, 0, 40,

};

EXPORT_SYMBOL(rtw89_wde_qt18);



	.wde_qt18 = {3228, 60, 0, 40,},

	/* PCIE SCC */

const struct rtw89_ple_quota rtw89_ple_qt4 = {

	264, 0, 16, 20, 26, 13, 356, 0, 32, 40, 8,

};

EXPORT_SYMBOL(rtw89_ple_qt4);



	.ple_qt4 = {264, 0, 16, 20, 26, 13, 356, 0, 32, 40, 8,},

	/* PCIE SCC */

const struct rtw89_ple_quota rtw89_ple_qt5 = {

	264, 0, 32, 20, 64, 13, 1101, 0, 64, 128, 120,

};

EXPORT_SYMBOL(rtw89_ple_qt5);



	.ple_qt5 = {264, 0, 32, 20, 64, 13, 1101, 0, 64, 128, 120,},

	/* DLFW */

const struct rtw89_ple_quota rtw89_ple_qt13 = {

	0, 0, 16, 48, 0, 0, 0, 0, 0, 0, 0

};

EXPORT_SYMBOL(rtw89_ple_qt13);



	.ple_qt13 = {0, 0, 16, 48, 0, 0, 0, 0, 0, 0, 0,},

	/* DLFW 52C */

const struct rtw89_ple_quota rtw89_ple_qt44 = {

	0, 0, 16, 256, 0, 0, 0, 0, 0, 0, 0, 0,

};

EXPORT_SYMBOL(rtw89_ple_qt44);



	.ple_qt44 = {0, 0, 16, 256, 0, 0, 0, 0, 0, 0, 0, 0,},

	/* DLFW 52C */

const struct rtw89_ple_quota rtw89_ple_qt45 = {

	0, 0, 32, 256, 0, 0, 0, 0, 0, 0, 0, 0,

};

EXPORT_SYMBOL(rtw89_ple_qt45);



	.ple_qt45 = {0, 0, 32, 256, 0, 0, 0, 0, 0, 0, 0, 0,},

	/* 8852C PCIE SCC */

const struct rtw89_ple_quota rtw89_ple_qt46 = {

	525, 0, 16, 20, 13, 13, 178, 0, 32, 62, 8, 16,

};

EXPORT_SYMBOL(rtw89_ple_qt46);



	.ple_qt46 = {525, 0, 16, 20, 13, 13, 178, 0, 32, 62, 8, 16,},

	/* 8852C PCIE SCC */

const struct rtw89_ple_quota rtw89_ple_qt47 = {

	525, 0, 32, 20, 1034, 13, 1199, 0, 1053, 62, 160, 1037,

	.ple_qt47 = {525, 0, 32, 20, 1034, 13, 1199, 0, 1053, 62, 160, 1037,},

};

EXPORT_SYMBOL(rtw89_ple_qt47);

EXPORT_SYMBOL(rtw89_mac_size);



static const struct rtw89_dle_mem *get_dle_mem_cfg(struct rtw89_dev *rtwdev,

						   enum rtw89_qta_mode mode)

drivers/net/wireless/realtek/rtw89/mac.h

+24 −20
Original line number Diff line number Diff line
@@ -682,26 +682,30 @@ enum mac_ax_err_info { 
	MAC_AX_SET_ERR_MAX,

};



extern const struct rtw89_hfc_prec_cfg rtw89_hfc_preccfg_pcie;

extern const struct rtw89_dle_size rtw89_wde_size0;

extern const struct rtw89_dle_size rtw89_wde_size4;

extern const struct rtw89_dle_size rtw89_wde_size18;

extern const struct rtw89_dle_size rtw89_wde_size19;

extern const struct rtw89_dle_size rtw89_ple_size0;

extern const struct rtw89_dle_size rtw89_ple_size4;

extern const struct rtw89_dle_size rtw89_ple_size18;

extern const struct rtw89_dle_size rtw89_ple_size19;

extern const struct rtw89_wde_quota rtw89_wde_qt0;

extern const struct rtw89_wde_quota rtw89_wde_qt4;

extern const struct rtw89_wde_quota rtw89_wde_qt17;

extern const struct rtw89_wde_quota rtw89_wde_qt18;

extern const struct rtw89_ple_quota rtw89_ple_qt4;

extern const struct rtw89_ple_quota rtw89_ple_qt5;

extern const struct rtw89_ple_quota rtw89_ple_qt13;

extern const struct rtw89_ple_quota rtw89_ple_qt44;

extern const struct rtw89_ple_quota rtw89_ple_qt45;

extern const struct rtw89_ple_quota rtw89_ple_qt46;

extern const struct rtw89_ple_quota rtw89_ple_qt47;

struct rtw89_mac_size_set {

	const struct rtw89_hfc_prec_cfg hfc_preccfg_pcie;

	const struct rtw89_dle_size wde_size0;

	const struct rtw89_dle_size wde_size4;

	const struct rtw89_dle_size wde_size18;

	const struct rtw89_dle_size wde_size19;

	const struct rtw89_dle_size ple_size0;

	const struct rtw89_dle_size ple_size4;

	const struct rtw89_dle_size ple_size18;

	const struct rtw89_dle_size ple_size19;

	const struct rtw89_wde_quota wde_qt0;

	const struct rtw89_wde_quota wde_qt4;

	const struct rtw89_wde_quota wde_qt17;

	const struct rtw89_wde_quota wde_qt18;

	const struct rtw89_ple_quota ple_qt4;

	const struct rtw89_ple_quota ple_qt5;

	const struct rtw89_ple_quota ple_qt13;

	const struct rtw89_ple_quota ple_qt44;

	const struct rtw89_ple_quota ple_qt45;

	const struct rtw89_ple_quota ple_qt46;

	const struct rtw89_ple_quota ple_qt47;

};



extern const struct rtw89_mac_size_set rtw89_mac_size;



static inline u32 rtw89_mac_reg_by_idx(u32 reg_base, u8 band)

{

drivers/net/wireless/realtek/rtw89/rtw8852a.c

+10 −8
Original line number Diff line number Diff line
@@ -37,19 +37,21 @@ static const struct rtw89_hfc_pub_cfg rtw8852a_hfc_pubcfg_pcie = { 


static const struct rtw89_hfc_param_ini rtw8852a_hfc_param_ini_pcie[] = {

	[RTW89_QTA_SCC] = {rtw8852a_hfc_chcfg_pcie, &rtw8852a_hfc_pubcfg_pcie,

			   &rtw89_hfc_preccfg_pcie, RTW89_HCIFC_POH},

	[RTW89_QTA_DLFW] = {NULL, NULL, &rtw89_hfc_preccfg_pcie,

			   &rtw89_mac_size.hfc_preccfg_pcie, RTW89_HCIFC_POH},

	[RTW89_QTA_DLFW] = {NULL, NULL, &rtw89_mac_size.hfc_preccfg_pcie,

			    RTW89_HCIFC_POH},

	[RTW89_QTA_INVALID] = {NULL},

};



static const struct rtw89_dle_mem rtw8852a_dle_mem_pcie[] = {

	[RTW89_QTA_SCC] = {RTW89_QTA_SCC, &rtw89_wde_size0, &rtw89_ple_size0,

			   &rtw89_wde_qt0, &rtw89_wde_qt0, &rtw89_ple_qt4,

			   &rtw89_ple_qt5},

	[RTW89_QTA_DLFW] = {RTW89_QTA_DLFW, &rtw89_wde_size4, &rtw89_ple_size4,

			    &rtw89_wde_qt4, &rtw89_wde_qt4, &rtw89_ple_qt13,

			    &rtw89_ple_qt13},

	[RTW89_QTA_SCC] = {RTW89_QTA_SCC, &rtw89_mac_size.wde_size0,

			   &rtw89_mac_size.ple_size0, &rtw89_mac_size.wde_qt0,

			   &rtw89_mac_size.wde_qt0, &rtw89_mac_size.ple_qt4,

			   &rtw89_mac_size.ple_qt5},

	[RTW89_QTA_DLFW] = {RTW89_QTA_DLFW, &rtw89_mac_size.wde_size4,

			    &rtw89_mac_size.ple_size4, &rtw89_mac_size.wde_qt4,

			    &rtw89_mac_size.wde_qt4, &rtw89_mac_size.ple_qt13,

			    &rtw89_mac_size.ple_qt13},

	[RTW89_QTA_INVALID] = {RTW89_QTA_INVALID, NULL, NULL, NULL, NULL, NULL,

			       NULL},

};

drivers/net/wireless/realtek/rtw89/rtw8852c.c

+8 −6
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@ 
#include "rtw8852c.h"



static const struct rtw89_dle_mem rtw8852c_dle_mem_pcie[] = {

	[RTW89_QTA_SCC] = {RTW89_QTA_SCC, &rtw89_wde_size19, &rtw89_ple_size19,

			   &rtw89_wde_qt18, &rtw89_wde_qt18, &rtw89_ple_qt46,

			   &rtw89_ple_qt47},

	[RTW89_QTA_DLFW] = {RTW89_QTA_DLFW, &rtw89_wde_size18,

			    &rtw89_ple_size18, &rtw89_wde_qt17, &rtw89_wde_qt17,

			    &rtw89_ple_qt44, &rtw89_ple_qt45},

	[RTW89_QTA_SCC] = {RTW89_QTA_SCC, &rtw89_mac_size.wde_size19,

			   &rtw89_mac_size.ple_size19, &rtw89_mac_size.wde_qt18,

			   &rtw89_mac_size.wde_qt18, &rtw89_mac_size.ple_qt46,

			   &rtw89_mac_size.ple_qt47},

	[RTW89_QTA_DLFW] = {RTW89_QTA_DLFW, &rtw89_mac_size.wde_size18,

			    &rtw89_mac_size.ple_size18, &rtw89_mac_size.wde_qt17,

			    &rtw89_mac_size.wde_qt17, &rtw89_mac_size.ple_qt44,

			    &rtw89_mac_size.ple_qt45},

	[RTW89_QTA_INVALID] = {RTW89_QTA_INVALID, NULL, NULL, NULL, NULL, NULL,

			       NULL},

};