Pull SCSI updates from James Bottomley: "This consists of the usual driver updates (ufs, qla2xxx, tcmu, lpfc, hpsa, zfcp, scsi_debug) and minor bug fixes. We also have a huge docbook fix update like most other subsystems and no major update to the core (the few non trivial updates are either minor fixes or removing an unused feature [scsi_sdb_cache])" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (307 commits) scsi: scsi_transport_srp: Sanitize scsi_target_block/unblock sequences scsi: ufs-mediatek: Apply DELAY_AFTER_LPM quirk to Micron devices scsi: ufs: Introduce device quirk "DELAY_AFTER_LPM" scsi: virtio-scsi: Correctly handle the case where all LUNs are unplugged scsi: scsi_debug: Implement tur_ms_to_ready parameter scsi: scsi_debug: Fix request sense scsi: lpfc: Fix typo in comment for ULP scsi: ufs-mediatek: Prevent LPM operation on undeclared VCC scsi: iscsi: Do not put host in iscsi_set_flashnode_param() scsi: hpsa: Correct ctrl queue depth scsi: target: tcmu: Make TMR notification optional scsi: target: tcmu: Implement tmr_notify callback scsi: target: tcmu: Fix and simplify timeout handling scsi: target: tcmu: Factor out new helper ring_insert_padding scsi: target: tcmu: Do not queue aborted commands scsi: target: tcmu: Use priv pointer in se_cmd scsi: target: Add tmr_notify backend function scsi: target: Modify core_tmr_abort_task() scsi: target: iscsi: Fix inconsistent debug message scsi: target: iscsi: Fix login error when receiving ...
Showing the changes to include/linux (1 of 221 files). Show all
Unified · Split
| @@ -44,6 +44,13 @@ enum qcom_scm_sec_dev_id { · 43 unmodified lines | ||
| 44 | 44 | QCOM_SCM_ICE_DEV_ID = 20, |
| 45 | 45 | }; |
| 46 | 46 | |
| 47 | +enum qcom_scm_ice_cipher { | |
| 48 | + QCOM_SCM_ICE_CIPHER_AES_128_XTS = 0, | |
| 49 | + QCOM_SCM_ICE_CIPHER_AES_128_CBC = 1, | |
| 50 | + QCOM_SCM_ICE_CIPHER_AES_256_XTS = 3, | |
| 51 | + QCOM_SCM_ICE_CIPHER_AES_256_CBC = 4, | |
| 52 | +}; | |
| 53 | + | |
| 47 | 54 | #define QCOM_SCM_VMID_HLOS 0x3 |
| 48 | 55 | #define QCOM_SCM_VMID_MSS_MSA 0xF |
| 49 | 56 | #define QCOM_SCM_VMID_WLAN 0x18 |
| @@ -88,6 +95,12 @@ extern int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, · 38 unmodified lines | ||
| 88 | 95 | extern int qcom_scm_ocmem_unlock(enum qcom_scm_ocmem_client id, u32 offset, |
| 89 | 96 | u32 size); |
| 90 | 97 | |
| 98 | +extern bool qcom_scm_ice_available(void); | |
| 99 | +extern int qcom_scm_ice_invalidate_key(u32 index); | |
| 100 | +extern int qcom_scm_ice_set_key(u32 index, const u8 *key, u32 key_size, | |
| 101 | + enum qcom_scm_ice_cipher cipher, | |
| 102 | + u32 data_unit_size); | |
| 103 | + | |
| 91 | 104 | extern bool qcom_scm_hdcp_available(void); |
| 92 | 105 | extern int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, |
| 93 | 106 | u32 *resp); |
| @@ -138,6 +151,12 @@ static inline int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, · 44 unmodified lines | ||
| 138 | 151 | static inline int qcom_scm_ocmem_unlock(enum qcom_scm_ocmem_client id, |
| 139 | 152 | u32 offset, u32 size) { return -ENODEV; } |
| 140 | 153 | |
| 154 | +static inline bool qcom_scm_ice_available(void) { return false; } | |
| 155 | +static inline int qcom_scm_ice_invalidate_key(u32 index) { return -ENODEV; } | |
| 156 | +static inline int qcom_scm_ice_set_key(u32 index, const u8 *key, u32 key_size, | |
| 157 | + enum qcom_scm_ice_cipher cipher, | |
| 158 | + u32 data_unit_size) { return -ENODEV; } | |
| 159 | + | |
| 141 | 160 | static inline bool qcom_scm_hdcp_available(void) { return false; } |
| 142 | 161 | static inline int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, |
| 143 | 162 | u32 *resp) { return -ENODEV; } |