common/dpaax/caamflib: load correct HFN from desc buffer

The offset of the HFN word and Bearer/Dir word is different
depending on type of PDB.

The wrong value was used.

This patch address this issue

Signed-off-by: Franck Lenormand <franck.lenormand@nxp.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h
index 659e289..e97d58c 100644 (file)
--- a/drivers/common/dpaax/caamflib/desc/pdcp.h
+++ b/drivers/common/dpaax/caamflib/desc/pdcp.h
@@ -270,6 +270,9 @@ enum pdb_type_e {
        PDCP_PDB_TYPE_INVALID
 };
 
+#define REDUCED_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET 4
+#define FULL_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET 8
+
 /**
  * rta_inline_pdcp_query() - Provide indications if a key can be passed as
  *                           immediate data or shall be referenced in a
@@ -2564,11 +2567,11 @@ insert_hfn_ov_op(struct program *p,
                return 0;
 
        case PDCP_PDB_TYPE_REDUCED_PDB:
-               hfn_pdb_offset = 4;
+               hfn_pdb_offset = REDUCED_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET;
                break;
 
        case PDCP_PDB_TYPE_FULL_PDB:
-               hfn_pdb_offset = 8;
+               hfn_pdb_offset = FULL_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET;
                break;
 
        default:

diff --git a/drivers/common/dpaax/caamflib/desc/sdap.h b/drivers/common/dpaax/caamflib/desc/sdap.h
index 6523db1..f1c49ea 100644 (file)
--- a/drivers/common/dpaax/caamflib/desc/sdap.h
+++ b/drivers/common/dpaax/caamflib/desc/sdap.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2020 NXP
+ * Copyright 2020-2021 NXP
  */
 
 #ifndef __DESC_SDAP_H__
@@ -109,12 +109,17 @@ static inline int pdcp_sdap_insert_no_int_op(struct program *p,
                                             bool swap __maybe_unused,
                                             struct alginfo *cipherdata,
                                             unsigned int dir,
-                                            enum pdcp_sn_size sn_size)
+                                            enum pdcp_sn_size sn_size,
+                                            enum pdb_type_e pdb_type)
 {
        int op;
        uint32_t sn_mask = 0;
        uint32_t length = 0;
        uint32_t offset = 0;
+       int hfn_bearer_dir_offset_in_descbuf =
+               (pdb_type == PDCP_PDB_TYPE_FULL_PDB) ?
+                       FULL_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET :
+                       REDUCED_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET;
 
        if (pdcp_sdap_get_sn_parameters(sn_size, swap, &offset, &length,
                                        &sn_mask))
@@ -137,7 +142,8 @@ static inline int pdcp_sdap_insert_no_int_op(struct program *p,
        SEQSTORE(p, MATH0, offset, length, 0);
 
        MATHB(p, MATH1, SHLD, MATH1, MATH1, 8, 0);
-       MOVEB(p, DESCBUF, 8, MATH2, 0, 8, WAITCOMP | IMMED);
+       MOVEB(p, DESCBUF, hfn_bearer_dir_offset_in_descbuf,
+                       MATH2, 0, 8, WAITCOMP | IMMED);
        MATHB(p, MATH1, OR, MATH2, MATH2, 8, 0);
 
        MATHB(p, SEQINSZ, SUB, MATH3, VSEQINSZ, 4, 0);
@@ -190,9 +196,14 @@ pdcp_sdap_insert_enc_only_op(struct program *p, bool swap __maybe_unused,
                             struct alginfo *cipherdata,
                             struct alginfo *authdata __maybe_unused,
                             unsigned int dir, enum pdcp_sn_size sn_size,
-                            unsigned char era_2_sw_hfn_ovrd __maybe_unused)
+                            unsigned char era_2_sw_hfn_ovrd __maybe_unused,
+                            enum pdb_type_e pdb_type)
 {
        uint32_t offset = 0, length = 0, sn_mask = 0;
+       int hfn_bearer_dir_offset_in_descbuf =
+               (pdb_type == PDCP_PDB_TYPE_FULL_PDB) ?
+                       FULL_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET :
+                       REDUCED_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET;
 
        if (pdcp_sdap_get_sn_parameters(sn_size, swap, &offset, &length,
                                        &sn_mask))
@@ -217,7 +228,8 @@ pdcp_sdap_insert_enc_only_op(struct program *p, bool swap __maybe_unused,
        /* Word (32 bit) swap */
        MATHB(p, MATH1, SHLD, MATH1, MATH1, 8, 0);
        /* Load words from PDB: word 02 (HFN) + word 03 (bearer_dir)*/
-       MOVEB(p, DESCBUF, 8, MATH2, 0, 8, WAITCOMP | IMMED);
+       MOVEB(p, DESCBUF, hfn_bearer_dir_offset_in_descbuf,
+                       MATH2, 0, 8, WAITCOMP | IMMED);
        /* Create basic IV */
        MATHB(p, MATH1, OR, MATH2, MATH2, 8, 0);
 
@@ -309,13 +321,18 @@ static inline int
 pdcp_sdap_insert_snoop_op(struct program *p, bool swap __maybe_unused,
                          struct alginfo *cipherdata, struct alginfo *authdata,
                          unsigned int dir, enum pdcp_sn_size sn_size,
-                         unsigned char era_2_sw_hfn_ovrd __maybe_unused)
+                         unsigned char era_2_sw_hfn_ovrd __maybe_unused,
+                         enum pdb_type_e pdb_type)
 {
        uint32_t offset = 0, length = 0, sn_mask = 0;
        uint32_t int_op_alg = 0;
        uint32_t int_op_aai = 0;
        uint32_t cipher_op_alg = 0;
        uint32_t cipher_op_aai = 0;
+       int hfn_bearer_dir_offset_in_descbuf =
+               (pdb_type == PDCP_PDB_TYPE_FULL_PDB) ?
+                       FULL_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET :
+                       REDUCED_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET;
 
        if (authdata->algtype == PDCP_CIPHER_TYPE_ZUC) {
                if (rta_sec_era < RTA_SEC_ERA_5) {
@@ -362,11 +379,13 @@ pdcp_sdap_insert_snoop_op(struct program *p, bool swap __maybe_unused,
 
        /* Load the HFN / Beare / Dir from the PDB
         * CAAM word are 32bit hence loading 8 byte loads 2 words:
-        *  - The HFN at offset 8
-        *  - The Bearer / Dir at offset 12
+        *  - The HFN at offset hfn_bearer_dir_offset_in_descbuf
+        *  - The Bearer / Dir at next word
         */
-       MOVEB(p, DESCBUF, 8, MATH2, 0, 8, WAITCOMP | IMMED);
-       /* Create the 4 first byte of the ICV by oring the math registers */
+       MOVEB(p, DESCBUF, hfn_bearer_dir_offset_in_descbuf,
+                       MATH2, 0, 8, WAITCOMP | IMMED);
+
+       /* Create the 4 first byte of the ICV by or-ing the math registers */
        MATHB(p, MATH1, OR, MATH2, MATH1, 8, 0);
 
        /* Set the IV of class 1 CHA */
@@ -562,11 +581,16 @@ pdcp_sdap_insert_snoop_op(struct program *p, bool swap __maybe_unused,
 static inline int pdcp_sdap_insert_no_snoop_op(
        struct program *p, bool swap __maybe_unused, struct alginfo *cipherdata,
        struct alginfo *authdata, unsigned int dir, enum pdcp_sn_size sn_size,
-       unsigned char era_2_sw_hfn_ovrd __maybe_unused)
+       unsigned char era_2_sw_hfn_ovrd __maybe_unused,
+       enum pdb_type_e pdb_type)
 {
        uint32_t offset = 0, length = 0, sn_mask = 0;
        uint32_t cipher_alg_op = 0;
        uint32_t cipher_alg_aai = 0;
+       int hfn_bearer_dir_offset_in_descbuf =
+               (pdb_type == PDCP_PDB_TYPE_FULL_PDB) ?
+                       FULL_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET :
+                       REDUCED_PDB_DESCBUF_HFN_BEARER_DIR_OFFSET;
 
        if (authdata->algtype == PDCP_CIPHER_TYPE_ZUC) {
                if (rta_sec_era < RTA_SEC_ERA_5) {
@@ -592,7 +616,8 @@ static inline int pdcp_sdap_insert_no_snoop_op(
 #endif
 
        MATHB(p, MATH1, SHLD, MATH1, MATH1, 8, 0);
-       MOVEB(p, DESCBUF, 8, MATH2, 0, 0x08, WAITCOMP | IMMED);
+       MOVEB(p, DESCBUF, hfn_bearer_dir_offset_in_descbuf,
+                       MATH2, 0, 0x08, WAITCOMP | IMMED);
        MATHB(p, MATH1, OR, MATH2, MATH2, 8, 0);
 
        SEQSTORE(p, MATH0, offset, length, 0);
@@ -753,22 +778,51 @@ static inline int pdcp_sdap_insert_no_snoop_op(
        return 0;
 }
 
+static inline int
+pdcp_sdap_insert_cplane_null_op(struct program *p,
+                          bool swap __maybe_unused,
+                          struct alginfo *cipherdata,
+                          struct alginfo *authdata,
+                          unsigned int dir,
+                          enum pdcp_sn_size sn_size,
+                          unsigned char era_2_sw_hfn_ovrd,
+                          enum pdb_type_e pdb_type __maybe_unused)
+{
+       return pdcp_insert_cplane_int_only_op(p, swap, cipherdata, authdata,
+                                       dir, sn_size, era_2_sw_hfn_ovrd);
+}
+
+static inline int
+pdcp_sdap_insert_cplane_int_only_op(struct program *p,
+                          bool swap __maybe_unused,
+                          struct alginfo *cipherdata,
+                          struct alginfo *authdata,
+                          unsigned int dir,
+                          enum pdcp_sn_size sn_size,
+                          unsigned char era_2_sw_hfn_ovrd,
+                          enum pdb_type_e pdb_type __maybe_unused)
+{
+       return pdcp_insert_cplane_int_only_op(p, swap, cipherdata, authdata,
+                               dir, sn_size, era_2_sw_hfn_ovrd);
+}
+
 static int pdcp_sdap_insert_with_int_op(
        struct program *p, bool swap __maybe_unused, struct alginfo *cipherdata,
        struct alginfo *authdata, enum pdcp_sn_size sn_size,
-       unsigned char era_2_sw_hfn_ovrd, unsigned int dir)
+       unsigned char era_2_sw_hfn_ovrd, unsigned int dir,
+       enum pdb_type_e pdb_type)
 {
        static int (
                *pdcp_cp_fp[PDCP_CIPHER_TYPE_INVALID][PDCP_AUTH_TYPE_INVALID])(
                struct program *, bool swap, struct alginfo *, struct alginfo *,
                unsigned int, enum pdcp_sn_size,
-               unsigned char __maybe_unused) = {
+               unsigned char __maybe_unused, enum pdb_type_e pdb_type) = {
                {
                        /* NULL */
-                       pdcp_insert_cplane_null_op,     /* NULL */
-                       pdcp_insert_cplane_int_only_op, /* SNOW f9 */
-                       pdcp_insert_cplane_int_only_op, /* AES CMAC */
-                       pdcp_insert_cplane_int_only_op  /* ZUC-I */
+                       pdcp_sdap_insert_cplane_null_op,     /* NULL */
+                       pdcp_sdap_insert_cplane_int_only_op, /* SNOW f9 */
+                       pdcp_sdap_insert_cplane_int_only_op, /* AES CMAC */
+                       pdcp_sdap_insert_cplane_int_only_op  /* ZUC-I */
                },
                {
                        /* SNOW f8 */
@@ -796,7 +850,7 @@ static int pdcp_sdap_insert_with_int_op(
 
        err = pdcp_cp_fp[cipherdata->algtype]
                        [authdata->algtype](p, swap, cipherdata, authdata, dir,
-                                           sn_size, era_2_sw_hfn_ovrd);
+                                       sn_size, era_2_sw_hfn_ovrd, pdb_type);
        if (err)
                return err;
 
@@ -948,7 +1002,7 @@ cnstr_shdsc_pdcp_sdap_u_plane(uint32_t *descbuf,
                } else {
                        err = pdcp_sdap_insert_no_int_op(p, swap, cipherdata,
                                                         caps_mode,
-                                                        sn_size);
+                                                        sn_size, pdb_type);
                        if (err) {
                                pr_err("Fail pdcp_sdap_insert_no_int_op\n");
                                return err;
@@ -958,7 +1012,7 @@ cnstr_shdsc_pdcp_sdap_u_plane(uint32_t *descbuf,
                err = pdcp_sdap_insert_with_int_op(p, swap, cipherdata,
                                                   authdata, sn_size,
                                                   era_2_sw_hfn_ovrd,
-                                                  caps_mode);
+                                                  caps_mode, pdb_type);
                if (err) {
                        pr_err("Fail pdcp_sdap_insert_with_int_op\n");
                        return err;