From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753638AbbJNNID (ORCPT ); Wed, 14 Oct 2015 09:08:03 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:45038 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753583AbbJNNH7 (ORCPT ); Wed, 14 Oct 2015 09:07:59 -0400 X-AuditID: cbfee690-f794e6d0000014de-5a-561e53ad7735 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, alim.akhtar@samsung.com, arnd@arndb.de Subject: [PATCH v4 03/11] scsi: ufs: add quirk to contain unconformable utrd field Date: Wed, 14 Oct 2015 18:25:43 +0530 Message-id: <1444827351-24128-4-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1444827351-24128-1-git-send-email-alim.akhtar@samsung.com> References: <1444827351-24128-1-git-send-email-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRmVeSWpSXmKPExsWyRsSkTndtsFyYweUbghYP5m1js2i4GmLx d9Ixdov5R86xWiy/sITJ4v/62ywWl3fNYbPovr6DzWLHwioHTo/fvyYxeuycdZfd4/CPH8we fVtWMXp83iQXwBrFZZOSmpNZllqkb5fAlTHhSzdTwU3pinfHmtkbGL+KdTFyckgImEis+nyA FcIWk7hwbz1bFyMXh5DACkaJfbduMcEU3elqYIdILGWUOPH2IlTVT0aJ21P3glWxCWhL3J2+ BcwWEbCROH/zARNIEbPAIkaJD4/nATkcHMICIRJ3P1qC1LAIqAJteMIOYvMKuEvM37Iaapui RPezCWwgNqeAh8Tc+cfAaoSAatqPTwebKSGwil3i4pomJohBAhLfJh9iAZkvISArsekAM8Qc SYmDK26wTGAUXsDIsIpRNLUguaA4Kb3IRK84Mbe4NC9dLzk/dxMjMPBP/3s2YQfjvQPWhxgF OBiVeHgzVsuGCbEmlhVX5h5iNAXaMJFZSjQ5HxhfeSXxhsZmRhamJqbGRuaWZkrivK+lfgYL CaQnlqRmp6YWpBbFF5XmpBYfYmTi4JRqYBTzt/709WVg9e97m3vlnbntXr5QNatu+mxT+bfX TWfHJv3v/55ssDGTnbn/yMcnaTKVYnbNLNdc2H/HS7T+rZafo/Mj463z//1Kn7jz/l2aw/XM SGN7albS8oq3OyqE+WYFZIY3ntmTa/pa8oae1syrTy/6MHx2nf/vmNKXV417Lfd3OIkkGCqx FGckGmoxFxUnAgCaITUOdwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsVy+t9jAd21wXJhBpM6mS0ezNvGZtFwNcTi 76Rj7Bbzj5xjtVh+YQmTxf/1t1ksLu+aw2bRfX0Hm8WOhVUOnB6/f01i9Ng56y67x+EfP5g9 +rasYvT4vEkugDWqgdEmIzUxJbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJ xSdA1y0zB+geJYWyxJxSoFBAYnGxkr4dpgmhIW66FjCNEbq+IUFwPUYGaCBhDWPGhC/dTAU3 pSveHWtmb2D8KtbFyMkhIWAicaergR3CFpO4cG89WxcjF4eQwFJGiRNvL0I5Pxklbk/dywRS xSagLXF3+hYwW0TARuL8zQdMIEXMAosYJT48ngfkcHAIC4RI3P1oCVLDIqAqse/WE7ANvALu EvO3rGaC2KYo0f1sAhuIzSngITF3/jGwGiGgmvbj05kmMPIuYGRYxSiRWpBcUJyUnmuUl1qu V5yYW1yal66XnJ+7iREcXc+kdzAe3uV+iFGAg1GJhzdjtWyYEGtiWXFl7iFGCQ5mJRHePwZy YUK8KYmVValF+fFFpTmpxYcYTYEOm8gsJZqcD4z8vJJ4Q2MTc1NjU0sTCxMzSyVx3huHGMKE BNITS1KzU1MLUotg+pg4OKUaGNtvyniFHp8prawkeuLPMifGHYsefNH4qfy/yKWbV3Z/k+Kr /CfVF9gjVI4oLL6zO/erk6sSt76BpmZ9sPrUvphjpucCbz6LiHOMO2li8Fn9yNp9X8MWmW9R 55HjjbtabeC2K+uDovqGLg/dGfXScbm/1aR9l0+TU5+tWy59V7fwcZxspNJzJZbijERDLeai 4kQAxJ5LwcQCAAA= 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 131c72038bf8..587a9c8fbfe9 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 2570d9477b37..6cd542a803d5 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -467,6 +467,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