>ufshcd_prepare_req_desc_hdr maybe pack all your additions to ufshcd_prepare_req_desc_hdr into a ufshcd_prepare_req_desc_hdr_crypto helper, so the ifdefs can be avoided? >ufshcd_compose_dev_cmd same goes to ufshcd_compose_dev_cmd and ufshcd_issue_devman_upiu_cmd - maybe just call ufshcd_prepare_lrbp_crypto (with some minor changes) instead of those ifdefs?
