Commit 09612576 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jakub Kicinski
Browse files

net: sungem_phy: Constify struct mii_phy_def 



'struct mii_phy_def' are not modified in this driver.

Constifying these structures moves some data to a read-only section, so
increase overall security.

While at it fix the checkpatch warning related to this patch (some missing
newlines and spaces around *)

On a x86_64, with allmodconfig:
Before:
======
  27709	    928	      0	  28637	   6fdd	drivers/net/sungem_phy.o

After:
=====
   text	   data	    bss	    dec	    hex	filename
  28157	    476	      0	  28633	   6fd9	drivers/net/sungem_phy.o

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/54c3b30930f80f4895e6fa2f4234714fdea4ef4e.1723033266.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ceb62743

drivers/net/sungem_phy.c

+19 −16
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ static const struct mii_phy_ops bcm5201_phy_ops = { 
	.read_link	= genmii_read_link,

};



static struct mii_phy_def bcm5201_phy_def = {

static const struct mii_phy_def bcm5201_phy_def = {

	.phy_id		= 0x00406210,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5201",
@@ -912,7 +912,7 @@ static const struct mii_phy_ops bcm5221_phy_ops = { 
	.read_link	= genmii_read_link,

};



static struct mii_phy_def bcm5221_phy_def = {

static const struct mii_phy_def bcm5221_phy_def = {

	.phy_id		= 0x004061e0,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5221",
@@ -930,7 +930,8 @@ static const struct mii_phy_ops bcm5241_phy_ops = { 
	.poll_link	= genmii_poll_link,

	.read_link	= genmii_read_link,

};

static struct mii_phy_def bcm5241_phy_def = {



static const struct mii_phy_def bcm5241_phy_def = {

	.phy_id		= 0x0143bc30,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5241",
@@ -949,7 +950,7 @@ static const struct mii_phy_ops bcm5400_phy_ops = { 
	.read_link	= bcm54xx_read_link,

};



static struct mii_phy_def bcm5400_phy_def = {

static const struct mii_phy_def bcm5400_phy_def = {

	.phy_id		= 0x00206040,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5400",
@@ -968,7 +969,7 @@ static const struct mii_phy_ops bcm5401_phy_ops = { 
	.read_link	= bcm54xx_read_link,

};



static struct mii_phy_def bcm5401_phy_def = {

static const struct mii_phy_def bcm5401_phy_def = {

	.phy_id		= 0x00206050,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5401",
@@ -987,7 +988,7 @@ static const struct mii_phy_ops bcm5411_phy_ops = { 
	.read_link	= bcm54xx_read_link,

};



static struct mii_phy_def bcm5411_phy_def = {

static const struct mii_phy_def bcm5411_phy_def = {

	.phy_id		= 0x00206070,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5411",
@@ -1007,7 +1008,7 @@ static const struct mii_phy_ops bcm5421_phy_ops = { 
	.enable_fiber   = bcm5421_enable_fiber,

};



static struct mii_phy_def bcm5421_phy_def = {

static const struct mii_phy_def bcm5421_phy_def = {

	.phy_id		= 0x002060e0,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5421",
@@ -1026,7 +1027,7 @@ static const struct mii_phy_ops bcm5421k2_phy_ops = { 
	.read_link	= bcm54xx_read_link,

};



static struct mii_phy_def bcm5421k2_phy_def = {

static const struct mii_phy_def bcm5421k2_phy_def = {

	.phy_id		= 0x002062e0,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5421-K2",
@@ -1045,7 +1046,7 @@ static const struct mii_phy_ops bcm5461_phy_ops = { 
	.enable_fiber   = bcm5461_enable_fiber,

};



static struct mii_phy_def bcm5461_phy_def = {

static const struct mii_phy_def bcm5461_phy_def = {

	.phy_id		= 0x002060c0,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5461",
@@ -1064,7 +1065,7 @@ static const struct mii_phy_ops bcm5462V_phy_ops = { 
	.read_link	= bcm54xx_read_link,

};



static struct mii_phy_def bcm5462V_phy_def = {

static const struct mii_phy_def bcm5462V_phy_def = {

	.phy_id		= 0x002060d0,

	.phy_id_mask	= 0xfffffff0,

	.name		= "BCM5462-Vesta",
@@ -1094,7 +1095,7 @@ static const struct mii_phy_ops marvell88e1111_phy_ops = { 
/* two revs in darwin for the 88e1101 ... I could use a datasheet

 * to get the proper names...

 */

static struct mii_phy_def marvell88e1101v1_phy_def = {

static const struct mii_phy_def marvell88e1101v1_phy_def = {

	.phy_id		= 0x01410c20,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Marvell 88E1101v1",
@@ -1102,7 +1103,8 @@ static struct mii_phy_def marvell88e1101v1_phy_def = { 
	.magic_aneg	= 1,

	.ops		= &marvell88e1101_phy_ops

};

static struct mii_phy_def marvell88e1101v2_phy_def = {



static const struct mii_phy_def marvell88e1101v2_phy_def = {

	.phy_id		= 0x01410c60,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Marvell 88E1101v2",
@@ -1110,7 +1112,8 @@ static struct mii_phy_def marvell88e1101v2_phy_def = { 
	.magic_aneg	= 1,

	.ops		= &marvell88e1101_phy_ops

};

static struct mii_phy_def marvell88e1111_phy_def = {



static const struct mii_phy_def marvell88e1111_phy_def = {

	.phy_id		= 0x01410cc0,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Marvell 88E1111",
@@ -1127,7 +1130,7 @@ static const struct mii_phy_ops generic_phy_ops = { 
	.read_link	= genmii_read_link

};



static struct mii_phy_def genmii_phy_def = {

static const struct mii_phy_def genmii_phy_def = {

	.phy_id		= 0x00000000,

	.phy_id_mask	= 0x00000000,

	.name		= "Generic MII",
@@ -1136,7 +1139,7 @@ static struct mii_phy_def genmii_phy_def = { 
	.ops		= &generic_phy_ops

};



static struct mii_phy_def* mii_phy_table[] = {

static const struct mii_phy_def *mii_phy_table[] = {

	&bcm5201_phy_def,

	&bcm5221_phy_def,

	&bcm5241_phy_def,
@@ -1156,9 +1159,9 @@ static struct mii_phy_def* mii_phy_table[] = { 


int sungem_phy_probe(struct mii_phy *phy, int mii_id)

{

	const struct mii_phy_def *def;

	int rc;

	u32 id;

	struct mii_phy_def* def;

	int i;



	/* We do not reset the mii_phy structure as the driver

include/linux/sungem_phy.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ enum { 
/* An instance of a PHY, partially borrowed from mii_if_info */

struct mii_phy

{

	struct mii_phy_def*	def;

	const struct mii_phy_def *def;

	u32			advertising;

	int			mii_id;