From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Sat, 10 Apr 2021 17:51:19 +0000 (-0700)
Subject: Merge branch 'misc' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=15cc26df65526838f7c56ca6f636d6c565d220d5;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'misc' into for-next

 Conflicts:
	drivers/scsi/ufs/ufshcd.c
---

15cc26df65526838f7c56ca6f636d6c565d220d5
diff --cc drivers/scsi/ufs/ufshcd.c
index a5f3ae3b61700,58d7f264c6649..0625da7a42ee9
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6392,16 -6398,17 +6396,16 @@@ static int __ufshcd_issue_tm_cmd(struc
  	ufshcd_hold(hba, false);
  
  	spin_lock_irqsave(host->host_lock, flags);
 -	task_tag = hba->nutrs + free_slot;
 +	blk_mq_start_request(req);
  
 +	task_tag = req->tag;
- 	treq->req_header.dword_0 |= cpu_to_be32(task_tag);
+ 	treq->upiu_req.req_header.dword_0 |= cpu_to_be32(task_tag);
  
 -	memcpy(hba->utmrdl_base_addr + free_slot, treq, sizeof(*treq));
 -	ufshcd_vops_setup_task_mgmt(hba, free_slot, tm_function);
 +	memcpy(hba->utmrdl_base_addr + task_tag, treq, sizeof(*treq));
 +	ufshcd_vops_setup_task_mgmt(hba, task_tag, tm_function);
  
  	/* send command to the controller */
 -	__set_bit(free_slot, &hba->outstanding_tasks);
 +	__set_bit(task_tag, &hba->outstanding_tasks);
  
  	/* Make sure descriptors are ready before ringing the task doorbell */
  	wmb();