↑ Collapse Diff ↑
 
new file 100644
1
 

	
2
 
/*
3
 
 * DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
4
 
 * 
5
 
 * If you need to change the driver's name spaces, look in the scons
6
 
 * files for the driver's defineVmkDriver() rule.
7
 
 */
8
 

	
9
 
VMK_NAMESPACE_PROVIDES("com.broadcom.tg3", "9.2.0.0");
10
 
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.0.0"
...
 
@@ -398,6 +398,8 @@
398 398
 
#define VMK_SCSI_ASC_LOGICAL_UNIT_ERROR                                      0x3e
399 399
 
#define VMK_SCSI_ASCQ_LOGICAL_UNIT_FAILED_SELF_TEST                          0x03
400 400
 
#define VMK_SCSI_ASCQ_LOGICAL_UNIT_FAILURE                                   0x01
401
 
/** \brief LU is not configured (array only). */
402
 
#define VMK_SCSI_ASC_LU_NOT_CONFIGURED                                       0x68
401 403
 

	
402 404
 
/*
403 405
 
 * Inquiry data.
...
 
@@ -398,6 +398,8 @@
398 398
 
#define VMK_SCSI_ASC_LOGICAL_UNIT_ERROR                                      0x3e
399 399
 
#define VMK_SCSI_ASCQ_LOGICAL_UNIT_FAILED_SELF_TEST                          0x03
400 400
 
#define VMK_SCSI_ASCQ_LOGICAL_UNIT_FAILURE                                   0x01
401
 
/** \brief LU is not configured (array only). */
402
 
#define VMK_SCSI_ASC_LU_NOT_CONFIGURED                                       0x68
401 403
 

	
402 404
 
/*
403 405
 
 * Inquiry data.
1
 
#define BUILD_NUMBER "build-623860"
2
 
#define BUILD_NUMBER_NUMERIC 623860
3
 
#define BUILD_NUMBER_NUMERIC_STRING "623860"
4
 
#define PRODUCT_BUILD_NUMBER "product-build-45730"
5
 
#define PRODUCT_BUILD_NUMBER_NUMERIC 45730
6
 
#define PRODUCT_BUILD_NUMBER_NUMERIC_STRING "45730"
1
 
#define BUILD_NUMBER "build-920308"
2
 
#define BUILD_NUMBER_NUMERIC 920308
3
 
#define BUILD_NUMBER_NUMERIC_STRING "920308"
4
 
#define PRODUCT_BUILD_NUMBER "product-build-53817"
5
 
#define PRODUCT_BUILD_NUMBER_NUMERIC 53817
6
 
#define PRODUCT_BUILD_NUMBER_NUMERIC_STRING "53817"
...
 
@@ -438,6 +438,9 @@ void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
438 438
 
		qc = NULL;
439 439
 

	
440 440
 
	/* reset PIO HSM and stop DMA engine */
441
 
        
442
 
        cancel_delayed_work_sync(&ap->port_task);
443
 

	
441 444
 
	spin_lock_irqsave(ap->lock, flags);
442 445
 

	
443 446
 
	ap->hsm_task_state = HSM_ST_IDLE;
...
 
@@ -307,7 +307,11 @@ static void return_hosed_msg(struct smi_info *smi_info, int cCode)
307 307
 
	msg->rsp_size = 3;
308 308
 

	
309 309
 
	smi_info->curr_msg = NULL;
310
 

	
311
 
	/* To fix #PR 889881*/
312
 
	spin_unlock(&(smi_info->msg_lock));
310 313
 
	deliver_recv_msg(smi_info, msg);
314
 
	spin_lock(&(smi_info->msg_lock));
311 315
 
}
312 316
 

	
313 317
 
static enum si_sm_result start_next_msg(struct smi_info *smi_info)
...
 
@@ -767,7 +771,10 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
767 771
 
			/* If we were handling a user message, format
768 772
 
                           a response to send to the upper layer to
769 773
 
                           tell it about the error. */
774
 
			/* To fix #PR 889881*/
775
 
			spin_lock(&(smi_info->msg_lock));
770 776
 
			return_hosed_msg(smi_info, IPMI_ERR_UNSPECIFIED);
777
 
			spin_unlock(&(smi_info->msg_lock));
771 778
 
		}
772 779
 
		si_sm_result = smi_info->handlers->event(smi_info->si_sm, 0);
773 780
 
	}
...
 
@@ -104,7 +104,7 @@
104 104
 

	
105 105
 
#define DRV_MODULE_VERSION	"1.61.15.v50.1"
106 106
 

	
107
 
#define DRV_MODULE_RELDATE	"$DateTime: 2011/04/17 13:10:36 $"
107
 
#define DRV_MODULE_RELDATE	"$DateTime: 2012/04/17 15:53:26 $"
108 108
 
#define BNX2X_BC_VER		0x040200
109 109
 

	
110 110
 
#if defined(BNX2X_UPSTREAM) && !defined(BNX2X_USE_INIT_VALUES) /* BNX2X_UPSTREAM */
...
 
@@ -13641,7 +13641,7 @@ static void poll_bnx2x(struct net_device *dev)
13641 13641
 
#endif
13642 13642
 
#else
13643 13643
 
/* HAVE_POLL_CONTROLLER is used in 2.4 kernels */
13644
 
#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
13644
 
#if (defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)) && !defined(__VMKLNX__)
13645 13645
 
static void poll_bnx2x(struct net_device *dev)
13646 13646
 
{
13647 13647
 
	struct bnx2x *bp = netdev_priv(dev);
...
 
@@ -13675,8 +13675,10 @@ static const struct net_device_ops bnx2x_netdev_ops = {
13675 13675
 
	.ndo_vlan_rx_register	= bnx2x_vlan_rx_register,
13676 13676
 
#endif
13677 13677
 
#ifdef CONFIG_NET_POLL_CONTROLLER
13678
 
#if !defined(__VMKLNX__) /* BNX2X_UPSTREAM */
13678 13679
 
	.ndo_poll_controller	= poll_bnx2x,
13679 13680
 
#endif
13681
 
#endif
13680 13682
 
};
13681 13683
 
#endif
13682 13684
 

	
...
 
@@ -13872,9 +13874,11 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
13872 13874
 
#endif
13873 13875
 
#endif
13874 13876
 
#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
13877
 
#if !defined(__VMKLNX__) /* BNX2X_UPSTREAM */
13875 13878
 
	dev->poll_controller = poll_bnx2x;
13876 13879
 
#endif
13877 13880
 
#endif
13881
 
#endif
13878 13882
 
	dev->features |= NETIF_F_SG;
13879 13883
 
	dev->features |= NETIF_F_HW_CSUM;
13880 13884
 
	if (bp->flags & USING_DAC_FLAG)
...
 
@@ -3738,6 +3738,9 @@ static irqreturn_t e1000_intr(int irq, void *data)
3738 3738
 
	if (likely(netif_rx_schedule_prep(netdev, &adapter->rx_ring[0].napi))) {
3739 3739
 
#else /* defined(__VMKLNX__) */
3740 3740
 
	if (likely(netif_rx_schedule_prep(netdev, &adapter->napi))) {
3741
 
		/* disable interrupts, without the synchronize_irq bit */
3742
 
		E1000_WRITE_REG(hw, E1000_IMC, ~0);
3743
 
		E1000_WRITE_FLUSH(&adapter->hw);
3741 3744
 
#endif /* !defined(__VMKLNX__) */
3742 3745
 
		adapter->total_tx_bytes = 0;
3743 3746
 
		adapter->total_tx_packets = 0;
...
 
@@ -959,8 +959,11 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
959 959
 
			tx_desc = E1000_TX_DESC(*tx_ring, i);
960 960
 
			buffer_info = &tx_ring->buffer_info[i];
961 961
 
			cleaned = (i == eop);
962
 

	
962
 
#ifdef __VMKLNX__
963
 
			if (cleaned && (buffer_info->skb != NULL)) {
964
 
#else //!__VMKLNX__
963 965
 
			if (cleaned) {
966
 
#endif //__VMKLNX__
964 967
 
				struct sk_buff *skb = buffer_info->skb;
965 968
 
#ifdef NETIF_F_TSO
966 969
 
				unsigned int segs, bytecount;
...
 
@@ -3496,15 +3496,11 @@ static void igb_update_ring_itr(struct igb_q_vector *q_vector)
3496 3496
 
	/* Don't starve jumbo frames */
3497 3497
 
	avg_wire_size = min(avg_wire_size, 3000);
3498 3498
 

	
3499
 
#ifndef __VMKLNX__
3500 3499
 
	/* Give a little boost to mid-size frames */
3501 3500
 
	if ((avg_wire_size > 300) && (avg_wire_size < 1200))
3502 3501
 
		new_val = avg_wire_size / 3;
3503 3502
 
	else
3504 3503
 
		new_val = avg_wire_size / 2;
3505
 
#else
3506
 
	new_val = avg_wire_size;
3507
 
#endif
3508 3504
 

	
3509 3505
 
set_itr_val:
3510 3506
 
	if (new_val != q_vector->itr_val) {
...
 
@@ -107,7 +107,12 @@ int ixgbe_cna_enable(struct ixgbe_adapter *adapter)
107 107
 
	cnadev->mtu = netdev->mtu;
108 108
 
	cnadev->pdev = netdev->pdev;
109 109
 
	cnadev->gso_max_size = GSO_MAX_SIZE;
110
 
	cnadev->features = netdev->features | NETIF_F_CNA;
110
 
#ifdef __VMKLNX__
111
 
	cnadev->features = netdev->features | NETIF_F_CNA |
112
 
                        NETIF_F_HW_VLAN_FILTER;
113
 
#else
114
 
   cnadev->features = netdev->features | NETIF_F_CNA;
115
 
#endif /*__VMKLNX__*/
111 116
 

	
112 117
 
	/* set the MAC address to SAN mac address */
113 118
 
	if (ixgbe_validate_mac_addr(adapter->hw.mac.san_addr) == 0)
...
 
@@ -2951,11 +2951,13 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
2951 2951
 
	else
2952 2952
 
		*speed = IXGBE_LINK_SPEED_100_FULL;
2953 2953
 

	
2954
 
#ifndef __VMKLNX__
2954 2955
 
	/* if link is down, zero out the current_mode */
2955 2956
 
	if (*link_up == false) {
2956 2957
 
		hw->fc.current_mode = ixgbe_fc_none;
2957 2958
 
		hw->fc.fc_was_autonegged = false;
2958 2959
 
	}
2960
 
#endif
2959 2961
 

	
2960 2962
 
	return 0;
2961 2963
 
}
...
 
@@ -74,7 +74,7 @@ static const char ixgbe_driver_string[] =
74 74
 

	
75 75
 
#define FPGA
76 76
 

	
77
 
#define DRV_VERSION "2.0.84.8.2-10vmw" DRIVERNAPI DRV_HW_PERF FPGA
77
 
#define DRV_VERSION "2.0.84.8.2-11vmw" DRIVERNAPI DRV_HW_PERF FPGA
78 78
 
const char ixgbe_driver_version[] = DRV_VERSION;
79 79
 
static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
80 80
 
/* ixgbe_pci_tbl - PCI Device ID Table
...
 
@@ -6095,7 +6095,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
6095 6095
 
		adapter->dcb_cfg.bw_percentage[DCB_TX_CONFIG][0] = 100;
6096 6096
 
		adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100;
6097 6097
 
		adapter->dcb_cfg.rx_pba_cfg = pba_equal;
6098
 
		adapter->dcb_cfg.pfc_mode_enable = true;
6098
 
		adapter->dcb_cfg.pfc_mode_enable = false;
6099 6099
 

	
6100 6100
 
		adapter->dcb_cfg.round_robin_enable = false;
6101 6101
 
		adapter->dcb_set_bitmap = 0x00;
...
 
@@ -8281,18 +8281,24 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
8281 8281
 

	
8282 8282
 
	DPRINTK(TX_ERR, INFO, "my (preferred) node is: %d\n", adapter->node);
8283 8283
 

	
8284
 
#ifndef __VMKLNX__
8284 8285
 
	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
8285 8286
 
		hw->fc.requested_mode = ixgbe_fc_pfc;
8286 8287
 
		hw->fc.current_mode = ixgbe_fc_pfc;	/* init for ethtool output */
8287 8288
 
	}
8289
 
#endif
8288 8290
 

	
8289 8291
 
#ifdef MAX_SKB_FRAGS
8290 8292
 
#ifdef NETIF_F_HW_VLAN_TX
8291 8293
 
	netdev->features = NETIF_F_SG |
8292 8294
 
			   NETIF_F_IP_CSUM |
8293 8295
 
			   NETIF_F_HW_VLAN_TX |
8294
 
			   NETIF_F_HW_VLAN_RX |
8295
 
			   NETIF_F_HW_VLAN_FILTER;
8296
 
#ifdef __VMKLNX__
8297
 
			   NETIF_F_HW_VLAN_RX;
8298
 
#else
8299
 
            NETIF_F_HW_VLAN_RX |
8300
 
            NETIF_F_HW_VLAN_FILTER;
8301
 
#endif /*__VMKLNX__*/
8296 8302
 

	
8297 8303
 
#else
8298 8304
 
	netdev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
...
 
@@ -29,7 +29,7 @@
29 29
 
/*
30 30
 
 * Source file for NIC routines to access the Phantom hardware
31 31
 
 *
32
 
 * $Id: //depot/vmkdrivers/esx50u1/src_9/drivers/net/nx_nic/unm_nic_hw.c#1 $
32
 
 * $Id: //depot/vmkdrivers/esx50u2/src_9/drivers/net/nx_nic/unm_nic_hw.c#1 $
33 33
 
 *
34 34
 
 */
35 35
 
#include <linux/delay.h>
 
new file 100644
1
 
/****************************************************************************
2
 
 * Copyright(c) 2000-2012 Broadcom Corporation, all rights reserved
3
 
 * Proprietary and Confidential Information.
4
 
 *
5
 
 * This source file is the property of Broadcom Corporation, and
6
 
 * may not be copied or distributed in any isomorphic form without 
7
 
 * the prior written consent of Broadcom Corporation. 
8
 
 *
9
 
 * Name: esx_ioctl.h
10
 
 *
11
 
 * Description: Define data structures and prototypes to access ioctls
12
 
 *              supported by driver in VMware ESXi system.
13
 
 *
14
 
 * Author: cchsu
15
 
 *
16
 
 * $Log:
17
 
 * 
18
 
 ****************************************************************************/
19
 

	
20
 
#ifndef BRCM_VMWARE_IOCTL_H
21
 
#define BRCM_VMWARE_IOCTL_H
22
 

	
23
 
#ifdef __cplusplus
24
 
extern "C" {
25
 
#endif
26
 

	
27
 
#define BRCM_VMWARE_CIM_IOCTL  0x89f0
28
 

	
29
 
#define BRCM_VMWARE_CIM_CMD_ENABLE_NIC          0x0001
30
 
#define BRCM_VMWARE_CIM_CMD_DISABLE_NIC         0x0002
31
 
#define BRCM_VMWARE_CIM_CMD_REG_READ            0x0003
32
 
#define BRCM_VMWARE_CIM_CMD_REG_WRITE           0x0004
33
 
#define BRCM_VMWARE_CIM_CMD_GET_NIC_PARAM       0x0005
34
 
#define BRCM_VMWARE_CIM_CMD_GET_NIC_STATUS      0x0006
35
 
#define BRCM_VMWARE_CIM_CMD_CFG_REG_READ        0x0007
36
 
#define BRCM_VMWARE_CIM_CMD_CFG_REG_WRITE       0x0008
37
 

	
38
 
// Access type for Register Read/Write Ioctl
39
 
#define BRCM_VMWARE_REG_ACCESS_DIRECT           0x0000
40
 
#define BRCM_VMWARE_REG_ACCESS_PCI_CFG          0x0001
41
 

	
42
 
struct brcm_vmware_ioctl_reg_read_req
43
 
{
44
 
    u32 reg_offset;
45
 
    u32 reg_value;
46
 
    u32 reg_access_type;
47
 
} __attribute__((packed));
48
 

	
49
 
struct brcm_vmware_ioctl_reg_write_req
50
 
{
51
 
    u32 reg_offset;
52
 
    u32 reg_value;
53
 
    u32 reg_access_type;
54
 
} __attribute__((packed));
55
 

	
56
 
#define BRCM_VMWARE_GET_NIC_PARAM_VERSION   1
57
 
struct brcm_vmware_ioctl_get_nic_param_req
58
 
{
59
 
    u32 version;
60
 
    u32 mtu;
61
 
    u8  current_mac_addr[8];
62
 
} __attribute__((packed));
63
 

	
64
 
#define BRCM_VMWARE_INVALID_NIC_STATUS  0xffffffff
65
 
struct brcm_vmware_ioctl_get_nic_status_req
66
 
{
67
 
    u32 nic_status; // 1: Up, 0: Down
68
 
} __attribute__((packed));
69
 

	
70
 
struct brcm_vmware_ioctl_req
71
 
{
72
 
    u32 cmd;
73
 
    union {
74
 
        // no struct for reset_nic command
75
 
        struct brcm_vmware_ioctl_reg_read_req reg_read_req;
76
 
        struct brcm_vmware_ioctl_reg_write_req reg_write_req;
77
 
        struct brcm_vmware_ioctl_get_nic_param_req get_nic_param_req;
78
 
        struct brcm_vmware_ioctl_get_nic_status_req get_nic_status_req;
79
 
    } cmd_req;
80
 
} __attribute__((packed));
81
 

	
82
 
#ifdef __cplusplus
83
 
};
84
 
#endif
85
 

	
86
 
#endif

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)