e1000e: specify max supported frame size in adapter struct (2adc55c9) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/e1000e/82571.c

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -341,8 +341,10 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
	if (e1000_read_nvm(&adapter->hw, NVM_INIT_3GIO_3, 1,		if (e1000_read_nvm(&adapter->hw, NVM_INIT_3GIO_3, 1,
	&eeprom_data) < 0)		&eeprom_data) < 0)
	break;		break;
	if (eeprom_data & NVM_WORD1A_ASPM_MASK)		if (!(eeprom_data & NVM_WORD1A_ASPM_MASK)) {
	adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES;		adapter->flags \|= FLAG_HAS_JUMBO_FRAMES;
			adapter->max_hw_frame_size = DEFAULT_JUMBO;
			}
	}		}
	break;		break;
	default:		default:
	@@ -1672,6 +1674,7 @@ struct e1000_info e1000_82571_info = {
	\| FLAG_TARC_SPEED_MODE_BIT /* errata */		\| FLAG_TARC_SPEED_MODE_BIT /* errata */
	\| FLAG_APME_CHECK_PORT_B,		\| FLAG_APME_CHECK_PORT_B,
	.pba = 38,		.pba = 38,
			.max_hw_frame_size = DEFAULT_JUMBO,
	.get_variants = e1000_get_variants_82571,		.get_variants = e1000_get_variants_82571,
	.mac_ops = &e82571_mac_ops,		.mac_ops = &e82571_mac_ops,
	.phy_ops = &e82_phy_ops_igp,		.phy_ops = &e82_phy_ops_igp,
	@@ -1688,6 +1691,7 @@ struct e1000_info e1000_82572_info = {
	\| FLAG_HAS_CTRLEXT_ON_LOAD		\| FLAG_HAS_CTRLEXT_ON_LOAD
	\| FLAG_TARC_SPEED_MODE_BIT, /* errata */		\| FLAG_TARC_SPEED_MODE_BIT, /* errata */
	.pba = 38,		.pba = 38,
			.max_hw_frame_size = DEFAULT_JUMBO,
	.get_variants = e1000_get_variants_82571,		.get_variants = e1000_get_variants_82571,
	.mac_ops = &e82571_mac_ops,		.mac_ops = &e82571_mac_ops,
	.phy_ops = &e82_phy_ops_igp,		.phy_ops = &e82_phy_ops_igp,
	@@ -1706,6 +1710,7 @@ struct e1000_info e1000_82573_info = {
	\| FLAG_HAS_ERT		\| FLAG_HAS_ERT
	\| FLAG_HAS_SWSM_ON_LOAD,		\| FLAG_HAS_SWSM_ON_LOAD,
	.pba = 20,		.pba = 20,
			.max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN,
	.get_variants = e1000_get_variants_82571,		.get_variants = e1000_get_variants_82571,
	.mac_ops = &e82571_mac_ops,		.mac_ops = &e82571_mac_ops,
	.phy_ops = &e82_phy_ops_m88,		.phy_ops = &e82_phy_ops_m88,
	@@ -1724,6 +1729,7 @@ struct e1000_info e1000_82574_info = {
	\| FLAG_HAS_AMT		\| FLAG_HAS_AMT
	\| FLAG_HAS_CTRLEXT_ON_LOAD,		\| FLAG_HAS_CTRLEXT_ON_LOAD,
	.pba = 20,		.pba = 20,
			.max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN,
	.get_variants = e1000_get_variants_82571,		.get_variants = e1000_get_variants_82571,
	.mac_ops = &e82571_mac_ops,		.mac_ops = &e82571_mac_ops,
	.phy_ops = &e82_phy_ops_bm,		.phy_ops = &e82_phy_ops_bm,
	@@ -1740,6 +1746,7 @@ struct e1000_info e1000_82583_info = {
	\| FLAG_HAS_AMT		\| FLAG_HAS_AMT
	\| FLAG_HAS_CTRLEXT_ON_LOAD,		\| FLAG_HAS_CTRLEXT_ON_LOAD,
	.pba = 20,		.pba = 20,
			.max_hw_frame_size = DEFAULT_JUMBO,
	.get_variants = e1000_get_variants_82571,		.get_variants = e1000_get_variants_82571,
	.mac_ops = &e82571_mac_ops,		.mac_ops = &e82571_mac_ops,
	.phy_ops = &e82_phy_ops_bm,		.phy_ops = &e82_phy_ops_bm,

drivers/net/e1000e/e1000.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,8 @@ struct e1000_info;
	/* Number of packet split data buffers (not including the header buffer) */		/* Number of packet split data buffers (not including the header buffer) */
	#define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1)		#define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1)

			#define DEFAULT_JUMBO 9234

	enum e1000_boards {		enum e1000_boards {
	board_82571,		board_82571,
	board_82572,		board_82572,
	@@ -293,6 +295,7 @@ struct e1000_adapter {
	u32 eeprom_wol;		u32 eeprom_wol;
	u32 wol;		u32 wol;
	u32 pba;		u32 pba;
			u32 max_hw_frame_size;

	bool fc_autoneg;		bool fc_autoneg;

	@@ -309,6 +312,7 @@ struct e1000_info {
	unsigned int flags;		unsigned int flags;
	unsigned int flags2;		unsigned int flags2;
	u32 pba;		u32 pba;
			u32 max_hw_frame_size;
	s32 (get_variants)(struct e1000_adapter );		s32 (get_variants)(struct e1000_adapter );
	struct e1000_mac_operations *mac_ops;		struct e1000_mac_operations *mac_ops;
	struct e1000_phy_operations *phy_ops;		struct e1000_phy_operations *phy_ops;

drivers/net/e1000e/es2lan.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1422,6 +1422,7 @@ struct e1000_info e1000_es2_info = {
	\| FLAG_DISABLE_FC_PAUSE_TIME /* errata */		\| FLAG_DISABLE_FC_PAUSE_TIME /* errata */
	\| FLAG_TIPG_MEDIUM_FOR_80003ESLAN,		\| FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
	.pba = 38,		.pba = 38,
			.max_hw_frame_size = DEFAULT_JUMBO,
	.get_variants = e1000_get_variants_80003es2lan,		.get_variants = e1000_get_variants_80003es2lan,
	.mac_ops = &es2_mac_ops,		.mac_ops = &es2_mac_ops,
	.phy_ops = &es2_phy_ops,		.phy_ops = &es2_phy_ops,

drivers/net/e1000e/ich8lan.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -382,6 +382,11 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
	if (rc)		if (rc)
	return rc;		return rc;

			if (adapter->hw.phy.type == e1000_phy_ife) {
			adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES;
			adapter->max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN;
			}

	if ((adapter->hw.mac.type == e1000_ich8lan) &&		if ((adapter->hw.mac.type == e1000_ich8lan) &&
	(adapter->hw.phy.type == e1000_phy_igp_3))		(adapter->hw.phy.type == e1000_phy_igp_3))
	adapter->flags \|= FLAG_LSC_GIG_SPEED_DROP;		adapter->flags \|= FLAG_LSC_GIG_SPEED_DROP;
	@@ -2595,6 +2600,7 @@ struct e1000_info e1000_ich8_info = {
	\| FLAG_HAS_FLASH		\| FLAG_HAS_FLASH
	\| FLAG_APME_IN_WUC,		\| FLAG_APME_IN_WUC,
	.pba = 8,		.pba = 8,
			.max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN,
	.get_variants = e1000_get_variants_ich8lan,		.get_variants = e1000_get_variants_ich8lan,
	.mac_ops = &ich8_mac_ops,		.mac_ops = &ich8_mac_ops,
	.phy_ops = &ich8_phy_ops,		.phy_ops = &ich8_phy_ops,
	@@ -2613,6 +2619,7 @@ struct e1000_info e1000_ich9_info = {
	\| FLAG_HAS_FLASH		\| FLAG_HAS_FLASH
	\| FLAG_APME_IN_WUC,		\| FLAG_APME_IN_WUC,
	.pba = 10,		.pba = 10,
			.max_hw_frame_size = DEFAULT_JUMBO,
	.get_variants = e1000_get_variants_ich8lan,		.get_variants = e1000_get_variants_ich8lan,
	.mac_ops = &ich8_mac_ops,		.mac_ops = &ich8_mac_ops,
	.phy_ops = &ich8_phy_ops,		.phy_ops = &ich8_phy_ops,
	@@ -2631,6 +2638,7 @@ struct e1000_info e1000_ich10_info = {
	\| FLAG_HAS_FLASH		\| FLAG_HAS_FLASH
	\| FLAG_APME_IN_WUC,		\| FLAG_APME_IN_WUC,
	.pba = 10,		.pba = 10,
			.max_hw_frame_size = DEFAULT_JUMBO,
	.get_variants = e1000_get_variants_ich8lan,		.get_variants = e1000_get_variants_ich8lan,
	.mac_ops = &ich8_mac_ops,		.mac_ops = &ich8_mac_ops,
	.phy_ops = &ich8_phy_ops,		.phy_ops = &ich8_phy_ops,

drivers/net/e1000e/netdev.c

+9 −18

Original line number	Original line	Diff line number	Diff line
	@@ -4212,27 +4212,17 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
	struct e1000_adapter *adapter = netdev_priv(netdev);		struct e1000_adapter *adapter = netdev_priv(netdev);
	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;		int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;

	if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) \|\|		/* Jumbo frame support */
	(max_frame > MAX_JUMBO_FRAME_SIZE)) {		if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
	e_err("Invalid MTU setting\n");		!(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
	return -EINVAL;
	}

	/* Jumbo frame size limits */
	if (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) {
	if (!(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
	e_err("Jumbo Frames not supported.\n");		e_err("Jumbo Frames not supported.\n");
	return -EINVAL;		return -EINVAL;
	}		}
	if (adapter->hw.phy.type == e1000_phy_ife) {
	e_err("Jumbo Frames not supported.\n");
	return -EINVAL;
	}
	}

	#define MAX_STD_JUMBO_FRAME_SIZE 9234		/* Supported frame sizes */
	if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {		if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) \|\|
	e_err("MTU > 9216 not supported.\n");		(max_frame > adapter->max_hw_frame_size)) {
			e_err("Unsupported MTU setting\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -4848,6 +4838,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
	adapter->flags2 = ei->flags2;		adapter->flags2 = ei->flags2;
	adapter->hw.adapter = adapter;		adapter->hw.adapter = adapter;
	adapter->hw.mac.type = ei->mac;		adapter->hw.mac.type = ei->mac;
			adapter->max_hw_frame_size = ei->max_hw_frame_size;
	adapter->msg_enable = (1 << NETIF_MSG_DRV \| NETIF_MSG_PROBE) - 1;		adapter->msg_enable = (1 << NETIF_MSG_DRV \| NETIF_MSG_PROBE) - 1;

	mmio_start = pci_resource_start(pdev, 0);		mmio_start = pci_resource_start(pdev, 0);