Skip to content

Commit 711b2e2

Browse files
SruChallaherbertx
authored andcommitted
crypto: octeontx2 - remove CPT block reset
CPT block reset in CPT PF erase all the CPT configuration which is done in AF driver init. So, remove CPT block reset from CPT PF as it is also being done in AF init and not required in PF. Signed-off-by: Srujana Challa <schalla@marvell.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 37c6fc3 commit 711b2e2

File tree

1 file changed

+0
-43
lines changed

1 file changed

+0
-43
lines changed

drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -587,45 +587,6 @@ static int cpt_is_pf_usable(struct otx2_cptpf_dev *cptpf)
587587
return 0;
588588
}
589589

590-
static int cptx_device_reset(struct otx2_cptpf_dev *cptpf, int blkaddr)
591-
{
592-
int timeout = 10, ret;
593-
u64 reg = 0;
594-
595-
ret = otx2_cpt_write_af_reg(&cptpf->afpf_mbox, cptpf->pdev,
596-
CPT_AF_BLK_RST, 0x1, blkaddr);
597-
if (ret)
598-
return ret;
599-
600-
do {
601-
ret = otx2_cpt_read_af_reg(&cptpf->afpf_mbox, cptpf->pdev,
602-
CPT_AF_BLK_RST, &reg, blkaddr);
603-
if (ret)
604-
return ret;
605-
606-
if (!((reg >> 63) & 0x1))
607-
break;
608-
609-
usleep_range(10000, 20000);
610-
if (timeout-- < 0)
611-
return -EBUSY;
612-
} while (1);
613-
614-
return ret;
615-
}
616-
617-
static int cptpf_device_reset(struct otx2_cptpf_dev *cptpf)
618-
{
619-
int ret = 0;
620-
621-
if (cptpf->has_cpt1) {
622-
ret = cptx_device_reset(cptpf, BLKADDR_CPT1);
623-
if (ret)
624-
return ret;
625-
}
626-
return cptx_device_reset(cptpf, BLKADDR_CPT0);
627-
}
628-
629590
static void cptpf_check_block_implemented(struct otx2_cptpf_dev *cptpf)
630591
{
631592
u64 cfg;
@@ -643,10 +604,6 @@ static int cptpf_device_init(struct otx2_cptpf_dev *cptpf)
643604

644605
/* check if 'implemented' bit is set for block BLKADDR_CPT1 */
645606
cptpf_check_block_implemented(cptpf);
646-
/* Reset the CPT PF device */
647-
ret = cptpf_device_reset(cptpf);
648-
if (ret)
649-
return ret;
650607

651608
/* Get number of SE, IE and AE engines */
652609
ret = otx2_cpt_read_af_reg(&cptpf->afpf_mbox, cptpf->pdev,

0 commit comments

Comments
 (0)