Makussu/vendor-reset
1
0
Fork 0
mirror of https://github.com/gnif/vendor-reset.git synced 2026-03-28 13:12:43 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Makussu:feature/polaris_baco
Branches Tags
Makussu:master Makussu:feature/audio_reset Makussu:feature/navi10_baco Makussu:feature/polaris_baco
Makussu:v0.1.0
..
compare: Makussu:feature/audio_reset
Branches Tags
Makussu:master Makussu:feature/audio_reset Makussu:feature/navi10_baco Makussu:feature/polaris_baco
Makussu:v0.1.0

10 Commits
feature/po ... feature/au

Author SHA1 Message Date
Adam Madsen
da933c8f85 Merge branch 'master' into feature/audio_reset 2021-01-12 21:29:54 -06:00
Geoffrey McRae
6875092f2f [core] revert commits that are not quite ready yet 
This reverts commit 30ffca808b.
This reverts commit 623fa20705.
 2021-01-13 14:07:02 +11:00
Adam Madsen
30ffca808b [core] dkms: bump version 2021-01-13 13:55:51 +11:00
Adam Madsen
623fa20705 [amd] audio: Preserve PCI config space for audio device 2021-01-13 13:55:51 +11:00
BegoneRaven
eadbb20b38 Update README.md 
Adding the 'Vega FE' Common Name for the Vega 10  Family under the Supported Devices section
 2021-01-12 13:01:00 -06:00
Eugene Shatsky
f435bf9e93 Add lists of Polaris GPUs 2021-01-12 10:44:12 -08:00
Adam Madsen
b762dc41d5 [core] dkms: bump version 2021-01-12 11:30:38 -06:00
Adam Madsen
e06046d7f8 [amd] audio: Preserve PCI config space for audio device 2021-01-12 11:30:17 -06:00
Matthias Tafelmeier
765b05cdbd refer to uaccess to prevent build failure 
Tackling following build glitch for 4.19 kernel:

/var/lib/dkms/vendor-reset/0.0.18/build/src/ioctl.c: In function ‘vendor_reset_ioctl_reset’:
/var/lib/dkms/vendor-reset/0.0.18/build/src/ioctl.c:34:7: error: implicit declaration of function ‘copy_from_user’; did you mean ‘sg_copy_from_buffer’? [-Werror=implicit-function-declaration]
   if (copy_from_user(&iodev, (void __user *)arg, sizeof(iodev)))
       ^~~~~~~~~~~~~~
       sg_copy_from_buffer
cc1: some warnings being treated as errors
make[4]: *** [/usr/src/linux-headers-4.19.0-12-common/scripts/Makefile.build:308: /var/lib/dkms/vendor-reset/0.0.18/build/src/ioctl.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [/usr/src/linux-headers-4.19.0-12-common/Makefile:1565: _module_/var/lib/dkms/vendor-reset/0.0.18/build] Error 2
make[2]: *** [Makefile:146: sub-make] Error 2
make[1]: *** [Makefile:8: all] Error 2
make[1]: Leaving directory '/usr/src/linux-headers-4.19.0-12-amd64'
make: *** [Makefile:8: build] Error 2
 2020-12-23 05:38:44 +11:00
Adam Madsen
a6458b3dbf [core] release dkms version 0.0.18 2020-11-20 13:17:03 -06:00
5 changed files with 65 additions and 44 deletions
Expand all files Collapse all files

8
README.md
View File

@@ -55,10 +55,10 @@ updating your initrd.
| Vendor | Family | Common Name(s) | Vendor | Family | Common Name(s)
|---|---|---| |---|---|---|
|AMD|Polaris 10| |AMD|Polaris 10| RX 470, 480, 570, 580, 590
|AMD|Polaris 11| |AMD|Polaris 11| RX 460, 560
|AMD|Polaris 12| |AMD|Polaris 12| RX 540, 550
|AMD|Vega 10| Vega 56/64 | |AMD|Vega 10| Vega 56/64/FE |
|AMD|Vega 20| Radeon VII | |AMD|Vega 20| Radeon VII |
|AMD|Navi 10| 5600XT, 5700, 5700XT |AMD|Navi 10| 5600XT, 5700, 5700XT
|AMD|Navi 12| Pro 5600M | |AMD|Navi 12| Pro 5600M |

2
dkms.conf
View File

@@ -1,5 +1,5 @@
PACKAGE_NAME="vendor-reset" PACKAGE_NAME="vendor-reset"
PACKAGE_VERSION="0.0.18-pre.1" PACKAGE_VERSION="0.0.19"
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,6 +84,15 @@ 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:
@@ -96,7 +105,8 @@ 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;
} }
@@ -114,6 +124,14 @@ 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,6 +117,8 @@ 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;

1
src/ioctl.c
View File

@@ -21,6 +21,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "vendor-reset-ioctl.h" #include "vendor-reset-ioctl.h"
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/uaccess.h>
#define VENDOR_RESET_IOCTL_DEVNAME "vendor_reset" #define VENDOR_RESET_IOCTL_DEVNAME "vendor_reset"