phy: cadence: Sierra: Constify some structs
Subsystems (2)
cover phy: cadence: Sierra: Constify some structs
This series is just about constification of some structs.
Before:
======
text data bss dec hex filename
60489 4342 16 64847 fd4f drivers/phy/cadence/phy-cadence-sierra.o
After:
=====
text data bss dec hex filename
60897 3878 16 64791 fd17 drivers/phy/cadence/phy-cadence-sierra.o
All patches have been compile tested only.
Christophe JAILLET (3):
phy: cadence: Sierra: Constify struct cdns_reg_pairs
phy: cadence: Sierra: Constify struct cdns_sierra_vals
phy: cadence: Sierra: Constify a u32[]
drivers/phy/cadence/phy-cadence-sierra.c | 88 ++++++++++++------------ 1 file changed, 44 insertions(+), 44 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/3 phy: cadence: Sierra: Constify struct cdns_reg_pairs
'struct cdns_reg_pairs' 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
60489 4342 16 64847 fd4f drivers/phy/cadence/phy-cadence-sierra.o
After:
=====
text data bss dec hex filename
60521 4310 16 64847 fd4f drivers/phy/cadence/phy-cadence-sierra.o
---
Compile tested-only.
--- drivers/phy/cadence/phy-cadence-sierra.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/phy/cadence/phy-cadence-sierra.c +3 -3
@@ -1544,7 +1544,7 @@ static void cdns_sierra_phy_remove(struct platform_device *pdev) }/* SGMII PHY PMA lane configuration */ -static struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = { +static const struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = { {0x9010 ,SIERRA_PHY_PMA_XCVR_CTRL } };
@@ -1609,7 +1609,7 @@ static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = { };/* QSGMII PHY PMA lane configuration */ -static struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = { +static const struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = { {0x9010 ,SIERRA_PHY_PMA_XCVR_CTRL } };
@@ -1675,7 +1675,7 @@ static struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_ln_vals = { };/* PCIE PHY PCS common configuration */ -static struct cdns_reg_pairs pcie_phy_pcs_cmn_regs[] = { +static const struct cdns_reg_pairs pcie_phy_pcs_cmn_regs[] = { {0x0430 ,SIERRA_PHY_PIPE_CMN_CTRL1 } };
Signature · 1 line
2.45.2
PATCH 2/3 phy: cadence: Sierra: Constify struct cdns_sierra_vals
In reply to Christophe JAILLET'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
---
Compile tested-only.
--- drivers/phy/cadence/phy-cadence-sierra.c | 80 ++++++++++++------------ 1 file changed, 40 insertions(+), 40 deletions(-)
drivers/phy/cadence/phy-cadence-sierra.c +40 -40
@@ -362,14 +362,14 @@ struct cdns_sierra_data {u32 id_value;u8 block_offset_shift;u8 reg_offset_shift; -struct cdns_sierra_vals *pcs_cmn_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] - [NUM_SSC_MODE ]; -struct cdns_sierra_vals *phy_pma_ln_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] - [NUM_SSC_MODE ]; -struct cdns_sierra_vals *pma_cmn_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] - [NUM_SSC_MODE ]; -struct cdns_sierra_vals *pma_ln_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] - [NUM_SSC_MODE ]; +const struct cdns_sierra_vals *pcs_cmn_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] + [NUM_SSC_MODE ]; +const struct cdns_sierra_vals *phy_pma_ln_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] + [NUM_SSC_MODE ]; +const struct cdns_sierra_vals *pma_cmn_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] + [NUM_SSC_MODE ]; +const struct cdns_sierra_vals *pma_ln_vals[NUM_PHY_TYPE ][NUM_PHY_TYPE ] + [NUM_SSC_MODE ]; };struct cdns_regmap_cdb_context {
@@ -539,12 +539,12 @@ static int cdns_sierra_phy_init(struct phy *gphy)struct cdns_sierra_inst *ins =phy_get_drvdata (gphy);struct cdns_sierra_phy *phy =dev_get_drvdata (gphy->dev.parent);const struct cdns_sierra_data *init_data = phy->init_data; -struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals; +const struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals;enum cdns_sierra_phy_type phy_type = ins->phy_type; +const struct cdns_sierra_vals *phy_pma_ln_vals;enum cdns_sierra_ssc_mode ssc = ins->ssc_mode; -struct cdns_sierra_vals *phy_pma_ln_vals; +const struct cdns_sierra_vals *pcs_cmn_vals;const struct cdns_reg_pairs *reg_pairs; -struct cdns_sierra_vals *pcs_cmn_vals;struct regmap *regmap;u32 num_regs;int i, j;
@@ -1244,12 +1244,12 @@ static int cdns_sierra_phy_get_resets(struct cdns_sierra_phy *sp,static int cdns_sierra_phy_configure_multilink (struct cdns_sierra_phy *sp) { +const struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals;const struct cdns_sierra_data *init_data = sp->init_data; -struct cdns_sierra_vals *pma_cmn_vals, *pma_ln_vals; +const struct cdns_sierra_vals *phy_pma_ln_vals; +const struct cdns_sierra_vals *pcs_cmn_vals;enum cdns_sierra_phy_type phy_t1, phy_t2; -struct cdns_sierra_vals *phy_pma_ln_vals;const struct cdns_reg_pairs *reg_pairs; -struct cdns_sierra_vals *pcs_cmn_vals;int i, j, node, mlane, num_lanes, ret;enum cdns_sierra_ssc_mode ssc;struct regmap *regmap;
@@ -1548,7 +1548,7 @@ static const struct cdns_reg_pairs sgmii_phy_pma_ln_regs[] = { {0x9010, SIERRA_PHY_PMA_XCVR_CTRL} }; -static struct cdns_sierra_vals sgmii_phy_pma_ln_vals = { +static const struct cdns_sierra_vals sgmii_phy_pma_ln_vals = { .reg_pairs = sgmii_phy_pma_ln_regs, .num_regs =ARRAY_SIZE (sgmii_phy_pma_ln_regs), };
@@ -1598,12 +1598,12 @@ static const struct cdns_reg_pairs sgmii_100_no_ssc_plllc1_opt3_ln_regs[] = { {0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG} }; -static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = { +static const struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_cmn_vals = { .reg_pairs = sgmii_100_no_ssc_plllc1_opt3_cmn_regs, .num_regs =ARRAY_SIZE (sgmii_100_no_ssc_plllc1_opt3_cmn_regs), }; -static struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = { +static const struct cdns_sierra_vals sgmii_100_no_ssc_plllc1_opt3_ln_vals = { .reg_pairs = sgmii_100_no_ssc_plllc1_opt3_ln_regs, .num_regs =ARRAY_SIZE (sgmii_100_no_ssc_plllc1_opt3_ln_regs), };
@@ -1613,7 +1613,7 @@ static const struct cdns_reg_pairs qsgmii_phy_pma_ln_regs[] = { {0x9010, SIERRA_PHY_PMA_XCVR_CTRL} }; -static struct cdns_sierra_vals qsgmii_phy_pma_ln_vals = { +static const struct cdns_sierra_vals qsgmii_phy_pma_ln_vals = { .reg_pairs = qsgmii_phy_pma_ln_regs, .num_regs =ARRAY_SIZE (qsgmii_phy_pma_ln_regs), };
@@ -1664,12 +1664,12 @@ static const struct cdns_reg_pairs qsgmii_100_no_ssc_plllc1_ln_regs[] = { {0x0002, SIERRA_RXBUFFER_RCDFECTRL_PREG} }; -static struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_cmn_vals = { +static const struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_cmn_vals = { .reg_pairs = qsgmii_100_no_ssc_plllc1_cmn_regs, .num_regs =ARRAY_SIZE (qsgmii_100_no_ssc_plllc1_cmn_regs), }; -static struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_ln_vals = { +static const struct cdns_sierra_vals qsgmii_100_no_ssc_plllc1_ln_vals = { .reg_pairs = qsgmii_100_no_ssc_plllc1_ln_regs, .num_regs =ARRAY_SIZE (qsgmii_100_no_ssc_plllc1_ln_regs), };
@@ -1679,7 +1679,7 @@ static const struct cdns_reg_pairs pcie_phy_pcs_cmn_regs[] = { {0x0430, SIERRA_PHY_PIPE_CMN_CTRL1} }; -static struct cdns_sierra_vals pcie_phy_pcs_cmn_vals = { +static const struct cdns_sierra_vals pcie_phy_pcs_cmn_vals = { .reg_pairs = pcie_phy_pcs_cmn_regs, .num_regs =ARRAY_SIZE (pcie_phy_pcs_cmn_regs), };
@@ -1745,12 +1745,12 @@ static const struct cdns_reg_pairs ml_pcie_100_no_ssc_ln_regs[] = { {0x4432, SIERRA_RXBUFFER_DFECTRL_PREG} }; -static struct cdns_sierra_vals pcie_100_no_ssc_plllc_cmn_vals = { +static const struct cdns_sierra_vals pcie_100_no_ssc_plllc_cmn_vals = { .reg_pairs = pcie_100_no_ssc_plllc_cmn_regs, .num_regs =ARRAY_SIZE (pcie_100_no_ssc_plllc_cmn_regs), }; -static struct cdns_sierra_vals ml_pcie_100_no_ssc_ln_vals = { +static const struct cdns_sierra_vals ml_pcie_100_no_ssc_ln_vals = { .reg_pairs = ml_pcie_100_no_ssc_ln_regs, .num_regs =ARRAY_SIZE (ml_pcie_100_no_ssc_ln_regs), };
@@ -1810,7 +1810,7 @@ static const struct cdns_reg_pairs ti_ml_pcie_100_no_ssc_ln_regs[] = { {0x0002, SIERRA_TX_RCVDET_OVRD_PREG} }; -static struct cdns_sierra_vals ti_ml_pcie_100_no_ssc_ln_vals = { +static const struct cdns_sierra_vals ti_ml_pcie_100_no_ssc_ln_vals = { .reg_pairs = ti_ml_pcie_100_no_ssc_ln_regs, .num_regs =ARRAY_SIZE (ti_ml_pcie_100_no_ssc_ln_regs), };
@@ -1886,12 +1886,12 @@ static const struct cdns_reg_pairs ml_pcie_100_int_ssc_ln_regs[] = { {0x4432, SIERRA_RXBUFFER_DFECTRL_PREG} }; -static struct cdns_sierra_vals pcie_100_int_ssc_plllc_cmn_vals = { +static const struct cdns_sierra_vals pcie_100_int_ssc_plllc_cmn_vals = { .reg_pairs = pcie_100_int_ssc_plllc_cmn_regs, .num_regs =ARRAY_SIZE (pcie_100_int_ssc_plllc_cmn_regs), }; -static struct cdns_sierra_vals ml_pcie_100_int_ssc_ln_vals = { +static const struct cdns_sierra_vals ml_pcie_100_int_ssc_ln_vals = { .reg_pairs = ml_pcie_100_int_ssc_ln_regs, .num_regs =ARRAY_SIZE (ml_pcie_100_int_ssc_ln_regs), };
@@ -1954,7 +1954,7 @@ static const struct cdns_reg_pairs ti_ml_pcie_100_int_ssc_ln_regs[] = { {0x0002, SIERRA_TX_RCVDET_OVRD_PREG} }; -static struct cdns_sierra_vals ti_ml_pcie_100_int_ssc_ln_vals = { +static const struct cdns_sierra_vals ti_ml_pcie_100_int_ssc_ln_vals = { .reg_pairs = ti_ml_pcie_100_int_ssc_ln_regs, .num_regs =ARRAY_SIZE (ti_ml_pcie_100_int_ssc_ln_regs), };
@@ -2024,12 +2024,12 @@ static const struct cdns_reg_pairs ml_pcie_100_ext_ssc_ln_regs[] = { {0x4432, SIERRA_RXBUFFER_DFECTRL_PREG} }; -static struct cdns_sierra_vals pcie_100_ext_ssc_plllc_cmn_vals = { +static const struct cdns_sierra_vals pcie_100_ext_ssc_plllc_cmn_vals = { .reg_pairs = pcie_100_ext_ssc_plllc_cmn_regs, .num_regs =ARRAY_SIZE (pcie_100_ext_ssc_plllc_cmn_regs), }; -static struct cdns_sierra_vals ml_pcie_100_ext_ssc_ln_vals = { +static const struct cdns_sierra_vals ml_pcie_100_ext_ssc_ln_vals = { .reg_pairs = ml_pcie_100_ext_ssc_ln_regs, .num_regs =ARRAY_SIZE (ml_pcie_100_ext_ssc_ln_regs), };
@@ -2092,7 +2092,7 @@ static const struct cdns_reg_pairs ti_ml_pcie_100_ext_ssc_ln_regs[] = { {0x0002, SIERRA_TX_RCVDET_OVRD_PREG} }; -static struct cdns_sierra_vals ti_ml_pcie_100_ext_ssc_ln_vals = { +static const struct cdns_sierra_vals ti_ml_pcie_100_ext_ssc_ln_vals = { .reg_pairs = ti_ml_pcie_100_ext_ssc_ln_regs, .num_regs =ARRAY_SIZE (ti_ml_pcie_100_ext_ssc_ln_regs), };
@@ -2152,12 +2152,12 @@ static const struct cdns_reg_pairs cdns_pcie_ln_regs_no_ssc[] = { {0x4432, SIERRA_RXBUFFER_DFECTRL_PREG} }; -static struct cdns_sierra_vals pcie_100_no_ssc_cmn_vals = { +static const struct cdns_sierra_vals pcie_100_no_ssc_cmn_vals = { .reg_pairs = cdns_pcie_cmn_regs_no_ssc, .num_regs =ARRAY_SIZE (cdns_pcie_cmn_regs_no_ssc), }; -static struct cdns_sierra_vals pcie_100_no_ssc_ln_vals = { +static const struct cdns_sierra_vals pcie_100_no_ssc_ln_vals = { .reg_pairs = cdns_pcie_ln_regs_no_ssc, .num_regs =ARRAY_SIZE (cdns_pcie_ln_regs_no_ssc), };
@@ -2227,12 +2227,12 @@ static const struct cdns_reg_pairs cdns_pcie_ln_regs_int_ssc[] = { {0x4432, SIERRA_RXBUFFER_DFECTRL_PREG} }; -static struct cdns_sierra_vals pcie_100_int_ssc_cmn_vals = { +static const struct cdns_sierra_vals pcie_100_int_ssc_cmn_vals = { .reg_pairs = cdns_pcie_cmn_regs_int_ssc, .num_regs =ARRAY_SIZE (cdns_pcie_cmn_regs_int_ssc), }; -static struct cdns_sierra_vals pcie_100_int_ssc_ln_vals = { +static const struct cdns_sierra_vals pcie_100_int_ssc_ln_vals = { .reg_pairs = cdns_pcie_ln_regs_int_ssc, .num_regs =ARRAY_SIZE (cdns_pcie_ln_regs_int_ssc), };
@@ -2296,12 +2296,12 @@ static const struct cdns_reg_pairs cdns_pcie_ln_regs_ext_ssc[] = { {0x4432, SIERRA_RXBUFFER_DFECTRL_PREG} }; -static struct cdns_sierra_vals pcie_100_ext_ssc_cmn_vals = { +static const struct cdns_sierra_vals pcie_100_ext_ssc_cmn_vals = { .reg_pairs = cdns_pcie_cmn_regs_ext_ssc, .num_regs =ARRAY_SIZE (cdns_pcie_cmn_regs_ext_ssc), }; -static struct cdns_sierra_vals pcie_100_ext_ssc_ln_vals = { +static const struct cdns_sierra_vals pcie_100_ext_ssc_ln_vals = { .reg_pairs = cdns_pcie_ln_regs_ext_ssc, .num_regs =ARRAY_SIZE (cdns_pcie_ln_regs_ext_ssc), };
@@ -2413,12 +2413,12 @@ static const struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = { {0x4243, SIERRA_RXBUFFER_DFECTRL_PREG} }; -static struct cdns_sierra_vals usb_100_ext_ssc_cmn_vals = { +static const struct cdns_sierra_vals usb_100_ext_ssc_cmn_vals = { .reg_pairs = cdns_usb_cmn_regs_ext_ssc, .num_regs =ARRAY_SIZE (cdns_usb_cmn_regs_ext_ssc), }; -static struct cdns_sierra_vals usb_100_ext_ssc_ln_vals = { +static const struct cdns_sierra_vals usb_100_ext_ssc_ln_vals = { .reg_pairs = cdns_usb_ln_regs_ext_ssc, .num_regs =ARRAY_SIZE (cdns_usb_ln_regs_ext_ssc), };
@@ -2443,7 +2443,7 @@ static const struct cdns_reg_pairs sgmii_pma_cmn_vals[] = { {0x0013, SIERRA_CMN_PLLLC1_DCOCAL_CTRL_PREG}, }; -static struct cdns_sierra_vals sgmii_cmn_vals = { +static const struct cdns_sierra_vals sgmii_cmn_vals = { .reg_pairs = sgmii_pma_cmn_vals, .num_regs =ARRAY_SIZE (sgmii_pma_cmn_vals), };
@@ -2489,7 +2489,7 @@ static const struct cdns_reg_pairs sgmii_ln_regs[] = { {0x321F, SIERRA_CPICAL_RES_STARTCODE_MODE01_PREG}, }; -static struct cdns_sierra_vals sgmii_pma_ln_vals = { +static const struct cdns_sierra_vals sgmii_pma_ln_vals = { .reg_pairs = sgmii_ln_regs, .num_regs =ARRAY_SIZE (sgmii_ln_regs), };
Signature · 1 line
2.45.2
PATCH 3/3 phy: cadence: Sierra: Constify a u32[]
In reply to Christophe JAILLET'cdns_sierra_pll_mux_table' is not modified in this driver. And it is only used as a "const u32 *".
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
60937 3894 16 64847 fd4f drivers/phy/cadence/phy-cadence-sierra.o
After:
=====
text data bss dec hex filename
60897 3878 16 64791 fd17 drivers/phy/cadence/phy-cadence-sierra.o
---
Compile tested-only.
--- drivers/phy/cadence/phy-cadence-sierra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/cadence/phy-cadence-sierra.c +1 -1
@@ -310,7 +310,7 @@ static const struct clk_parent_data pll_mux_parent_data[][SIERRA_NUM_CMN_PLLC_PA }, }; -static u32 cdns_sierra_pll_mux_table[][SIERRA_NUM_CMN_PLLC_PARENTS ] = { +static const u32 cdns_sierra_pll_mux_table[][SIERRA_NUM_CMN_PLLC_PARENTS ] = { [CMN_PLLLC ] = {0 ,1 }, [CMN_PLLLC1 ] = {1 ,0 }, };
Signature · 1 line
2.45.2
Quoted 8 lines · Christophe JAILLET
This series is just about constification of some structs.
Before:
======
text data bss dec hex filename
60489 4342 16 64847 fd4fdrivers/phy/cadence/phy-cadence-sierra.o[...]
Applied, thanks!
[1/3] phy: cadence: Sierra: Constify struct cdns_reg_pairs
commit: 29f33f0b442c092d7180b511d8bef871f3be9fed
[2/3] phy: cadence: Sierra: Constify struct cdns_sierra_vals
commit: da41bac5c89720f9fb8289a03e30ec0b3cb1cc9c
[3/3] phy: cadence: Sierra: Constify a u32[]
commit: f75999c525a1d7d6c4425a6a225cabae40ab1721Best regards,
Signature · 1 line
Vinod Koul <[email protected]>