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

Commit a70f9393 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by Jeff Garzik
Browse files

netxen: add new board types 



Add couple of new board configurations based on NX3031 chip.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 24a7a455

drivers/net/netxen/netxen_nic.h

+5 −1
Original line number Diff line number Diff line
@@ -508,6 +508,8 @@ typedef enum { 
	NETXEN_BRDTYPE_P3_10000_BASE_T = 0x0027,

	NETXEN_BRDTYPE_P3_XG_LOM = 0x0028,

	NETXEN_BRDTYPE_P3_4_GB_MM = 0x0029,

	NETXEN_BRDTYPE_P3_10G_SFP_CT = 0x002a,

	NETXEN_BRDTYPE_P3_10G_SFP_QT = 0x002b,

	NETXEN_BRDTYPE_P3_10G_CX4 = 0x0031,

	NETXEN_BRDTYPE_P3_10G_XFP = 0x0032
@@ -1502,7 +1504,9 @@ static const struct netxen_brdinfo netxen_boards[] = { 
	{NETXEN_BRDTYPE_P3_10G_SFP_PLUS, 2, "Dual XGb SFP+ LP"},

	{NETXEN_BRDTYPE_P3_10000_BASE_T, 1, "XGB 10G BaseT LP"},

	{NETXEN_BRDTYPE_P3_XG_LOM,  2, "Dual XGb LOM"},

	{NETXEN_BRDTYPE_P3_4_GB_MM, 4, "Quad GB - March Madness"},

	{NETXEN_BRDTYPE_P3_4_GB_MM, 4, "NX3031 Gigabit Ethernet"},

	{NETXEN_BRDTYPE_P3_10G_SFP_CT, 2, "NX3031 10 Gigabit Ethernet"},

	{NETXEN_BRDTYPE_P3_10G_SFP_QT, 2, "Quanta Dual XGb SFP+"},

	{NETXEN_BRDTYPE_P3_10G_CX4, 2, "Reference Dual CX4 Option"},

	{NETXEN_BRDTYPE_P3_10G_XFP, 1, "Reference Single XFP Option"}

};

drivers/net/netxen/netxen_nic_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
		break;

	case NETXEN_BRDTYPE_P2_SB31_10G:

	case NETXEN_BRDTYPE_P3_10G_SFP_PLUS:

	case NETXEN_BRDTYPE_P3_10G_SFP_CT:

	case NETXEN_BRDTYPE_P3_10G_SFP_QT:

	case NETXEN_BRDTYPE_P3_10G_XFP:

		ecmd->supported |= SUPPORTED_FIBRE;

		ecmd->advertising |= ADVERTISED_FIBRE;

drivers/net/netxen/netxen_nic_hw.c

+3 −0
Original line number Diff line number Diff line
@@ -2016,6 +2016,8 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter) 
	case NETXEN_BRDTYPE_P3_10G_CX4_LP:

	case NETXEN_BRDTYPE_P3_IMEZ:

	case NETXEN_BRDTYPE_P3_10G_SFP_PLUS:

	case NETXEN_BRDTYPE_P3_10G_SFP_CT:

	case NETXEN_BRDTYPE_P3_10G_SFP_QT:

	case NETXEN_BRDTYPE_P3_10G_XFP:

	case NETXEN_BRDTYPE_P3_10000_BASE_T:
@@ -2034,6 +2036,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter) 
	default:

		printk("%s: Unknown(%x)\n", netxen_nic_driver_name,

		       boardinfo->board_type);

		rv = -ENODEV;

		break;

	}

drivers/net/netxen/netxen_nic_main.c

+6 −0
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ static void netxen_check_options(struct netxen_adapter *adapter) 
	case NETXEN_BRDTYPE_P3_10G_CX4_LP:

	case NETXEN_BRDTYPE_P3_IMEZ:

	case NETXEN_BRDTYPE_P3_10G_SFP_PLUS:

	case NETXEN_BRDTYPE_P3_10G_SFP_QT:

	case NETXEN_BRDTYPE_P3_10G_SFP_CT:

	case NETXEN_BRDTYPE_P3_10G_XFP:

	case NETXEN_BRDTYPE_P3_10000_BASE_T:

		adapter->msix_supported = !!use_msi_x;
@@ -301,6 +303,10 @@ static void netxen_check_options(struct netxen_adapter *adapter) 
	case NETXEN_BRDTYPE_P3_REF_QG:

	case NETXEN_BRDTYPE_P3_4_GB:

	case NETXEN_BRDTYPE_P3_4_GB_MM:

		adapter->msix_supported = 0;

		adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS_10G;

		break;



	case NETXEN_BRDTYPE_P2_SB35_4G:

	case NETXEN_BRDTYPE_P2_SB31_2G:

		adapter->msix_supported = 0;