Merge branch 'master' into feature/audio_reset

dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME="vendor-reset"
-PACKAGE_VERSION="0.0.18"
+PACKAGE_VERSION="0.0.19"
 BUILT_MODULE_NAME[0]="${PACKAGE_NAME}"
 MAKE[0]="make KDIR=${kernel_source_dir}"
 CLEAN="make KDIR=${kernel_source_dir} clean"

src/amd/common.c

@@ -84,6 +84,15 @@ int amd_common_pre_reset(struct vendor_reset_dev *dev)
   pci_read_config_word(pdev, PCI_COMMAND, &priv->cfg);
   pci_write_config_word(pdev, PCI_COMMAND, priv->cfg | PCI_COMMAND_MEMORY | PCI_COMMAND_INTX_DISABLE);
 
+  priv->audio_pdev = pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus),
+                                                 pdev->bus->number, 1);
+  if (priv->audio_pdev)
+  {
+    pci_set_power_state(priv->audio_pdev, PCI_D0);
+    pci_clear_master(priv->audio_pdev);
+    pci_save_state(priv->audio_pdev);
+  }
+
   return 0;
 
 err_free:
@@ -96,7 +105,8 @@ int amd_common_post_reset(struct vendor_reset_dev *dev)
   struct amd_vendor_private *priv = amd_private(dev);
   struct pci_dev *pdev = dev->pdev;
 
-  if (priv->mmio) {
+  if (priv->mmio)
+  {
     iounmap(priv->mmio);
     priv->mmio = NULL;
   }
@@ -114,6 +124,14 @@ int amd_common_post_reset(struct vendor_reset_dev *dev)
   }
   pci_write_config_word(pdev, PCI_COMMAND, priv->cfg);
 
+  if (priv->audio_pdev)
+  {
+    pci_restore_state(priv->audio_pdev);
+    pci_set_power_state(priv->audio_pdev, PCI_D3hot);
+    pci_dev_put(priv->audio_pdev);
+    priv->audio_pdev = NULL;
+  }
+
   /* don't try to go to low power if reset failed */
   if (!dev->reset_ret)
     pci_set_power_state(pdev, PCI_D3hot);

src/amd/common.h

@@ -117,6 +117,8 @@ struct amd_vendor_private
 {
   u16 cfg;
 
+  struct pci_dev *audio_pdev;
+
   struct vendor_reset_dev *vdev;
   struct pci_saved_state *saved_state;
   struct amd_fake_dev adev;