cleaups

--- arch/x86/kvm/pmu.c

+++ arch/x86/kvm/pmu.c

@@ -657,24 +675,53 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)

 	return 0;

 }

-/* refresh PMU settings. This function generally is called when underlying

- * settings are changed (such as changes of PMU CPUID by guest VMs), which

- * should rarely happen.

+void kvm_pmu_reset(struct kvm_vcpu *vcpu)

+{

+	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);

+	struct kvm_pmc *pmc;

+	int i;

+

+	pmu->need_cleanup = false;

+

+	bitmap_zero(pmu->reprogram_pmi, X86_PMC_IDX_MAX);

+

+	for_each_set_bit(i, pmu->all_valid_pmc_idx, X86_PMC_IDX_MAX) {

+		pmc = static_call(kvm_x86_pmu_pmc_idx_to_pmc)(pmu, i);

+		if (!pmc)

+			continue;

+

+		pmc_stop_counter(pmc);

+		pmc->counter = 0;

+

+		if (pmc_is_gp(pmc))

+			pmc->eventsel = 0;

+	}

+

+	pmu->fixed_ctr_ctrl = pmu->global_ctrl = pmu->global_status = 0;

+

+	static_call_cond(kvm_x86_pmu_reset)(vcpu);

+}

+

+

+/*

+ * Refresh the PMU configuration for the vCPU, e.g. if userspace changes CPUID

+ * and/or PERF_CAPABILITIES.

  */

 void kvm_pmu_refresh(struct kvm_vcpu *vcpu)

 {

 	if (KVM_BUG_ON(kvm_vcpu_has_run(vcpu), vcpu->kvm))

 		return;

+	/*

+	 * Stop/release all existing counters/events before realizing the new

+	 * vPMU model.

+	 */

+	kvm_pmu_reset(vcpu);

+

 	bitmap_zero(vcpu_to_pmu(vcpu)->all_valid_pmc_idx, X86_PMC_IDX_MAX);

 	static_call(kvm_x86_pmu_refresh)(vcpu);

 }

-void kvm_pmu_reset(struct kvm_vcpu *vcpu)

-{

-	static_call(kvm_x86_pmu_reset)(vcpu);

-}

-

 void kvm_pmu_init(struct kvm_vcpu *vcpu)

 {

 	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);

--- drivers/ata/libata-scsi.c

+++ drivers/ata/libata-scsi.c

@@ -1055,9 +1055,14 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev)

 		 * Ask the sd driver to issue START STOP UNIT on runtime suspend

 		 * and resume and shutdown only. For system level suspend/resume,

 		 * devices power state is handled directly by libata EH.

+		 * Given that disks are always spun up on system resume, also

+		 * make sure that the sd driver forces runtime suspended disks

+		 * to be resumed to correctly reflect the power state of the

+		 * device.

 		 */

-		sdev->manage_runtime_start_stop = true;

-		sdev->manage_shutdown = true;

+		sdev->manage_runtime_start_stop = 1;

+		sdev->manage_shutdown = 1;

+		sdev->force_runtime_start_on_system_start = 1;

 	}

 	/*

--- drivers/bluetooth/hci_vhci.c

+++ drivers/bluetooth/hci_vhci.c

@@ -77,11 +79,10 @@ static int vhci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)

 	memcpy(skb_push(skb, 1), &hci_skb_pkt_type(skb), 1);

-	mutex_lock(&data->open_mutex);

 	skb_queue_tail(&data->readq, skb);

-	mutex_unlock(&data->open_mutex);

-	wake_up_interruptible(&data->read_wait);

+	if (atomic_read(&data->initialized))

+		wake_up_interruptible(&data->read_wait);

 	return 0;

 }

--- drivers/crypto/virtio/virtio_crypto_core.c

+++ drivers/crypto/virtio/virtio_crypto_core.c

@@ -500,12 +503,15 @@ static void virtcrypto_free_unused_reqs(struct virtio_crypto *vcrypto)

 static void virtcrypto_remove(struct virtio_device *vdev)

 {

 	struct virtio_crypto *vcrypto = vdev->priv;

+	int i;

 	dev_info(&vdev->dev, "Start virtcrypto_remove.\n");

 	flush_work(&vcrypto->config_work);

 	if (virtcrypto_dev_started(vcrypto))

 		virtcrypto_dev_stop(vcrypto);

+	for (i = 0; i < vcrypto->max_data_queues; i++)

+		tasklet_kill(&vcrypto->data_vq[i].done_task);

 	virtio_reset_device(vdev);

 	virtcrypto_free_unused_reqs(vcrypto);

 	virtcrypto_clear_crypto_engines(vcrypto);

--- drivers/firewire/sbp2.c

+++ drivers/firewire/sbp2.c

@@ -1519,9 +1519,9 @@ static int sbp2_scsi_slave_configure(struct scsi_device *sdev)

 	sdev->use_10_for_rw = 1;

 	if (sbp2_param_exclusive_login) {

-		sdev->manage_system_start_stop = true;

-		sdev->manage_runtime_start_stop = true;

-		sdev->manage_shutdown = true;

+		sdev->manage_system_start_stop = 1;

+		sdev->manage_runtime_start_stop = 1;

+		sdev->manage_shutdown = 1;

 	}

 	if (sdev->type == TYPE_ROM)