Commit da41bac5 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Vinod Koul
Browse files

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/0ccfd259fdf40475c89cfb22a64c6388e7c646b4.1720723132.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 29f33f0b

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

+40 −40
Original line number Diff line number Diff line
@@ -362,13 +362,13 @@ 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]

	const 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]

	const 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]

	const 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]

	const struct cdns_sierra_vals *pma_ln_vals[NUM_PHY_TYPE][NUM_PHY_TYPE]

						  [NUM_SSC_MODE];

};
@@ -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),

};