From 85b95f472d1c4932d0a92d70b27ad06910212807 Mon Sep 17 00:00:00 2001 From: Conrad Pankoff Date: Sat, 4 Jan 2020 12:41:50 +1100 Subject: [PATCH] Kernel: Remove unused PCI.{h,cpp} --- Kernel/PCI.cpp | 141 ------------------------------------------------- Kernel/PCI.h | 62 ---------------------- 2 files changed, 203 deletions(-) delete mode 100644 Kernel/PCI.cpp delete mode 100644 Kernel/PCI.h diff --git a/Kernel/PCI.cpp b/Kernel/PCI.cpp deleted file mode 100644 index 09d62e5fec..0000000000 --- a/Kernel/PCI.cpp +++ /dev/null @@ -1,141 +0,0 @@ -#include -#include - -//#define PCI_DEBUG - -#define PCI_VENDOR_ID 0x00 // word -#define PCI_DEVICE_ID 0x02 // word -#define PCI_COMMAND 0x04 // word -#define PCI_STATUS 0x06 // word -#define PCI_REVISION_ID 0x08 // byte -#define PCI_PROG_IF 0x09 // byte -#define PCI_SUBCLASS 0x0a // byte -#define PCI_CLASS 0x0b // byte -#define PCI_CACHE_LINE_SIZE 0x0c // byte -#define PCI_LATENCY_TIMER 0x0d // byte -#define PCI_HEADER_TYPE 0x0e // byte -#define PCI_BIST 0x0f // byte -#define PCI_BAR0 0x10 // u32 -#define PCI_BAR1 0x14 // u32 -#define PCI_BAR2 0x18 // u32 -#define PCI_BAR3 0x1C // u32 -#define PCI_BAR4 0x20 // u32 -#define PCI_BAR5 0x24 // u32 -#define PCI_SUBSYSTEM_ID 0x2C // u16 -#define PCI_SUBSYSTEM_VENDOR_ID 0x2E // u16 -#define PCI_INTERRUPT_LINE 0x3C // byte -#define PCI_SECONDARY_BUS 0x19 // byte -#define PCI_HEADER_TYPE_DEVICE 0 -#define PCI_HEADER_TYPE_BRIDGE 1 -#define PCI_TYPE_BRIDGE 0x0604 -#define PCI_ADDRESS_PORT 0xCF8 -#define PCI_VALUE_PORT 0xCFC -#define PCI_NONE 0xFFFF - -namespace PCI { - -template -T read_field(Address address, u32 field) -{ - IO::out32(PCI_ADDRESS_PORT, address.io_address_for_field(field)); - if constexpr (sizeof(T) == 4) - return IO::in32(PCI_VALUE_PORT); - if constexpr (sizeof(T) == 2) - return IO::in16(PCI_VALUE_PORT + (field & 2)); - if constexpr (sizeof(T) == 1) - return IO::in8(PCI_VALUE_PORT + (field & 3)); -} - -template -void write_field(Address address, u32 field, T value) -{ - IO::out32(PCI_ADDRESS_PORT, address.io_address_for_field(field)); - if constexpr (sizeof(T) == 4) - IO::out32(PCI_VALUE_PORT, value); - if constexpr (sizeof(T) == 2) - IO::out16(PCI_VALUE_PORT + (field & 2), value); - if constexpr (sizeof(T) == 1) - IO::out8(PCI_VALUE_PORT + (field & 3), value); -} - -u16 read_type(Address address) -{ - return (read_field(address, PCI_CLASS) << 8u) | read_field(address, PCI_SUBCLASS); -} - -void enumerate_bus(int type, u8 bus, Function&); - -void enumerate_functions(int type, u8 bus, u8 slot, u8 function, Function& callback) -{ - Address address(bus, slot, function); - if (type == -1 || type == read_type(address)) - callback(address, { read_field(address, PCI_VENDOR_ID), read_field(address, PCI_DEVICE_ID) }); - if (read_type(address) == PCI_TYPE_BRIDGE) { - u8 secondary_bus = read_field(address, PCI_SECONDARY_BUS); -#ifdef PCI_DEBUG - kprintf("PCI: Found secondary bus: %u\n", secondary_bus); -#endif - ASSERT(secondary_bus != bus); - enumerate_bus(type, secondary_bus, callback); - } -} - -void enumerate_slot(int type, u8 bus, u8 slot, Function& callback) -{ - Address address(bus, slot, 0); - if (read_field(address, PCI_VENDOR_ID) == PCI_NONE) - return; - enumerate_functions(type, bus, slot, 0, callback); - if (!(read_field(address, PCI_HEADER_TYPE) & 0x80)) - return; - for (u8 function = 1; function < 8; ++function) { - Address address(bus, slot, function); - if (read_field(address, PCI_VENDOR_ID) != PCI_NONE) - enumerate_functions(type, bus, slot, function, callback); - } -} - -void enumerate_bus(int type, u8 bus, Function& callback) -{ - for (u8 slot = 0; slot < 32; ++slot) - enumerate_slot(type, bus, slot, callback); -} - -u8 get_interrupt_line(Address address) { return read_field(address, PCI_INTERRUPT_LINE); } -u32 get_BAR0(Address address) { return read_field(address, PCI_BAR0); } -u32 get_BAR1(Address address) { return read_field(address, PCI_BAR1); } -u32 get_BAR2(Address address) { return read_field(address, PCI_BAR2); } -u32 get_BAR3(Address address) { return read_field(address, PCI_BAR3); } -u32 get_BAR4(Address address) { return read_field(address, PCI_BAR4); } -u32 get_BAR5(Address address) { return read_field(address, PCI_BAR5); } -u8 get_revision_id(Address address) { return read_field(address, PCI_REVISION_ID); } -u8 get_subclass(Address address) { return read_field(address, PCI_SUBCLASS); } -u8 get_class(Address address) { return read_field(address, PCI_CLASS); } -u16 get_subsystem_id(Address address) { return read_field(address, PCI_SUBSYSTEM_ID); } -u16 get_subsystem_vendor_id(Address address) { return read_field(address, PCI_SUBSYSTEM_VENDOR_ID); } - -void enable_bus_mastering(Address address) -{ - auto value = read_field(address, PCI_COMMAND); - value |= (1 << 2); - value |= (1 << 0); - write_field(address, PCI_COMMAND, value); -} - -void enumerate_all(Function callback) -{ - // Single PCI host controller. - if ((read_field(Address(), PCI_HEADER_TYPE) & 0x80) == 0) { - enumerate_bus(-1, 0, callback); - return; - } - - // Multiple PCI host controllers. - for (u8 function = 0; function < 8; ++function) { - if (read_field(Address(0, 0, function), PCI_VENDOR_ID) == PCI_NONE) - break; - enumerate_bus(-1, function, callback); - } -} - -} diff --git a/Kernel/PCI.h b/Kernel/PCI.h deleted file mode 100644 index 9d20a20a3e..0000000000 --- a/Kernel/PCI.h +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include -#include - -namespace PCI { - -struct ID { - u16 vendor_id { 0 }; - u16 device_id { 0 }; - - bool is_null() const { return !vendor_id && !device_id; } - - bool operator==(const ID& other) const - { - return vendor_id == other.vendor_id && device_id == other.device_id; - } -}; - -struct Address { - Address() {} - Address(u8 bus, u8 slot, u8 function) - : m_bus(bus) - , m_slot(slot) - , m_function(function) - { - } - - bool is_null() const { return !m_bus && !m_slot && !m_function; } - operator bool() const { return !is_null(); } - - u8 bus() const { return m_bus; } - u8 slot() const { return m_slot; } - u8 function() const { return m_function; } - - u32 io_address_for_field(u8 field) const - { - return 0x80000000u | (m_bus << 16u) | (m_slot << 11u) | (m_function << 8u) | (field & 0xfc); - } - -private: - u8 m_bus { 0 }; - u8 m_slot { 0 }; - u8 m_function { 0 }; -}; - -void enumerate_all(Function); -u8 get_interrupt_line(Address); -u32 get_BAR0(Address); -u32 get_BAR1(Address); -u32 get_BAR2(Address); -u32 get_BAR3(Address); -u32 get_BAR4(Address); -u32 get_BAR5(Address); -u8 get_revision_id(Address); -u8 get_subclass(Address); -u8 get_class(Address); -u16 get_subsystem_id(Address); -u16 get_subsystem_vendor_id(Address); -void enable_bus_mastering(Address); - -}