| Message ID | 20200107192531.73802-3-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ufs: Let the SCSI core allocate per-command UFS data | expand |
> > > This patch does not change any functionality but makes the next patch in this > series easier to read. > > Cc: Can Guo <cang@codeaurora.org> > Cc: Avri Altman <avri.altman@wdc.com> > Cc: Bean Huo <beanhuo@micron.com> > Cc: Stanley Chu <stanley.chu@mediatek.com> > Cc: Tomas Winkler <tomas.winkler@intel.com> > Cc: Alim Akhtar <alim.akhtar@samsung.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Avri Altman <avri.altman@wdc.com>
Hi Bart On Wed, Jan 8, 2020 at 12:57 AM Bart Van Assche <bvanassche@acm.org> wrote: > > This patch does not change any functionality but makes the next patch in > this series easier to read. > > Cc: Can Guo <cang@codeaurora.org> > Cc: Avri Altman <avri.altman@wdc.com> > Cc: Bean Huo <beanhuo@micron.com> > Cc: Stanley Chu <stanley.chu@mediatek.com> > Cc: Tomas Winkler <tomas.winkler@intel.com> > Cc: Alim Akhtar <alim.akhtar@samsung.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com> > drivers/scsi/ufs/ufshcd.c | 38 ++++++++++++++++++++++---------------- > 1 file changed, 22 insertions(+), 16 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 1b97f2dc0b63..6f55d72e7fdd 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -2364,6 +2364,27 @@ static inline u16 ufshcd_upiu_wlun_to_scsi_wlun(u8 upiu_wlun_id) > return (upiu_wlun_id & ~UFS_UPIU_WLUN_ID) | SCSI_W_LUN_BASE; > } > > +static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i) > +{ > + struct utp_transfer_cmd_desc *cmd_descp = hba->ucdl_base_addr; > + struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr; > + dma_addr_t cmd_desc_element_addr = hba->ucdl_dma_addr + > + i * sizeof(struct utp_transfer_cmd_desc); > + u16 response_offset = offsetof(struct utp_transfer_cmd_desc, > + response_upiu); > + u16 prdt_offset = offsetof(struct utp_transfer_cmd_desc, prd_table); > + > + lrb->utr_descriptor_ptr = utrdlp + i; > + lrb->utrd_dma_addr = hba->utrdl_dma_addr + > + i * sizeof(struct utp_transfer_req_desc); > + lrb->ucd_req_ptr = (struct utp_upiu_req *)(cmd_descp + i); > + lrb->ucd_req_dma_addr = cmd_desc_element_addr; > + lrb->ucd_rsp_ptr = (struct utp_upiu_rsp *)cmd_descp[i].response_upiu; > + lrb->ucd_rsp_dma_addr = cmd_desc_element_addr + response_offset; > + lrb->ucd_prdt_ptr = (struct ufshcd_sg_entry *)cmd_descp[i].prd_table; > + lrb->ucd_prdt_dma_addr = cmd_desc_element_addr + prdt_offset; > +} > + > /** > * ufshcd_queuecommand - main entry point for SCSI requests > * @host: SCSI host pointer > @@ -3385,7 +3406,6 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba) > */ > static void ufshcd_host_memory_configure(struct ufs_hba *hba) > { > - struct utp_transfer_cmd_desc *cmd_descp; > struct utp_transfer_req_desc *utrdlp; > dma_addr_t cmd_desc_dma_addr; > dma_addr_t cmd_desc_element_addr; > @@ -3395,7 +3415,6 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) > int i; > > utrdlp = hba->utrdl_base_addr; > - cmd_descp = hba->ucdl_base_addr; > > response_offset = > offsetof(struct utp_transfer_cmd_desc, response_upiu); > @@ -3431,20 +3450,7 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) > cpu_to_le16(ALIGNED_UPIU_SIZE >> 2); > } > > - hba->lrb[i].utr_descriptor_ptr = (utrdlp + i); > - hba->lrb[i].utrd_dma_addr = hba->utrdl_dma_addr + > - (i * sizeof(struct utp_transfer_req_desc)); > - hba->lrb[i].ucd_req_ptr = > - (struct utp_upiu_req *)(cmd_descp + i); > - hba->lrb[i].ucd_req_dma_addr = cmd_desc_element_addr; > - hba->lrb[i].ucd_rsp_ptr = > - (struct utp_upiu_rsp *)cmd_descp[i].response_upiu; > - hba->lrb[i].ucd_rsp_dma_addr = cmd_desc_element_addr + > - response_offset; > - hba->lrb[i].ucd_prdt_ptr = > - (struct ufshcd_sg_entry *)cmd_descp[i].prd_table; > - hba->lrb[i].ucd_prdt_dma_addr = cmd_desc_element_addr + > - prdt_offset; > + ufshcd_init_lrb(hba, &hba->lrb[i], i); > } > } >
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 1b97f2dc0b63..6f55d72e7fdd 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2364,6 +2364,27 @@ static inline u16 ufshcd_upiu_wlun_to_scsi_wlun(u8 upiu_wlun_id) return (upiu_wlun_id & ~UFS_UPIU_WLUN_ID) | SCSI_W_LUN_BASE; } +static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i) +{ + struct utp_transfer_cmd_desc *cmd_descp = hba->ucdl_base_addr; + struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr; + dma_addr_t cmd_desc_element_addr = hba->ucdl_dma_addr + + i * sizeof(struct utp_transfer_cmd_desc); + u16 response_offset = offsetof(struct utp_transfer_cmd_desc, + response_upiu); + u16 prdt_offset = offsetof(struct utp_transfer_cmd_desc, prd_table); + + lrb->utr_descriptor_ptr = utrdlp + i; + lrb->utrd_dma_addr = hba->utrdl_dma_addr + + i * sizeof(struct utp_transfer_req_desc); + lrb->ucd_req_ptr = (struct utp_upiu_req *)(cmd_descp + i); + lrb->ucd_req_dma_addr = cmd_desc_element_addr; + lrb->ucd_rsp_ptr = (struct utp_upiu_rsp *)cmd_descp[i].response_upiu; + lrb->ucd_rsp_dma_addr = cmd_desc_element_addr + response_offset; + lrb->ucd_prdt_ptr = (struct ufshcd_sg_entry *)cmd_descp[i].prd_table; + lrb->ucd_prdt_dma_addr = cmd_desc_element_addr + prdt_offset; +} + /** * ufshcd_queuecommand - main entry point for SCSI requests * @host: SCSI host pointer @@ -3385,7 +3406,6 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba) */ static void ufshcd_host_memory_configure(struct ufs_hba *hba) { - struct utp_transfer_cmd_desc *cmd_descp; struct utp_transfer_req_desc *utrdlp; dma_addr_t cmd_desc_dma_addr; dma_addr_t cmd_desc_element_addr; @@ -3395,7 +3415,6 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) int i; utrdlp = hba->utrdl_base_addr; - cmd_descp = hba->ucdl_base_addr; response_offset = offsetof(struct utp_transfer_cmd_desc, response_upiu); @@ -3431,20 +3450,7 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) cpu_to_le16(ALIGNED_UPIU_SIZE >> 2); } - hba->lrb[i].utr_descriptor_ptr = (utrdlp + i); - hba->lrb[i].utrd_dma_addr = hba->utrdl_dma_addr + - (i * sizeof(struct utp_transfer_req_desc)); - hba->lrb[i].ucd_req_ptr = - (struct utp_upiu_req *)(cmd_descp + i); - hba->lrb[i].ucd_req_dma_addr = cmd_desc_element_addr; - hba->lrb[i].ucd_rsp_ptr = - (struct utp_upiu_rsp *)cmd_descp[i].response_upiu; - hba->lrb[i].ucd_rsp_dma_addr = cmd_desc_element_addr + - response_offset; - hba->lrb[i].ucd_prdt_ptr = - (struct ufshcd_sg_entry *)cmd_descp[i].prd_table; - hba->lrb[i].ucd_prdt_dma_addr = cmd_desc_element_addr + - prdt_offset; + ufshcd_init_lrb(hba, &hba->lrb[i], i); } }
This patch does not change any functionality but makes the next patch in this series easier to read. Cc: Can Guo <cang@codeaurora.org> Cc: Avri Altman <avri.altman@wdc.com> Cc: Bean Huo <beanhuo@micron.com> Cc: Stanley Chu <stanley.chu@mediatek.com> Cc: Tomas Winkler <tomas.winkler@intel.com> Cc: Alim Akhtar <alim.akhtar@samsung.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/ufs/ufshcd.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-)