From 6875092f2fe7001b38d3a7bc46533fd71343fcb1 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Wed, 13 Jan 2021 14:06:40 +1100 Subject: [PATCH] [core] revert commits that are not quite ready yet This reverts commit 30ffca808b2452327af2141061e067b1aa03ba29. This reverts commit 623fa20705d10ff8f3ffed56895cebc7ce8106f9. --- dkms.conf | 2 +- src/amd/common.c | 20 +------------ src/amd/common.h | 78 +++++++++++++++++++++++------------------------- 3 files changed, 40 insertions(+), 60 deletions(-) diff --git a/dkms.conf b/dkms.conf index e981d84..15de063 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="vendor-reset" -PACKAGE_VERSION="0.0.19" +PACKAGE_VERSION="0.0.18" BUILT_MODULE_NAME[0]="${PACKAGE_NAME}" MAKE[0]="make KDIR=${kernel_source_dir}" CLEAN="make KDIR=${kernel_source_dir} clean" diff --git a/src/amd/common.c b/src/amd/common.c index a888e5b..57563df 100644 --- a/src/amd/common.c +++ b/src/amd/common.c @@ -84,15 +84,6 @@ 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: @@ -105,8 +96,7 @@ 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; } @@ -124,14 +114,6 @@ 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); diff --git a/src/amd/common.h b/src/amd/common.h index 57b855c..4c8dd66 100644 --- 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,8 +117,6 @@ 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;