RepoMirrors
/
vendor-reset
mirror of https://github.com/gnif/vendor-reset
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[core] revert commits that are not quite ready yet 

This reverts commit 30ffca808b.
This reverts commit 623fa20705.
This commit is contained in:
Geoffrey McRae 2021-01-13 14:06:40 +11:00
parent 30ffca808b
commit 6875092f2f
3 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dkms.conf
View File

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

20
src/amd/common.c
View File

@ -84,15 +84,6 @@ int amd_common_pre_reset(struct vendor_reset_dev *dev)
pci_read_config_word(pdev, PCI_COMMAND, &priv->cfg); 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); 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; return 0;
err_free: 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 amd_vendor_private *priv = amd_private(dev);
struct pci_dev *pdev = dev->pdev; struct pci_dev *pdev = dev->pdev;
if (priv->mmio) if (priv->mmio) {
{
iounmap(priv->mmio); iounmap(priv->mmio);
priv->mmio = NULL; 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); 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 */ /* don't try to go to low power if reset failed */
if (!dev->reset_ret) if (!dev->reset_ret)
pci_set_power_state(pdev, PCI_D3hot); pci_set_power_state(pdev, PCI_D3hot);

78
src/amd/common.h
View File

@ -30,52 +30,52 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#define DRM_DEBUG(fmt, args...) pr_debug("vendor-reset-drm: " fmt, ##args) #define DRM_DEBUG(fmt, args...) pr_debug("vendor-reset-drm: " fmt, ##args)
static inline bool drm_can_sleep(void) static inline bool drm_can_sleep(void)
{ {
if (in_atomic() || in_dbg_master() || irqs_disabled()) if (in_atomic() || in_dbg_master() || irqs_disabled())
return false; return false;
return true; return true;
} }
#define RREG32(reg) \ #define RREG32(reg) \
({ \ ({ \
u32 __out; \ u32 __out; \
if (((reg)*4) < adev_to_amd_private(adev)->mmio_size) \ if (((reg) * 4) < adev_to_amd_private(adev)->mmio_size) \
__out = readl(adev_to_amd_private(adev)->mmio + (reg)); \ __out = readl(adev_to_amd_private(adev)->mmio + (reg)); \
else \ else \
{ \ { \
writel(((reg)*4), adev_to_amd_private(adev)->mmio + mmMM_INDEX); \ writel(((reg) * 4), adev_to_amd_private(adev)->mmio + mmMM_INDEX); \
__out = readl(adev_to_amd_private(adev)->mmio + mmMM_DATA); \ __out = readl(adev_to_amd_private(adev)->mmio + mmMM_DATA); \
} \ } \
__out; \ __out; \
}) })
#define WREG32(reg, v) \ #define WREG32(reg, v) \
do \ do \
{ \ { \
if (((reg)*4) < adev_to_amd_private(adev)->mmio_size) \ if (((reg) * 4) < adev_to_amd_private(adev)->mmio_size) \
writel(v, adev_to_amd_private(adev)->mmio + (reg)); \ writel(v, adev_to_amd_private(adev)->mmio + (reg)); \
else \ else \
{ \ { \
writel(((reg)*4), adev_to_amd_private(adev)->mmio + mmMM_INDEX); \ writel(((reg) * 4), adev_to_amd_private(adev)->mmio + mmMM_INDEX); \
writel(v, adev_to_amd_private(adev)->mmio + mmMM_DATA); \ writel(v, adev_to_amd_private(adev)->mmio + mmMM_DATA); \
} \ } \
} while (0) } while (0)
#define WREG32_PCIE(reg, v) \ #define WREG32_PCIE(reg, v) \
do \ do \
{ \ { \
WREG32(mmPCIE_INDEX2, reg); \ WREG32(mmPCIE_INDEX2, reg); \
(void)RREG32(mmPCIE_INDEX2); \ (void)RREG32(mmPCIE_INDEX2); \
WREG32(mmPCIE_DATA2, v); \ WREG32(mmPCIE_DATA2, v); \
(void)RREG32(mmPCIE_DATA2); \ (void)RREG32(mmPCIE_DATA2); \
} while (0) } while (0)
#define RREG32_PCIE(reg) \ #define RREG32_PCIE(reg) \
({ \ ({ \
u32 __tmp_read; \ u32 __tmp_read; \
WREG32(mmPCIE_INDEX2, reg); \ WREG32(mmPCIE_INDEX2, reg); \
(void)RREG32(mmPCIE_INDEX2); \ (void)RREG32(mmPCIE_INDEX2); \
__tmp_read = RREG32(mmPCIE_DATA2); \ __tmp_read = RREG32(mmPCIE_DATA2); \
__tmp_read; \ __tmp_read; \
}) })
/* KIQ is only used for SRIOV accesses, we are not targetting these devices so /* KIQ is only used for SRIOV accesses, we are not targetting these devices so
@ -117,8 +117,6 @@ struct amd_vendor_private
{ {
u16 cfg; u16 cfg;
struct pci_dev *audio_pdev;
struct vendor_reset_dev *vdev; struct vendor_reset_dev *vdev;
struct pci_saved_state *saved_state; struct pci_saved_state *saved_state;
struct amd_fake_dev adev; struct amd_fake_dev adev;