Bump MODULE_VERSION to 0.1.1

MODULE_VERSION was still set to the old version of 0.1.0, which would give out a warning when DKIM performed version sanity checks.
[core] add support for linux 5.11
2026-03-28 13:12:43 +01:00 · 2021-10-19 18:32:24 -05:00 · 2021-02-15 17:29:48 -06:00 · 2021-01-23 12:17:09 -06:00 · 2021-01-23 12:13:35 -06:00 · 2021-01-23 11:56:27 -06:00
5 changed files with 69 additions and 40 deletions
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="vendor-reset"
-PACKAGE_VERSION="0.0.18"
+PACKAGE_VERSION="0.1.1"
 BUILT_MODULE_NAME[0]="${PACKAGE_NAME}"
 MAKE[0]="make KDIR=${kernel_source_dir}"
 CLEAN="make KDIR=${kernel_source_dir} clean"
--- a/src/amd/common.c
+++ b/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);
--- a/src/amd/common.h
+++ b/src/amd/common.h
@@ -30,52 +30,52 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #define DRM_DEBUG(fmt, args...) pr_debug("vendor-reset-drm: " fmt, ##args)
 static inline bool drm_can_sleep(void)
 {
-	if (in_atomic() || in_dbg_master() || irqs_disabled())
-		return false;
-	return true;
+  if (in_atomic() || in_dbg_master() || irqs_disabled())
+    return false;
+  return true;
 }

-#define RREG32(reg)                                                          \
-  ({                                                                         \
-    u32 __out;                                                               \
-    if (((reg) * 4) < adev_to_amd_private(adev)->mmio_size)                        \
-      __out = readl(adev_to_amd_private(adev)->mmio + (reg));                \
-    else                                                                     \
-    {                                                                        \
-      writel(((reg) * 4), adev_to_amd_private(adev)->mmio + mmMM_INDEX);           \
-      __out = readl(adev_to_amd_private(adev)->mmio + mmMM_DATA);            \
-    }                                                                        \
-    __out;                                                                   \
+#define RREG32(reg)                                                    \
+  ({                                                                   \
+    u32 __out;                                                         \
+    if (((reg)*4) < adev_to_amd_private(adev)->mmio_size)              \
+      __out = readl(adev_to_amd_private(adev)->mmio + (reg));          \
+    else                                                               \
+    {                                                                  \
+      writel(((reg)*4), adev_to_amd_private(adev)->mmio + mmMM_INDEX); \
+      __out = readl(adev_to_amd_private(adev)->mmio + mmMM_DATA);      \
+    }                                                                  \
+    __out;                                                             \
  })

-#define WREG32(reg, v)                                                       \
-  do                                                                         \
-  {                                                                          \
-    if (((reg) * 4) < adev_to_amd_private(adev)->mmio_size)                        \
-      writel(v, adev_to_amd_private(adev)->mmio + (reg));                    \
-    else                                                                     \
-    {                                                                        \
-      writel(((reg) * 4), adev_to_amd_private(adev)->mmio + mmMM_INDEX);           \
-      writel(v, adev_to_amd_private(adev)->mmio + mmMM_DATA);                \
-    }                                                                        \
+#define WREG32(reg, v)                                                 \
+  do                                                                   \
+  {                                                                    \
+    if (((reg)*4) < adev_to_amd_private(adev)->mmio_size)              \
+      writel(v, adev_to_amd_private(adev)->mmio + (reg));              \
+    else                                                               \
+    {                                                                  \
+      writel(((reg)*4), adev_to_amd_private(adev)->mmio + mmMM_INDEX); \
+      writel(v, adev_to_amd_private(adev)->mmio + mmMM_DATA);          \
+    }                                                                  \
  } while (0)

-#define WREG32_PCIE(reg, v)                                                 \
-  do                                                                        \
-  {                                                                         \
-    WREG32(mmPCIE_INDEX2, reg);                                             \
-    (void)RREG32(mmPCIE_INDEX2);                                            \
-    WREG32(mmPCIE_DATA2, v);                                                \
-    (void)RREG32(mmPCIE_DATA2);                                             \
+#define WREG32_PCIE(reg, v)      \
+  do                             \
+  {                              \
+    WREG32(mmPCIE_INDEX2, reg);  \
+    (void)RREG32(mmPCIE_INDEX2); \
+    WREG32(mmPCIE_DATA2, v);     \
+    (void)RREG32(mmPCIE_DATA2);  \
  } while (0)

-#define RREG32_PCIE(reg)                                                    \
-  ({                                                                        \
-    u32 __tmp_read;                                                         \
-    WREG32(mmPCIE_INDEX2, reg);                                             \
-    (void)RREG32(mmPCIE_INDEX2);                                            \
-    __tmp_read = RREG32(mmPCIE_DATA2);                                      \
-    __tmp_read;                                                             \
+#define RREG32_PCIE(reg)               \
+  ({                                   \
+    u32 __tmp_read;                    \
+    WREG32(mmPCIE_INDEX2, reg);        \
+    (void)RREG32(mmPCIE_INDEX2);       \
+    __tmp_read = RREG32(mmPCIE_DATA2); \
+    __tmp_read;                        \
  })

 /* KIQ is only used for SRIOV accesses, we are not targetting these devices so
@@ -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;
--- a/src/ftrace.c
+++ b/src/ftrace.c
@@ -22,6 +22,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <linux/ftrace.h>
 #include <linux/kprobes.h>
 #include <linux/pci.h>
+#include <linux/version.h>

 #include "ftrace.h"

@@ -48,8 +49,15 @@ static int resolve_hook_address(struct ftrace_hook *hook)
  return 0;
 }

+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
 static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct pt_regs *regs)
 {
+#else
+static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs)
+{
+  struct pt_regs *regs;
+  regs = ftrace_get_regs(fregs);
+#endif
  struct ftrace_hook *hook = to_ftrace_hook(ops);

  if (!within_module(parent_ip, THIS_MODULE))
--- a/src/module.c
+++ b/src/module.c
@@ -53,3 +53,4 @@ module_exit(vendor_reset_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Geoffrey McRae <geoff@hostfission.com>");
 MODULE_AUTHOR("Adam Madsen <adam@ajmadsen.com>");
+MODULE_VERSION("0.1.1");
Author	SHA1	Message	Date
dev-sda1	7d43285a50	Bump MODULE_VERSION to 0.1.1 MODULE_VERSION was still set to the old version of 0.1.0, which would give out a warning when DKIM performed version sanity checks.	2021-10-19 18:32:24 -05:00
Térence Clastres	225a49a409	[core] add support for linux 5.11 This approach maintains compatibility with previous kernel versions. Thanks to @justinkb for finding the commit that broke it (torvalds/linux@d19ad07).	2021-02-15 17:29:48 -06:00
Adam Madsen	e16c0d7931	[core] remove unneeded line in dkms.conf	2021-01-23 12:17:09 -06:00
Adam Madsen	547aec42c4	[core] add MODULE_VERSION(), bump DKMS version for first release	2021-01-23 12:13:35 -06:00
Adam Madsen	24c9fc5473	[core] dkms: bump version	2021-01-23 11:56:27 -06:00
Adam Madsen	fc694db073	[amd] audio: Preserve PCI config space for audio device	2021-01-23 11:56:27 -06:00