* [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place
@ 2015-12-10 19:38 Joshua Hay
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features with right offload Joshua Hay
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Joshua Hay @ 2015-12-10 19:38 UTC (permalink / raw)
To: intel-wired-lan
From: Shannon Nelson <shannon.nelson@intel.com>
The device capabilities were defined in two places, and neither had all
the definitions. It really belongs with the AQ API definition, so this
patch removes the other set of definitions and fills out the missing item.
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Change-ID: I273ba7d79a476cd11d2e0ca5825fec1716740de2
---
V2: remove second signed-off-by
Testing Hints: Apply and compile cleanly
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 1 +
drivers/net/ethernet/intel/i40e/i40e_common.c | 85 +++++++---------------
.../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 1 +
3 files changed, 30 insertions(+), 57 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
index b22012a..256ce65 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
@@ -422,6 +422,7 @@ struct i40e_aqc_list_capabilities_element_resp {
#define I40E_AQ_CAP_ID_LED 0x0061
#define I40E_AQ_CAP_ID_SDP 0x0062
#define I40E_AQ_CAP_ID_MDIO 0x0063
+#define I40E_AQ_CAP_ID_WSR_PROT 0x0064
#define I40E_AQ_CAP_ID_FLEX10 0x00F1
#define I40E_AQ_CAP_ID_CEM 0x00F2
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 6a034dd..4bdb08b 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -2765,35 +2765,6 @@ i40e_aq_erase_nvm_exit:
return status;
}
-#define I40E_DEV_FUNC_CAP_SWITCH_MODE 0x01
-#define I40E_DEV_FUNC_CAP_MGMT_MODE 0x02
-#define I40E_DEV_FUNC_CAP_NPAR 0x03
-#define I40E_DEV_FUNC_CAP_OS2BMC 0x04
-#define I40E_DEV_FUNC_CAP_VALID_FUNC 0x05
-#define I40E_DEV_FUNC_CAP_SRIOV_1_1 0x12
-#define I40E_DEV_FUNC_CAP_VF 0x13
-#define I40E_DEV_FUNC_CAP_VMDQ 0x14
-#define I40E_DEV_FUNC_CAP_802_1_QBG 0x15
-#define I40E_DEV_FUNC_CAP_802_1_QBH 0x16
-#define I40E_DEV_FUNC_CAP_VSI 0x17
-#define I40E_DEV_FUNC_CAP_DCB 0x18
-#define I40E_DEV_FUNC_CAP_FCOE 0x21
-#define I40E_DEV_FUNC_CAP_ISCSI 0x22
-#define I40E_DEV_FUNC_CAP_RSS 0x40
-#define I40E_DEV_FUNC_CAP_RX_QUEUES 0x41
-#define I40E_DEV_FUNC_CAP_TX_QUEUES 0x42
-#define I40E_DEV_FUNC_CAP_MSIX 0x43
-#define I40E_DEV_FUNC_CAP_MSIX_VF 0x44
-#define I40E_DEV_FUNC_CAP_FLOW_DIRECTOR 0x45
-#define I40E_DEV_FUNC_CAP_IEEE_1588 0x46
-#define I40E_DEV_FUNC_CAP_FLEX10 0xF1
-#define I40E_DEV_FUNC_CAP_CEM 0xF2
-#define I40E_DEV_FUNC_CAP_IWARP 0x51
-#define I40E_DEV_FUNC_CAP_LED 0x61
-#define I40E_DEV_FUNC_CAP_SDP 0x62
-#define I40E_DEV_FUNC_CAP_MDIO 0x63
-#define I40E_DEV_FUNC_CAP_WR_CSR_PROT 0x64
-
/**
* i40e_parse_discover_capabilities
* @hw: pointer to the hw struct
@@ -2832,79 +2803,79 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
major_rev = cap->major_rev;
switch (id) {
- case I40E_DEV_FUNC_CAP_SWITCH_MODE:
+ case I40E_AQ_CAP_ID_SWITCH_MODE:
p->switch_mode = number;
break;
- case I40E_DEV_FUNC_CAP_MGMT_MODE:
+ case I40E_AQ_CAP_ID_MNG_MODE:
p->management_mode = number;
break;
- case I40E_DEV_FUNC_CAP_NPAR:
+ case I40E_AQ_CAP_ID_NPAR_ACTIVE:
p->npar_enable = number;
break;
- case I40E_DEV_FUNC_CAP_OS2BMC:
+ case I40E_AQ_CAP_ID_OS2BMC_CAP:
p->os2bmc = number;
break;
- case I40E_DEV_FUNC_CAP_VALID_FUNC:
+ case I40E_AQ_CAP_ID_FUNCTIONS_VALID:
p->valid_functions = number;
break;
- case I40E_DEV_FUNC_CAP_SRIOV_1_1:
+ case I40E_AQ_CAP_ID_SRIOV:
if (number == 1)
p->sr_iov_1_1 = true;
break;
- case I40E_DEV_FUNC_CAP_VF:
+ case I40E_AQ_CAP_ID_VF:
p->num_vfs = number;
p->vf_base_id = logical_id;
break;
- case I40E_DEV_FUNC_CAP_VMDQ:
+ case I40E_AQ_CAP_ID_VMDQ:
if (number == 1)
p->vmdq = true;
break;
- case I40E_DEV_FUNC_CAP_802_1_QBG:
+ case I40E_AQ_CAP_ID_8021QBG:
if (number == 1)
p->evb_802_1_qbg = true;
break;
- case I40E_DEV_FUNC_CAP_802_1_QBH:
+ case I40E_AQ_CAP_ID_8021QBR:
if (number == 1)
p->evb_802_1_qbh = true;
break;
- case I40E_DEV_FUNC_CAP_VSI:
+ case I40E_AQ_CAP_ID_VSI:
p->num_vsis = number;
break;
- case I40E_DEV_FUNC_CAP_DCB:
+ case I40E_AQ_CAP_ID_DCB:
if (number == 1) {
p->dcb = true;
p->enabled_tcmap = logical_id;
p->maxtc = phys_id;
}
break;
- case I40E_DEV_FUNC_CAP_FCOE:
+ case I40E_AQ_CAP_ID_FCOE:
if (number == 1)
p->fcoe = true;
break;
- case I40E_DEV_FUNC_CAP_ISCSI:
+ case I40E_AQ_CAP_ID_ISCSI:
if (number == 1)
p->iscsi = true;
break;
- case I40E_DEV_FUNC_CAP_RSS:
+ case I40E_AQ_CAP_ID_RSS:
p->rss = true;
p->rss_table_size = number;
p->rss_table_entry_width = logical_id;
break;
- case I40E_DEV_FUNC_CAP_RX_QUEUES:
+ case I40E_AQ_CAP_ID_RXQ:
p->num_rx_qp = number;
p->base_queue = phys_id;
break;
- case I40E_DEV_FUNC_CAP_TX_QUEUES:
+ case I40E_AQ_CAP_ID_TXQ:
p->num_tx_qp = number;
p->base_queue = phys_id;
break;
- case I40E_DEV_FUNC_CAP_MSIX:
+ case I40E_AQ_CAP_ID_MSIX:
p->num_msix_vectors = number;
break;
- case I40E_DEV_FUNC_CAP_MSIX_VF:
+ case I40E_AQ_CAP_ID_VF_MSIX:
p->num_msix_vectors_vf = number;
break;
- case I40E_DEV_FUNC_CAP_FLEX10:
+ case I40E_AQ_CAP_ID_FLEX10:
if (major_rev == 1) {
if (number == 1) {
p->flex10_enable = true;
@@ -2920,38 +2891,38 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
p->flex10_mode = logical_id;
p->flex10_status = phys_id;
break;
- case I40E_DEV_FUNC_CAP_CEM:
+ case I40E_AQ_CAP_ID_CEM:
if (number == 1)
p->mgmt_cem = true;
break;
- case I40E_DEV_FUNC_CAP_IWARP:
+ case I40E_AQ_CAP_ID_IWARP:
if (number == 1)
p->iwarp = true;
break;
- case I40E_DEV_FUNC_CAP_LED:
+ case I40E_AQ_CAP_ID_LED:
if (phys_id < I40E_HW_CAP_MAX_GPIO)
p->led[phys_id] = true;
break;
- case I40E_DEV_FUNC_CAP_SDP:
+ case I40E_AQ_CAP_ID_SDP:
if (phys_id < I40E_HW_CAP_MAX_GPIO)
p->sdp[phys_id] = true;
break;
- case I40E_DEV_FUNC_CAP_MDIO:
+ case I40E_AQ_CAP_ID_MDIO:
if (number == 1) {
p->mdio_port_num = phys_id;
p->mdio_port_mode = logical_id;
}
break;
- case I40E_DEV_FUNC_CAP_IEEE_1588:
+ case I40E_AQ_CAP_ID_1588:
if (number == 1)
p->ieee_1588 = true;
break;
- case I40E_DEV_FUNC_CAP_FLOW_DIRECTOR:
+ case I40E_AQ_CAP_ID_FLOW_DIRECTOR:
p->fd = true;
p->fd_filters_guaranteed = number;
p->fd_filters_best_effort = logical_id;
break;
- case I40E_DEV_FUNC_CAP_WR_CSR_PROT:
+ case I40E_AQ_CAP_ID_WSR_PROT:
p->wr_csr_prot = (u64)number;
p->wr_csr_prot |= (u64)logical_id << 32;
break;
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
index f5b2b36..0d3bc3b 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
@@ -419,6 +419,7 @@ struct i40e_aqc_list_capabilities_element_resp {
#define I40E_AQ_CAP_ID_LED 0x0061
#define I40E_AQ_CAP_ID_SDP 0x0062
#define I40E_AQ_CAP_ID_MDIO 0x0063
+#define I40E_AQ_CAP_ID_WSR_PROT 0x0064
#define I40E_AQ_CAP_ID_FLEX10 0x00F1
#define I40E_AQ_CAP_ID_CEM 0x00F2
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features with right offload
2015-12-10 19:38 [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place Joshua Hay
@ 2015-12-10 19:38 ` Joshua Hay
2015-12-23 19:13 ` Bowers, AndrewX
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 13/13] i40e: bump version to 1.4.10 Joshua Hay
2016-01-06 22:39 ` [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place Bowers, AndrewX
2 siblings, 1 reply; 6+ messages in thread
From: Joshua Hay @ 2015-12-10 19:38 UTC (permalink / raw)
To: intel-wired-lan
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Synchronize code bases and add SCTP offload support.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Change-ID: I9f99071f7176225479026930c387bf681a47494e
---
V2: remove reviewed-by
Testing Hints: Test SCTP in a tunnel like vxlan and make sure
TSO is still working. Test GRE tunnels and make sure they
work. See already applied GRE upstream commit for instructions.
drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 747387f..cc83332 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8847,10 +8847,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
np = netdev_priv(netdev);
np->vsi = vsi;
- netdev->hw_enc_features |= NETIF_F_IP_CSUM |
- NETIF_F_GSO_UDP_TUNNEL |
- NETIF_F_GSO_GRE |
- NETIF_F_TSO;
+ netdev->hw_enc_features |= NETIF_F_IP_CSUM |
+ NETIF_F_SCTP_CSUM |
+ NETIF_F_GSO_UDP_TUNNEL |
+ NETIF_F_GSO_GRE |
+ NETIF_F_TSO |
+ 0;
netdev->features = NETIF_F_SG |
NETIF_F_IP_CSUM |
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-wired-lan] [v2 next PATCH S23 13/13] i40e: bump version to 1.4.10
2015-12-10 19:38 [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place Joshua Hay
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features with right offload Joshua Hay
@ 2015-12-10 19:38 ` Joshua Hay
2015-12-30 16:13 ` Bowers, AndrewX
2016-01-06 22:39 ` [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place Bowers, AndrewX
2 siblings, 1 reply; 6+ messages in thread
From: Joshua Hay @ 2015-12-10 19:38 UTC (permalink / raw)
To: intel-wired-lan
From: Catherine Sullivan <catherine.sullivan@intel.com>
Bump.
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Change-ID: Ic9a495feb9ab0606f953c3848b0acf67169d3930
---
V2: remove second change-id
Testing Hints: check version
drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index cc83332..fb58608 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -48,7 +48,7 @@ static const char i40e_driver_string[] =
#define DRV_VERSION_MAJOR 1
#define DRV_VERSION_MINOR 4
-#define DRV_VERSION_BUILD 8
+#define DRV_VERSION_BUILD 10
#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
__stringify(DRV_VERSION_MINOR) "." \
__stringify(DRV_VERSION_BUILD) DRV_KERN
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features with right offload
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features with right offload Joshua Hay
@ 2015-12-23 19:13 ` Bowers, AndrewX
0 siblings, 0 replies; 6+ messages in thread
From: Bowers, AndrewX @ 2015-12-23 19:13 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Joshua Hay
> Sent: Thursday, December 10, 2015 11:39 AM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features
> with right offload
>
> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
>
> Synchronize code bases and add SCTP offload support.
>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Change-ID: I9f99071f7176225479026930c387bf681a47494e
> ---
> V2: remove reviewed-by
>
> Testing Hints: Test SCTP in a tunnel like vxlan and make sure TSO is still
> working. Test GRE tunnels and make sure they work. See already applied
> GRE upstream commit for instructions.
>
> drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Patch code changes correctly applied, GRE tunnels work, SCTP over VxLAN works
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-wired-lan] [v2 next PATCH S23 13/13] i40e: bump version to 1.4.10
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 13/13] i40e: bump version to 1.4.10 Joshua Hay
@ 2015-12-30 16:13 ` Bowers, AndrewX
0 siblings, 0 replies; 6+ messages in thread
From: Bowers, AndrewX @ 2015-12-30 16:13 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Joshua Hay
> Sent: Thursday, December 10, 2015 11:39 AM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [v2 next PATCH S23 13/13] i40e: bump version to
> 1.4.10
>
> From: Catherine Sullivan <catherine.sullivan@intel.com>
>
> Bump.
>
> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
> Change-ID: Ic9a495feb9ab0606f953c3848b0acf67169d3930
> ---
> V2: remove second change-id
>
> Testing Hints: check version
>
> drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Patch code changes correctly applied, driver reports correct version
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place
2015-12-10 19:38 [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place Joshua Hay
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features with right offload Joshua Hay
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 13/13] i40e: bump version to 1.4.10 Joshua Hay
@ 2016-01-06 22:39 ` Bowers, AndrewX
2 siblings, 0 replies; 6+ messages in thread
From: Bowers, AndrewX @ 2016-01-06 22:39 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Joshua Hay
> Sent: Thursday, December 10, 2015 11:39 AM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function
> capabilities in only one place
>
> From: Shannon Nelson <shannon.nelson@intel.com>
>
> The device capabilities were defined in two places, and neither had all the
> definitions. It really belongs with the AQ API definition, so this patch
> removes the other set of definitions and fills out the missing item.
>
> Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
> Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Change-ID: I273ba7d79a476cd11d2e0ca5825fec1716740de2
> ---
> V2: remove second signed-off-by
>
> Testing Hints: Apply and compile cleanly
>
> drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 1 +
> drivers/net/ethernet/intel/i40e/i40e_common.c | 85 +++++++-------------
> --
> .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 1 +
> 3 files changed, 30 insertions(+), 57 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Patch code changes correctly applied
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-06 22:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-10 19:38 [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place Joshua Hay
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 12/13] i40e: update features with right offload Joshua Hay
2015-12-23 19:13 ` Bowers, AndrewX
2015-12-10 19:38 ` [Intel-wired-lan] [v2 next PATCH S23 13/13] i40e: bump version to 1.4.10 Joshua Hay
2015-12-30 16:13 ` Bowers, AndrewX
2016-01-06 22:39 ` [Intel-wired-lan] [v2 next PATCH S23 08/13] i40e: define function capabilities in only one place Bowers, AndrewX
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.