diff mbox series

[RFC,jkirsher/next-queue,2/9] ixgbe: clean up ipsec defines

Message ID 1510862087-1924-3-git-send-email-shannon.nelson@oracle.com
State RFC
Headers show
Series None | expand

Commit Message

Shannon Nelson Nov. 16, 2017, 7:54 p.m. UTC 
Clean up the ipsec/macsec descriptor bit definitions to match the rest
of the defines and file organization.

Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Comments

Alexander H Duyck Nov. 17, 2017, 5:02 p.m. UTC | #1 
On Thu, Nov 16, 2017 at 11:54 AM, Shannon Nelson
<shannon.nelson@oracle.com> wrote:
> Clean up the ipsec/macsec descriptor bit definitions to match the rest
> of the defines and file organization.
>
> Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
> ---
>  drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 23 ++++++++++-------------
>  1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
> index 0a77941..befed8b 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
> @@ -2321,11 +2321,6 @@ enum {
>  #define IXGBE_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
>  #define IXGBE_TXD_STAT_DD    0x00000001 /* Descriptor Done */
>
> -#define IXGBE_RXDADV_IPSEC_STATUS_SECP                  0x00020000
> -#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_PROTOCOL       0x08000000
> -#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_LENGTH         0x10000000
> -#define IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED            0x18000000
> -#define IXGBE_RXDADV_IPSEC_ERROR_BIT_MASK               0x18000000
>  /* Multiple Transmit Queue Command Register */
>  #define IXGBE_MTQC_RT_ENA       0x1 /* DCB Enable */
>  #define IXGBE_MTQC_VT_ENA       0x2 /* VMDQ2 Enable */
> @@ -2375,6 +2370,14 @@ enum {
>  #define IXGBE_RXDADV_ERR_HBO    0x00800000 /*Header Buffer Overflow */
>  #define IXGBE_RXDADV_ERR_CE     0x01000000 /* CRC Error */
>  #define IXGBE_RXDADV_ERR_LE     0x02000000 /* Length Error */
> +
> +#define IXGBE_RXDADV_ERR_MACSEC_NO_SA_MATCH  0x08000000
> +#define IXGBE_RXDADV_ERR_MACSEC_REPLAY_ERROR 0x10000000
> +#define IXGBE_RXDADV_ERR_MACSEC_BAD_SIG      0x18000000

I assume you are going to need the ipsec defines, what is the reason
fro adding the macsec ones? If they aren't needed I would say just
drop them as we don't need to be carrying them in the code if they
aren't going to be used.

> +#define IXGBE_RXDADV_ERR_IPSEC_INV_PROTOCOL  0x08000000
> +#define IXGBE_RXDADV_ERR_IPSEC_INV_LENGTH    0x10000000
> +#define IXGBE_RXDADV_ERR_IPSEC_AUTH_FAILED   0x18000000
> +
>  #define IXGBE_RXDADV_ERR_USE    0x20000000 /* Undersize Error */
>  #define IXGBE_RXDADV_ERR_TCPE   0x40000000 /* TCP/UDP Checksum Error */
>  #define IXGBE_RXDADV_ERR_IPE    0x80000000 /* IP Checksum Error */
> @@ -2396,6 +2399,7 @@ enum {
>  #define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
>  #define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
>  #define IXGBE_RXDADV_STAT_TS           0x00010000 /* IEEE 1588 Time Stamp */
> +#define IXGBE_RXDADV_STAT_SECP          0x00020000 /* IPsec/MACsec pkt found */
>
>  /* PSRTYPE bit definitions */
>  #define IXGBE_PSRTYPE_TCPHDR    0x00000010
> @@ -2462,13 +2466,6 @@ enum {
>  #define IXGBE_RXDADV_PKTTYPE_ETQF_MASK  0x00000070 /* ETQF has 8 indices */
>  #define IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT 4          /* Right-shift 4 bits */
>
> -/* Security Processing bit Indication */
> -#define IXGBE_RXDADV_LNKSEC_STATUS_SECP         0x00020000
> -#define IXGBE_RXDADV_LNKSEC_ERROR_NO_SA_MATCH   0x08000000
> -#define IXGBE_RXDADV_LNKSEC_ERROR_REPLAY_ERROR  0x10000000
> -#define IXGBE_RXDADV_LNKSEC_ERROR_BIT_MASK      0x18000000
> -#define IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG       0x18000000
> -
>  /* Masks to determine if packets should be dropped due to frame errors */
>  #define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \
>                                       IXGBE_RXD_ERR_CE | \
> @@ -2889,6 +2886,7 @@ struct ixgbe_adv_tx_context_desc {
>                                  IXGBE_ADVTXD_POPTS_SHIFT)
>  #define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM << \
>                                  IXGBE_ADVTXD_POPTS_SHIFT)
> +#define IXGBE_ADVTXD_POPTS_IPSEC     0x00000400 /* IPSec offload request */
>  #define IXGBE_ADVTXD_POPTS_ISCO_1ST  0x00000000 /* 1st TSO of iSCSI PDU */
>  #define IXGBE_ADVTXD_POPTS_ISCO_MDL  0x00000800 /* Middle TSO of iSCSI PDU */
>  #define IXGBE_ADVTXD_POPTS_ISCO_LAST 0x00001000 /* Last TSO of iSCSI PDU */
> @@ -2904,7 +2902,6 @@ struct ixgbe_adv_tx_context_desc {
>  #define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */
>  #define IXGBE_ADVTXD_TUCMD_L4T_RSV     0x00001800 /* RSV L4 Packet TYPE */
>  #define IXGBE_ADVTXD_TUCMD_MKRREQ    0x00002000 /*Req requires Markers and CRC*/
> -#define IXGBE_ADVTXD_POPTS_IPSEC      0x00000400 /* IPSec offload request */
>  #define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000 /* IPSec Type ESP */
>  #define IXGBE_ADVTXD_TUCMD_IPSEC_ENCRYPT_EN 0x00004000/* ESP Encrypt Enable */
>  #define IXGBE_ADVTXT_TUCMD_FCOE      0x00008000       /* FCoE Frame Type */
> --
> 2.7.4
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Shannon Nelson Nov. 17, 2017, 6:33 p.m. UTC | #2 
On 11/17/2017 9:02 AM, Alexander Duyck wrote:
> On Thu, Nov 16, 2017 at 11:54 AM, Shannon Nelson
> <shannon.nelson@oracle.com> wrote:
>> Clean up the ipsec/macsec descriptor bit definitions to match the rest
>> of the defines and file organization.
>>
>> Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
>> ---
>>   drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 23 ++++++++++-------------
>>   1 file changed, 10 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
>> index 0a77941..befed8b 100644
>> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
>> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
>> @@ -2321,11 +2321,6 @@ enum {
>>   #define IXGBE_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
>>   #define IXGBE_TXD_STAT_DD    0x00000001 /* Descriptor Done */
>>
>> -#define IXGBE_RXDADV_IPSEC_STATUS_SECP                  0x00020000
>> -#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_PROTOCOL       0x08000000
>> -#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_LENGTH         0x10000000
>> -#define IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED            0x18000000
>> -#define IXGBE_RXDADV_IPSEC_ERROR_BIT_MASK               0x18000000
>>   /* Multiple Transmit Queue Command Register */
>>   #define IXGBE_MTQC_RT_ENA       0x1 /* DCB Enable */
>>   #define IXGBE_MTQC_VT_ENA       0x2 /* VMDQ2 Enable */
>> @@ -2375,6 +2370,14 @@ enum {
>>   #define IXGBE_RXDADV_ERR_HBO    0x00800000 /*Header Buffer Overflow */
>>   #define IXGBE_RXDADV_ERR_CE     0x01000000 /* CRC Error */
>>   #define IXGBE_RXDADV_ERR_LE     0x02000000 /* Length Error */
>> +
>> +#define IXGBE_RXDADV_ERR_MACSEC_NO_SA_MATCH  0x08000000
>> +#define IXGBE_RXDADV_ERR_MACSEC_REPLAY_ERROR 0x10000000
>> +#define IXGBE_RXDADV_ERR_MACSEC_BAD_SIG      0x18000000
> 
> I assume you are going to need the ipsec defines, what is the reason
> fro adding the macsec ones? If they aren't needed I would say just
> drop them as we don't need to be carrying them in the code if they
> aren't going to be used.

I didn't add them but changed their names from the unused LNKSEC defines 
a few lines further down, and kept them around for future travelers.  I 
don't have a problem dropping them.

sln

> 
>> +#define IXGBE_RXDADV_ERR_IPSEC_INV_PROTOCOL  0x08000000
>> +#define IXGBE_RXDADV_ERR_IPSEC_INV_LENGTH    0x10000000
>> +#define IXGBE_RXDADV_ERR_IPSEC_AUTH_FAILED   0x18000000
>> +
>>   #define IXGBE_RXDADV_ERR_USE    0x20000000 /* Undersize Error */
>>   #define IXGBE_RXDADV_ERR_TCPE   0x40000000 /* TCP/UDP Checksum Error */
>>   #define IXGBE_RXDADV_ERR_IPE    0x80000000 /* IP Checksum Error */
>> @@ -2396,6 +2399,7 @@ enum {
>>   #define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
>>   #define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
>>   #define IXGBE_RXDADV_STAT_TS           0x00010000 /* IEEE 1588 Time Stamp */
>> +#define IXGBE_RXDADV_STAT_SECP          0x00020000 /* IPsec/MACsec pkt found */
>>
>>   /* PSRTYPE bit definitions */
>>   #define IXGBE_PSRTYPE_TCPHDR    0x00000010
>> @@ -2462,13 +2466,6 @@ enum {
>>   #define IXGBE_RXDADV_PKTTYPE_ETQF_MASK  0x00000070 /* ETQF has 8 indices */
>>   #define IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT 4          /* Right-shift 4 bits */
>>
>> -/* Security Processing bit Indication */
>> -#define IXGBE_RXDADV_LNKSEC_STATUS_SECP         0x00020000
>> -#define IXGBE_RXDADV_LNKSEC_ERROR_NO_SA_MATCH   0x08000000
>> -#define IXGBE_RXDADV_LNKSEC_ERROR_REPLAY_ERROR  0x10000000
>> -#define IXGBE_RXDADV_LNKSEC_ERROR_BIT_MASK      0x18000000
>> -#define IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG       0x18000000
>> -
>>   /* Masks to determine if packets should be dropped due to frame errors */
>>   #define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \
>>                                        IXGBE_RXD_ERR_CE | \
>> @@ -2889,6 +2886,7 @@ struct ixgbe_adv_tx_context_desc {
>>                                   IXGBE_ADVTXD_POPTS_SHIFT)
>>   #define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM << \
>>                                   IXGBE_ADVTXD_POPTS_SHIFT)
>> +#define IXGBE_ADVTXD_POPTS_IPSEC     0x00000400 /* IPSec offload request */
>>   #define IXGBE_ADVTXD_POPTS_ISCO_1ST  0x00000000 /* 1st TSO of iSCSI PDU */
>>   #define IXGBE_ADVTXD_POPTS_ISCO_MDL  0x00000800 /* Middle TSO of iSCSI PDU */
>>   #define IXGBE_ADVTXD_POPTS_ISCO_LAST 0x00001000 /* Last TSO of iSCSI PDU */
>> @@ -2904,7 +2902,6 @@ struct ixgbe_adv_tx_context_desc {
>>   #define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */
>>   #define IXGBE_ADVTXD_TUCMD_L4T_RSV     0x00001800 /* RSV L4 Packet TYPE */
>>   #define IXGBE_ADVTXD_TUCMD_MKRREQ    0x00002000 /*Req requires Markers and CRC*/
>> -#define IXGBE_ADVTXD_POPTS_IPSEC      0x00000400 /* IPSec offload request */
>>   #define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000 /* IPSec Type ESP */
>>   #define IXGBE_ADVTXD_TUCMD_IPSEC_ENCRYPT_EN 0x00004000/* ESP Encrypt Enable */
>>   #define IXGBE_ADVTXT_TUCMD_FCOE      0x00008000       /* FCoE Frame Type */
>> --
>> 2.7.4
>>
>> _______________________________________________
>> Intel-wired-lan mailing list
>> Intel-wired-lan@osuosl.org
>> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 0a77941..befed8b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -2321,11 +2321,6 @@  enum {
 #define IXGBE_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
 #define IXGBE_TXD_STAT_DD    0x00000001 /* Descriptor Done */
 
-#define IXGBE_RXDADV_IPSEC_STATUS_SECP                  0x00020000
-#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_PROTOCOL       0x08000000
-#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_LENGTH         0x10000000
-#define IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED            0x18000000
-#define IXGBE_RXDADV_IPSEC_ERROR_BIT_MASK               0x18000000
 /* Multiple Transmit Queue Command Register */
 #define IXGBE_MTQC_RT_ENA       0x1 /* DCB Enable */
 #define IXGBE_MTQC_VT_ENA       0x2 /* VMDQ2 Enable */
@@ -2375,6 +2370,14 @@  enum {
 #define IXGBE_RXDADV_ERR_HBO    0x00800000 /*Header Buffer Overflow */
 #define IXGBE_RXDADV_ERR_CE     0x01000000 /* CRC Error */
 #define IXGBE_RXDADV_ERR_LE     0x02000000 /* Length Error */
+
+#define IXGBE_RXDADV_ERR_MACSEC_NO_SA_MATCH  0x08000000
+#define IXGBE_RXDADV_ERR_MACSEC_REPLAY_ERROR 0x10000000
+#define IXGBE_RXDADV_ERR_MACSEC_BAD_SIG      0x18000000
+#define IXGBE_RXDADV_ERR_IPSEC_INV_PROTOCOL  0x08000000
+#define IXGBE_RXDADV_ERR_IPSEC_INV_LENGTH    0x10000000
+#define IXGBE_RXDADV_ERR_IPSEC_AUTH_FAILED   0x18000000
+
 #define IXGBE_RXDADV_ERR_USE    0x20000000 /* Undersize Error */
 #define IXGBE_RXDADV_ERR_TCPE   0x40000000 /* TCP/UDP Checksum Error */
 #define IXGBE_RXDADV_ERR_IPE    0x80000000 /* IP Checksum Error */
@@ -2396,6 +2399,7 @@  enum {
 #define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
 #define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
 #define IXGBE_RXDADV_STAT_TS		0x00010000 /* IEEE 1588 Time Stamp */
+#define IXGBE_RXDADV_STAT_SECP          0x00020000 /* IPsec/MACsec pkt found */
 
 /* PSRTYPE bit definitions */
 #define IXGBE_PSRTYPE_TCPHDR    0x00000010
@@ -2462,13 +2466,6 @@  enum {
 #define IXGBE_RXDADV_PKTTYPE_ETQF_MASK  0x00000070 /* ETQF has 8 indices */
 #define IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT 4          /* Right-shift 4 bits */
 
-/* Security Processing bit Indication */
-#define IXGBE_RXDADV_LNKSEC_STATUS_SECP         0x00020000
-#define IXGBE_RXDADV_LNKSEC_ERROR_NO_SA_MATCH   0x08000000
-#define IXGBE_RXDADV_LNKSEC_ERROR_REPLAY_ERROR  0x10000000
-#define IXGBE_RXDADV_LNKSEC_ERROR_BIT_MASK      0x18000000
-#define IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG       0x18000000
-
 /* Masks to determine if packets should be dropped due to frame errors */
 #define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \
 				      IXGBE_RXD_ERR_CE | \
@@ -2889,6 +2886,7 @@  struct ixgbe_adv_tx_context_desc {
 				 IXGBE_ADVTXD_POPTS_SHIFT)
 #define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM << \
 				 IXGBE_ADVTXD_POPTS_SHIFT)
+#define IXGBE_ADVTXD_POPTS_IPSEC     0x00000400 /* IPSec offload request */
 #define IXGBE_ADVTXD_POPTS_ISCO_1ST  0x00000000 /* 1st TSO of iSCSI PDU */
 #define IXGBE_ADVTXD_POPTS_ISCO_MDL  0x00000800 /* Middle TSO of iSCSI PDU */
 #define IXGBE_ADVTXD_POPTS_ISCO_LAST 0x00001000 /* Last TSO of iSCSI PDU */
@@ -2904,7 +2902,6 @@  struct ixgbe_adv_tx_context_desc {
 #define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */
 #define IXGBE_ADVTXD_TUCMD_L4T_RSV     0x00001800 /* RSV L4 Packet TYPE */
 #define IXGBE_ADVTXD_TUCMD_MKRREQ    0x00002000 /*Req requires Markers and CRC*/
-#define IXGBE_ADVTXD_POPTS_IPSEC      0x00000400 /* IPSec offload request */
 #define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000 /* IPSec Type ESP */
 #define IXGBE_ADVTXD_TUCMD_IPSEC_ENCRYPT_EN 0x00004000/* ESP Encrypt Enable */
 #define IXGBE_ADVTXT_TUCMD_FCOE      0x00008000       /* FCoE Frame Type */