PCI IDE driver, new create_volume () syscall, test scripts
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m37s
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m37s
This commit is contained in:
@@ -1,20 +1,94 @@
|
||||
#include <amd64/io.h>
|
||||
#include <device/pci.h>
|
||||
#include <device/pci_ide.h>
|
||||
#include <device/pci_info.h>
|
||||
#include <libk/lengthof.h>
|
||||
#include <libk/std.h>
|
||||
#include <sync/spin_lock.h>
|
||||
#include <sys/debug.h>
|
||||
|
||||
static uint32_t pci_read32 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset) {
|
||||
static const struct pci_driver_info pci_driver_infos[] = {
|
||||
{.class = 0x01, .subclass = 0x01, .init = &pci_ide_init},
|
||||
};
|
||||
|
||||
static spin_lock_t pci_lock = SPIN_LOCK_INIT;
|
||||
|
||||
uint32_t pci_read32 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset) {
|
||||
uint32_t addr = (uint32_t)((uint32_t)bus << 16) | ((uint32_t)slot << 11) | ((uint32_t)func << 8) |
|
||||
(offset & 0xFc) | ((uint32_t)0x80000000);
|
||||
(offset & 0xFC) | ((uint32_t)0x80000000);
|
||||
|
||||
spin_lock (&pci_lock);
|
||||
|
||||
outl (PCI_CONFIG_ADDR, addr);
|
||||
return inl (PCI_CONFIG_DATA);
|
||||
uint32_t r = inl (PCI_CONFIG_DATA);
|
||||
|
||||
spin_unlock (&pci_lock);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static void pci_write32 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset, uint32_t value) {
|
||||
void pci_write32 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset, uint32_t value) {
|
||||
uint32_t addr = (uint32_t)((uint32_t)bus << 16) | ((uint32_t)slot << 11) | ((uint32_t)func << 8) |
|
||||
(offset & 0xFc) | ((uint32_t)0x80000000);
|
||||
(offset & 0xFC) | ((uint32_t)0x80000000);
|
||||
|
||||
spin_lock (&pci_lock);
|
||||
|
||||
outl (PCI_CONFIG_ADDR, addr);
|
||||
outl (PCI_CONFIG_DATA, value);
|
||||
|
||||
spin_unlock (&pci_lock);
|
||||
}
|
||||
|
||||
uint16_t pci_read16 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset) {
|
||||
uint32_t addr = (uint32_t)((uint32_t)bus << 16) | ((uint32_t)slot << 11) | ((uint32_t)func << 8) |
|
||||
(offset & 0xFC) | ((uint32_t)0x80000000);
|
||||
|
||||
spin_lock (&pci_lock);
|
||||
|
||||
outl (PCI_CONFIG_ADDR, addr);
|
||||
uint16_t r = inw (PCI_CONFIG_DATA + (offset & 2));
|
||||
|
||||
spin_unlock (&pci_lock);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
void pci_write16 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset, uint16_t value) {
|
||||
uint32_t addr = (uint32_t)((uint32_t)bus << 16) | ((uint32_t)slot << 11) | ((uint32_t)func << 8) |
|
||||
(offset & 0xFC) | ((uint32_t)0x80000000);
|
||||
|
||||
spin_lock (&pci_lock);
|
||||
|
||||
outl (PCI_CONFIG_ADDR, addr);
|
||||
outw (PCI_CONFIG_DATA + (offset & 2), value);
|
||||
|
||||
spin_unlock (&pci_lock);
|
||||
}
|
||||
|
||||
uint8_t pci_read8 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset) {
|
||||
uint32_t addr = (uint32_t)((uint32_t)bus << 16) | ((uint32_t)slot << 11) | ((uint32_t)func << 8) |
|
||||
(offset & 0xFC) | ((uint32_t)0x80000000);
|
||||
|
||||
spin_lock (&pci_lock);
|
||||
|
||||
outl (PCI_CONFIG_ADDR, addr);
|
||||
uint8_t r = inb (PCI_CONFIG_DATA + (offset & 3));
|
||||
|
||||
spin_unlock (&pci_lock);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
void pci_write8 (uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset, uint8_t value) {
|
||||
uint32_t addr = (uint32_t)((uint32_t)bus << 16) | ((uint32_t)slot << 11) | ((uint32_t)func << 8) |
|
||||
(offset & 0xFC) | ((uint32_t)0x80000000);
|
||||
|
||||
spin_lock (&pci_lock);
|
||||
|
||||
outl (PCI_CONFIG_ADDR, addr);
|
||||
outb (PCI_CONFIG_DATA + (offset & 3), value);
|
||||
|
||||
spin_unlock (&pci_lock);
|
||||
}
|
||||
|
||||
static void pci_check_bus (uint8_t bus, pci_cb_func_t cb);
|
||||
@@ -28,20 +102,20 @@ static void pci_check_func (uint8_t bus, uint8_t slot, uint8_t func, pci_cb_func
|
||||
|
||||
uint32_t reg8 = pci_read32 (bus, slot, func, PCI_REVISION_ID);
|
||||
|
||||
struct pci_dev pci_dev = {
|
||||
struct pci_info pci_info = {
|
||||
.bus = bus,
|
||||
.slot = slot,
|
||||
.func = func,
|
||||
.vendor = vendor,
|
||||
.device = ((uint16_t)(reg0 >> 16)),
|
||||
.classcode = ((uint8_t)(reg8 >> 24)),
|
||||
.class = ((uint8_t)(reg8 >> 24)),
|
||||
.subclass = ((uint8_t)(reg8 >> 16)),
|
||||
};
|
||||
|
||||
cb (pci_dev);
|
||||
cb (pci_info);
|
||||
|
||||
/* PCI 2 PCI bridge */
|
||||
if (pci_dev.classcode == 0x06 && pci_dev.subclass == 0x04) {
|
||||
if (pci_info.class == 0x06 && pci_info.subclass == 0x04) {
|
||||
uint32_t reg18 = pci_read32 (bus, slot, func, 0x18);
|
||||
uint8_t secondary = (uint8_t)(reg18 >> 8);
|
||||
pci_check_bus (secondary, cb);
|
||||
@@ -112,13 +186,21 @@ static void pci_string_identifiers (uint16_t vendor_id, uint16_t device_id, uint
|
||||
}
|
||||
}
|
||||
|
||||
static void pci_discovery_cb (struct pci_dev pci_dev) {
|
||||
static void pci_discovery_cb (struct pci_info pci_info) {
|
||||
const char *vname, *dname, *cname;
|
||||
pci_string_identifiers (pci_dev.vendor, pci_dev.device, pci_dev.classcode, pci_dev.subclass,
|
||||
pci_string_identifiers (pci_info.vendor, pci_info.device, pci_info.class, pci_info.subclass,
|
||||
&vname, &dname, &cname);
|
||||
|
||||
DEBUG ("PCI DEVICE: %04x:%04x at %02d:%02d:%02d / %s; %s; %s\n", pci_dev.vendor, pci_dev.device,
|
||||
pci_dev.bus, pci_dev.slot, pci_dev.func, vname, dname, cname);
|
||||
DEBUG ("PCI DEVICE: %04x:%04x %02x:%02x at %03d:%03d:%03d / %s; %s; %s\n", pci_info.vendor,
|
||||
pci_info.device, pci_info.class, pci_info.subclass, pci_info.bus, pci_info.slot,
|
||||
pci_info.func, vname, dname, cname);
|
||||
|
||||
for (size_t driver = 0; driver < lengthof (pci_driver_infos); driver++) {
|
||||
if (pci_driver_infos[driver].class == pci_info.class &&
|
||||
pci_driver_infos[driver].subclass == pci_info.subclass) {
|
||||
pci_driver_infos[driver].init (pci_info);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void pci_init (void) { pci_enumerate (&pci_discovery_cb); }
|
||||
|
||||
Reference in New Issue
Block a user