rtw89: reduce export symbol number of mac size and quota
Ping-Ke Shih
maintainerPATCH 1/1 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 Ping-Ke Shih <[email protected]>
--- drivers/net/wireless/realtek/rtw89/mac.c | 158 +++++------------- drivers/net/wireless/realtek/rtw89/mac.h | 44 ++--- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 18 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 14 +- 4 files changed, 83 insertions(+), 151 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +41 -117
@@ -482,11 +482,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;
@@ -1171,119 +1166,48 @@ static int rtw89_mac_sys_init(struct rtw89_dev *rtwdev)return ret; } -/* PCIE 64 */ -const struct rtw89_dle_size rtw89_wde_size0 = { -RTW89_WDE_PG_64 ,4095 ,1 , -}; -EXPORT_SYMBOL (rtw89_wde_size0); - -/* DLFW */ -const struct rtw89_dle_size rtw89_wde_size4 = { -RTW89_WDE_PG_64 ,0 ,4096 , -}; -EXPORT_SYMBOL (rtw89_wde_size4); - -/* 8852C DLFW */ -const struct rtw89_dle_size rtw89_wde_size18 = { -RTW89_WDE_PG_64 ,0 ,2048 , -}; -EXPORT_SYMBOL (rtw89_wde_size18); - -/* 8852C PCIE SCC */ -const struct rtw89_dle_size rtw89_wde_size19 = { -RTW89_WDE_PG_64 ,3328 ,0 , -}; -EXPORT_SYMBOL (rtw89_wde_size19); - -/* PCIE */ -const struct rtw89_dle_size rtw89_ple_size0 = { -RTW89_PLE_PG_128 ,1520 ,16 , -}; -EXPORT_SYMBOL (rtw89_ple_size0); - -/* DLFW */ -const struct rtw89_dle_size rtw89_ple_size4 = { -RTW89_PLE_PG_128 ,64 ,1472 , -}; -EXPORT_SYMBOL (rtw89_ple_size4); - -/* 8852C DLFW */ -const struct rtw89_dle_size rtw89_ple_size18 = { -RTW89_PLE_PG_128 ,2544 ,16 , -}; -EXPORT_SYMBOL (rtw89_ple_size18); - -/* 8852C PCIE SCC */ -const struct rtw89_dle_size rtw89_ple_size19 = { -RTW89_PLE_PG_128 ,1904 ,16 , -}; -EXPORT_SYMBOL (rtw89_ple_size19); - -/* PCIE 64 */ -const struct rtw89_wde_quota rtw89_wde_qt0 = { -3792 ,196 ,0 ,107 , -}; -EXPORT_SYMBOL (rtw89_wde_qt0); - -/* DLFW */ -const struct rtw89_wde_quota rtw89_wde_qt4 = { -0 ,0 ,0 ,0 , -}; -EXPORT_SYMBOL (rtw89_wde_qt4); - -/* 8852C DLFW */ -const struct rtw89_wde_quota rtw89_wde_qt17 = { -0 ,0 ,0 ,0 , -}; -EXPORT_SYMBOL (rtw89_wde_qt17); - -/* 8852C PCIE SCC */ -const struct rtw89_wde_quota rtw89_wde_qt18 = { -3228 ,60 ,0 ,40 , -}; -EXPORT_SYMBOL (rtw89_wde_qt18); - -/* 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); - -/* 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); - -/* 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); - -/* 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); - -/* 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); - -/* 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); - -/* 8852C PCIE SCC */ -const struct rtw89_ple_quota rtw89_ple_qt47 = { -525 ,0 ,32 ,20 ,1034 ,13 ,1199 ,0 ,1053 ,62 ,160 ,1037 , +const struct rtw89_mac_size_set rtw89_mac_size = { + .hfc_preccfg_pcie = {2 ,40 ,0 ,0 ,1 ,0 ,0 ,0 }, +/* PCIE 64 */ + .wde_size0 = {RTW89_WDE_PG_64 ,4095 ,1 ,}, +/* DLFW */ + .wde_size4 = {RTW89_WDE_PG_64 ,0 ,4096 ,}, +/* 8852C DLFW */ + .wde_size18 = {RTW89_WDE_PG_64 ,0 ,2048 ,}, +/* 8852C PCIE SCC */ + .wde_size19 = {RTW89_WDE_PG_64 ,3328 ,0 ,}, +/* PCIE */ + .ple_size0 = {RTW89_PLE_PG_128 ,1520 ,16 ,}, +/* DLFW */ + .ple_size4 = {RTW89_PLE_PG_128 ,64 ,1472 ,}, +/* 8852C DLFW */ + .ple_size18 = {RTW89_PLE_PG_128 ,2544 ,16 ,}, +/* 8852C PCIE SCC */ + .ple_size19 = {RTW89_PLE_PG_128 ,1904 ,16 ,}, +/* PCIE 64 */ + .wde_qt0 = {3792 ,196 ,0 ,107 ,}, +/* DLFW */ + .wde_qt4 = {0 ,0 ,0 ,0 ,}, +/* 8852C DLFW */ + .wde_qt17 = {0 ,0 ,0 ,0 ,}, +/* 8852C PCIE SCC */ + .wde_qt18 = {3228 ,60 ,0 ,40 ,}, +/* PCIE SCC */ + .ple_qt4 = {264 ,0 ,16 ,20 ,26 ,13 ,356 ,0 ,32 ,40 ,8 ,}, +/* PCIE SCC */ + .ple_qt5 = {264 ,0 ,32 ,20 ,64 ,13 ,1101 ,0 ,64 ,128 ,120 ,}, +/* DLFW */ + .ple_qt13 = {0 ,0 ,16 ,48 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,}, +/* DLFW 52C */ + .ple_qt44 = {0 ,0 ,16 ,256 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,}, +/* DLFW 52C */ + .ple_qt45 = {0 ,0 ,32 ,256 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,}, +/* 8852C PCIE SCC */ + .ple_qt46 = {525 ,0 ,16 ,20 ,13 ,13 ,178 ,0 ,32 ,62 ,8 ,16 ,}, +/* 8852C PCIE SCC */ + .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
50 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852a.c +10 -8
@@ -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
@@ -9,12 +9,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 }, };
Signature · 1 line
2.25.1
Quoted 8 lines · Ping-Ke Shih
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 Ping-Ke Shih <[email protected]>
Patch applied to wireless-next.git, thanks.
306451188062 rtw89: reduce export symbol number of mac size and quota
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches