leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: ufs: introduce UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk

Browse Source 
Some UFS host controllers may think granularities of PRDT length and
offset as bytes, not double words.

Signed-off-by: Kiwoong Kim <kwmad.kim@samsung.com>
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Kiwoong Kim 2016-11-22 17:06:59 +09:00 committed by Martin K. Petersen
parent a6854dff63
commit 75b1cc4ad6
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1129,7 +1129,7 @@ ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
* *
* Returns 0 in case of success, non-zero value in case of failure * Returns 0 in case of success, non-zero value in case of failure
*/ */
static int ufshcd_map_sg(struct ufshcd_lrb *lrbp) static int ufshcd_map_sg(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
{ {
struct ufshcd_sg_entry *prd_table; struct ufshcd_sg_entry *prd_table;
struct scatterlist *sg; struct scatterlist *sg;
@ -1143,8 +1143,13 @@ static int ufshcd_map_sg(struct ufshcd_lrb *lrbp)
return sg_segments; return sg_segments;
if (sg_segments) { if (sg_segments) {
lrbp->utr_descriptor_ptr->prd_table_length = if (hba->quirks & UFSHCD_QUIRK_PRDT_BYTE_GRAN)
cpu_to_le16((u16) (sg_segments)); lrbp->utr_descriptor_ptr->prd_table_length =
cpu_to_le16((u16)(sg_segments *
sizeof(struct ufshcd_sg_entry)));
else
lrbp->utr_descriptor_ptr->prd_table_length =
cpu_to_le16((u16) (sg_segments));
prd_table = (struct ufshcd_sg_entry *)lrbp->ucd_prdt_ptr; prd_table = (struct ufshcd_sg_entry *)lrbp->ucd_prdt_ptr;
@ -1507,7 +1512,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
ufshcd_comp_scsi_upiu(hba, lrbp); ufshcd_comp_scsi_upiu(hba, lrbp);
err = ufshcd_map_sg(lrbp); err = ufshcd_map_sg(hba, lrbp);
if (err) { if (err) {
lrbp->cmd = NULL; lrbp->cmd = NULL;
clear_bit_unlock(tag, &hba->lrb_in_use); clear_bit_unlock(tag, &hba->lrb_in_use);
@ -2368,12 +2373,21 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba)
cpu_to_le32(upper_32_bits(cmd_desc_element_addr)); cpu_to_le32(upper_32_bits(cmd_desc_element_addr));
/* Response upiu and prdt offset should be in double words */ /* Response upiu and prdt offset should be in double words */
utrdlp[i].response_upiu_offset = if (hba->quirks & UFSHCD_QUIRK_PRDT_BYTE_GRAN) {
utrdlp[i].response_upiu_offset =
cpu_to_le16(response_offset);
utrdlp[i].prd_table_offset =
cpu_to_le16(prdt_offset);
utrdlp[i].response_upiu_length =
cpu_to_le16(ALIGNED_UPIU_SIZE);
} else {
utrdlp[i].response_upiu_offset =
cpu_to_le16((response_offset >> 2)); cpu_to_le16((response_offset >> 2));
utrdlp[i].prd_table_offset = utrdlp[i].prd_table_offset =
cpu_to_le16((prdt_offset >> 2)); cpu_to_le16((prdt_offset >> 2));
utrdlp[i].response_upiu_length = utrdlp[i].response_upiu_length =
cpu_to_le16(ALIGNED_UPIU_SIZE >> 2); cpu_to_le16(ALIGNED_UPIU_SIZE >> 2);
}
hba->lrb[i].utr_descriptor_ptr = (utrdlp + i); hba->lrb[i].utr_descriptor_ptr = (utrdlp + i);
hba->lrb[i].ucd_req_ptr = hba->lrb[i].ucd_req_ptr =

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

@ -485,6 +485,12 @@ struct ufs_hba {
*/ */
#define UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION UFS_BIT(5) #define UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION UFS_BIT(5)
/*
* This quirk needs to be enabled if the host contoller regards
* resolution of the values of PRDTO and PRDTL in UTRD as byte.
*/
#define UFSHCD_QUIRK_PRDT_BYTE_GRAN UFS_BIT(7)
unsigned int quirks; /* Deviations from standard UFSHCI spec. */ unsigned int quirks; /* Deviations from standard UFSHCI spec. */
/* Device deviations from standard UFS device spec. */ /* Device deviations from standard UFS device spec. */