* [net-next 0/3] Intel Wired LAN Driver Updates
@ 2014-01-15 23:18 Aaron Brown
2014-01-15 23:18 ` [net-next 1/3] i40e: remove mistaken file Aaron Brown
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Aaron Brown @ 2014-01-15 23:18 UTC (permalink / raw)
To: davem; +Cc: Aaron Brown, netdev, gospo, sassmann
This series contains updates to i40e from Shannon Nelson. The first
removes a mistaken file that I apparently introduced as part of a
branch merge / update. Second checks that descritors were allocated
before printing and makes the code a bit easier to read. Finally he
refines cloud support in the Firmware API.
Shannon Nelson (3):
i40e: remove mistaken file
i40e: check desc pointer before printing
i40e: updates to AdminQ interface
drivers/net/ethernet/intel/i40e/Module.symvers | 0
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 22 +++-----
drivers/net/ethernet/intel/i40e/i40e_common.c | 1 -
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 67 +++++++++++++----------
4 files changed, 47 insertions(+), 43 deletions(-)
delete mode 100644 drivers/net/ethernet/intel/i40e/Module.symvers
--
1.8.5.GIT
^ permalink raw reply [flat|nested] 6+ messages in thread
* [net-next 1/3] i40e: remove mistaken file
2014-01-15 23:18 [net-next 0/3] Intel Wired LAN Driver Updates Aaron Brown
@ 2014-01-15 23:18 ` Aaron Brown
2014-01-15 23:18 ` [net-next 2/3] i40e: check desc pointer before printing Aaron Brown
2014-01-15 23:18 ` [net-next 3/3] i40e: updates to AdminQ interface Aaron Brown
2 siblings, 0 replies; 6+ messages in thread
From: Aaron Brown @ 2014-01-15 23:18 UTC (permalink / raw)
To: davem
Cc: Nelson, Shannon, netdev, gospo, sassmann, Stephen Hemminger, Aaron Brown
From: "Nelson, Shannon" <shannon.nelson@intel.com>
Remove the Module.symvers that somehow got caught up in
commit 9d8bf54723e9f21c502a410495840d8771f769ef
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
drivers/net/ethernet/intel/i40e/Module.symvers | 0
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 drivers/net/ethernet/intel/i40e/Module.symvers
diff --git a/drivers/net/ethernet/intel/i40e/Module.symvers b/drivers/net/ethernet/intel/i40e/Module.symvers
deleted file mode 100644
index e69de29..0000000
--
1.8.5.GIT
^ permalink raw reply [flat|nested] 6+ messages in thread
* [net-next 2/3] i40e: check desc pointer before printing
2014-01-15 23:18 [net-next 0/3] Intel Wired LAN Driver Updates Aaron Brown
2014-01-15 23:18 ` [net-next 1/3] i40e: remove mistaken file Aaron Brown
@ 2014-01-15 23:18 ` Aaron Brown
2014-01-17 1:21 ` David Miller
2014-01-15 23:18 ` [net-next 3/3] i40e: updates to AdminQ interface Aaron Brown
2 siblings, 1 reply; 6+ messages in thread
From: Aaron Brown @ 2014-01-15 23:18 UTC (permalink / raw)
To: davem; +Cc: Shannon Nelson, netdev, gospo, sassmann, Aaron Brown
From: Shannon Nelson <shannon.nelson@intel.com>
Check that the descriptors were allocated before trying to dump
them to the logfile. While we're there, de-trick-ify the code
so as to be easier to read and not abusing the types and unions.
Change-ID: I22898f4b22cecda3582d4d9e4018da9cd540f177
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 67 +++++++++++++++-----------
1 file changed, 39 insertions(+), 28 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 36a5cc8..913ba9e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -752,7 +752,8 @@ static void i40e_dbg_dump_aq_desc(struct i40e_pf *pf)
static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n,
struct i40e_pf *pf, bool is_rx_ring)
{
- union i40e_rx_desc *ds;
+ struct i40e_tx_desc *txd;
+ union i40e_rx_desc *rxd;
struct i40e_ring ring;
struct i40e_vsi *vsi;
int i;
@@ -766,7 +767,7 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n,
dev_info(&pf->pdev->dev, "ring %d not found\n", ring_id);
return;
}
- if (!vsi->tx_rings) {
+ if (!vsi->tx_rings || !vsi->tx_rings[0]->desc) {
dev_info(&pf->pdev->dev,
"descriptor rings have not been allocated for vsi %d\n",
vsi_seid);
@@ -780,22 +781,27 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n,
dev_info(&pf->pdev->dev, "vsi = %02i %s ring = %02i\n",
vsi_seid, is_rx_ring ? "rx" : "tx", ring_id);
for (i = 0; i < ring.count; i++) {
- if (is_rx_ring)
- ds = I40E_RX_DESC(&ring, i);
- else
- ds = (union i40e_rx_desc *)
- I40E_TX_DESC(&ring, i);
- if ((sizeof(union i40e_rx_desc) ==
- sizeof(union i40e_16byte_rx_desc)) || (!is_rx_ring))
+ if (!is_rx_ring) {
+ txd = I40E_TX_DESC(&ring, i);
dev_info(&pf->pdev->dev,
- " d[%03i] = 0x%016llx 0x%016llx\n", i,
- ds->read.pkt_addr, ds->read.hdr_addr);
- else
+ " d[%03i] = 0x%016llx 0x%016llx\n",
+ i, txd->buffer_addr,
+ txd->cmd_type_offset_bsz);
+ } else if (sizeof(union i40e_rx_desc) ==
+ sizeof(union i40e_16byte_rx_desc)) {
+ rxd = I40E_RX_DESC(&ring, i);
+ dev_info(&pf->pdev->dev,
+ " d[%03i] = 0x%016llx 0x%016llx\n",
+ i, rxd->read.pkt_addr,
+ rxd->read.hdr_addr);
+ } else {
+ rxd = I40E_RX_DESC(&ring, i);
dev_info(&pf->pdev->dev,
" d[%03i] = 0x%016llx 0x%016llx 0x%016llx 0x%016llx\n",
- i, ds->read.pkt_addr,
- ds->read.hdr_addr,
- ds->read.rsvd1, ds->read.rsvd2);
+ i, rxd->read.pkt_addr,
+ rxd->read.hdr_addr,
+ rxd->read.rsvd1, rxd->read.rsvd2);
+ }
}
} else if (cnt == 3) {
if (desc_n >= ring.count || desc_n < 0) {
@@ -803,22 +809,27 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n,
"descriptor %d not found\n", desc_n);
return;
}
- if (is_rx_ring)
- ds = I40E_RX_DESC(&ring, desc_n);
- else
- ds = (union i40e_rx_desc *)I40E_TX_DESC(&ring, desc_n);
- if ((sizeof(union i40e_rx_desc) ==
- sizeof(union i40e_16byte_rx_desc)) || (!is_rx_ring))
+ if (!is_rx_ring) {
+ txd = I40E_TX_DESC(&ring, desc_n);
dev_info(&pf->pdev->dev,
- "vsi = %02i %s ring = %02i d[%03i] = 0x%016llx 0x%016llx\n",
- vsi_seid, is_rx_ring ? "rx" : "tx", ring_id,
- desc_n, ds->read.pkt_addr, ds->read.hdr_addr);
- else
+ "vsi = %02i tx ring = %02i d[%03i] = 0x%016llx 0x%016llx\n",
+ vsi_seid, ring_id, desc_n,
+ txd->buffer_addr, txd->cmd_type_offset_bsz);
+ } else if (sizeof(union i40e_rx_desc) ==
+ sizeof(union i40e_16byte_rx_desc)) {
+ rxd = I40E_RX_DESC(&ring, desc_n);
+ dev_info(&pf->pdev->dev,
+ "vsi = %02i rx ring = %02i d[%03i] = 0x%016llx 0x%016llx\n",
+ vsi_seid, ring_id, desc_n,
+ rxd->read.pkt_addr, rxd->read.hdr_addr);
+ } else {
+ rxd = I40E_RX_DESC(&ring, desc_n);
dev_info(&pf->pdev->dev,
"vsi = %02i rx ring = %02i d[%03i] = 0x%016llx 0x%016llx 0x%016llx 0x%016llx\n",
- vsi_seid, ring_id,
- desc_n, ds->read.pkt_addr, ds->read.hdr_addr,
- ds->read.rsvd1, ds->read.rsvd2);
+ vsi_seid, ring_id, desc_n,
+ rxd->read.pkt_addr, rxd->read.hdr_addr,
+ rxd->read.rsvd1, rxd->read.rsvd2);
+ }
} else {
dev_info(&pf->pdev->dev, "dump desc rx/tx <vsi_seid> <ring_id> [<desc_n>]\n");
}
--
1.8.5.GIT
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net-next 3/3] i40e: updates to AdminQ interface
2014-01-15 23:18 [net-next 0/3] Intel Wired LAN Driver Updates Aaron Brown
2014-01-15 23:18 ` [net-next 1/3] i40e: remove mistaken file Aaron Brown
2014-01-15 23:18 ` [net-next 2/3] i40e: check desc pointer before printing Aaron Brown
@ 2014-01-15 23:18 ` Aaron Brown
2014-01-17 1:21 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Aaron Brown @ 2014-01-15 23:18 UTC (permalink / raw)
To: davem; +Cc: Shannon Nelson, netdev, gospo, sassmann, Aaron Brown
From: Shannon Nelson <shannon.nelson@intel.com>
Refinements to cloud support in the Firmware API.
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 22 ++++++++--------------
drivers/net/ethernet/intel/i40e/i40e_common.c | 1 -
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
index be61a47..7b6374a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
@@ -680,7 +680,6 @@ struct i40e_aqc_add_get_update_vsi {
#define I40E_AQ_VSI_TYPE_PF 0x2
#define I40E_AQ_VSI_TYPE_EMP_MNG 0x3
#define I40E_AQ_VSI_FLAG_CASCADED_PV 0x4
-#define I40E_AQ_VSI_FLAG_CLOUD_VSI 0x8
__le32 addr_high;
__le32 addr_low;
};
@@ -1042,7 +1041,9 @@ struct i40e_aqc_set_vsi_promiscuous_modes {
#define I40E_AQC_SET_VSI_PROMISC_VLAN 0x10
__le16 seid;
#define I40E_AQC_VSI_PROM_CMD_SEID_MASK 0x3FF
- u8 reserved[10];
+ __le16 vlan_tag;
+#define I40E_AQC_SET_VSI_VLAN_VALID 0x8000
+ u8 reserved[8];
};
I40E_CHECK_CMD_LENGTH(i40e_aqc_set_vsi_promiscuous_modes);
@@ -1947,19 +1948,12 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start);
/* Add Udp Tunnel command and completion (direct 0x0B00) */
struct i40e_aqc_add_udp_tunnel {
__le16 udp_port;
- u8 header_len; /* in DWords, 1 to 15 */
+ u8 reserved0[3];
u8 protocol_type;
-#define I40E_AQC_TUNNEL_TYPE_TEREDO 0x0
-#define I40E_AQC_TUNNEL_TYPE_VXLAN 0x2
-#define I40E_AQC_TUNNEL_TYPE_NGE 0x3
- u8 variable_udp_length;
-#define I40E_AQC_TUNNEL_FIXED_UDP_LENGTH 0x0
-#define I40E_AQC_TUNNEL_VARIABLE_UDP_LENGTH 0x1
- u8 udp_key_index;
-#define I40E_AQC_TUNNEL_KEY_INDEX_VXLAN 0x0
-#define I40E_AQC_TUNNEL_KEY_INDEX_NGE 0x1
-#define I40E_AQC_TUNNEL_KEY_INDEX_PROPRIETARY_UDP 0x2
- u8 reserved[10];
+#define I40E_AQC_TUNNEL_TYPE_VXLAN 0x00
+#define I40E_AQC_TUNNEL_TYPE_NGE 0x01
+#define I40E_AQC_TUNNEL_TYPE_TEREDO 0x10
+ u8 reserved1[10];
};
I40E_CHECK_CMD_LENGTH(i40e_aqc_add_udp_tunnel);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index aedc71b..529ecb4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -1742,7 +1742,6 @@ i40e_status i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_add_udp_tunnel);
cmd->udp_port = cpu_to_le16(udp_port);
- cmd->header_len = header_len;
cmd->protocol_type = protocol_index;
status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
--
1.8.5.GIT
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [net-next 2/3] i40e: check desc pointer before printing
2014-01-15 23:18 ` [net-next 2/3] i40e: check desc pointer before printing Aaron Brown
@ 2014-01-17 1:21 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2014-01-17 1:21 UTC (permalink / raw)
To: aaron.f.brown; +Cc: shannon.nelson, netdev, gospo, sassmann
From: Aaron Brown <aaron.f.brown@intel.com>
Date: Wed, 15 Jan 2014 15:18:23 -0800
> From: Shannon Nelson <shannon.nelson@intel.com>
>
> Check that the descriptors were allocated before trying to dump
> them to the logfile. While we're there, de-trick-ify the code
> so as to be easier to read and not abusing the types and unions.
>
> Change-ID: I22898f4b22cecda3582d4d9e4018da9cd540f177
> Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [net-next 3/3] i40e: updates to AdminQ interface
2014-01-15 23:18 ` [net-next 3/3] i40e: updates to AdminQ interface Aaron Brown
@ 2014-01-17 1:21 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2014-01-17 1:21 UTC (permalink / raw)
To: aaron.f.brown; +Cc: shannon.nelson, netdev, gospo, sassmann
From: Aaron Brown <aaron.f.brown@intel.com>
Date: Wed, 15 Jan 2014 15:18:24 -0800
> From: Shannon Nelson <shannon.nelson@intel.com>
>
> Refinements to cloud support in the Firmware API.
>
> Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-17 1:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-15 23:18 [net-next 0/3] Intel Wired LAN Driver Updates Aaron Brown
2014-01-15 23:18 ` [net-next 1/3] i40e: remove mistaken file Aaron Brown
2014-01-15 23:18 ` [net-next 2/3] i40e: check desc pointer before printing Aaron Brown
2014-01-17 1:21 ` David Miller
2014-01-15 23:18 ` [net-next 3/3] i40e: updates to AdminQ interface Aaron Brown
2014-01-17 1:21 ` 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).