|
116 | 116 | #define QM_SQC_VFT_BASE_SHIFT_V2 28
|
117 | 117 | #define QM_SQC_VFT_BASE_MASK_V2 GENMASK(15, 0)
|
118 | 118 | #define QM_SQC_VFT_NUM_SHIFT_V2 45
|
119 |
| -#define QM_SQC_VFT_NUM_MASK_v2 GENMASK(9, 0) |
| 119 | +#define QM_SQC_VFT_NUM_MASK_V2 GENMASK(9, 0) |
120 | 120 |
|
121 | 121 | #define QM_ABNORMAL_INT_SOURCE 0x100000
|
122 | 122 | #define QM_ABNORMAL_INT_MASK 0x100004
|
|
230 | 230 | #define QM_AUTOSUSPEND_DELAY 3000
|
231 | 231 |
|
232 | 232 | #define QM_MK_CQC_DW3_V1(hop_num, pg_sz, buf_sz, cqe_sz) \
|
233 |
| - (((hop_num) << QM_CQ_HOP_NUM_SHIFT) | \ |
234 |
| - ((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT) | \ |
235 |
| - ((buf_sz) << QM_CQ_BUF_SIZE_SHIFT) | \ |
| 233 | + (((hop_num) << QM_CQ_HOP_NUM_SHIFT) | \ |
| 234 | + ((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT) | \ |
| 235 | + ((buf_sz) << QM_CQ_BUF_SIZE_SHIFT) | \ |
236 | 236 | ((cqe_sz) << QM_CQ_CQE_SIZE_SHIFT))
|
237 | 237 |
|
238 | 238 | #define QM_MK_CQC_DW3_V2(cqe_sz, cq_depth) \
|
239 | 239 | ((((u32)cq_depth) - 1) | ((cqe_sz) << QM_CQ_CQE_SIZE_SHIFT))
|
240 | 240 |
|
241 | 241 | #define QM_MK_SQC_W13(priority, orders, alg_type) \
|
242 |
| - (((priority) << QM_SQ_PRIORITY_SHIFT) | \ |
243 |
| - ((orders) << QM_SQ_ORDERS_SHIFT) | \ |
| 242 | + (((priority) << QM_SQ_PRIORITY_SHIFT) | \ |
| 243 | + ((orders) << QM_SQ_ORDERS_SHIFT) | \ |
244 | 244 | (((alg_type) & QM_SQ_TYPE_MASK) << QM_SQ_TYPE_SHIFT))
|
245 | 245 |
|
246 | 246 | #define QM_MK_SQC_DW3_V1(hop_num, pg_sz, buf_sz, sqe_sz) \
|
247 |
| - (((hop_num) << QM_SQ_HOP_NUM_SHIFT) | \ |
248 |
| - ((pg_sz) << QM_SQ_PAGE_SIZE_SHIFT) | \ |
249 |
| - ((buf_sz) << QM_SQ_BUF_SIZE_SHIFT) | \ |
| 247 | + (((hop_num) << QM_SQ_HOP_NUM_SHIFT) | \ |
| 248 | + ((pg_sz) << QM_SQ_PAGE_SIZE_SHIFT) | \ |
| 249 | + ((buf_sz) << QM_SQ_BUF_SIZE_SHIFT) | \ |
250 | 250 | ((u32)ilog2(sqe_sz) << QM_SQ_SQE_SIZE_SHIFT))
|
251 | 251 |
|
252 | 252 | #define QM_MK_SQC_DW3_V2(sqe_sz, sq_depth) \
|
@@ -696,7 +696,7 @@ static void qm_db_v2(struct hisi_qm *qm, u16 qn, u8 cmd, u16 index, u8 priority)
|
696 | 696 |
|
697 | 697 | doorbell = qn | ((u64)cmd << QM_DB_CMD_SHIFT_V2) |
|
698 | 698 | ((u64)randata << QM_DB_RAND_SHIFT_V2) |
|
699 |
| - ((u64)index << QM_DB_INDEX_SHIFT_V2) | |
| 699 | + ((u64)index << QM_DB_INDEX_SHIFT_V2) | |
700 | 700 | ((u64)priority << QM_DB_PRIORITY_SHIFT_V2);
|
701 | 701 |
|
702 | 702 | writeq(doorbell, io_base);
|
@@ -1294,7 +1294,7 @@ static int qm_get_vft_v2(struct hisi_qm *qm, u32 *base, u32 *number)
|
1294 | 1294 | sqc_vft = readl(qm->io_base + QM_MB_CMD_DATA_ADDR_L) |
|
1295 | 1295 | ((u64)readl(qm->io_base + QM_MB_CMD_DATA_ADDR_H) << 32);
|
1296 | 1296 | *base = QM_SQC_VFT_BASE_MASK_V2 & (sqc_vft >> QM_SQC_VFT_BASE_SHIFT_V2);
|
1297 |
| - *number = (QM_SQC_VFT_NUM_MASK_v2 & |
| 1297 | + *number = (QM_SQC_VFT_NUM_MASK_V2 & |
1298 | 1298 | (sqc_vft >> QM_SQC_VFT_NUM_SHIFT_V2)) + 1;
|
1299 | 1299 |
|
1300 | 1300 | return 0;
|
@@ -3063,7 +3063,6 @@ static int qm_stop_started_qp(struct hisi_qm *qm)
|
3063 | 3063 | return 0;
|
3064 | 3064 | }
|
3065 | 3065 |
|
3066 |
| - |
3067 | 3066 | /**
|
3068 | 3067 | * qm_clear_queues() - Clear all queues memory in a qm.
|
3069 | 3068 | * @qm: The qm in which the queues will be cleared.
|
@@ -3547,7 +3546,7 @@ static ssize_t qm_algqos_read(struct file *filp, char __user *buf,
|
3547 | 3546 | qos_val = ir / QM_QOS_RATE;
|
3548 | 3547 | ret = scnprintf(tbuf, QM_DBG_READ_LEN, "%u\n", qos_val);
|
3549 | 3548 |
|
3550 |
| - ret = simple_read_from_buffer(buf, count, pos, tbuf, ret); |
| 3549 | + ret = simple_read_from_buffer(buf, count, pos, tbuf, ret); |
3551 | 3550 |
|
3552 | 3551 | err_get_status:
|
3553 | 3552 | clear_bit(QM_RESETTING, &qm->misc_ctl);
|
@@ -4038,13 +4037,10 @@ static void qm_dev_ecc_mbit_handle(struct hisi_qm *qm)
|
4038 | 4037 | if (!qm->err_status.is_dev_ecc_mbit &&
|
4039 | 4038 | qm->err_status.is_qm_ecc_mbit &&
|
4040 | 4039 | qm->err_ini->close_axi_master_ooo) {
|
4041 |
| - |
4042 | 4040 | qm->err_ini->close_axi_master_ooo(qm);
|
4043 |
| - |
4044 | 4041 | } else if (qm->err_status.is_dev_ecc_mbit &&
|
4045 | 4042 | !qm->err_status.is_qm_ecc_mbit &&
|
4046 | 4043 | !qm->err_ini->close_axi_master_ooo) {
|
4047 |
| - |
4048 | 4044 | nfe_enb = readl(qm->io_base + QM_RAS_NFE_ENABLE);
|
4049 | 4045 | writel(nfe_enb & QM_RAS_NFE_MBIT_DISABLE,
|
4050 | 4046 | qm->io_base + QM_RAS_NFE_ENABLE);
|
@@ -4488,7 +4484,6 @@ static irqreturn_t qm_abnormal_irq(int irq, void *data)
|
4488 | 4484 | return IRQ_HANDLED;
|
4489 | 4485 | }
|
4490 | 4486 |
|
4491 |
| - |
4492 | 4487 | /**
|
4493 | 4488 | * hisi_qm_dev_shutdown() - Shutdown device.
|
4494 | 4489 | * @pdev: The device will be shutdown.
|
|
0 commit comments