Commit 51987461 authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller

enic: Clean up: Organize devcmd wrapper routines

Organize the wrapper routines for firmware devcmds into a separate file.
Signed-off-by: default avatarChristian Benvenuti <benve@cisco.com>
Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid Wang <dwang2@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a375557
obj-$(CONFIG_ENIC) := enic.o obj-$(CONFIG_ENIC) := enic.o
enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \ enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
enic_res.o vnic_dev.o vnic_rq.o vnic_vic.o enic_res.o enic_dev.o vnic_dev.o vnic_rq.o vnic_vic.o
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define DRV_NAME "enic" #define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
#define DRV_VERSION "2.1.1.2a" #define DRV_VERSION "2.1.1.3"
#define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc"
#define ENIC_BARS_MAX 6 #define ENIC_BARS_MAX 6
......
/*
* Copyright 2011 Cisco Systems, Inc. All rights reserved.
*
* This program is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
*/
#include <linux/pci.h>
#include <linux/etherdevice.h>
#include "vnic_dev.h"
#include "vnic_vic.h"
#include "enic_res.h"
#include "enic.h"
#include "enic_dev.h"
int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_fw_info(enic->vdev, fw_info);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_stats_dump(enic->vdev, vstats);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_add_station_addr(struct enic *enic)
{
int err = 0;
if (is_valid_ether_addr(enic->netdev->dev_addr)) {
spin_lock(&enic->devcmd_lock);
err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
spin_unlock(&enic->devcmd_lock);
}
return err;
}
int enic_dev_del_station_addr(struct enic *enic)
{
int err = 0;
if (is_valid_ether_addr(enic->netdev->dev_addr)) {
spin_lock(&enic->devcmd_lock);
err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
spin_unlock(&enic->devcmd_lock);
}
return err;
}
int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
int broadcast, int promisc, int allmulti)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_packet_filter(enic->vdev, directed,
multicast, broadcast, promisc, allmulti);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_add_addr(struct enic *enic, u8 *addr)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_add_addr(enic->vdev, addr);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_del_addr(struct enic *enic, u8 *addr)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_del_addr(enic->vdev, addr);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_hw_version(struct enic *enic, enum vnic_dev_hw_version *hw_ver)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_hw_version(enic->vdev, hw_ver);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_notify_unset(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_notify_unset(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_hang_notify(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_hang_notify(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_enable(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_enable_wait(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_disable(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_disable(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_vnic_dev_deinit(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_deinit(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_init_prov(enic->vdev,
(u8 *)vp, vic_provinfo_size(vp));
spin_unlock(&enic->devcmd_lock);
return err;
}
int enic_dev_init_done(struct enic *enic, int *done, int *error)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_init_done(enic->vdev, done, error);
spin_unlock(&enic->devcmd_lock);
return err;
}
/* rtnl lock is held */
void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
{
struct enic *enic = netdev_priv(netdev);
spin_lock(&enic->devcmd_lock);
enic_add_vlan(enic, vid);
spin_unlock(&enic->devcmd_lock);
}
/* rtnl lock is held */
void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
{
struct enic *enic = netdev_priv(netdev);
spin_lock(&enic->devcmd_lock);
enic_del_vlan(enic, vid);
spin_unlock(&enic->devcmd_lock);
}
/*
* Copyright 2011 Cisco Systems, Inc. All rights reserved.
*
* This program is free software; you may redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
*/
#ifndef _ENIC_DEV_H_
#define _ENIC_DEV_H_
int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info);
int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats);
int enic_dev_add_station_addr(struct enic *enic);
int enic_dev_del_station_addr(struct enic *enic);
int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
int broadcast, int promisc, int allmulti);
int enic_dev_add_addr(struct enic *enic, u8 *addr);
int enic_dev_del_addr(struct enic *enic, u8 *addr);
void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
int enic_dev_hw_version(struct enic *enic, enum vnic_dev_hw_version *hw_ver);
int enic_dev_notify_unset(struct enic *enic);
int enic_dev_hang_notify(struct enic *enic);
int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);
int enic_dev_enable(struct enic *enic);
int enic_dev_disable(struct enic *enic);
int enic_vnic_dev_deinit(struct enic *enic);
int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp);
int enic_dev_init_done(struct enic *enic, int *done, int *error);
#endif /* _ENIC_DEV_H_ */
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "vnic_vic.h" #include "vnic_vic.h"
#include "enic_res.h" #include "enic_res.h"
#include "enic.h" #include "enic.h"
#include "enic_dev.h"
#define ENIC_NOTIFY_TIMER_PERIOD (2 * HZ) #define ENIC_NOTIFY_TIMER_PERIOD (2 * HZ)
#define WQ_ENET_MAX_DESC_LEN (1 << WQ_ENET_LEN_BITS) #define WQ_ENET_MAX_DESC_LEN (1 << WQ_ENET_LEN_BITS)
...@@ -190,18 +191,6 @@ static int enic_get_settings(struct net_device *netdev, ...@@ -190,18 +191,6 @@ static int enic_get_settings(struct net_device *netdev,
return 0; return 0;
} }
static int enic_dev_fw_info(struct enic *enic,
struct vnic_devcmd_fw_info **fw_info)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_fw_info(enic->vdev, fw_info);
spin_unlock(&enic->devcmd_lock);
return err;
}
static void enic_get_drvinfo(struct net_device *netdev, static void enic_get_drvinfo(struct net_device *netdev,
struct ethtool_drvinfo *drvinfo) struct ethtool_drvinfo *drvinfo)
{ {
...@@ -246,17 +235,6 @@ static int enic_get_sset_count(struct net_device *netdev, int sset) ...@@ -246,17 +235,6 @@ static int enic_get_sset_count(struct net_device *netdev, int sset)
} }
} }
static int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_stats_dump(enic->vdev, vstats);
spin_unlock(&enic->devcmd_lock);
return err;
}
static void enic_get_ethtool_stats(struct net_device *netdev, static void enic_get_ethtool_stats(struct net_device *netdev,
struct ethtool_stats *stats, u64 *data) struct ethtool_stats *stats, u64 *data)
{ {
...@@ -919,32 +897,6 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr) ...@@ -919,32 +897,6 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
return 0; return 0;
} }
static int enic_dev_add_station_addr(struct enic *enic)
{
int err = 0;
if (is_valid_ether_addr(enic->netdev->dev_addr)) {
spin_lock(&enic->devcmd_lock);
err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
spin_unlock(&enic->devcmd_lock);
}
return err;
}
static int enic_dev_del_station_addr(struct enic *enic)
{
int err = 0;
if (is_valid_ether_addr(enic->netdev->dev_addr)) {
spin_lock(&enic->devcmd_lock);
err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
spin_unlock(&enic->devcmd_lock);
}
return err;
}
static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p) static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p)
{ {
struct enic *enic = netdev_priv(netdev); struct enic *enic = netdev_priv(netdev);
...@@ -989,41 +941,6 @@ static int enic_set_mac_address(struct net_device *netdev, void *p) ...@@ -989,41 +941,6 @@ static int enic_set_mac_address(struct net_device *netdev, void *p)
return enic_dev_add_station_addr(enic); return enic_dev_add_station_addr(enic);
} }
static int enic_dev_packet_filter(struct enic *enic, int directed,
int multicast, int broadcast, int promisc, int allmulti)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_packet_filter(enic->vdev, directed,
multicast, broadcast, promisc, allmulti);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_dev_add_addr(struct enic *enic, u8 *addr)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_add_addr(enic->vdev, addr);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_dev_del_addr(struct enic *enic, u8 *addr)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_del_addr(enic->vdev, addr);
spin_unlock(&enic->devcmd_lock);
return err;
}
static void enic_add_multicast_addr_list(struct enic *enic) static void enic_add_multicast_addr_list(struct enic *enic)
{ {
struct net_device *netdev = enic->netdev; struct net_device *netdev = enic->netdev;
...@@ -1170,26 +1087,6 @@ static void enic_vlan_rx_register(struct net_device *netdev, ...@@ -1170,26 +1087,6 @@ static void enic_vlan_rx_register(struct net_device *netdev,
enic->vlan_group = vlan_group; enic->vlan_group = vlan_group;
} }
/* rtnl lock is held */
static void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
{
struct enic *enic = netdev_priv(netdev);
spin_lock(&enic->devcmd_lock);
enic_add_vlan(enic, vid);
spin_unlock(&enic->devcmd_lock);
}
/* rtnl lock is held */
static void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
{
struct enic *enic = netdev_priv(netdev);
spin_lock(&enic->devcmd_lock);
enic_del_vlan(enic, vid);
spin_unlock(&enic->devcmd_lock);
}
/* netif_tx_lock held, BHs disabled */ /* netif_tx_lock held, BHs disabled */
static void enic_tx_timeout(struct net_device *netdev) static void enic_tx_timeout(struct net_device *netdev)
{ {
...@@ -1197,40 +1094,6 @@ static void enic_tx_timeout(struct net_device *netdev) ...@@ -1197,40 +1094,6 @@ static void enic_tx_timeout(struct net_device *netdev)
schedule_work(&enic->reset); schedule_work(&enic->reset);
} }
static int enic_vnic_dev_deinit(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_deinit(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_init_prov(enic->vdev,
(u8 *)vp, vic_provinfo_size(vp));
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_dev_init_done(struct enic *enic, int *done, int *error)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_init_done(enic->vdev, done, error);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
{ {
struct enic *enic = netdev_priv(netdev); struct enic *enic = netdev_priv(netdev);
...@@ -1505,18 +1368,6 @@ static int enic_rq_alloc_buf_a1(struct vnic_rq *rq) ...@@ -1505,18 +1368,6 @@ static int enic_rq_alloc_buf_a1(struct vnic_rq *rq)
return 0; return 0;
} }
static int enic_dev_hw_version(struct enic *enic,
enum vnic_dev_hw_version *hw_ver)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_hw_version(enic->vdev, hw_ver);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_set_rq_alloc_buf(struct enic *enic) static int enic_set_rq_alloc_buf(struct enic *enic)
{ {
enum vnic_dev_hw_version hw_ver; enum vnic_dev_hw_version hw_ver;
...@@ -1897,39 +1748,6 @@ static int enic_dev_notify_set(struct enic *enic) ...@@ -1897,39 +1748,6 @@ static int enic_dev_notify_set(struct enic *enic)
return err; return err;
} }
static int enic_dev_notify_unset(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_notify_unset(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_dev_enable(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_enable_wait(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_dev_disable(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_disable(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
static void enic_notify_timer_start(struct enic *enic) static void enic_notify_timer_start(struct enic *enic)
{ {
switch (vnic_dev_get_intr_mode(enic->vdev)) { switch (vnic_dev_get_intr_mode(enic->vdev)) {
...@@ -2281,29 +2099,6 @@ static int enic_set_rss_nic_cfg(struct enic *enic) ...@@ -2281,29 +2099,6 @@ static int enic_set_rss_nic_cfg(struct enic *enic)
rss_hash_bits, rss_base_cpu, rss_enable); rss_hash_bits, rss_base_cpu, rss_enable);
} }
static int enic_dev_hang_notify(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_hang_notify(enic->vdev);
spin_unlock(&enic->devcmd_lock);
return err;
}
static int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
{
int err;
spin_lock(&enic->devcmd_lock);
err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
spin_unlock(&enic->devcmd_lock);
return err;
}
static void enic_reset(struct work_struct *work) static void enic_reset(struct work_struct *work)
{ {
struct enic *enic = container_of(work, struct enic, reset); struct enic *enic = container_of(work, struct enic, reset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment