From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756552AbbJAIVB (ORCPT ); Thu, 1 Oct 2015 04:21:01 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:45405 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755509AbbJAIU5 (ORCPT ); Thu, 1 Oct 2015 04:20:57 -0400 X-AuditID: cbfee68f-f796f6d0000014a4-4d-560cece7f7d5 From: Alim Akhtar To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: JBottomley@odin.com, vinholikatti@gmail.com, amit.daniel@samsung.com, essuuj@gmail.com, devicetree@vger.kernel.org Subject: [PATCH v3 03/13] scsi: ufs: add quirk to contain unconformable utrd field Date: Thu, 01 Oct 2015 13:39:20 +0530 Message-id: <1443686970-28104-4-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1443686970-28104-1-git-send-email-alim.akhtar@samsung.com> References: <1443686970-28104-1-git-send-email-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsWyRsSkSvf5G54wg+Nt2hYNV0Ms5h85x2qx /MISJov/62+zWFzeNYfNovv6DjaLHQurHNg9ds66y+5x+McPZo++LasYPT5vkgtgieKySUnN ySxLLdK3S+DKaHh9kKXgqHRFy9o5rA2MD8W6GDk5JARMJPZtmMQKYYtJXLi3nq2LkYtDSGAF o8TG3/uZYIq6ls5lhkjMYpRoOvKeFcL5ySjx7dN8NpAqNgFtibvTt4B1iAjYSJy/+QDMZhao kLh1ZgILiC0sECLRe3keI4jNIqAq8e3VAzCbV8Bd4s/xZhaIbYoS3c8mAM3k4OAU8JD4tigU JCwEVPLh7nJGkL0SApPZJV7un8QGMUdA4tvkQywg9RICshKbDjBDjJGUOLjiBssERuEFjAyr GEVTC5ILipPSi4z1ihNzi0vz0vWS83M3MQID+/S/Z/07GO8esD7EKMDBqMTDK5HOEybEmlhW XJl7iNEUaMNEZinR5Hxg/OSVxBsamxlZmJqYGhuZW5opifMulPoZLCSQnliSmp2aWpBaFF9U mpNafIiRiYNTqoFRSkHbbMXzYuHz5vMjHU59qV9aqsv/fW3ZhrUzVd8tPMp12mKuyTQHvrYn ItcDSs6V1k53vOvj43/tynfPxdcColpefk7/aWe97WHPKUXVQPWilHnzV/394J6ya5HZSpHT 7lOPn2r5n3byxZ6GZj63Ld7rvpixV/vNiQl6/ix/l6NCkJX5r85VSizFGYmGWsxFxYkA2N6u JWcCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t9jQd3nb3jCDPrOy1s0XA2xmH/kHKvF 8gtLmCz+r7/NYnF51xw2i+7rO9gsdiyscmD32DnrLrvH4R8/mD36tqxi9Pi8SS6AJaqB0SYj NTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH6AAlhbLEnFKg UEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY0bD64MsBUelK1rWzmFtYHwo1sXIySEh YCLRtXQuM4QtJnHh3nq2LkYuDiGBWYwSTUfes0I4Pxklvn2azwZSxSagLXF3+hYmEFtEwEbi /M0HYDazQIXErTMTWEBsYYEQid7L8xhBbBYBVYlvrx6A2bwC7hJ/jjezQGxTlOh+NgFoJgcH p4CHxLdFoSBhIaCSD3eXM05g5F3AyLCKUSK1ILmgOCk91ygvtVyvODG3uDQvXS85P3cTIzh6 nknvYDy8y/0QowAHoxIP74EUnjAh1sSy4srcQ4wSHMxKIrwH7wGFeFMSK6tSi/Lji0pzUosP MZoC3TWRWUo0OR8Y2Xkl8YbGJuamxqaWJhYmZpZK4rw3DjGECQmkJ5akZqemFqQWwfQxcXBK NTBa6hUcNWVSUC6yqFwaHtvz2zfkZ5S25aHLLwvbm3RizwaEnw8NVUlk7zq3X8uzMOCO1n3+ 2N51nwOs3DkFdE9f1BP/l/ddiLm+gpeDtctrw5l1SgWLhQ8tsT5g6Tx/y7UL5rNiAmbdu8Yq defaFK46mwv3H//UXhCXfsTuUdCq7NLzG+9UJSmxFGckGmoxFxUnAgDreNLjtAIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Seungwon Jeon UTRD(UTP Transfer Request Descriptor)'s field such as offset/length, especially response's has DWORD expression. This quirk can be specified for host controller not to conform standard. Signed-off-by: Seungwon Jeon Signed-off-by: Alim Akhtar --- drivers/scsi/ufs/ufshcd.c | 28 +++++++++++++++++++++------- drivers/scsi/ufs/ufshcd.h | 7 +++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index b0ade73..90f76e7 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1009,7 +1009,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 */ -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 scatterlist *sg; @@ -1023,8 +1023,13 @@ static int ufshcd_map_sg(struct ufshcd_lrb *lrbp) return sg_segments; if (sg_segments) { - lrbp->utr_descriptor_ptr->prd_table_length = - cpu_to_le16((u16) (sg_segments)); + if (hba->quirks & UFSHCI_QUIRK_BYTE_ALIGN_UTRD) + 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; @@ -1347,7 +1352,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) /* form UPIU before issuing the command */ ufshcd_compose_upiu(hba, lrbp); - err = ufshcd_map_sg(lrbp); + err = ufshcd_map_sg(hba, lrbp); if (err) { lrbp->cmd = NULL; clear_bit_unlock(tag, &hba->lrb_in_use); @@ -2034,13 +2039,22 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) utrdlp[i].command_desc_base_addr_hi = cpu_to_le32(upper_32_bits(cmd_desc_element_addr)); + if (hba->quirks & UFSHCI_QUIRK_BYTE_ALIGN_UTRD) { + 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 { /* Response upiu and prdt offset should be in double words */ - utrdlp[i].response_upiu_offset = + utrdlp[i].response_upiu_offset = cpu_to_le16((response_offset >> 2)); - utrdlp[i].prd_table_offset = + utrdlp[i].prd_table_offset = cpu_to_le16((prdt_offset >> 2)); - utrdlp[i].response_upiu_length = + utrdlp[i].response_upiu_length = cpu_to_le16(ALIGNED_UPIU_SIZE >> 2); + } hba->lrb[i].utr_descriptor_ptr = (utrdlp + i); hba->lrb[i].ucd_req_ptr = diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index c40a0e7..2f96abe 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -459,6 +459,13 @@ struct ufs_hba { */ #define UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION UFS_BIT(5) + /* + * This quirk needs to be enabled if host controller doesn't conform + * with UTRD. Some fields such as offset/length might not be in double + * word, but in byte. + */ + #define UFSHCI_QUIRK_BYTE_ALIGN_UTRD UFS_BIT(6) + unsigned int quirks; /* Deviations from standard UFSHCI spec. */ wait_queue_head_t tm_wq; -- 1.7.10.4