korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto: hisilicon/hpre - add controller reset support for HPRE

Browse Source 
Add support for the controller reset in HPRE driver.

Signed-off-by: Hui Tang <tanghui20@huawei.com>
Signed-off-by: Shukun Tan <tanshukun1@huawei.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>
Reviewed-by: Zaibo Xu <xuzaibo@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Hui Tang 2020-04-03 16:16:40 +08:00 committed by Herbert Xu
parent 84c9b7802b
commit 1f5c9f34f0
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/crypto/hisilicon/hpre/hpre_main.c
View File

@ -59,10 +59,6 @@
#define HPRE_HAC_ECC2_CNT 0x301a08 #define HPRE_HAC_ECC2_CNT 0x301a08
#define HPRE_HAC_INT_STATUS 0x301800 #define HPRE_HAC_INT_STATUS 0x301800
#define HPRE_HAC_SOURCE_INT 0x301600 #define HPRE_HAC_SOURCE_INT 0x301600
#define MASTER_GLOBAL_CTRL_SHUTDOWN 1
#define MASTER_TRANS_RETURN_RW 3
#define HPRE_MASTER_TRANS_RETURN 0x300150
#define HPRE_MASTER_GLOBAL_CTRL 0x300000
#define HPRE_CLSTR_ADDR_INTRVL 0x1000 #define HPRE_CLSTR_ADDR_INTRVL 0x1000
#define HPRE_CLUSTER_INQURY 0x100 #define HPRE_CLUSTER_INQURY 0x100
#define HPRE_CLSTR_ADDR_INQRY_RSLT 0x104 #define HPRE_CLSTR_ADDR_INQRY_RSLT 0x104
@ -80,6 +76,13 @@
#define HPRE_BD_USR_MASK 0x3 #define HPRE_BD_USR_MASK 0x3
#define HPRE_CLUSTER_CORE_MASK 0xf #define HPRE_CLUSTER_CORE_MASK 0xf
#define HPRE_AM_OOO_SHUTDOWN_ENB 0x301044
#define HPRE_AM_OOO_SHUTDOWN_ENABLE BIT(0)
#define HPRE_WR_MSI_PORT BIT(2)
#define HPRE_CORE_ECC_2BIT_ERR BIT(1)
#define HPRE_OOO_ECC_2BIT_ERR BIT(5)
#define HPRE_VIA_MSI_DSM 1 #define HPRE_VIA_MSI_DSM 1
static struct hisi_qm_list hpre_devices; static struct hisi_qm_list hpre_devices;
@ -241,9 +244,8 @@ static int hpre_cfg_by_dsm(struct hisi_qm *qm)
return 0; return 0;
} }
static int hpre_set_user_domain_and_cache(struct hpre *hpre) static int hpre_set_user_domain_and_cache(struct hisi_qm *qm)
{ {
struct hisi_qm *qm = &hpre->qm;
struct device *dev = &qm->pdev->dev; struct device *dev = &qm->pdev->dev;
unsigned long offset; unsigned long offset;
int ret, i; int ret, i;
@ -339,6 +341,9 @@ static void hpre_hw_error_disable(struct hisi_qm *qm)
static void hpre_hw_error_enable(struct hisi_qm *qm) static void hpre_hw_error_enable(struct hisi_qm *qm)
{ {
/* clear HPRE hw error source if having */
writel(HPRE_CORE_INT_DISABLE, qm->io_base + HPRE_HAC_SOURCE_INT);
/* enable hpre hw error interrupts */ /* enable hpre hw error interrupts */
writel(HPRE_CORE_INT_ENABLE, qm->io_base + HPRE_INT_MASK); writel(HPRE_CORE_INT_ENABLE, qm->io_base + HPRE_INT_MASK);
writel(HPRE_HAC_RAS_CE_ENABLE, qm->io_base + HPRE_RAS_CE_ENB); writel(HPRE_HAC_RAS_CE_ENABLE, qm->io_base + HPRE_RAS_CE_ENB);
@ -700,8 +705,6 @@ static void hpre_log_hw_error(struct hisi_qm *qm, u32 err_sts)
err->msg, err->int_msk); err->msg, err->int_msk);
err++; err++;
} }
writel(err_sts, qm->io_base + HPRE_HAC_SOURCE_INT);
} }
static u32 hpre_get_hw_err_status(struct hisi_qm *qm) static u32 hpre_get_hw_err_status(struct hisi_qm *qm)
@ -709,16 +712,39 @@ static u32 hpre_get_hw_err_status(struct hisi_qm *qm)
return readl(qm->io_base + HPRE_HAC_INT_STATUS); return readl(qm->io_base + HPRE_HAC_INT_STATUS);
} }
static void hpre_clear_hw_err_status(struct hisi_qm *qm, u32 err_sts)
{
writel(err_sts, qm->io_base + HPRE_HAC_SOURCE_INT);
}
static void hpre_open_axi_master_ooo(struct hisi_qm *qm)
{
u32 value;
value = readl(qm->io_base + HPRE_AM_OOO_SHUTDOWN_ENB);
writel(value & ~HPRE_AM_OOO_SHUTDOWN_ENABLE,
HPRE_ADDR(qm, HPRE_AM_OOO_SHUTDOWN_ENB));
writel(value | HPRE_AM_OOO_SHUTDOWN_ENABLE,
HPRE_ADDR(qm, HPRE_AM_OOO_SHUTDOWN_ENB));
}
static const struct hisi_qm_err_ini hpre_err_ini = { static const struct hisi_qm_err_ini hpre_err_ini = {
.hw_init = hpre_set_user_domain_and_cache,
.hw_err_enable = hpre_hw_error_enable, .hw_err_enable = hpre_hw_error_enable,
.hw_err_disable = hpre_hw_error_disable, .hw_err_disable = hpre_hw_error_disable,
.get_dev_hw_err_status = hpre_get_hw_err_status, .get_dev_hw_err_status = hpre_get_hw_err_status,
.clear_dev_hw_err_status = hpre_clear_hw_err_status,
.log_dev_hw_err = hpre_log_hw_error, .log_dev_hw_err = hpre_log_hw_error,
.open_axi_master_ooo = hpre_open_axi_master_ooo,
.err_info = { .err_info = {
.ce = QM_BASE_CE, .ce = QM_BASE_CE,
.nfe = QM_BASE_NFE | QM_ACC_DO_TASK_TIMEOUT, .nfe = QM_BASE_NFE | QM_ACC_DO_TASK_TIMEOUT,
.fe = 0, .fe = 0,
.msi = QM_DB_RANDOM_INVALID, .msi = QM_DB_RANDOM_INVALID,
.ecc_2bits_mask = HPRE_CORE_ECC_2BIT_ERR |
HPRE_OOO_ECC_2BIT_ERR,
.msi_wr_port = HPRE_WR_MSI_PORT,
.acpi_rst = "HRST",
} }
}; };
@ -729,10 +755,11 @@ static int hpre_pf_probe_init(struct hpre *hpre)
qm->ctrl_qp_num = HPRE_QUEUE_NUM_V2; qm->ctrl_qp_num = HPRE_QUEUE_NUM_V2;
ret = hpre_set_user_domain_and_cache(hpre); ret = hpre_set_user_domain_and_cache(qm);
if (ret) if (ret)
return ret; return ret;
qm->qm_list = &hpre_devices;
qm->err_ini = &hpre_err_ini; qm->err_ini = &hpre_err_ini;
hisi_qm_dev_err_init(qm); hisi_qm_dev_err_init(qm);
@ -840,6 +867,7 @@ static void hpre_remove(struct pci_dev *pdev)
static const struct pci_error_handlers hpre_err_handler = { static const struct pci_error_handlers hpre_err_handler = {
.error_detected = hisi_qm_dev_err_detected, .error_detected = hisi_qm_dev_err_detected,
.slot_reset = hisi_qm_dev_slot_reset,
}; };
static struct pci_driver hpre_pci_driver = { static struct pci_driver hpre_pci_driver = {