| From 06cb4f03fc67eb6e8ae0dd32d77b1735ab4d0386 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 16 Apr 2021 11:44:57 +0800 |
| Subject: scsi: arcmsr: Fix the wrong CDB payload report to IOP |
| |
| From: ching Huang <ching2048@areca.com.tw> |
| |
| [ Upstream commit 5b8644968d2ca85abb785e83efec36934974b0c2 ] |
| |
| This patch fixes the wrong CDB payload report to IOP. |
| |
| Link: https://lore.kernel.org/r/d2c97df3c817595c6faf582839316209022f70da.camel@areca.com.tw |
| Signed-off-by: ching Huang <ching2048@areca.com.tw> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/arcmsr/arcmsr_hba.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c |
| index 4b79661275c9..930972cda38c 100644 |
| --- a/drivers/scsi/arcmsr/arcmsr_hba.c |
| +++ b/drivers/scsi/arcmsr/arcmsr_hba.c |
| @@ -1923,8 +1923,12 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr |
| |
| if (ccb->arc_cdb_size <= 0x300) |
| arc_cdb_size = (ccb->arc_cdb_size - 1) >> 6 | 1; |
| - else |
| - arc_cdb_size = (((ccb->arc_cdb_size + 0xff) >> 8) + 2) << 1 | 1; |
| + else { |
| + arc_cdb_size = ((ccb->arc_cdb_size + 0xff) >> 8) + 2; |
| + if (arc_cdb_size > 0xF) |
| + arc_cdb_size = 0xF; |
| + arc_cdb_size = (arc_cdb_size << 1) | 1; |
| + } |
| ccb_post_stamp = (ccb->smid | arc_cdb_size); |
| writel(0, &pmu->inbound_queueport_high); |
| writel(ccb_post_stamp, &pmu->inbound_queueport_low); |
| -- |
| 2.30.2 |
| |
