Merge tag 'LA.UM.7.1.r1-16300-sm8150.0' of https://source.codeaurora.…

…org/quic/la/kernel/msm-4.14 into aosp/LA.UM.7.1.r1

"LA.UM.7.1.r1-16300-sm8150.0"

drivers/media/platform/msm/vidc/venus_hfi.c

@@ -4774,7 +4774,8 @@ static void __venus_power_off(struct venus_hfi_device *device, bool axi_reset)
 		disable_irq_nosync(device->hal_data->irq);
 	device->intr_status = 0;
 
-	version = __read_register(device, VIDC_WRAPPER_HW_VERSION);
+	if (axi_reset)
+		version = __read_register(device, VIDC_WRAPPER_HW_VERSION);
 
 	if (axi_reset)
 		version = __read_register(device, VIDC_WRAPPER_HW_VERSION);

drivers/misc/qseecom.c

@@ -6881,9 +6881,11 @@ static int __qseecom_update_qteec_req_buf(struct qseecom_qteec_modfd_req *req,
 	for (i = 0; i < MAX_ION_FD; i++) {
 		if (req->ifd_data[i].fd > 0) {
 			ion_fd = req->ifd_data[i].fd;
-			if ((req->req_len < sizeof(uint32_t)) ||
+			if ((req->req_len <
+				sizeof(struct qseecom_param_memref)) ||
 				(req->ifd_data[i].cmd_buf_offset >
-				req->req_len - sizeof(uint32_t))) {
+				req->req_len -
+				sizeof(struct qseecom_param_memref))) {
 				pr_err("Invalid offset/req len 0x%x/0x%x\n",
 					req->req_len,
 					req->ifd_data[i].cmd_buf_offset);

drivers/pci/pci-driver.c

@@ -855,13 +855,17 @@ static int pci_pm_resume(struct device *dev)
 	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 	int error = 0;
 
+	if (pci_dev->no_d3hot)
+		goto skip_pci_pm_restore;
+
 	/*
 	 * This is necessary for the suspend error path in which resume is
 	 * called without restoring the standard config registers of the device.
 	 */
 	if (pci_dev->state_saved)
 		pci_restore_standard_config(pci_dev);
 
+skip_pci_pm_restore:
 	if (pci_has_legacy_pm_support(pci_dev))
 		return pci_legacy_resume(dev);