diff options
| author | Martin K. Petersen <[email protected]> | 2023-09-27 11:14:07 -0400 |
|---|---|---|
| committer | Martin K. Petersen <[email protected]> | 2023-09-27 11:14:07 -0400 |
| commit | d15dbf000153c997e07bdebb87e24ca150eab917 (patch) | |
| tree | b4c422f6caaf5b79767ef80c2c221fe369f6d360 /include | |
| parent | f3f50c78649cb167b5b1c567090d89824da84b2b (diff) | |
| parent | 00d2fa28da0aa371ad215e92ebf5297c0e7d4861 (diff) | |
Merge patch series "UFS core patches"
Bart Van Assche <[email protected]> says:
Hi Martin,
Please consider these UFS core patches for the next merge window.
Thanks,
Bart.
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Martin K. Petersen <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ufs/ufs.h | 3 | ||||
| -rw-r--r-- | include/ufs/ufshcd.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/ufs/ufs.h b/include/ufs/ufs.h index 0cced88f4531..e77ab1786856 100644 --- a/include/ufs/ufs.h +++ b/include/ufs/ufs.h @@ -98,9 +98,10 @@ enum upiu_response_transaction { UPIU_TRANSACTION_REJECT_UPIU = 0x3F, }; -/* UPIU Read/Write flags */ +/* UPIU Read/Write flags. See also table "UPIU Flags" in the UFS standard. */ enum { UPIU_CMD_FLAGS_NONE = 0x00, + UPIU_CMD_FLAGS_CP = 0x04, UPIU_CMD_FLAGS_WRITE = 0x20, UPIU_CMD_FLAGS_READ = 0x40, }; diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 7d07b256e906..e0d6590d163d 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -28,6 +28,7 @@ #define UFSHCD "ufshcd" +struct scsi_device; struct ufs_hba; enum dev_cmd_type { @@ -371,6 +372,7 @@ struct ufs_hba_variant_ops { int (*get_outstanding_cqs)(struct ufs_hba *hba, unsigned long *ocqs); int (*config_esi)(struct ufs_hba *hba); + void (*config_scsi_dev)(struct scsi_device *sdev); }; /* clock gating state */ @@ -597,11 +599,6 @@ enum ufshcd_quirks { UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING = 1 << 13, /* - * Align DMA SG entries on a 4 KiB boundary. - */ - UFSHCD_QUIRK_4KB_DMA_ALIGNMENT = 1 << 14, - - /* * This quirk needs to be enabled if the host controller does not * support UIC command */ |