* [PATCH net-next 0/7] be2net patch set
@ 2013-08-06 3:57 Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 1/7] be2net: Adding more speeds reported by get_settings Sathya Perla
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
The following fix/cleanup patches are for the net-next tree. Pls apply.
Thanks!
Sathya Perla (1):
be2net: update driver version
Vasundhara Volam (6):
be2net: Adding more speeds reported by get_settings
be2net: Do not call get_die_temperature cmd for VF
be2net: don't limit max MAC and VLAN counts
be2net: Fix displaying supported speeds for BE2
be2net: fixup log msgs for async events
be2net: Initialize "status" in be_cmd_get_die_temperature()
drivers/net/ethernet/emulex/benet/be.h | 2 +-
drivers/net/ethernet/emulex/benet/be_cmds.c | 20 +++++++++++++++++---
drivers/net/ethernet/emulex/benet/be_cmds.h | 5 ++++-
drivers/net/ethernet/emulex/benet/be_main.c | 10 ++--------
4 files changed, 24 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next 1/7] be2net: Adding more speeds reported by get_settings
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
@ 2013-08-06 3:57 ` Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 2/7] be2net: Do not call get_die_temperature cmd for VF Sathya Perla
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
From: Vasundhara Volam <vasundhara.volam@emulex.com>
The new speeds are supported by variants of the Skyhawk-R chip.
Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_cmds.c | 6 ++++++
drivers/net/ethernet/emulex/benet/be_cmds.h | 5 ++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 613d887..bef25b7 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1464,6 +1464,12 @@ static int be_mac_to_link_speed(int mac_speed)
return 1000;
case PHY_LINK_SPEED_10GBPS:
return 10000;
+ case PHY_LINK_SPEED_20GBPS:
+ return 20000;
+ case PHY_LINK_SPEED_25GBPS:
+ return 25000;
+ case PHY_LINK_SPEED_40GBPS:
+ return 40000;
}
return 0;
}
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index eb541f0..9b91608 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -960,7 +960,10 @@ enum {
PHY_LINK_SPEED_10MBPS = 0x1,
PHY_LINK_SPEED_100MBPS = 0x2,
PHY_LINK_SPEED_1GBPS = 0x3,
- PHY_LINK_SPEED_10GBPS = 0x4
+ PHY_LINK_SPEED_10GBPS = 0x4,
+ PHY_LINK_SPEED_20GBPS = 0x5,
+ PHY_LINK_SPEED_25GBPS = 0x6,
+ PHY_LINK_SPEED_40GBPS = 0x7
};
struct be_cmd_resp_link_status {
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 2/7] be2net: Do not call get_die_temperature cmd for VF
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 1/7] be2net: Adding more speeds reported by get_settings Sathya Perla
@ 2013-08-06 3:57 ` Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 3/7] be2net: don't limit max MAC and VLAN counts Sathya Perla
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
From: Vasundhara Volam <vasundhara.volam@emulex.com>
This is a chip wide value and the PFs already report it.
Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 3df1503..834f77b 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4143,7 +4143,8 @@ static void be_worker(struct work_struct *work)
be_cmd_get_stats(adapter, &adapter->stats_cmd);
}
- if (MODULO(adapter->work_counter, adapter->be_get_temp_freq) == 0)
+ if (be_physfn(adapter) &&
+ MODULO(adapter->work_counter, adapter->be_get_temp_freq) == 0)
be_cmd_get_die_temperature(adapter);
for_all_rx_queues(adapter, rxo, i) {
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 3/7] be2net: don't limit max MAC and VLAN counts
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 1/7] be2net: Adding more speeds reported by get_settings Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 2/7] be2net: Do not call get_die_temperature cmd for VF Sathya Perla
@ 2013-08-06 3:57 ` Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 4/7] be2net: Fix displaying supported speeds for BE2 Sathya Perla
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
From: Vasundhara Volam <vasundhara.volam@emulex.com>
For SH-R and Lancer-R, use the FW supported values for Max unicast MACs,
Max VLANs and Max multicast MACs.
Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_main.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 834f77b..dc45e1a 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2995,13 +2995,6 @@ static void be_get_resources(struct be_adapter *adapter)
}
if (profile_present) {
- /* Sanity fixes for Lancer */
- adapter->max_pmac_cnt = min_t(u16, adapter->max_pmac_cnt,
- BE_UC_PMAC_COUNT);
- adapter->max_vlans = min_t(u16, adapter->max_vlans,
- BE_NUM_VLANS_SUPPORTED);
- adapter->max_mcast_mac = min_t(u16, adapter->max_mcast_mac,
- BE_MAX_MC);
adapter->max_tx_queues = min_t(u16, adapter->max_tx_queues,
MAX_TX_QS);
adapter->max_rss_queues = min_t(u16, adapter->max_rss_queues,
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 4/7] be2net: Fix displaying supported speeds for BE2
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
` (2 preceding siblings ...)
2013-08-06 3:57 ` [PATCH net-next 3/7] be2net: don't limit max MAC and VLAN counts Sathya Perla
@ 2013-08-06 3:57 ` Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 5/7] be2net: fixup log msgs for async events Sathya Perla
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
From: Vasundhara Volam <vasundhara.volam@emulex.com>
The BE2 FW GET_PHY_DETAILS cmd does not return fixed speeds supported.
Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_cmds.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index bef25b7..53541a9 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -2454,6 +2454,12 @@ int be_cmd_get_phy_info(struct be_adapter *adapter)
le16_to_cpu(resp_phy_info->fixed_speeds_supported);
adapter->phy.misc_params =
le32_to_cpu(resp_phy_info->misc_params);
+
+ if (BE2_chip(adapter)) {
+ adapter->phy.fixed_speeds_supported =
+ BE_SUPPORTED_SPEED_10GBPS |
+ BE_SUPPORTED_SPEED_1GBPS;
+ }
}
pci_free_consistent(adapter->pdev, cmd.size,
cmd.va, cmd.dma);
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 5/7] be2net: fixup log msgs for async events
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
` (3 preceding siblings ...)
2013-08-06 3:57 ` [PATCH net-next 4/7] be2net: Fix displaying supported speeds for BE2 Sathya Perla
@ 2013-08-06 3:57 ` Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 6/7] be2net: Initialize "status" in be_cmd_get_die_temperature() Sathya Perla
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
From: Vasundhara Volam <vasundhara.volam@emulex.com>
Log the event type for unknown async events
Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_cmds.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 53541a9..9f04dac 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -258,7 +258,8 @@ static void be_async_grp5_evt_process(struct be_adapter *adapter,
(struct be_async_event_grp5_pvid_state *)evt);
break;
default:
- dev_warn(&adapter->pdev->dev, "Unknown grp5 event!\n");
+ dev_warn(&adapter->pdev->dev, "Unknown grp5 event 0x%x!\n",
+ event_type);
break;
}
}
@@ -279,7 +280,8 @@ static void be_async_dbg_evt_process(struct be_adapter *adapter,
adapter->flags |= BE_FLAGS_QNQ_ASYNC_EVT_RCVD;
break;
default:
- dev_warn(&adapter->pdev->dev, "Unknown debug event\n");
+ dev_warn(&adapter->pdev->dev, "Unknown debug event 0x%x!\n",
+ event_type);
break;
}
}
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 6/7] be2net: Initialize "status" in be_cmd_get_die_temperature()
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
` (4 preceding siblings ...)
2013-08-06 3:57 ` [PATCH net-next 5/7] be2net: fixup log msgs for async events Sathya Perla
@ 2013-08-06 3:57 ` Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 7/7] be2net: update driver version Sathya Perla
2013-08-07 17:40 ` [PATCH net-next 0/7] be2net patch set David Miller
7 siblings, 0 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
From: Vasundhara Volam <vasundhara.volam@emulex.com>
Uninitialized value was being returned in the non-failure case.
Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 9f04dac..1e0a05d 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1532,7 +1532,7 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
{
struct be_mcc_wrb *wrb;
struct be_cmd_req_get_cntl_addnl_attribs *req;
- int status;
+ int status = 0;
spin_lock_bh(&adapter->mcc_lock);
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 7/7] be2net: update driver version
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
` (5 preceding siblings ...)
2013-08-06 3:57 ` [PATCH net-next 6/7] be2net: Initialize "status" in be_cmd_get_die_temperature() Sathya Perla
@ 2013-08-06 3:57 ` Sathya Perla
2013-08-07 17:40 ` [PATCH net-next 0/7] be2net patch set David Miller
7 siblings, 0 replies; 9+ messages in thread
From: Sathya Perla @ 2013-08-06 3:57 UTC (permalink / raw)
To: netdev
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
---
drivers/net/ethernet/emulex/benet/be.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index c827b1b..11c815d 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -34,7 +34,7 @@
#include "be_hw.h"
#include "be_roce.h"
-#define DRV_VER "4.6.62.0u"
+#define DRV_VER "4.9.134.0u"
#define DRV_NAME "be2net"
#define BE_NAME "Emulex BladeEngine2"
#define BE3_NAME "Emulex BladeEngine3"
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 0/7] be2net patch set
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
` (6 preceding siblings ...)
2013-08-06 3:57 ` [PATCH net-next 7/7] be2net: update driver version Sathya Perla
@ 2013-08-07 17:40 ` David Miller
7 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2013-08-07 17:40 UTC (permalink / raw)
To: sathya.perla; +Cc: netdev
From: Sathya Perla <sathya.perla@emulex.com>
Date: Tue, 6 Aug 2013 09:27:14 +0530
> The following fix/cleanup patches are for the net-next tree. Pls apply.
Series applied, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-08-07 17:35 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-06 3:57 [PATCH net-next 0/7] be2net patch set Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 1/7] be2net: Adding more speeds reported by get_settings Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 2/7] be2net: Do not call get_die_temperature cmd for VF Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 3/7] be2net: don't limit max MAC and VLAN counts Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 4/7] be2net: Fix displaying supported speeds for BE2 Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 5/7] be2net: fixup log msgs for async events Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 6/7] be2net: Initialize "status" in be_cmd_get_die_temperature() Sathya Perla
2013-08-06 3:57 ` [PATCH net-next 7/7] be2net: update driver version Sathya Perla
2013-08-07 17:40 ` [PATCH net-next 0/7] be2net patch set David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).