switch from bar0 in tables to using probed bar0 pcie values #1

This commit is contained in:
Ole Algoritme
2023-05-02 21:34:02 +02:00
parent e37d296b9a
commit 80a44fff4d

68
gddr6.c
View File

@@ -19,43 +19,42 @@
} while(0) } while(0)
// variables // variables
int fd; int fd;
void *map_base; void *map_base;
// device struct // device struct
struct device struct device
{ {
uint32_t bar0; uint32_t bar0;
uint32_t offset; uint32_t offset;
uint16_t dev_id; uint16_t dev_id;
const char *vram; const char *vram;
const char *arch; const char *arch;
const char *name; const char *name;
}; };
// device table // device table
static const struct device dev_table[] = struct device dev_table[] =
{ {
{ .bar0 = 0xEC000000, .offset = 0x0000E2A8, .dev_id = 0x2684, .vram = "GDDR6X", .arch = "AD102", .name = "RTX 4090" }, { .offset = 0x0000E2A8, .dev_id = 0x2684, .vram = "GDDR6X", .arch = "AD102", .name = "RTX 4090" },
{ .bar0 = 0xFB000000, .offset = 0x0000E2A8, .dev_id = 0x2204, .vram = "GDDR6X", .arch = "GA102", .name = "RTX 3090" }, { .offset = 0x0000E2A8, .dev_id = 0x2204, .vram = "GDDR6X", .arch = "GA102", .name = "RTX 3090" },
{ .bar0 = 0xFA000000, .offset = 0x0000E2A8, .dev_id = 0x2204, .vram = "GDDR6X", .arch = "GA102", .name = "RTX 3090" }, { .offset = 0x0000EE50, .dev_id = 0x2484, .vram = "GDDR6", .arch = "GA104", .name = "RTX 3070" },
{ .bar0 = 0xFB000000, .offset = 0x0000EE50, .dev_id = 0x2484, .vram = "GDDR6", .arch = "GA104", .name = "RTX 3070" }, { .offset = 0x0000EE50, .dev_id = 0x2488, .vram = "GDDR6", .arch = "GA104", .name = "RTX 3070-LHR" },
{ .bar0 = 0xFB000000, .offset = 0x0000EE50, .dev_id = 0x2488, .vram = "GDDR6", .arch = "GA104", .name = "RTX 3070-LHR" }, };
};
// prototypes // prototypes
void cleanup(int signal); void cleanup(int signal);
void cleanup_sig_handler(void); void cleanup_sig_handler(void);
struct device *pci_detect_dev(void); struct device *pci_detect_dev(void);
// cleanup // cleanup
void cleanup(int signal) void cleanup(int signal)
{ {
if (signal == SIGHUP || signal == SIGINT || signal == SIGTERM) if (signal == SIGHUP || signal == SIGINT || signal == SIGTERM)
{ {
if (map_base != (void *) -1) if (map_base != (void *) -1)
@@ -64,12 +63,12 @@ void cleanup(int signal)
close(fd); close(fd);
exit(0); exit(0);
} }
} }
// cleanup signal handler // cleanup signal handler
void cleanup_sig_handler(void) void cleanup_sig_handler(void)
{ {
struct sigaction sa; struct sigaction sa;
sa.sa_handler = &cleanup; sa.sa_handler = &cleanup;
sa.sa_flags = 0; sa.sa_flags = 0;
@@ -83,12 +82,12 @@ void cleanup_sig_handler(void)
if (sigaction(SIGTERM, &sa, NULL) < 0) if (sigaction(SIGTERM, &sa, NULL) < 0)
perror("Cannot handle SIGTERM"); perror("Cannot handle SIGTERM");
} }
// pci device detection // pci device detection
struct device *pci_detect_dev(void) struct device *pci_detect_dev(void)
{ {
struct pci_access *pacc = NULL; struct pci_access *pacc = NULL;
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
struct device *device = NULL; struct device *device = NULL;
@@ -107,12 +106,7 @@ struct device *pci_detect_dev(void)
if (pci_dev->device_id == dev_table[i].dev_id) if (pci_dev->device_id == dev_table[i].dev_id)
{ {
device = (struct device *) &dev_table[i]; device = (struct device *) &dev_table[i];
device->bar0 = (pci_dev->base_addr[0] & 0xFFFFFFFF);
if (pci_dev->base_addr[0] != device->bar0)
{
device->bar0 = pci_dev->base_addr[0];
}
break; break;
} }
} }