Skip to content

Commit

Permalink
crypto: hisilicon/sec - modify the hardware endian configuration
Browse files Browse the repository at this point in the history
When the endian configuration of the hardware is abnormal, it will
cause the SEC engine is faulty that reports empty message. And it
will affect the normal function of the hardware. Currently the soft
configuration method can't restore the faulty device. The endian
needs to be configured according to the system properties. So fix it.

Signed-off-by: Kai Ye <yekai13@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
yekai123123 authored and herbertx committed Aug 21, 2021
1 parent 90367a0 commit a526261
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 27 deletions.
5 changes: 0 additions & 5 deletions drivers/crypto/hisilicon/sec2/sec.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,6 @@ struct sec_ctx {
struct device *dev;
};

enum sec_endian {
SEC_LE = 0,
SEC_32BE,
SEC_64BE
};

enum sec_debug_file_index {
SEC_CLEAR_ENABLE,
Expand Down
31 changes: 9 additions & 22 deletions drivers/crypto/hisilicon/sec2/sec_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -318,31 +318,20 @@ static const struct pci_device_id sec_dev_ids[] = {
};
MODULE_DEVICE_TABLE(pci, sec_dev_ids);

static u8 sec_get_endian(struct hisi_qm *qm)
static void sec_set_endian(struct hisi_qm *qm)
{
u32 reg;

/*
* As for VF, it is a wrong way to get endian setting by
* reading a register of the engine
*/
if (qm->pdev->is_virtfn) {
dev_err_ratelimited(&qm->pdev->dev,
"cannot access a register in VF!\n");
return SEC_LE;
}
reg = readl_relaxed(qm->io_base + SEC_CONTROL_REG);
/* BD little endian mode */
if (!(reg & BIT(0)))
return SEC_LE;
reg &= ~(BIT(1) | BIT(0));
if (!IS_ENABLED(CONFIG_64BIT))
reg |= BIT(1);

/* BD 32-bits big endian mode */
else if (!(reg & BIT(1)))
return SEC_32BE;

/* BD 64-bits big endian mode */
else
return SEC_64BE;
if (!IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))
reg |= BIT(0);

writel_relaxed(reg, qm->io_base + SEC_CONTROL_REG);
}

static void sec_open_sva_prefetch(struct hisi_qm *qm)
Expand Down Expand Up @@ -463,9 +452,7 @@ static int sec_engine_init(struct hisi_qm *qm)
qm->io_base + SEC_BD_ERR_CHK_EN_REG3);

/* config endian */
reg = readl_relaxed(qm->io_base + SEC_CONTROL_REG);
reg |= sec_get_endian(qm);
writel_relaxed(reg, qm->io_base + SEC_CONTROL_REG);
sec_set_endian(qm);

sec_enable_clock_gate(qm);

Expand Down

0 comments on commit a526261

Please sign in to comment.