diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2024-07-10 22:26:08 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-07-10 22:26:08 -0400 |
| commit | e30618a480cbbfc1f49ec65fea86766141b7a1df (patch) | |
| tree | a9314ca74e8e28496c157dd26d8fdfc5c9ce7f40 /include/ufs | |
| parent | 5e9a522b0779fa67928b7726374e60461e8aa5c5 (diff) | |
| parent | af568c7e8292bd96f5a4f3d81dcc099bcfe7cb73 (diff) | |
| download | lwn-e30618a480cbbfc1f49ec65fea86766141b7a1df.tar.gz lwn-e30618a480cbbfc1f49ec65fea86766141b7a1df.zip | |
Merge patch series "UFS patches for kernel 6.11"
Bart Van Assche <bvanassche@acm.org> says:
Hi Martin,
Please consider this series of UFS driver patches for the next merge window.
Thank you,
Bart.
Link: https://lore.kernel.org/r/20240708211716.2827751-1-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/ufs')
| -rw-r--r-- | include/ufs/ufshcd.h | 13 | ||||
| -rw-r--r-- | include/ufs/ufshci.h | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 049520bcc6c0..52b0b10cca50 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -73,8 +73,8 @@ enum ufs_event_type { * @done: UIC command completion */ struct uic_command { - u32 command; - u32 argument1; + const u32 command; + const u32 argument1; u32 argument2; u32 argument3; int cmd_active; @@ -325,7 +325,9 @@ struct ufs_pwr_mode_info { * @event_notify: called to notify important events * @reinit_notify: called to notify reinit of UFSHCD during max gear switch * @mcq_config_resource: called to configure MCQ platform resources - * @get_hba_mac: called to get vendor specific mac value, mandatory for mcq mode + * @get_hba_mac: reports maximum number of outstanding commands supported by + * the controller. Should be implemented for UFSHCI 4.0 or later + * controllers that are not compliant with the UFSHCI 4.0 specification. * @op_runtime_config: called to config Operation and runtime regs Pointers * @get_outstanding_cqs: called to get outstanding completion queues * @config_esi: called to config Event Specific Interrupt @@ -1133,11 +1135,6 @@ struct ufs_hw_queue { #define MCQ_QCFG_SIZE 0x40 -static inline bool is_mcq_enabled(struct ufs_hba *hba) -{ - return hba->mcq_enabled; -} - static inline unsigned int ufshcd_mcq_opr_offset(struct ufs_hba *hba, enum ufshcd_mcq_opr opr, int idx) { diff --git a/include/ufs/ufshci.h b/include/ufs/ufshci.h index c50f92bf2e1d..38fe97971a65 100644 --- a/include/ufs/ufshci.h +++ b/include/ufs/ufshci.h @@ -67,7 +67,8 @@ enum { /* Controller capability masks */ enum { - MASK_TRANSFER_REQUESTS_SLOTS = 0x0000001F, + MASK_TRANSFER_REQUESTS_SLOTS_SDB = 0x0000001F, + MASK_TRANSFER_REQUESTS_SLOTS_MCQ = 0x000000FF, MASK_NUMBER_OUTSTANDING_RTT = 0x0000FF00, MASK_TASK_MANAGEMENT_REQUEST_SLOTS = 0x00070000, MASK_EHSLUTRD_SUPPORTED = 0x00400000, |