🆕 能成功遍历pci总线下的设备

This commit is contained in:
fslongjin 2022-03-22 18:02:37 +08:00
parent db3749ece4
commit 08fa7b5358
6 changed files with 94 additions and 84 deletions

View File

@ -19,10 +19,10 @@ all: kernel
objcopy -I elf64-x86-64 -S -R ".comment" -R ".eh_frame" -O elf64-x86-64 kernel ../bin/kernel/kernel.elf objcopy -I elf64-x86-64 -S -R ".comment" -R ".eh_frame" -O elf64-x86-64 kernel ../bin/kernel/kernel.elf
kernel: head.o entry.o main.o printk.o trap.o mm.o slab.o irq.o pic.o process.o syscall.o multiboot2.o cpu.o acpi.o ps2_keyboard.o ps2_mouse.o ata.o kernel: head.o entry.o main.o printk.o trap.o mm.o slab.o irq.o pic.o process.o syscall.o multiboot2.o cpu.o acpi.o ps2_keyboard.o ps2_mouse.o ata.o pci.o
ld -b elf64-x86-64 -z muldefs -o kernel head.o exception/entry.o main.o common/printk.o exception/trap.o exception/irq.o mm/mm.o mm/slab.o process/process.o syscall/syscall.o driver/multiboot2/multiboot2.o \ ld -b elf64-x86-64 -z muldefs -o kernel head.o exception/entry.o main.o common/printk.o exception/trap.o exception/irq.o mm/mm.o mm/slab.o process/process.o syscall/syscall.o driver/multiboot2/multiboot2.o \
common/cpu.o \ common/cpu.o \
driver/acpi/acpi.o driver/interrupt/pic.o driver/keyboard/ps2_keyboard.o driver/mouse/ps2_mouse.o driver/disk/ata.o \ driver/acpi/acpi.o driver/interrupt/pic.o driver/keyboard/ps2_keyboard.o driver/mouse/ps2_mouse.o driver/disk/ata.o driver/pci/pci.o \
-T link.lds -T link.lds
head.o: head.S head.o: head.S
@ -94,6 +94,9 @@ ps2_mouse.o: driver/mouse/ps2_mouse.c
ata.o: driver/disk/ata.c ata.o: driver/disk/ata.c
gcc $(CFLAGS) -c driver/disk/ata.c -o driver/disk/ata.o gcc $(CFLAGS) -c driver/disk/ata.c -o driver/disk/ata.o
pci.o: driver/pci/pci.c
gcc $(CFLAGS) -c driver/pci/pci.c -o driver/pci/pci.o
clean: clean:
rm -rf $(GARBAGE) rm -rf $(GARBAGE)

View File

@ -23,20 +23,12 @@ void ata_disk_handler(ul irq_num, ul param, struct pt_regs *regs)
unsigned char buf[64]; unsigned char buf[64];
int js=0; int js=0;
//printk("%d", info.Serial_Number); //printk("%d", info.Serial_Number);
printk("sizeof short=%d\n", sizeof(ushort));
for(int i = 0;i<10;i++) for(int i = 0;i<10;i++)
{ {
printk("[%d] %d \n",js, ((info.Serial_Number[i])));
printk("[%d] %d shift 8\n",js, ((info.Serial_Number[i]) >> 8));
printk("[%d] %d and 0xff\n",js, ((info.Serial_Number[i]) >> 8)&0xff);
buf[js++]=((info.Serial_Number[i]) >> 8) & 0xff;
buf[js++]=(info.Serial_Number[i] & 0xff); buf[js++]=(info.Serial_Number[i] & 0xff);
} }
buf[js] = '\0'; buf[js] = '\0';
printk("xxx");
printk("buf[0]=%d", buf[0]);
printk("buf[0]=%c", buf[0]);
printk("%s", buf); printk("%s", buf);
printk("\n"); printk("\n");

View File

@ -3,25 +3,26 @@
#include "../../mm/slab.h" #include "../../mm/slab.h"
static uint count_device_list = 0; static uint count_device_list = 0;
static void pci_checkBus(uint8_t bus);
/** /**
* @brief * @brief
* *
*/ */
#define ADD_DEVICE_STRUCT_TO_LIST(ret) \ #define ADD_DEVICE_STRUCT_TO_LIST(ret) \
do \ do \
{ \ { \
if (count_device_list > 0) \ if (count_device_list > 0) \
{ \ { \
++count_device_list; \ ++count_device_list; \
list_add(pci_device_structure_list, &ret->header->list); \ list_add(pci_device_structure_list, &(ret->header.list)); \
} \ } \
else \ else \
{ \ { \
++count_device_list; \ ++count_device_list; \
list_init(&ret->header->list); \ list_init(&(ret->header.list)); \
pci_device_structure_list = &ret->header->list; \ pci_device_structure_list = &(ret->header.list); \
} \ } \
} while (0) } while (0)
/** /**
@ -43,7 +44,10 @@ uint pci_read_config(uchar bus, uchar slot, uchar func, uchar offset)
uint address = (uint)((lbus << 16) | (lslot << 11) | (lfunc << 8) | (offset & 0xfc) | ((uint)0x80000000)); uint address = (uint)((lbus << 16) | (lslot << 11) | (lfunc << 8) | (offset & 0xfc) | ((uint)0x80000000));
io_out32(PORT_PCI_CONFIG_ADDRESS, address); io_out32(PORT_PCI_CONFIG_ADDRESS, address);
// 读取返回的数据 // 读取返回的数据
return (uint)(io_in32(PORT_PCI_CONFIG_DATA)); uint32_t ret = (uint)(io_in32(PORT_PCI_CONFIG_DATA));
// kdebug("data=%#010lx", ret);
return ret;
} }
/** /**
@ -198,7 +202,7 @@ static void pci_read_pci_to_cardbus_bridge_header(struct pci_device_structure_pc
*/ */
void *pci_read_header(int *type, uchar bus, uchar slot, uchar func, bool add_to_list) void *pci_read_header(int *type, uchar bus, uchar slot, uchar func, bool add_to_list)
{ {
struct pci_device_structure_header_t *common_header = (struct pci_device_structure_header_t *)kmalloc(sizeof(struct pci_device_structure_header_t), 0); struct pci_device_structure_header_t *common_header = (struct pci_device_structure_header_t *)kmalloc(100, 0);
uint32_t tmp32; uint32_t tmp32;
// 先读取公共header // 先读取公共header
@ -222,48 +226,50 @@ void *pci_read_header(int *type, uchar bus, uchar slot, uchar func, bool add_to_
common_header->HeaderType = (tmp32 >> 16) & 0xff; common_header->HeaderType = (tmp32 >> 16) & 0xff;
common_header->BIST = (tmp32 >> 24) & 0xff; common_header->BIST = (tmp32 >> 24) & 0xff;
// 根据公共头部,判断该结构所属的类型 void *ret;
switch (common_header->Vendor_ID) if (common_header->Vendor_ID == 0xffff)
{ {
case 0xFFFF: // 设备不可用
*type = E_DEVICE_INVALID; *type = E_DEVICE_INVALID;
kfree(common_header); kfree(common_header);
return NULL; return NULL;
break; }
case 0x0: // general device
struct pci_device_structure_general_device_t *ret = (struct pci_device_structure_general_device_t *)kmalloc(sizeof(struct pci_device_structure_general_device_t), 0);
ret->header = common_header; // 根据公共头部,判断该结构所属的类型
pci_read_general_device_header(ret, bus, slot, func); switch (common_header->HeaderType)
{
case 0x0: // general device
ret = common_header;
pci_read_general_device_header((struct pci_device_structure_general_device_t *)ret, bus, slot, func);
if (add_to_list) if (add_to_list)
ADD_DEVICE_STRUCT_TO_LIST(ret); ADD_DEVICE_STRUCT_TO_LIST(((struct pci_device_structure_general_device_t *)ret));
*type = 0x0; *type = 0x0;
return ret; return ret;
break; break;
case 0x1: case 0x1:
struct pci_device_structure_pci_to_pci_bridge_t *ret = (struct pci_device_structure_pci_to_pci_bridge_t *)kmalloc(sizeof(struct pci_device_structure_pci_to_pci_bridge_t), 0); ret = common_header;
ret->header = common_header; pci_read_pci_to_pci_bridge_header((struct pci_device_structure_pci_to_pci_bridge_t *)ret, bus, slot, func);
pci_read_pci_to_pci_bridge_header(ret, bus, slot, func);
if (add_to_list) if (add_to_list)
ADD_DEVICE_STRUCT_TO_LIST(ret); ADD_DEVICE_STRUCT_TO_LIST(((struct pci_device_structure_pci_to_pci_bridge_t *)ret));
*type = 0x1; *type = 0x1;
return ret; return ret;
break; break;
case 0x2: case 0x2:
struct pci_device_structure_pci_to_cardbus_bridge_t *ret = (struct pci_device_structure_pci_to_cardbus_bridge_t *)kmalloc(sizeof(struct pci_device_structure_pci_to_cardbus_bridge_t), 0); ret = common_header;
ret->header = common_header; pci_read_pci_to_cardbus_bridge_header((struct pci_device_structure_pci_to_cardbus_bridge_t *)ret, bus, slot, func);
pci_read_pci_to_cardbus_bridge_header(ret, bus, slot, func);
if (add_to_list) if (add_to_list)
ADD_DEVICE_STRUCT_TO_LIST(ret); ADD_DEVICE_STRUCT_TO_LIST(((struct pci_device_structure_pci_to_cardbus_bridge_t *)ret));
*type = 0x2; *type = 0x2;
return ret; return ret;
break; break;
default: // 错误的头类型 这里不应该被执行 default: // 错误的头类型 这里不应该被执行
kBUG("PCI->pci_read_header(): Invalid header type."); //kerror("PCI->pci_read_header(): Invalid header type.");
*type = E_WRONG_HEADER_TYPE; *type = E_WRONG_HEADER_TYPE;
//kerror("vendor id=%#010lx", common_header->Vendor_ID);
//kerror("header type = %d", common_header->HeaderType);
kfree(common_header); kfree(common_header);
return NULL; return NULL;
break; break;
@ -272,77 +278,76 @@ void *pci_read_header(int *type, uchar bus, uchar slot, uchar func, bool add_to_
static void pci_checkFunction(uint8_t bus, uint8_t device, uint8_t function) static void pci_checkFunction(uint8_t bus, uint8_t device, uint8_t function)
{ {
int header_type; int header_type;
struct pci_device_structure_header_t *header; struct pci_device_structure_header_t *header = pci_read_header(&header_type, bus, device, function, true);
void *raw_header = pci_read_header(&header_type, 0, 0, 0, true);
if (header_type == E_WRONG_HEADER_TYPE) if (header_type == E_WRONG_HEADER_TYPE)
{ {
kBUG("pci_checkFunction(): wrong header type!"); // kerror("pci_checkFunction(): wrong header type!");
// 此处内存已经在read header函数里面释放不用重复释放 // 此处内存已经在read header函数里面释放不用重复释放
return; return;
} }
header = ((struct pci_device_structure_general_device_t *)raw_header)->header; // header = ((struct pci_device_structure_general_device_t *)raw_header)->header;
if ((header->Class_code == 0x6) && (header->SubClass == 0x4)) if ((header->Class_code == 0x6) && (header->SubClass == 0x4))
{ {
uint8_t SecondaryBus = ((struct pci_device_structure_pci_to_pci_bridge_t *)raw_header)->Secondary_Bus_Number; uint8_t SecondaryBus = ((struct pci_device_structure_pci_to_pci_bridge_t *)header)->Secondary_Bus_Number;
pci_checkBus(SecondaryBus); pci_checkBus(SecondaryBus);
} }
kfree(header);
kfree(raw_header);
} }
static void pci_checkDevice(uint8_t bus, uint8_t device) static int pci_checkDevice(uint8_t bus, uint8_t device)
{ {
int header_type; int header_type;
void *raw_header;
struct pci_device_structure_header_t *header; struct pci_device_structure_header_t *header = pci_read_header(&header_type, bus, device, 0, false);
raw_header = pci_read_header(&header_type, bus, device, 0, false);
if (header_type == E_WRONG_HEADER_TYPE) if (header_type == E_WRONG_HEADER_TYPE)
{ {
// 此处内存已经在read header函数里面释放不用重复释放 // 此处内存已经在read header函数里面释放不用重复释放
kBUG("pci_checkDevice(): wrong header type!"); return E_WRONG_HEADER_TYPE;
return;
} }
header = ((struct pci_device_structure_general_device_t *)raw_header)->header; if (header_type == E_DEVICE_INVALID)
{
// kerror("DEVICE INVALID");
return E_DEVICE_INVALID;
}
uint16_t vendorID = header->Vendor_ID; uint16_t vendorID = header->Vendor_ID;
if (vendorID == 0xffff) // 设备不存在 if (vendorID == 0xffff) // 设备不存在
{ {
kfree(header); kfree(header);
kfree(raw_header); return E_DEVICE_INVALID;
return;
} }
pci_checkFunction(bus, device, 0); pci_checkFunction(bus, device, 0);
header_type = header->HeaderType; header_type = header->HeaderType;
if ((header_type & 0x80) != 0) if ((header_type & 0x80) != 0)
{ {
kdebug("Multi func device");
// 这是一个多function的设备因此查询剩余的function // 这是一个多function的设备因此查询剩余的function
for (uint8_t func = 1; func < 8; ++func) for (uint8_t func = 1; func < 8; ++func)
{ {
struct pci_device_structure_header_t *tmp_header; struct pci_device_structure_header_t *tmp_header;
void *tmp_raw_header; tmp_header = (struct pci_device_structure_header_t *)pci_read_header(&header_type, bus, device, func, false);
tmp_raw_header = pci_read_header(&header_type, bus, device, func, false);
tmp_header = ((struct pci_device_structure_general_device_t *)tmp_raw_header)->header;
pci_checkFunction(bus, device, func); if (tmp_header->Vendor_ID != 0xffff)
pci_checkFunction(bus, device, func);
// 释放内存 // 释放内存
kfree(tmp_header); kfree(tmp_header);
kfree(tmp_raw_header);
} }
} }
kfree(header); kfree(header);
kfree(raw_header); return 0;
} }
static void pci_checkBus(uint8_t bus) static void pci_checkBus(uint8_t bus)
{ {
for (uint8_t device = 0; device < 32; ++device) for (uint8_t device = 0; device < 32; ++device)
{
pci_checkDevice(bus, device); pci_checkDevice(bus, device);
}
} }
/** /**
@ -351,10 +356,9 @@ static void pci_checkBus(uint8_t bus)
*/ */
void pci_checkAllBuses() void pci_checkAllBuses()
{ {
kinfo("Checking all devices in PCI bus...");
int header_type; int header_type;
void *raw_header; struct pci_device_structure_header_t *header = pci_read_header(&header_type, 0, 0, 0, false);
struct pci_device_structure_header_t *header;
raw_header = pci_read_header(&header_type, 0, 0, 0, false);
if (header_type == E_WRONG_HEADER_TYPE) if (header_type == E_WRONG_HEADER_TYPE)
{ {
@ -362,7 +366,6 @@ void pci_checkAllBuses()
// 此处内存已经在read header函数里面释放不用重复释放 // 此处内存已经在read header函数里面释放不用重复释放
return; return;
} }
header = ((struct pci_device_structure_general_device_t *)raw_header)->header;
header_type = header->HeaderType; header_type = header->HeaderType;
@ -374,29 +377,37 @@ void pci_checkAllBuses()
{ {
// Multiple PCI host controller // Multiple PCI host controller
// 那么总线0设备0功能1则是总线1的pci主机控制器以此类推 // 那么总线0设备0功能1则是总线1的pci主机控制器以此类推
void *tmp_raw_header;
struct pci_device_structure_header_t *tmp_header; struct pci_device_structure_header_t *tmp_header;
for (uint8_t func = 0; func < 8; ++func) for (uint8_t func = 0; func < 8; ++func)
{ {
tmp_raw_header = pci_read_header(&header_type, 0, 0, func, false); tmp_header = (struct pci_device_structure_header_t *)pci_read_header(&header_type, 0, 0, func, false);
tmp_header = ((struct pci_device_structure_general_device_t *)tmp_raw_header)->header;
if (header->Vendor_ID != 0xffff) // @todo 这里的判断条件可能有点问题 if (header->Vendor_ID != 0xffff) // @todo 这里的判断条件可能有点问题
{ {
kfree(tmp_header); kfree(tmp_header);
kfree(tmp_raw_header);
break; break;
} }
pci_checkBus(func); pci_checkBus(func);
kfree(tmp_header); kfree(tmp_header);
kfree(tmp_raw_header);
} }
} }
kfree(header); kfree(header);
kfree(raw_header);
} }
void pci_init() void pci_init()
{ {
kinfo("Initializing PCI bus!");
pci_checkAllBuses();
kinfo("Total pci device and function num = %d", count_device_list);
struct pci_device_structure_header_t *ptr = container_of(pci_device_structure_list, struct pci_device_structure_header_t, list);
for (int i = 0; i < count_device_list; ++i)
{
kinfo("[ pci device %d ] class code = %d\tsubclass=%d", i, ptr->Class_code, ptr->SubClass);
ptr = container_of(list_next(&(ptr->list)), struct pci_device_structure_header_t, list);
}
kinfo("PCI bus initialized.")
} }

View File

@ -49,7 +49,7 @@ struct pci_device_structure_header_t
*/ */
struct pci_device_structure_general_device_t struct pci_device_structure_general_device_t
{ {
struct pci_device_structure_header_t *header; struct pci_device_structure_header_t header;
uint32_t BAR0; uint32_t BAR0;
uint32_t BAR1; uint32_t BAR1;
uint32_t BAR2; uint32_t BAR2;
@ -81,7 +81,7 @@ struct pci_device_structure_general_device_t
*/ */
struct pci_device_structure_pci_to_pci_bridge_t struct pci_device_structure_pci_to_pci_bridge_t
{ {
struct pci_device_structure_header_t *header; struct pci_device_structure_header_t header;
uint32_t BAR0; uint32_t BAR0;
uint32_t BAR1; uint32_t BAR1;
@ -126,7 +126,7 @@ struct pci_device_structure_pci_to_pci_bridge_t
*/ */
struct pci_device_structure_pci_to_cardbus_bridge_t struct pci_device_structure_pci_to_cardbus_bridge_t
{ {
struct pci_device_structure_header_t *header; struct pci_device_structure_header_t header;
uint32_t CardBus_Socket_ExCa_base_address; uint32_t CardBus_Socket_ExCa_base_address;

View File

@ -18,6 +18,7 @@
#include "driver/keyboard/ps2_keyboard.h" #include "driver/keyboard/ps2_keyboard.h"
#include "driver/mouse/ps2_mouse.h" #include "driver/mouse/ps2_mouse.h"
#include "driver/disk/ata.h" #include "driver/disk/ata.h"
#include "driver/pci/pci.h"
unsigned int *FR_address = (unsigned int *)0xb8000; //帧缓存区的地址 unsigned int *FR_address = (unsigned int *)0xb8000; //帧缓存区的地址
@ -166,6 +167,7 @@ void system_initialize()
//ps2_keyboard_init(); //ps2_keyboard_init();
//ps2_mouse_init(); //ps2_mouse_init();
ata_init(); ata_init();
pci_init();
// test_slab(); // test_slab();
// test_mm(); // test_mm();

6
run.sh
View File

@ -94,8 +94,10 @@ if [ $flag_can_run -eq 1 ]; then
else else
qemu-system-x86_64 -cdrom ${iso} -m 512M \ qemu-system-x86_64 -cdrom ${iso} -m 512M \
-monitor telnet::2333,server,nowait -serial stdio -s -cpu IvyBridge --enable-kvm \ -monitor telnet::2333,server,nowait -serial stdio -s -cpu IvyBridge --enable-kvm \
#-drive id=disk,file=bin/disk.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -drive id=disk,file=bin/disk.img,if=none \
-hda bin/disk.img -device ahci,id=ahci \
-device ide-hd,drive=disk,bus=ahci.0 \
-usb
fi fi
else else