Skip to content

Commit da41bac

Browse files
tititiou36vinodkoul
tititiou36
authored and
vinodkoul
committed
phy: cadence: Sierra: Constify struct cdns_sierra_vals
'struct cdns_sierra_vals' is not modified in this driver. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig: Before: ====== text data bss dec hex filename 60521 4310 16 64847 fd4f drivers/phy/cadence/phy-cadence-sierra.o After: ===== text data bss dec hex filename 60937 3894 16 64847 fd4f drivers/phy/cadence/phy-cadence-sierra.o Signed-off-by: Christophe JAILLET <[email protected]> Link: https://lore.kernel.org/r/0ccfd259fdf40475c89cfb22a64c6388e7c646b4.1720723132.git.christophe.jaillet@wanadoo.fr Signed-off-by: Vinod Koul <[email protected]>
1 parent 29f33f0 commit da41bac

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎drivers/phy/cadence/phy-cadence-sierra.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -362,14 +362,14 @@ struct cdns_sierra_data {
362362
u32 id_value;
363363
u8 block_offset_shift;
364364
u8 reg_offset_shift;
365-
struct cdns_sierra_vals *pcs_cmn_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
366-
[NUM_SSC_MODE];
367-
struct cdns_sierra_vals *phy_pma_ln_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
368-
[NUM_SSC_MODE];
369-
struct cdns_sierra_vals *pma_cmn_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
370-
[NUM_SSC_MODE];
371-
struct cdns_sierra_vals *pma_ln_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
372-
[NUM_SSC_MODE];
365+
const struct cdns_sierra_vals *pcs_cmn_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
366+
[NUM_SSC_MODE];
367+
const struct cdns_sierra_vals *phy_pma_ln_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
368+
[NUM_SSC_MODE];
369+
const struct cdns_sierra_vals *pma_cmn_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
370+
[NUM_SSC_MODE];
371+
const struct cdns_sierra_vals *pma_ln_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]
372+
[NUM_SSC_MODE];
373373
};
374374

375375
struct cdns_regmap_cdb_context {
@@ -539,12 +539,12 @@ static int cdns_sierra_phy_init(struct phy *gphy)
539539
struct cdns_sierra_inst *ins = phy_get_drvdata(gphy);
540540
struct cdns_sierra_phy *phy = dev_get_drvdata(gphy->dev.parent);
541541
const struct cdns_sierra_data *init_data = phy->init_data;
542-
struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals;
542+
const struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals;
543543
enum cdns_sierra_phy_type phy_type = ins->phy_type;
544+
const struct cdns_sierra_vals *phy_pma_ln_vals;
544545
enum cdns_sierra_ssc_mode ssc = ins->ssc_mode;
545-
struct cdns_sierra_vals *phy_pma_ln_vals;
546+
const struct cdns_sierra_vals *pcs_cmn_vals;
546547
const struct cdns_reg_pairs *reg_pairs;
547-
struct cdns_sierra_vals *pcs_cmn_vals;
548548
struct regmap *regmap;
549549
u32 num_regs;
550550
int i, j;
@@ -1244,12 +1244,12 @@ static int cdns_sierra_phy_get_resets(struct cdns_sierra_phy *sp,
12441244

12451245
static int cdns_sierra_phy_configure_multilink(struct cdns_sierra_phy *sp)
12461246
{
1247+
const struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals;
12471248
const struct cdns_sierra_data *init_data = sp->init_data;
1248-
struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals;
1249+
const struct cdns_sierra_vals *phy_pma_ln_vals;
1250+
const struct cdns_sierra_vals *pcs_cmn_vals;
12491251
enum cdns_sierra_phy_type phy_t1, phy_t2;
1250-
struct cdns_sierra_vals *phy_pma_ln_vals;
12511252
const struct cdns_reg_pairs *reg_pairs;
1252-
struct cdns_sierra_vals *pcs_cmn_vals;
12531253
int i, j, node, mlane, num_lanes, ret;
12541254
enum cdns_sierra_ssc_mode ssc;
12551255
struct regmap *regmap;
@@ -1548,7 +1548,7 @@ static const struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = {
15481548
{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
15491549
};
15501550

1551-
static struct cdns_sierra_vals sgmii_phy_pma_ln_vals = {
1551+
static const struct cdns_sierra_vals sgmii_phy_pma_ln_vals = {
15521552
.reg_pairs = sgmii_phy_pma_ln_regs,
15531553
.num_regs = ARRAY_SIZE(sgmii_phy_pma_ln_regs),
15541554
};
@@ -1598,12 +1598,12 @@ static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_ln_regs[] = {
15981598
{0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG}
15991599
};
16001600

1601-
static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = {
1601+
static const struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = {
16021602
.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_cmn_regs,
16031603
.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_cmn_regs),
16041604
};
16051605

1606-
static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = {
1606+
static const struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = {
16071607
.reg_pairs = sgmii_100_no_ssc_plllc1_opt3_ln_regs,
16081608
.num_regs = ARRAY_SIZE(sgmii_100_no_ssc_plllc1_opt3_ln_regs),
16091609
};
@@ -1613,7 +1613,7 @@ static const struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = {
16131613
{0x9010, SIERRA_PHY_PMA_XCVR_CTRL}
16141614
};
16151615

1616-
static struct cdns_sierra_vals qsgmii_phy_pma_ln_vals = {
1616+
static const struct cdns_sierra_vals qsgmii_phy_pma_ln_vals = {
16171617
.reg_pairs = qsgmii_phy_pma_ln_regs,
16181618
.num_regs = ARRAY_SIZE(qsgmii_phy_pma_ln_regs),
16191619
};
@@ -1664,12 +1664,12 @@ static const struct cdns_reg_pairs qsgmii_100_no_ssc_plllc1_ln_regs[] = {
16641664
{0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG}
16651665
};
16661666

1667-
static struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_cmn_vals = {
1667+
static const struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_cmn_vals = {
16681668
.reg_pairs = qsgmii_100_no_ssc_plllc1_cmn_regs,
16691669
.num_regs = ARRAY_SIZE(qsgmii_100_no_ssc_plllc1_cmn_regs),
16701670
};
16711671

1672-
static struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_ln_vals = {
1672+
static const struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_ln_vals = {
16731673
.reg_pairs = qsgmii_100_no_ssc_plllc1_ln_regs,
16741674
.num_regs = ARRAY_SIZE(qsgmii_100_no_ssc_plllc1_ln_regs),
16751675
};
@@ -1679,7 +1679,7 @@ static const struct cdns_reg_pairs pcie_phy_pcs_cmn_regs[] = {
16791679
{0x0430, SIERRA_PHY_PIPE_CMN_CTRL1}
16801680
};
16811681

1682-
static struct cdns_sierra_vals pcie_phy_pcs_cmn_vals = {
1682+
static const struct cdns_sierra_vals pcie_phy_pcs_cmn_vals = {
16831683
.reg_pairs = pcie_phy_pcs_cmn_regs,
16841684
.num_regs = ARRAY_SIZE(pcie_phy_pcs_cmn_regs),
16851685
};
@@ -1745,12 +1745,12 @@ static const struct cdns_reg_pairs ml_pcie_100_no_ssc_ln_regs[] = {
17451745
{0x4432, SIERRA_RXBUFFER_DFECTRL_PREG}
17461746
};
17471747

1748-
static struct cdns_sierra_vals pcie_100_no_ssc_plllc_cmn_vals = {
1748+
static const struct cdns_sierra_vals pcie_100_no_ssc_plllc_cmn_vals = {
17491749
.reg_pairs = pcie_100_no_ssc_plllc_cmn_regs,
17501750
.num_regs = ARRAY_SIZE(pcie_100_no_ssc_plllc_cmn_regs),
17511751
};
17521752

1753-
static struct cdns_sierra_vals ml_pcie_100_no_ssc_ln_vals = {
1753+
static const struct cdns_sierra_vals ml_pcie_100_no_ssc_ln_vals = {
17541754
.reg_pairs = ml_pcie_100_no_ssc_ln_regs,
17551755
.num_regs = ARRAY_SIZE(ml_pcie_100_no_ssc_ln_regs),
17561756
};
@@ -1810,7 +1810,7 @@ static const struct cdns_reg_pairs ti_ml_pcie_100_no_ssc_ln_regs[] = {
18101810
{0x0002, SIERRA_TX_RCVDET_OVRD_PREG}
18111811
};
18121812

1813-
static struct cdns_sierra_vals ti_ml_pcie_100_no_ssc_ln_vals = {
1813+
static const struct cdns_sierra_vals ti_ml_pcie_100_no_ssc_ln_vals = {
18141814
.reg_pairs = ti_ml_pcie_100_no_ssc_ln_regs,
18151815
.num_regs = ARRAY_SIZE(ti_ml_pcie_100_no_ssc_ln_regs),
18161816
};
@@ -1886,12 +1886,12 @@ static const struct cdns_reg_pairs ml_pcie_100_int_ssc_ln_regs[] = {
18861886
{0x4432, SIERRA_RXBUFFER_DFECTRL_PREG}
18871887
};
18881888

1889-
static struct cdns_sierra_vals pcie_100_int_ssc_plllc_cmn_vals = {
1889+
static const struct cdns_sierra_vals pcie_100_int_ssc_plllc_cmn_vals = {
18901890
.reg_pairs = pcie_100_int_ssc_plllc_cmn_regs,
18911891
.num_regs = ARRAY_SIZE(pcie_100_int_ssc_plllc_cmn_regs),
18921892
};
18931893

1894-
static struct cdns_sierra_vals ml_pcie_100_int_ssc_ln_vals = {
1894+
static const struct cdns_sierra_vals ml_pcie_100_int_ssc_ln_vals = {
18951895
.reg_pairs = ml_pcie_100_int_ssc_ln_regs,
18961896
.num_regs = ARRAY_SIZE(ml_pcie_100_int_ssc_ln_regs),
18971897
};
@@ -1954,7 +1954,7 @@ static const struct cdns_reg_pairs ti_ml_pcie_100_int_ssc_ln_regs[] = {
19541954
{0x0002, SIERRA_TX_RCVDET_OVRD_PREG}
19551955
};
19561956

1957-
static struct cdns_sierra_vals ti_ml_pcie_100_int_ssc_ln_vals = {
1957+
static const struct cdns_sierra_vals ti_ml_pcie_100_int_ssc_ln_vals = {
19581958
.reg_pairs = ti_ml_pcie_100_int_ssc_ln_regs,
19591959
.num_regs = ARRAY_SIZE(ti_ml_pcie_100_int_ssc_ln_regs),
19601960
};
@@ -2024,12 +2024,12 @@ static const struct cdns_reg_pairs ml_pcie_100_ext_ssc_ln_regs[] = {
20242024
{0x4432, SIERRA_RXBUFFER_DFECTRL_PREG}
20252025
};
20262026

2027-
static struct cdns_sierra_vals pcie_100_ext_ssc_plllc_cmn_vals = {
2027+
static const struct cdns_sierra_vals pcie_100_ext_ssc_plllc_cmn_vals = {
20282028
.reg_pairs = pcie_100_ext_ssc_plllc_cmn_regs,
20292029
.num_regs = ARRAY_SIZE(pcie_100_ext_ssc_plllc_cmn_regs),
20302030
};
20312031

2032-
static struct cdns_sierra_vals ml_pcie_100_ext_ssc_ln_vals = {
2032+
static const struct cdns_sierra_vals ml_pcie_100_ext_ssc_ln_vals = {
20332033
.reg_pairs = ml_pcie_100_ext_ssc_ln_regs,
20342034
.num_regs = ARRAY_SIZE(ml_pcie_100_ext_ssc_ln_regs),
20352035
};
@@ -2092,7 +2092,7 @@ static const struct cdns_reg_pairs ti_ml_pcie_100_ext_ssc_ln_regs[] = {
20922092
{0x0002, SIERRA_TX_RCVDET_OVRD_PREG}
20932093
};
20942094

2095-
static struct cdns_sierra_vals ti_ml_pcie_100_ext_ssc_ln_vals = {
2095+
static const struct cdns_sierra_vals ti_ml_pcie_100_ext_ssc_ln_vals = {
20962096
.reg_pairs = ti_ml_pcie_100_ext_ssc_ln_regs,
20972097
.num_regs = ARRAY_SIZE(ti_ml_pcie_100_ext_ssc_ln_regs),
20982098
};
@@ -2152,12 +2152,12 @@ static const struct cdns_reg_pairs cdns_pcie_ln_regs_no_ssc[] = {
21522152
{0x4432, SIERRA_RXBUFFER_DFECTRL_PREG}
21532153
};
21542154

2155-
static struct cdns_sierra_vals pcie_100_no_ssc_cmn_vals = {
2155+
static const struct cdns_sierra_vals pcie_100_no_ssc_cmn_vals = {
21562156
.reg_pairs = cdns_pcie_cmn_regs_no_ssc,
21572157
.num_regs = ARRAY_SIZE(cdns_pcie_cmn_regs_no_ssc),
21582158
};
21592159

2160-
static struct cdns_sierra_vals pcie_100_no_ssc_ln_vals = {
2160+
static const struct cdns_sierra_vals pcie_100_no_ssc_ln_vals = {
21612161
.reg_pairs = cdns_pcie_ln_regs_no_ssc,
21622162
.num_regs = ARRAY_SIZE(cdns_pcie_ln_regs_no_ssc),
21632163
};
@@ -2227,12 +2227,12 @@ static const struct cdns_reg_pairs cdns_pcie_ln_regs_int_ssc[] = {
22272227
{0x4432, SIERRA_RXBUFFER_DFECTRL_PREG}
22282228
};
22292229

2230-
static struct cdns_sierra_vals pcie_100_int_ssc_cmn_vals = {
2230+
static const struct cdns_sierra_vals pcie_100_int_ssc_cmn_vals = {
22312231
.reg_pairs = cdns_pcie_cmn_regs_int_ssc,
22322232
.num_regs = ARRAY_SIZE(cdns_pcie_cmn_regs_int_ssc),
22332233
};
22342234

2235-
static struct cdns_sierra_vals pcie_100_int_ssc_ln_vals = {
2235+
static const struct cdns_sierra_vals pcie_100_int_ssc_ln_vals = {
22362236
.reg_pairs = cdns_pcie_ln_regs_int_ssc,
22372237
.num_regs = ARRAY_SIZE(cdns_pcie_ln_regs_int_ssc),
22382238
};
@@ -2296,12 +2296,12 @@ static const struct cdns_reg_pairs cdns_pcie_ln_regs_ext_ssc[] = {
22962296
{0x4432, SIERRA_RXBUFFER_DFECTRL_PREG}
22972297
};
22982298

2299-
static struct cdns_sierra_vals pcie_100_ext_ssc_cmn_vals = {
2299+
static const struct cdns_sierra_vals pcie_100_ext_ssc_cmn_vals = {
23002300
.reg_pairs = cdns_pcie_cmn_regs_ext_ssc,
23012301
.num_regs = ARRAY_SIZE(cdns_pcie_cmn_regs_ext_ssc),
23022302
};
23032303

2304-
static struct cdns_sierra_vals pcie_100_ext_ssc_ln_vals = {
2304+
static const struct cdns_sierra_vals pcie_100_ext_ssc_ln_vals = {
23052305
.reg_pairs = cdns_pcie_ln_regs_ext_ssc,
23062306
.num_regs = ARRAY_SIZE(cdns_pcie_ln_regs_ext_ssc),
23072307
};
@@ -2413,12 +2413,12 @@ static const struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
24132413
{0x4243, SIERRA_RXBUFFER_DFECTRL_PREG}
24142414
};
24152415

2416-
static struct cdns_sierra_vals usb_100_ext_ssc_cmn_vals = {
2416+
static const struct cdns_sierra_vals usb_100_ext_ssc_cmn_vals = {
24172417
.reg_pairs = cdns_usb_cmn_regs_ext_ssc,
24182418
.num_regs = ARRAY_SIZE(cdns_usb_cmn_regs_ext_ssc),
24192419
};
24202420

2421-
static struct cdns_sierra_vals usb_100_ext_ssc_ln_vals = {
2421+
static const struct cdns_sierra_vals usb_100_ext_ssc_ln_vals = {
24222422
.reg_pairs = cdns_usb_ln_regs_ext_ssc,
24232423
.num_regs = ARRAY_SIZE(cdns_usb_ln_regs_ext_ssc),
24242424
};
@@ -2443,7 +2443,7 @@ static const struct cdns_reg_pairs sgmii_pma_cmn_vals[] = {
24432443
{0x0013, SIERRA_CMN_PLLLC1_DCOCAL_CTRL_PREG},
24442444
};
24452445

2446-
static struct cdns_sierra_vals sgmii_cmn_vals = {
2446+
static const struct cdns_sierra_vals sgmii_cmn_vals = {
24472447
.reg_pairs = sgmii_pma_cmn_vals,
24482448
.num_regs = ARRAY_SIZE(sgmii_pma_cmn_vals),
24492449
};
@@ -2489,7 +2489,7 @@ static const struct cdns_reg_pairs sgmii_ln_regs[] = {
24892489
{0x321F, SIERRA_CPICAL_RES_STARTCODE_MODE01_PREG},
24902490
};
24912491

2492-
static struct cdns_sierra_vals sgmii_pma_ln_vals = {
2492+
static const struct cdns_sierra_vals sgmii_pma_ln_vals = {
24932493
.reg_pairs = sgmii_ln_regs,
24942494
.num_regs = ARRAY_SIZE(sgmii_ln_regs),
24952495
};

0 commit comments

Comments
 (0)