Skip to content

Commit 260b673

Browse files
arndbgregkh
arndb
authored and
gregkh
committed
brcmsmac: make some local variables 'static const' to reduce stack size
commit c503dd38f850be28867ef7a42d9abe5ade81a9bd upstream. With KASAN and a couple of other patches applied, this driver is one of the few remaining ones that actually use more than 2048 bytes of kernel stack: broadcom/brcm80211/brcmsmac/phy/phy_n.c: In function 'wlc_phy_workarounds_nphy_gainctrl': broadcom/brcm80211/brcmsmac/phy/phy_n.c:16065:1: warning: the frame size of 3264 bytes is larger than 2048 bytes [-Wframe-larger-than=] broadcom/brcm80211/brcmsmac/phy/phy_n.c: In function 'wlc_phy_workarounds_nphy': broadcom/brcm80211/brcmsmac/phy/phy_n.c:17138:1: warning: the frame size of 2864 bytes is larger than 2048 bytes [-Wframe-larger-than=] Here, I'm reducing the stack size by marking as many local variables as 'static const' as I can without changing the actual code. This is the first of three patches to improve the stack usage in this driver. It would be good to have this backported to stabl kernels to get all drivers in 'allmodconfig' below the 2048 byte limit so we can turn on the frame warning again globally, but I realize that the patch is larger than the normal limit for stable backports. The other two patches do not need to be backported. Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent efdcbff commit 260b673

1 file changed

Lines changed: 97 additions & 100 deletions

File tree

  • drivers/net/wireless/brcm80211/brcmsmac/phy

‎drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c‎

Lines changed: 97 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -14764,8 +14764,8 @@ static void wlc_phy_ipa_restore_tx_digi_filts_nphy(struct brcms_phy *pi)
1476414764
}
1476514765

1476614766
static void
14767-
wlc_phy_set_rfseq_nphy(struct brcms_phy *pi, u8 cmd, u8 *events, u8 *dlys,
14768-
u8 len)
14767+
wlc_phy_set_rfseq_nphy(struct brcms_phy *pi, u8 cmd, const u8 *events,
14768+
const u8 *dlys, u8 len)
1476914769
{
1477014770
u32 t1_offset, t2_offset;
1477114771
u8 ctr;
@@ -15240,16 +15240,16 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev5(struct brcms_phy *pi)
1524015240
static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(struct brcms_phy *pi)
1524115241
{
1524215242
u16 currband;
15243-
s8 lna1G_gain_db_rev7[] = { 9, 14, 19, 24 };
15244-
s8 *lna1_gain_db = NULL;
15245-
s8 *lna1_gain_db_2 = NULL;
15246-
s8 *lna2_gain_db = NULL;
15247-
s8 tiaA_gain_db_rev7[] = { -9, -6, -3, 0, 3, 3, 3, 3, 3, 3 };
15248-
s8 *tia_gain_db;
15249-
s8 tiaA_gainbits_rev7[] = { 0, 1, 2, 3, 4, 4, 4, 4, 4, 4 };
15250-
s8 *tia_gainbits;
15251-
u16 rfseqA_init_gain_rev7[] = { 0x624f, 0x624f };
15252-
u16 *rfseq_init_gain;
15243+
static const s8 lna1G_gain_db_rev7[] = { 9, 14, 19, 24 };
15244+
const s8 *lna1_gain_db = NULL;
15245+
const s8 *lna1_gain_db_2 = NULL;
15246+
const s8 *lna2_gain_db = NULL;
15247+
static const s8 tiaA_gain_db_rev7[] = { -9, -6, -3, 0, 3, 3, 3, 3, 3, 3 };
15248+
const s8 *tia_gain_db;
15249+
static const s8 tiaA_gainbits_rev7[] = { 0, 1, 2, 3, 4, 4, 4, 4, 4, 4 };
15250+
const s8 *tia_gainbits;
15251+
static const u16 rfseqA_init_gain_rev7[] = { 0x624f, 0x624f };
15252+
const u16 *rfseq_init_gain;
1525315253
u16 init_gaincode;
1525415254
u16 clip1hi_gaincode;
1525515255
u16 clip1md_gaincode = 0;
@@ -15310,21 +15310,19 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(struct brcms_phy *pi)
1531015310

1531115311
if ((freq <= 5080) || (freq == 5825)) {
1531215312

15313-
s8 lna1A_gain_db_rev7[] = { 11, 16, 20, 24 };
15314-
s8 lna1A_gain_db_2_rev7[] = {
15315-
11, 17, 22, 25};
15316-
s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
15313+
static const s8 lna1A_gain_db_rev7[] = { 11, 16, 20, 24 };
15314+
static const s8 lna1A_gain_db_2_rev7[] = { 11, 17, 22, 25};
15315+
static const s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
1531715316

1531815317
crsminu_th = 0x3e;
1531915318
lna1_gain_db = lna1A_gain_db_rev7;
1532015319
lna1_gain_db_2 = lna1A_gain_db_2_rev7;
1532115320
lna2_gain_db = lna2A_gain_db_rev7;
1532215321
} else if ((freq >= 5500) && (freq <= 5700)) {
1532315322

15324-
s8 lna1A_gain_db_rev7[] = { 11, 17, 21, 25 };
15325-
s8 lna1A_gain_db_2_rev7[] = {
15326-
12, 18, 22, 26};
15327-
s8 lna2A_gain_db_rev7[] = { 1, 8, 12, 16 };
15323+
static const s8 lna1A_gain_db_rev7[] = { 11, 17, 21, 25 };
15324+
static const s8 lna1A_gain_db_2_rev7[] = { 12, 18, 22, 26};
15325+
static const s8 lna2A_gain_db_rev7[] = { 1, 8, 12, 16 };
1532815326

1532915327
crsminu_th = 0x45;
1533015328
clip1md_gaincode_B = 0x14;
@@ -15335,10 +15333,9 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(struct brcms_phy *pi)
1533515333
lna2_gain_db = lna2A_gain_db_rev7;
1533615334
} else {
1533715335

15338-
s8 lna1A_gain_db_rev7[] = { 12, 18, 22, 26 };
15339-
s8 lna1A_gain_db_2_rev7[] = {
15340-
12, 18, 22, 26};
15341-
s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
15336+
static const s8 lna1A_gain_db_rev7[] = { 12, 18, 22, 26 };
15337+
static const s8 lna1A_gain_db_2_rev7[] = { 12, 18, 22, 26};
15338+
static const s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
1534215339

1534315340
crsminu_th = 0x41;
1534415341
lna1_gain_db = lna1A_gain_db_rev7;
@@ -15450,65 +15447,65 @@ static void wlc_phy_workarounds_nphy_gainctrl(struct brcms_phy *pi)
1545015447
NPHY_RFSEQ_CMD_CLR_HIQ_DIS,
1545115448
NPHY_RFSEQ_CMD_SET_HPF_BW
1545215449
};
15453-
u8 rfseq_updategainu_dlys[] = { 10, 30, 1 };
15454-
s8 lna1G_gain_db[] = { 7, 11, 16, 23 };
15455-
s8 lna1G_gain_db_rev4[] = { 8, 12, 17, 25 };
15456-
s8 lna1G_gain_db_rev5[] = { 9, 13, 18, 26 };
15457-
s8 lna1G_gain_db_rev6[] = { 8, 13, 18, 25 };
15458-
s8 lna1G_gain_db_rev6_224B0[] = { 10, 14, 19, 27 };
15459-
s8 lna1A_gain_db[] = { 7, 11, 17, 23 };
15460-
s8 lna1A_gain_db_rev4[] = { 8, 12, 18, 23 };
15461-
s8 lna1A_gain_db_rev5[] = { 6, 10, 16, 21 };
15462-
s8 lna1A_gain_db_rev6[] = { 6, 10, 16, 21 };
15463-
s8 *lna1_gain_db = NULL;
15464-
s8 lna2G_gain_db[] = { -5, 6, 10, 14 };
15465-
s8 lna2G_gain_db_rev5[] = { -3, 7, 11, 16 };
15466-
s8 lna2G_gain_db_rev6[] = { -5, 6, 10, 14 };
15467-
s8 lna2G_gain_db_rev6_224B0[] = { -5, 6, 10, 15 };
15468-
s8 lna2A_gain_db[] = { -6, 2, 6, 10 };
15469-
s8 lna2A_gain_db_rev4[] = { -5, 2, 6, 10 };
15470-
s8 lna2A_gain_db_rev5[] = { -7, 0, 4, 8 };
15471-
s8 lna2A_gain_db_rev6[] = { -7, 0, 4, 8 };
15472-
s8 *lna2_gain_db = NULL;
15473-
s8 tiaG_gain_db[] = {
15450+
static const u8 rfseq_updategainu_dlys[] = { 10, 30, 1 };
15451+
static const s8 lna1G_gain_db[] = { 7, 11, 16, 23 };
15452+
static const s8 lna1G_gain_db_rev4[] = { 8, 12, 17, 25 };
15453+
static const s8 lna1G_gain_db_rev5[] = { 9, 13, 18, 26 };
15454+
static const s8 lna1G_gain_db_rev6[] = { 8, 13, 18, 25 };
15455+
static const s8 lna1G_gain_db_rev6_224B0[] = { 10, 14, 19, 27 };
15456+
static const s8 lna1A_gain_db[] = { 7, 11, 17, 23 };
15457+
static const s8 lna1A_gain_db_rev4[] = { 8, 12, 18, 23 };
15458+
static const s8 lna1A_gain_db_rev5[] = { 6, 10, 16, 21 };
15459+
static const s8 lna1A_gain_db_rev6[] = { 6, 10, 16, 21 };
15460+
const s8 *lna1_gain_db = NULL;
15461+
static const s8 lna2G_gain_db[] = { -5, 6, 10, 14 };
15462+
static const s8 lna2G_gain_db_rev5[] = { -3, 7, 11, 16 };
15463+
static const s8 lna2G_gain_db_rev6[] = { -5, 6, 10, 14 };
15464+
static const s8 lna2G_gain_db_rev6_224B0[] = { -5, 6, 10, 15 };
15465+
static const s8 lna2A_gain_db[] = { -6, 2, 6, 10 };
15466+
static const s8 lna2A_gain_db_rev4[] = { -5, 2, 6, 10 };
15467+
static const s8 lna2A_gain_db_rev5[] = { -7, 0, 4, 8 };
15468+
static const s8 lna2A_gain_db_rev6[] = { -7, 0, 4, 8 };
15469+
const s8 *lna2_gain_db = NULL;
15470+
static const s8 tiaG_gain_db[] = {
1547415471
0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A };
15475-
s8 tiaA_gain_db[] = {
15472+
static const s8 tiaA_gain_db[] = {
1547615473
0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13 };
15477-
s8 tiaA_gain_db_rev4[] = {
15474+
static const s8 tiaA_gain_db_rev4[] = {
1547815475
0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
15479-
s8 tiaA_gain_db_rev5[] = {
15476+
static const s8 tiaA_gain_db_rev5[] = {
1548015477
0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
15481-
s8 tiaA_gain_db_rev6[] = {
15478+
static const s8 tiaA_gain_db_rev6[] = {
1548215479
0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
15483-
s8 *tia_gain_db;
15484-
s8 tiaG_gainbits[] = {
15480+
const s8 *tia_gain_db;
15481+
static const s8 tiaG_gainbits[] = {
1548515482
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 };
15486-
s8 tiaA_gainbits[] = {
15483+
static const s8 tiaA_gainbits[] = {
1548715484
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06 };
15488-
s8 tiaA_gainbits_rev4[] = {
15485+
static const s8 tiaA_gainbits_rev4[] = {
1548915486
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
15490-
s8 tiaA_gainbits_rev5[] = {
15487+
static const s8 tiaA_gainbits_rev5[] = {
1549115488
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
15492-
s8 tiaA_gainbits_rev6[] = {
15489+
static const s8 tiaA_gainbits_rev6[] = {
1549315490
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
15494-
s8 *tia_gainbits;
15495-
s8 lpf_gain_db[] = { 0x00, 0x06, 0x0c, 0x12, 0x12, 0x12 };
15496-
s8 lpf_gainbits[] = { 0x00, 0x01, 0x02, 0x03, 0x03, 0x03 };
15497-
u16 rfseqG_init_gain[] = { 0x613f, 0x613f, 0x613f, 0x613f };
15498-
u16 rfseqG_init_gain_rev4[] = { 0x513f, 0x513f, 0x513f, 0x513f };
15499-
u16 rfseqG_init_gain_rev5[] = { 0x413f, 0x413f, 0x413f, 0x413f };
15500-
u16 rfseqG_init_gain_rev5_elna[] = {
15491+
const s8 *tia_gainbits;
15492+
static const s8 lpf_gain_db[] = { 0x00, 0x06, 0x0c, 0x12, 0x12, 0x12 };
15493+
static const s8 lpf_gainbits[] = { 0x00, 0x01, 0x02, 0x03, 0x03, 0x03 };
15494+
static const u16 rfseqG_init_gain[] = { 0x613f, 0x613f, 0x613f, 0x613f };
15495+
static const u16 rfseqG_init_gain_rev4[] = { 0x513f, 0x513f, 0x513f, 0x513f };
15496+
static const u16 rfseqG_init_gain_rev5[] = { 0x413f, 0x413f, 0x413f, 0x413f };
15497+
static const u16 rfseqG_init_gain_rev5_elna[] = {
1550115498
0x013f, 0x013f, 0x013f, 0x013f };
15502-
u16 rfseqG_init_gain_rev6[] = { 0x513f, 0x513f };
15503-
u16 rfseqG_init_gain_rev6_224B0[] = { 0x413f, 0x413f };
15504-
u16 rfseqG_init_gain_rev6_elna[] = { 0x113f, 0x113f };
15505-
u16 rfseqA_init_gain[] = { 0x516f, 0x516f, 0x516f, 0x516f };
15506-
u16 rfseqA_init_gain_rev4[] = { 0x614f, 0x614f, 0x614f, 0x614f };
15507-
u16 rfseqA_init_gain_rev4_elna[] = {
15499+
static const u16 rfseqG_init_gain_rev6[] = { 0x513f, 0x513f };
15500+
static const u16 rfseqG_init_gain_rev6_224B0[] = { 0x413f, 0x413f };
15501+
static const u16 rfseqG_init_gain_rev6_elna[] = { 0x113f, 0x113f };
15502+
static const u16 rfseqA_init_gain[] = { 0x516f, 0x516f, 0x516f, 0x516f };
15503+
static const u16 rfseqA_init_gain_rev4[] = { 0x614f, 0x614f, 0x614f, 0x614f };
15504+
static const u16 rfseqA_init_gain_rev4_elna[] = {
1550815505
0x314f, 0x314f, 0x314f, 0x314f };
15509-
u16 rfseqA_init_gain_rev5[] = { 0x714f, 0x714f, 0x714f, 0x714f };
15510-
u16 rfseqA_init_gain_rev6[] = { 0x714f, 0x714f };
15511-
u16 *rfseq_init_gain;
15506+
static const u16 rfseqA_init_gain_rev5[] = { 0x714f, 0x714f, 0x714f, 0x714f };
15507+
static const u16 rfseqA_init_gain_rev6[] = { 0x714f, 0x714f };
15508+
const u16 *rfseq_init_gain;
1551215509
u16 initG_gaincode = 0x627e;
1551315510
u16 initG_gaincode_rev4 = 0x527e;
1551415511
u16 initG_gaincode_rev5 = 0x427e;
@@ -15538,10 +15535,10 @@ static void wlc_phy_workarounds_nphy_gainctrl(struct brcms_phy *pi)
1553815535
u16 clip1mdA_gaincode_rev6 = 0x2084;
1553915536
u16 clip1md_gaincode = 0;
1554015537
u16 clip1loG_gaincode = 0x0074;
15541-
u16 clip1loG_gaincode_rev5[] = {
15538+
static const u16 clip1loG_gaincode_rev5[] = {
1554215539
0x0062, 0x0064, 0x006a, 0x106a, 0x106c, 0x1074, 0x107c, 0x207c
1554315540
};
15544-
u16 clip1loG_gaincode_rev6[] = {
15541+
static const u16 clip1loG_gaincode_rev6[] = {
1554515542
0x106a, 0x106c, 0x1074, 0x107c, 0x007e, 0x107e, 0x207e, 0x307e
1554615543
};
1554715544
u16 clip1loG_gaincode_rev6_224B0 = 0x1074;
@@ -16066,7 +16063,7 @@ static void wlc_phy_workarounds_nphy_gainctrl(struct brcms_phy *pi)
1606616063

1606716064
static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1606816065
{
16069-
u8 rfseq_rx2tx_events[] = {
16066+
static const u8 rfseq_rx2tx_events[] = {
1607016067
NPHY_RFSEQ_CMD_NOP,
1607116068
NPHY_RFSEQ_CMD_RXG_FBW,
1607216069
NPHY_RFSEQ_CMD_TR_SWITCH,
@@ -16076,7 +16073,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1607616073
NPHY_RFSEQ_CMD_EXT_PA
1607716074
};
1607816075
u8 rfseq_rx2tx_dlys[] = { 8, 6, 6, 2, 4, 60, 1 };
16079-
u8 rfseq_tx2rx_events[] = {
16076+
static const u8 rfseq_tx2rx_events[] = {
1608016077
NPHY_RFSEQ_CMD_NOP,
1608116078
NPHY_RFSEQ_CMD_EXT_PA,
1608216079
NPHY_RFSEQ_CMD_TX_GAIN,
@@ -16085,8 +16082,8 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1608516082
NPHY_RFSEQ_CMD_RXG_FBW,
1608616083
NPHY_RFSEQ_CMD_CLR_HIQ_DIS
1608716084
};
16088-
u8 rfseq_tx2rx_dlys[] = { 8, 6, 2, 4, 4, 6, 1 };
16089-
u8 rfseq_tx2rx_events_rev3[] = {
16085+
static const u8 rfseq_tx2rx_dlys[] = { 8, 6, 2, 4, 4, 6, 1 };
16086+
static const u8 rfseq_tx2rx_events_rev3[] = {
1609016087
NPHY_REV3_RFSEQ_CMD_EXT_PA,
1609116088
NPHY_REV3_RFSEQ_CMD_INT_PA_PU,
1609216089
NPHY_REV3_RFSEQ_CMD_TX_GAIN,
@@ -16096,7 +16093,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1609616093
NPHY_REV3_RFSEQ_CMD_CLR_HIQ_DIS,
1609716094
NPHY_REV3_RFSEQ_CMD_END
1609816095
};
16099-
u8 rfseq_tx2rx_dlys_rev3[] = { 8, 4, 2, 2, 4, 4, 6, 1 };
16096+
static const u8 rfseq_tx2rx_dlys_rev3[] = { 8, 4, 2, 2, 4, 4, 6, 1 };
1610016097
u8 rfseq_rx2tx_events_rev3[] = {
1610116098
NPHY_REV3_RFSEQ_CMD_NOP,
1610216099
NPHY_REV3_RFSEQ_CMD_RXG_FBW,
@@ -16110,7 +16107,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1611016107
};
1611116108
u8 rfseq_rx2tx_dlys_rev3[] = { 8, 6, 6, 4, 4, 18, 42, 1, 1 };
1611216109

16113-
u8 rfseq_rx2tx_events_rev3_ipa[] = {
16110+
static const u8 rfseq_rx2tx_events_rev3_ipa[] = {
1611416111
NPHY_REV3_RFSEQ_CMD_NOP,
1611516112
NPHY_REV3_RFSEQ_CMD_RXG_FBW,
1611616113
NPHY_REV3_RFSEQ_CMD_TR_SWITCH,
@@ -16121,15 +16118,15 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1612116118
NPHY_REV3_RFSEQ_CMD_INT_PA_PU,
1612216119
NPHY_REV3_RFSEQ_CMD_END
1612316120
};
16124-
u8 rfseq_rx2tx_dlys_rev3_ipa[] = { 8, 6, 6, 4, 4, 16, 43, 1, 1 };
16125-
u16 rfseq_rx2tx_dacbufpu_rev7[] = { 0x10f, 0x10f };
16121+
static const u8 rfseq_rx2tx_dlys_rev3_ipa[] = { 8, 6, 6, 4, 4, 16, 43, 1, 1 };
16122+
static const u16 rfseq_rx2tx_dacbufpu_rev7[] = { 0x10f, 0x10f };
1612616123

1612716124
s16 alpha0, alpha1, alpha2;
1612816125
s16 beta0, beta1, beta2;
1612916126
u32 leg_data_weights, ht_data_weights, nss1_data_weights,
1613016127
stbc_data_weights;
1613116128
u8 chan_freq_range = 0;
16132-
u16 dac_control = 0x0002;
16129+
static const u16 dac_control = 0x0002;
1613316130
u16 aux_adc_vmid_rev7_core0[] = { 0x8e, 0x96, 0x96, 0x96 };
1613416131
u16 aux_adc_vmid_rev7_core1[] = { 0x8f, 0x9f, 0x9f, 0x96 };
1613516132
u16 aux_adc_vmid_rev4[] = { 0xa2, 0xb4, 0xb4, 0x89 };
@@ -16139,8 +16136,8 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1613916136
u16 aux_adc_gain_rev4[] = { 0x02, 0x02, 0x02, 0x00 };
1614016137
u16 aux_adc_gain_rev3[] = { 0x02, 0x02, 0x02, 0x00 };
1614116138
u16 *aux_adc_gain;
16142-
u16 sk_adc_vmid[] = { 0xb4, 0xb4, 0xb4, 0x24 };
16143-
u16 sk_adc_gain[] = { 0x02, 0x02, 0x02, 0x02 };
16139+
static const u16 sk_adc_vmid[] = { 0xb4, 0xb4, 0xb4, 0x24 };
16140+
static const u16 sk_adc_gain[] = { 0x02, 0x02, 0x02, 0x02 };
1614416141
s32 min_nvar_val = 0x18d;
1614516142
s32 min_nvar_offset_6mbps = 20;
1614616143
u8 pdetrange;
@@ -16151,9 +16148,9 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
1615116148
u16 rfseq_rx2tx_lpf_h_hpc_rev7 = 0x77;
1615216149
u16 rfseq_tx2rx_lpf_h_hpc_rev7 = 0x77;
1615316150
u16 rfseq_pktgn_lpf_h_hpc_rev7 = 0x77;
16154-
u16 rfseq_htpktgn_lpf_hpc_rev7[] = { 0x77, 0x11, 0x11 };
16155-
u16 rfseq_pktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
16156-
u16 rfseq_cckpktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
16151+
static const u16 rfseq_htpktgn_lpf_hpc_rev7[] = { 0x77, 0x11, 0x11 };
16152+
static const u16 rfseq_pktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
16153+
static const u16 rfseq_cckpktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
1615716154
u16 ipalvlshift_3p3_war_en = 0;
1615816155
u16 rccal_bcap_val, rccal_scap_val;
1615916156
u16 rccal_tx20_11b_bcap = 0;
@@ -24291,13 +24288,13 @@ static void wlc_phy_update_txcal_ladder_nphy(struct brcms_phy *pi, u16 core)
2429124288
u16 bbmult;
2429224289
u16 tblentry;
2429324290

24294-
struct nphy_txiqcal_ladder ladder_lo[] = {
24291+
static const struct nphy_txiqcal_ladder ladder_lo[] = {
2429524292
{3, 0}, {4, 0}, {6, 0}, {9, 0}, {13, 0}, {18, 0},
2429624293
{25, 0}, {25, 1}, {25, 2}, {25, 3}, {25, 4}, {25, 5},
2429724294
{25, 6}, {25, 7}, {35, 7}, {50, 7}, {71, 7}, {100, 7}
2429824295
};
2429924296

24300-
struct nphy_txiqcal_ladder ladder_iq[] = {
24297+
static const struct nphy_txiqcal_ladder ladder_iq[] = {
2430124298
{3, 0}, {4, 0}, {6, 0}, {9, 0}, {13, 0}, {18, 0},
2430224299
{25, 0}, {35, 0}, {50, 0}, {71, 0}, {100, 0}, {100, 1},
2430324300
{100, 2}, {100, 3}, {100, 4}, {100, 5}, {100, 6}, {100, 7}
@@ -25773,67 +25770,67 @@ wlc_phy_cal_txiqlo_nphy(struct brcms_phy *pi, struct nphy_txgains target_gain,
2577325770
u16 cal_gain[2];
2577425771
struct nphy_iqcal_params cal_params[2];
2577525772
u32 tbl_len;
25776-
void *tbl_ptr;
25773+
const void *tbl_ptr;
2577725774
bool ladder_updated[2];
2577825775
u8 mphase_cal_lastphase = 0;
2577925776
int bcmerror = 0;
2578025777
bool phyhang_avoid_state = false;
2578125778

25782-
u16 tbl_tx_iqlo_cal_loft_ladder_20[] = {
25779+
static const u16 tbl_tx_iqlo_cal_loft_ladder_20[] = {
2578325780
0x0300, 0x0500, 0x0700, 0x0900, 0x0d00, 0x1100, 0x1900, 0x1901,
2578425781
0x1902,
2578525782
0x1903, 0x1904, 0x1905, 0x1906, 0x1907, 0x2407, 0x3207, 0x4607,
2578625783
0x6407
2578725784
};
2578825785

25789-
u16 tbl_tx_iqlo_cal_iqimb_ladder_20[] = {
25786+
static const u16 tbl_tx_iqlo_cal_iqimb_ladder_20[] = {
2579025787
0x0200, 0x0300, 0x0600, 0x0900, 0x0d00, 0x1100, 0x1900, 0x2400,
2579125788
0x3200,
2579225789
0x4600, 0x6400, 0x6401, 0x6402, 0x6403, 0x6404, 0x6405, 0x6406,
2579325790
0x6407
2579425791
};
2579525792

25796-
u16 tbl_tx_iqlo_cal_loft_ladder_40[] = {
25793+
static const u16 tbl_tx_iqlo_cal_loft_ladder_40[] = {
2579725794
0x0200, 0x0300, 0x0400, 0x0700, 0x0900, 0x0c00, 0x1200, 0x1201,
2579825795
0x1202,
2579925796
0x1203, 0x1204, 0x1205, 0x1206, 0x1207, 0x1907, 0x2307, 0x3207,
2580025797
0x4707
2580125798
};
2580225799

25803-
u16 tbl_tx_iqlo_cal_iqimb_ladder_40[] = {
25800+
static const u16 tbl_tx_iqlo_cal_iqimb_ladder_40[] = {
2580425801
0x0100, 0x0200, 0x0400, 0x0700, 0x0900, 0x0c00, 0x1200, 0x1900,
2580525802
0x2300,
2580625803
0x3200, 0x4700, 0x4701, 0x4702, 0x4703, 0x4704, 0x4705, 0x4706,
2580725804
0x4707
2580825805
};
2580925806

25810-
u16 tbl_tx_iqlo_cal_startcoefs[] = {
25807+
static const u16 tbl_tx_iqlo_cal_startcoefs[] = {
2581125808
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
2581225809
0x0000
2581325810
};
2581425811

25815-
u16 tbl_tx_iqlo_cal_cmds_fullcal[] = {
25812+
static const u16 tbl_tx_iqlo_cal_cmds_fullcal[] = {
2581625813
0x8123, 0x8264, 0x8086, 0x8245, 0x8056,
2581725814
0x9123, 0x9264, 0x9086, 0x9245, 0x9056
2581825815
};
2581925816

25820-
u16 tbl_tx_iqlo_cal_cmds_recal[] = {
25817+
static const u16 tbl_tx_iqlo_cal_cmds_recal[] = {
2582125818
0x8101, 0x8253, 0x8053, 0x8234, 0x8034,
2582225819
0x9101, 0x9253, 0x9053, 0x9234, 0x9034
2582325820
};
2582425821

25825-
u16 tbl_tx_iqlo_cal_startcoefs_nphyrev3[] = {
25822+
static const u16 tbl_tx_iqlo_cal_startcoefs_nphyrev3[] = {
2582625823
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
2582725824
0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
2582825825
0x0000
2582925826
};
2583025827

25831-
u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = {
25828+
static const u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = {
2583225829
0x8434, 0x8334, 0x8084, 0x8267, 0x8056, 0x8234,
2583325830
0x9434, 0x9334, 0x9084, 0x9267, 0x9056, 0x9234
2583425831
};
2583525832

25836-
u16 tbl_tx_iqlo_cal_cmds_recal_nphyrev3[] = {
25833+
static const u16 tbl_tx_iqlo_cal_cmds_recal_nphyrev3[] = {
2583725834
0x8423, 0x8323, 0x8073, 0x8256, 0x8045, 0x8223,
2583825835
0x9423, 0x9323, 0x9073, 0x9256, 0x9045, 0x9223
2583925836
};

0 commit comments

Comments
 (0)