diff options
| author | Rich Schmitt <B43082@freescale.com> | 2014-10-31 15:03:32 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:39:21 (GMT) |
| commit | 0b18afe44faef1516f66168bbf782ebad4040006 (patch) | |
| tree | 1c0fd882a9dd5476a835b410109ca9ebbd95278e /drivers/crypto/caam | |
| parent | 23fd3e4bab3478f2b620732c0a4e07b3567b9f1c (diff) | |
| parent | bbadd4637d89b404a1b6a539ea72b37d4a748001 (diff) | |
| download | linux-fsl-qoriq-0b18afe44faef1516f66168bbf782ebad4040006.tar.xz | |
Integrate t1024 patches
Merge remote-tracking branch 't1024-linux/master'
Diffstat (limited to 'drivers/crypto/caam')
| -rw-r--r-- | drivers/crypto/caam/desc.h | 8 | ||||
| -rw-r--r-- | drivers/crypto/caam/pdb.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h index ffb9e99..7a2cde3 100644 --- a/drivers/crypto/caam/desc.h +++ b/drivers/crypto/caam/desc.h @@ -454,8 +454,16 @@ struct sec4_sg_entry { #define FIFOST_TYPE_MESSAGE_DATA (0x30 << FIFOST_TYPE_SHIFT) #define FIFOST_TYPE_RNGSTORE (0x34 << FIFOST_TYPE_SHIFT) #define FIFOST_TYPE_RNGFIFO (0x35 << FIFOST_TYPE_SHIFT) +#define FIFOST_TYPE_META_DATA (0x3e << FIFOST_TYPE_SHIFT) #define FIFOST_TYPE_SKIP (0x3f << FIFOST_TYPE_SHIFT) +/* AUX field */ +#define FIFOST_AUX_SHIFT 25 +#define FIFOST_AUX_TYPE0 (0x0 << FIFOST_AUX_SHIFT) +#define FIFOST_AUX_TYPE1 (0x1 << FIFOST_AUX_SHIFT) +#define FIFOST_AUX_TYPE2 (0x2 << FIFOST_AUX_SHIFT) +#define FIFOST_AUX_TYPE3 (0x3 << FIFOST_AUX_SHIFT) + /* * OPERATION Command Constructs */ diff --git a/drivers/crypto/caam/pdb.h b/drivers/crypto/caam/pdb.h index faab55b..7087be0 100644 --- a/drivers/crypto/caam/pdb.h +++ b/drivers/crypto/caam/pdb.h @@ -315,7 +315,7 @@ struct dtls_block_encap_pdb { u16 epoch; u16 seq_num[3]; u32 iv[4]; -}; +} __packed; struct tls_block_decap_pdb { u8 rsvd[3]; @@ -340,7 +340,7 @@ struct dtls_block_decap_pdb { u16 seq_num[3]; u32 iv[4]; u64 antireplay_scorecard; -}; +} __packed; /* * SRTP Protocol Data Blocks |