ixgbe: Add support for 82599 alternative WWNN/WWPN prefix
Subsystems (3)
PATCH 1/4 ixgbe: Add support for 82599 alternative WWNN/WWPN prefix
From: Yi Zou <[email protected]>
The 82599 EEPROM supports alternative prefix for World Wide Node Name (WWNN) and World Wide Port Name (WWPN). The prefixes can be used together with the SAN MAC address to form the WWNN and WWPN, which can be used by upper layer drivers such as Fiber Channel over Ethernet (FCoE).
---
drivers/net/ixgbe/ixgbe_82599.c | 50 +++++++++++++++++++++++++++++++++++++++ drivers/net/ixgbe/ixgbe_type.h | 15 ++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_82599.c +50 -0
@@ -1000,6 +1000,10 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) hw->mac.num_rar_entries--; } +/* Store the alternative WWNN/WWPN prefix */ + hw->mac.ops.get_wwn_prefix (hw, &hw->mac.wwnn_prefix, + &hw->mac.wwpn_prefix); + reset_hw_out:return status; }
@@ -2536,6 +2540,51 @@ fw_version_out:return status; } +/** +* ixgbe_get_wwn_prefix_82599 - Get alternative WWNN/WWPN prefix from +* the EEPROM +* @hw: pointer to hardware structure +* @wwnn_prefix: the alternative WWNN prefix +* @wwpn_prefix: the alternative WWPN prefix +* +* This function will read the EEPROM from the alternative SAN MAC address +* block to check the support for the alternative WWNN/WWPN prefix support. +**/ +static s32 ixgbe_get_wwn_prefix_82599 (struct ixgbe_hw *hw,u16 *wwnn_prefix, +u16 *wwpn_prefix) +{ +u16 offset, caps; +u16 alt_san_mac_blk_offset; + +/* clear output first */ + *wwnn_prefix =0xFFFF ; + *wwpn_prefix =0xFFFF ; + +/* check if alternative SAN MAC is supported */ + hw->eeprom.ops.read (hw,IXGBE_ALT_SAN_MAC_ADDR_BLK_PTR , + &alt_san_mac_blk_offset); + +if ((alt_san_mac_blk_offset ==0 ) || + (alt_san_mac_blk_offset ==0xFFFF )) + goto wwn_prefix_out; + +/* check capability in alternative san mac address block */ + offset = alt_san_mac_blk_offset +IXGBE_ALT_SAN_MAC_ADDR_CAPS_OFFSET ; + hw->eeprom.ops.read (hw, offset, &caps); +if (!(caps &IXGBE_ALT_SAN_MAC_ADDR_CAPS_ALTWWN )) + goto wwn_prefix_out; + +/* get the corresponding prefix for WWNN/WWPN */ + offset = alt_san_mac_blk_offset +IXGBE_ALT_SAN_MAC_ADDR_WWNN_OFFSET ; + hw->eeprom.ops.read (hw, offset, wwnn_prefix); + + offset = alt_san_mac_blk_offset +IXGBE_ALT_SAN_MAC_ADDR_WWPN_OFFSET ; + hw->eeprom.ops.read (hw, offset, wwpn_prefix); + +wwn_prefix_out: +return 0 ; +} +static struct ixgbe_mac_operations mac_ops_82599 = { .init_hw = &ixgbe_init_hw_generic, .reset_hw = &ixgbe_reset_hw_82599,
@@ -2547,6 +2596,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = { .get_mac_addr = &ixgbe_get_mac_addr_generic, .get_san_mac_addr = &ixgbe_get_san_mac_addr_82599, .get_device_caps = &ixgbe_get_device_caps_82599, + .get_wwn_prefix = &ixgbe_get_wwn_prefix_82599, .stop_adapter = &ixgbe_stop_adapter_generic, .get_bus_info = &ixgbe_get_bus_info_generic, .set_lan_id = &ixgbe_set_lan_id_multi_port_pcie,
drivers/net/ixgbe/ixgbe_type.h +15 -0
@@ -1539,6 +1539,16 @@#define IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR 0x4#define IXGBE_FW_PATCH_VERSION_4 0x7 +/* Alternative SAN MAC Address Block */ +#define IXGBE_ALT_SAN_MAC_ADDR_BLK_PTR 0x27/* Alt. SAN MAC block */ +#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_OFFSET 0x0/* Alt. SAN MAC capability */ +#define IXGBE_ALT_SAN_MAC_ADDR_PORT0_OFFSET 0x1/* Alt. SAN MAC 0 offset */ +#define IXGBE_ALT_SAN_MAC_ADDR_PORT1_OFFSET 0x4/* Alt. SAN MAC 1 offset */ +#define IXGBE_ALT_SAN_MAC_ADDR_WWNN_OFFSET 0x7/* Alt. WWNN prefix offset */ +#define IXGBE_ALT_SAN_MAC_ADDR_WWPN_OFFSET 0x8/* Alt. WWPN prefix offset */ +#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_SANMAC 0x0/* Alt. SAN MAC exists */ +#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_ALTWWN 0x1/* Alt. WWN base exists */ +/* PCI Bus Info */ #define IXGBE_PCI_LINK_STATUS 0xB2#define IXGBE_PCI_DEVICE_CONTROL2 0xC8
@@ -2345,6 +2355,7 @@ struct ixgbe_mac_operations {s32 (*get_mac_addr)(struct ixgbe_hw *,u8 *);s32 (*get_san_mac_addr)(struct ixgbe_hw *,u8 *);s32 (*get_device_caps)(struct ixgbe_hw *,u16 *); +s32 (*get_wwn_prefix)(struct ixgbe_hw *,u16 *,u16 *);s32 (*stop_adapter)(struct ixgbe_hw *);s32 (*get_bus_info)(struct ixgbe_hw *);void (*set_lan_id)(struct ixgbe_hw *);
@@ -2416,6 +2427,10 @@ struct ixgbe_mac_info {u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS ];u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS ];u8 san_addr[IXGBE_ETH_LENGTH_OF_ADDRESS ]; +/* prefix for World Wide Node Name (WWNN) */ +u16 wwnn_prefix; +/* prefix for World Wide Port Name (WWPN) */ +u16 wwpn_prefix;s32 mc_filter_type;u32 mcft_size;u32 vft_size;
PATCH 2/4 net: Add ndo_fcoe_get_wwn to net_device_ops
From: Yi Zou <[email protected]>
Add ndo_fcoe_get_wwn so Fiber Channel over Ethernet (FCoE) can make use of the provided World Wide Port Name (WWPN) and World Wide Node Name (WWNN) from the underlying network interface driver.
---
include/linux/netdevice.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
include/linux/netdevice.h +4 -0
@@ -635,6 +635,10 @@ struct net_device_ops { unsigned int sgc);int (*ndo_fcoe_ddp_done)(struct net_device *dev,u16 xid); +#define NETDEV_FCOE_WWNN 0 +#define NETDEV_FCOE_WWPN 1 +int (*ndo_fcoe_get_wwn)(struct net_device *dev, +u64 *wwn,int type);#endif };
Re: [net-next-2.6 PATCH 2/4] net: Add ndo_fcoe_get_wwn to net_device_ops
From: Jeff Kirsher <[email protected]>
Date: Wed, 28 Oct 2009 21:24:35 -0700
Quoted 8 lines
From: Yi Zou <[email protected]>
Add
ndo_fcoe_get_wwnso Fiber Channel over Ethernet (FCoE) can make use of the provided World Wide Port Name (WWPN) and World Wide Node Name (WWNN) from the underlying network interface driver.Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/4 ixgbe: Add support for netdev_ops.ndo_fcoe_get_wwn to 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
Implements the netdev_ops.ndo_fcoe_get_wwn in 82599 if it finds valid prefix for the World Wide Node Name (WWNN) or World Wide Port Name (WWPN), as well as valid SAN MAC address.
---
drivers/net/ixgbe/ixgbe.h | 1 + drivers/net/ixgbe/ixgbe_fcoe.c | 46 ++++++++++++++++++++++++++++++++++++++++ drivers/net/ixgbe/ixgbe_main.c | 1 + 3 files changed, 48 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe.h +1 -0
@@ -457,6 +457,7 @@ extern int ixgbe_fcoe_disable(struct net_device *netdev);extern u8 ixgbe_fcoe_getapp (struct ixgbe_adapter *adapter);extern u8 ixgbe_fcoe_setapp (struct ixgbe_adapter *adapter,u8 up);#endif /* CONFIG_IXGBE_DCB */ +extern int ixgbe_fcoe_get_wwn (struct net_device *netdev,u64 *wwn,int type);#endif /* IXGBE_FCOE */ #endif /* _IXGBE_H_ */
drivers/net/ixgbe/ixgbe_fcoe.c +46 -0
49 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_main.c +1 -0
@@ -5449,6 +5449,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_fcoe_ddp_done = ixgbe_fcoe_ddp_put, .ndo_fcoe_enable = ixgbe_fcoe_enable, .ndo_fcoe_disable = ixgbe_fcoe_disable, + .ndo_fcoe_get_wwn = ixgbe_fcoe_get_wwn,#endif /* IXGBE_FCOE */ };
Re: [net-next-2.6 PATCH 3/4] ixgbe: Add support for netdev_ops.ndo_fcoe_get_wwn to 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 28 Oct 2009 21:24:56 -0700
Quoted 8 lines
From: Yi Zou <[email protected]>
Implements the netdev_ops.ndo_fcoe_get_wwn in 82599 if it finds valid prefix for the World Wide Node Name (WWNN) or World Wide Port Name (WWPN), as well as valid SAN MAC address.
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 4/4 vlan: Add support to netdev_ops.ndo_fcoe_get_wwn for VLAN device
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
Implements the netdev_ops.ndo_fcoe_get_wwn for VLAN device.
---
net/8021q/vlan_dev.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
net/8021q/vlan_dev.c +13 -0
@@ -626,6 +626,17 @@ static int vlan_dev_fcoe_disable(struct net_device *dev) rc = ops->ndo_fcoe_disable (real_dev); return rc; } + +static int vlan_dev_fcoe_get_wwn (struct net_device *dev,u64 *wwn,int type) +{ +struct net_device *real_dev =vlan_dev_info (dev)->real_dev; +const struct net_device_ops *ops = real_dev->netdev_ops; +int rc = -EINVAL ; + +if (ops->ndo_fcoe_get_wwn) + rc = ops->ndo_fcoe_get_wwn (real_dev, wwn, type); +return rc; +}#endif static void vlan_dev_change_rx_flags (struct net_device *dev,int change)
@@ -791,6 +802,7 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done, .ndo_fcoe_enable = vlan_dev_fcoe_enable, .ndo_fcoe_disable = vlan_dev_fcoe_disable, + .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,#endif };
@@ -813,6 +825,7 @@ static const struct net_device_ops vlan_netdev_accel_ops = { .ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done, .ndo_fcoe_enable = vlan_dev_fcoe_enable, .ndo_fcoe_disable = vlan_dev_fcoe_disable, + .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,#endif };
Re: [net-next-2.6 PATCH 4/4] vlan: Add support to netdev_ops.ndo_fcoe_get_wwn for VLAN device
Quoted 3 lines · Jeff Kirsher
From: Yi Zou <[email protected]>
Implements the netdev_ops.ndo_fcoe_get_wwn for VLAN device.
How would this arrange for different VLANs to get different WWPNs? Or does it allow FCoE only on one VLAN per port?
I guess that would be fair because some switches support only one FCoE VLAN.
Regards,
Joe
Quoted 51 lines
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>---
net/8021q/vlan_dev.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)net/8021q/vlan_dev.c +13
-1@@ -626,6 +626,17 @@ static int vlan_dev_fcoe_disable(struct net_device *dev) rc = ops->ndo_fcoe_disable (real_dev); return rc; } + +static int vlan_dev_fcoe_get_wwn (struct net_device *dev,u64 *wwn,int type) +{ +struct net_device *real_dev =vlan_dev_info (dev)->real_dev; +const struct net_device_ops *ops = real_dev->netdev_ops; +int rc = -EINVAL ; + +if (ops->ndo_fcoe_get_wwn) + rc = ops->ndo_fcoe_get_wwn (real_dev, wwn, type); +return rc; +}#endif static void vlan_dev_change_rx_flags (struct net_device *dev,int change)@@ -791,6 +802,7 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done, .ndo_fcoe_enable = vlan_dev_fcoe_enable, .ndo_fcoe_disable = vlan_dev_fcoe_disable, + .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,#endif };@@ -813,6 +825,7 @@ static const struct net_device_ops vlan_netdev_accel_ops = { .ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done, .ndo_fcoe_enable = vlan_dev_fcoe_enable, .ndo_fcoe_disable = vlan_dev_fcoe_disable, + .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,#endif }; --To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [net-next-2.6 PATCH 4/4] vlan: Add support to netdev_ops.ndo_fcoe_get_wwn for VLAN device
In reply to Jeff KirsherFrom: Jeff Kirsher <[email protected]>
Date: Wed, 28 Oct 2009 21:25:16 -0700
Quoted 6 lines
From: Yi Zou <[email protected]>
Implements the netdev_ops.ndo_fcoe_get_wwn for VLAN device.
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 28 Oct 2009 21:23:57 -0700
Quoted 10 lines
From: Yi Zou <[email protected]>
The 82599 EEPROM supports alternative prefix for World Wide Node Name (WWNN) and World Wide Port Name (WWPN). The prefixes can be used together with the SAN MAC address to form the WWNN and WWPN, which can be used by upper layer drivers such as Fiber Channel over Ethernet (FCoE).
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.