Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37689010 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Make all unchanging ops structures const 



The source for the ops structure contents are const, so make them
so. Copy them in place with structure assignments instead of memcpys.
Make the mbx_ops accessed by reference instead of making a copy of
the source structure. Update copyright date on the touched files.

Reported-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 06bb1c39

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+6 −6
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2013 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -862,11 +862,11 @@ enum ixgbe_boards { 
	board_X550EM_x,

};



extern struct ixgbe_info ixgbe_82598_info;

extern struct ixgbe_info ixgbe_82599_info;

extern struct ixgbe_info ixgbe_X540_info;

extern struct ixgbe_info ixgbe_X550_info;

extern struct ixgbe_info ixgbe_X550EM_x_info;

extern const struct ixgbe_info ixgbe_82598_info;

extern const struct ixgbe_info ixgbe_82599_info;

extern const struct ixgbe_info ixgbe_X540_info;

extern const struct ixgbe_info ixgbe_X550_info;

extern const struct ixgbe_info ixgbe_X550EM_x_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

#endif

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+5 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2015 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -1160,7 +1160,7 @@ static void ixgbe_set_rxpba_82598(struct ixgbe_hw *hw, int num_pb, 
		IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), IXGBE_TXPBSIZE_40KB);

}



static struct ixgbe_mac_operations mac_ops_82598 = {

static const struct ixgbe_mac_operations mac_ops_82598 = {

	.init_hw		= &ixgbe_init_hw_generic,

	.reset_hw		= &ixgbe_reset_hw_82598,

	.start_hw		= &ixgbe_start_hw_82598,
@@ -1203,7 +1203,7 @@ static struct ixgbe_mac_operations mac_ops_82598 = { 
	.disable_rx		= &ixgbe_disable_rx_generic,

};



static struct ixgbe_eeprom_operations eeprom_ops_82598 = {

static const struct ixgbe_eeprom_operations eeprom_ops_82598 = {

	.init_params		= &ixgbe_init_eeprom_params_generic,

	.read			= &ixgbe_read_eerd_generic,

	.write			= &ixgbe_write_eeprom_generic,
@@ -1214,7 +1214,7 @@ static struct ixgbe_eeprom_operations eeprom_ops_82598 = { 
	.update_checksum	= &ixgbe_update_eeprom_checksum_generic,

};



static struct ixgbe_phy_operations phy_ops_82598 = {

static const struct ixgbe_phy_operations phy_ops_82598 = {

	.identify		= &ixgbe_identify_phy_generic,

	.identify_sfp		= &ixgbe_identify_module_generic,

	.init			= &ixgbe_init_phy_ops_82598,
@@ -1230,7 +1230,7 @@ static struct ixgbe_phy_operations phy_ops_82598 = { 
	.check_overtemp		= &ixgbe_tn_check_overtemp,

};



struct ixgbe_info ixgbe_82598_info = {

const struct ixgbe_info ixgbe_82598_info = {

	.mac			= ixgbe_mac_82598EB,

	.get_invariants		= &ixgbe_get_invariants_82598,

	.mac_ops		= &mac_ops_82598,

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+5 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2015 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -2181,7 +2181,7 @@ static s32 ixgbe_write_i2c_byte_82599(struct ixgbe_hw *hw, u8 byte_offset, 
	return status;

}



static struct ixgbe_mac_operations mac_ops_82599 = {

static const struct ixgbe_mac_operations mac_ops_82599 = {

	.init_hw                = &ixgbe_init_hw_generic,

	.reset_hw               = &ixgbe_reset_hw_82599,

	.start_hw               = &ixgbe_start_hw_82599,
@@ -2235,7 +2235,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = { 
	.disable_rx		= &ixgbe_disable_rx_generic,

};



static struct ixgbe_eeprom_operations eeprom_ops_82599 = {

static const struct ixgbe_eeprom_operations eeprom_ops_82599 = {

	.init_params		= &ixgbe_init_eeprom_params_generic,

	.read			= &ixgbe_read_eeprom_82599,

	.read_buffer		= &ixgbe_read_eeprom_buffer_82599,
@@ -2246,7 +2246,7 @@ static struct ixgbe_eeprom_operations eeprom_ops_82599 = { 
	.update_checksum	= &ixgbe_update_eeprom_checksum_generic,

};



static struct ixgbe_phy_operations phy_ops_82599 = {

static const struct ixgbe_phy_operations phy_ops_82599 = {

	.identify		= &ixgbe_identify_phy_82599,

	.identify_sfp		= &ixgbe_identify_module_generic,

	.init			= &ixgbe_init_phy_ops_82599,
@@ -2263,7 +2263,7 @@ static struct ixgbe_phy_operations phy_ops_82599 = { 
	.check_overtemp		= &ixgbe_tn_check_overtemp,

};



struct ixgbe_info ixgbe_82599_info = {

const struct ixgbe_info ixgbe_82599_info = {

	.mac                    = ixgbe_mac_82599EB,

	.get_invariants         = &ixgbe_get_invariants_82599,

	.mac_ops                = &mac_ops_82599,

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+5 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2015 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -9136,12 +9136,12 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));



	/* Setup hw api */

	memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));

	hw->mac.ops   = *ii->mac_ops;

	hw->mac.type  = ii->mac;

	hw->mvals     = ii->mvals;



	/* EEPROM */

	memcpy(&hw->eeprom.ops, ii->eeprom_ops, sizeof(hw->eeprom.ops));

	hw->eeprom.ops = *ii->eeprom_ops;

	eec = IXGBE_READ_REG(hw, IXGBE_EEC(hw));

	if (ixgbe_removed(hw->hw_addr)) {

		err = -EIO;
@@ -9152,7 +9152,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		hw->eeprom.ops.read = &ixgbe_read_eeprom_bit_bang_generic;



	/* PHY */

	memcpy(&hw->phy.ops, ii->phy_ops, sizeof(hw->phy.ops));

	hw->phy.ops = *ii->phy_ops;

	hw->phy.sfp_type = ixgbe_sfp_type_unknown;

	/* ixgbe_identify_phy_generic will set prtad and mmds properly */

	hw->phy.mdio.prtad = MDIO_PRTAD_NONE;
@@ -9215,7 +9215,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto skip_sriov;

	/* Mailbox */

	ixgbe_init_mbx_params_pf(hw);

	memcpy(&hw->mbx.ops, ii->mbx_ops, sizeof(hw->mbx.ops));

	hw->mbx.ops = ii->mbx_ops;

	pci_sriov_set_totalvfs(pdev, IXGBE_MAX_VFS_DRV_LIMIT);

	ixgbe_enable_sriov(adapter);

skip_sriov:

drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c

+20 −20
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2014 Intel Corporation.

  Copyright(c) 1999 - 2016 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -48,10 +48,10 @@ s32 ixgbe_read_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id) 
	if (size > mbx->size)

		size = mbx->size;



	if (!mbx->ops.read)

	if (!mbx->ops)

		return IXGBE_ERR_MBX;



	return mbx->ops.read(hw, msg, size, mbx_id);

	return mbx->ops->read(hw, msg, size, mbx_id);

}



/**
@@ -70,10 +70,10 @@ s32 ixgbe_write_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id) 
	if (size > mbx->size)

		return IXGBE_ERR_MBX;



	if (!mbx->ops.write)

	if (!mbx->ops)

		return IXGBE_ERR_MBX;



	return mbx->ops.write(hw, msg, size, mbx_id);

	return mbx->ops->write(hw, msg, size, mbx_id);

}



/**
@@ -87,10 +87,10 @@ s32 ixgbe_check_for_msg(struct ixgbe_hw *hw, u16 mbx_id) 
{

	struct ixgbe_mbx_info *mbx = &hw->mbx;



	if (!mbx->ops.check_for_msg)

	if (!mbx->ops)

		return IXGBE_ERR_MBX;



	return mbx->ops.check_for_msg(hw, mbx_id);

	return mbx->ops->check_for_msg(hw, mbx_id);

}



/**
@@ -104,10 +104,10 @@ s32 ixgbe_check_for_ack(struct ixgbe_hw *hw, u16 mbx_id) 
{

	struct ixgbe_mbx_info *mbx = &hw->mbx;



	if (!mbx->ops.check_for_ack)

	if (!mbx->ops)

		return IXGBE_ERR_MBX;



	return mbx->ops.check_for_ack(hw, mbx_id);

	return mbx->ops->check_for_ack(hw, mbx_id);

}



/**
@@ -121,10 +121,10 @@ s32 ixgbe_check_for_rst(struct ixgbe_hw *hw, u16 mbx_id) 
{

	struct ixgbe_mbx_info *mbx = &hw->mbx;



	if (!mbx->ops.check_for_rst)

	if (!mbx->ops)

		return IXGBE_ERR_MBX;



	return mbx->ops.check_for_rst(hw, mbx_id);

	return mbx->ops->check_for_rst(hw, mbx_id);

}



/**
@@ -139,10 +139,10 @@ static s32 ixgbe_poll_for_msg(struct ixgbe_hw *hw, u16 mbx_id) 
	struct ixgbe_mbx_info *mbx = &hw->mbx;

	int countdown = mbx->timeout;



	if (!countdown || !mbx->ops.check_for_msg)

	if (!countdown || !mbx->ops)

		return IXGBE_ERR_MBX;



	while (mbx->ops.check_for_msg(hw, mbx_id)) {

	while (mbx->ops->check_for_msg(hw, mbx_id)) {

		countdown--;

		if (!countdown)

			return IXGBE_ERR_MBX;
@@ -164,10 +164,10 @@ static s32 ixgbe_poll_for_ack(struct ixgbe_hw *hw, u16 mbx_id) 
	struct ixgbe_mbx_info *mbx = &hw->mbx;

	int countdown = mbx->timeout;



	if (!countdown || !mbx->ops.check_for_ack)

	if (!countdown || !mbx->ops)

		return IXGBE_ERR_MBX;



	while (mbx->ops.check_for_ack(hw, mbx_id)) {

	while (mbx->ops->check_for_ack(hw, mbx_id)) {

		countdown--;

		if (!countdown)

			return IXGBE_ERR_MBX;
@@ -193,7 +193,7 @@ static s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, 
	struct ixgbe_mbx_info *mbx = &hw->mbx;

	s32 ret_val;



	if (!mbx->ops.read)

	if (!mbx->ops)

		return IXGBE_ERR_MBX;



	ret_val = ixgbe_poll_for_msg(hw, mbx_id);
@@ -201,7 +201,7 @@ static s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, 
		return ret_val;



	/* if ack received read message */

	return mbx->ops.read(hw, msg, size, mbx_id);

	return mbx->ops->read(hw, msg, size, mbx_id);

}



/**
@@ -221,11 +221,11 @@ static s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, 
	s32 ret_val;



	/* exit if either we can't write or there isn't a defined timeout */

	if (!mbx->ops.write || !mbx->timeout)

	if (!mbx->ops || !mbx->timeout)

		return IXGBE_ERR_MBX;



	/* send msg */

	ret_val = mbx->ops.write(hw, msg, size, mbx_id);

	ret_val = mbx->ops->write(hw, msg, size, mbx_id);

	if (ret_val)

		return ret_val;
@@ -446,7 +446,7 @@ void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw) 
}

#endif /* CONFIG_PCI_IOV */



struct ixgbe_mbx_operations mbx_ops_generic = {

const struct ixgbe_mbx_operations mbx_ops_generic = {

	.read                   = ixgbe_read_mbx_pf,

	.write                  = ixgbe_write_mbx_pf,

	.read_posted            = ixgbe_read_posted_mbx,