diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-08-20 14:48:42 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-08-20 14:48:42 -0700 |
| commit | a7e8a977f049e7dbf96dc58523c31c5731e1dfc5 (patch) | |
| tree | 5d017fab1762ef00cefb4284de5e74ef59320679 /include | |
| parent | 04d749a9dbd5bd3d50c28d691f34c42954e769d4 (diff) | |
| parent | 2a61e30d4462de293371173af5c153e0ea195f0e (diff) | |
Merge 2a61e30d4462de293371173af5c153e0ea195f0e on remote branch
Change-Id: Ia7621e339841d10bbad7aba0fc2a8e096e00c314
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/vmw_vmci_defs.h | 11 | ||||
| -rw-r--r-- | include/soc/qcom/icnss.h | 4 | ||||
| -rw-r--r-- | include/uapi/scsi/ufs/ufs.h | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/include/linux/vmw_vmci_defs.h b/include/linux/vmw_vmci_defs.h index 65ac54c61c18..7023432013e8 100644 --- a/include/linux/vmw_vmci_defs.h +++ b/include/linux/vmw_vmci_defs.h @@ -75,9 +75,18 @@ enum { /* * A single VMCI device has an upper limit of 128MB on the amount of - * memory that can be used for queue pairs. + * memory that can be used for queue pairs. Since each queue pair + * consists of at least two pages, the memory limit also dictates the + * number of queue pairs a guest can create. */ #define VMCI_MAX_GUEST_QP_MEMORY (128 * 1024 * 1024) +#define VMCI_MAX_GUEST_QP_COUNT (VMCI_MAX_GUEST_QP_MEMORY / PAGE_SIZE / 2) + +/* + * There can be at most PAGE_SIZE doorbells since there is one doorbell + * per byte in the doorbell bitmap page. + */ +#define VMCI_MAX_GUEST_DOORBELL_COUNT PAGE_SIZE /* * Queues with pre-mapped data pages must be small, so that we don't pin diff --git a/include/soc/qcom/icnss.h b/include/soc/qcom/icnss.h index 4de4cd5e89dc..716e28054e60 100644 --- a/include/soc/qcom/icnss.h +++ b/include/soc/qcom/icnss.h @@ -56,6 +56,8 @@ struct icnss_driver_ops { int (*suspend_noirq)(struct device *dev); int (*resume_noirq)(struct device *dev); int (*uevent)(struct device *dev, struct icnss_uevent_data *uevent); + int (*idle_shutdown)(struct device *dev); + int (*idle_restart)(struct device *dev); }; @@ -159,4 +161,6 @@ extern u8 *icnss_get_wlan_mac_address(struct device *dev, uint32_t *num); extern int icnss_trigger_recovery(struct device *dev); extern void icnss_block_shutdown(bool status); extern bool icnss_is_pdr(void); +extern int icnss_idle_restart(struct device *dev); +extern int icnss_idle_shutdown(struct device *dev); #endif /* _ICNSS_WLAN_H_ */ diff --git a/include/uapi/scsi/ufs/ufs.h b/include/uapi/scsi/ufs/ufs.h index cd82b760bd92..9da634db9e9f 100644 --- a/include/uapi/scsi/ufs/ufs.h +++ b/include/uapi/scsi/ufs/ufs.h @@ -51,7 +51,8 @@ enum desc_idn { QUERY_DESC_IDN_RFU_1 = 0x6, QUERY_DESC_IDN_GEOMETRY = 0x7, QUERY_DESC_IDN_POWER = 0x8, - QUERY_DESC_IDN_RFU_2 = 0x9, + QUERY_DESC_IDN_HEALTH = 0x9, + QUERY_DESC_IDN_RFU_2 = 0x0A, QUERY_DESC_IDN_MAX, }; |