shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: scsi: ufs: core: Micro-optimize ufshcd_map_sg()

Browse Source 
Replace two cpu_to_le32() calls by a single cpu_to_le64() call.

Additionally, issue a warning if the length of an scatter gather list
element exceeds what is allowed by the UFSHCI specification.

Link: https://lore.kernel.org/r/20211020214024.2007615-11-bvanassche@acm.org
Acked-by: Avri Altman <Avri.Altman@wdc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Bug: 234653003
(cherry picked from commit 1ea7d80263)
Change-Id: I09b9ec56ae44108306b4cf53a42aac5f90602600
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Bart Van Assche
2021-10-20 14:40:24 -07:00
committed by Bart Van Assche
parent 1f73097a23
commit fd5885d25a
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/ufs/ufshcd.c
View File

@@ -2446,12 +2446,19 @@ static int ufshcd_map_sg(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
prd = lrbp->ucd_prdt_ptr;
scsi_for_each_sg(cmd, sg, sg_segments, i) {
prd->size =
cpu_to_le32(((u32) sg_dma_len(sg))-1);
prd->base_addr =
cpu_to_le32(lower_32_bits(sg->dma_address));
prd->upper_addr =
cpu_to_le32(upper_32_bits(sg->dma_address));
const unsigned int len = sg_dma_len(sg);
/*
* From the UFSHCI spec: "Data Byte Count (DBC): A '0'
* based value that indicates the length, in bytes, of
* the data block. A maximum of length of 256KB may
* exist for any entry. Bits 1:0 of this field shall be
* 11b to indicate Dword granularity. A value of '3'
* indicates 4 bytes, '7' indicates 8 bytes, etc."
*/
WARN_ONCE(len > 256 * 1024, "len = %#x\n", len);
prd->size = cpu_to_le32(len - 1);
prd->addr = cpu_to_le64(sg->dma_address);
prd->reserved = 0;
prd = (void *)prd + hba->sg_entry_size;
}

6
drivers/scsi/ufs/ufshci.h
View File

@@ -416,14 +416,12 @@ enum {
/**
* struct ufshcd_sg_entry - UFSHCI PRD Entry
* @base_addr: Lower 32bit physical address DW-0
* @upper_addr: Upper 32bit physical address DW-1
* @addr: Physical address; DW-0 and DW-1.
* @reserved: Reserved for future use DW-2
* @size: size of physical segment DW-3
*/
struct ufshcd_sg_entry {
__le32 base_addr;
__le32 upper_addr;
__le64 addr;
__le32 reserved;
__le32 size;
/*