DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-18 16:26:31 +00:00
Code Issues Releases Wiki Activity

fix: 解决了page的锁未被初始化的bug

Browse Source
This commit is contained in:
fslongjin
2022-08-15 12:09:04 +08:00
parent 1dd9195d69
commit 06af77bd79
13 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/driver/usb/usb.c
View File

@ -30,9 +30,9 @@ void usb_init()
kwarn("There is no usb hardware in this computer!");
return;
}
kdebug("usb_pdevs_count=%d",usb_pdevs_count);
// 初始化每个usb控制器
for (int i = 0; i < usb_pdevs_count; ++i)
for (volatile int i = 0; i < usb_pdevs_count; ++i)
{
io_mfence();
switch (usb_pdevs[i]->ProgIF)
@ -47,6 +47,7 @@ void usb_init()
case USB_TYPE_XHCI:
// 初始化对应的xhci控制器
io_mfence();
xhci_init((struct pci_device_structure_general_device_t *)usb_pdevs[i]);
io_mfence();
break;

6
kernel/driver/usb/xhci/xhci.c
View File

@ -10,7 +10,6 @@
#include <driver/interrupt/apic/apic.h>
// 由于xhci寄存器读取需要对齐，因此禁用GCC优化选项
#pragma GCC push_options
#pragma GCC optimize("O0")
spinlock_t xhci_controller_init_lock = {0}; // xhci控制器初始化锁(在usb_init中被初始化)
@ -963,7 +962,9 @@ void xhci_init(struct pci_device_structure_general_device_t *dev_hdr)
FAIL_ON_TO(xhci_hc_init_intr(cid), failed_free_dyn);
io_mfence();
++xhci_ctrl_count;
io_mfence();
spin_unlock(&xhci_controller_init_lock);
io_mfence();
return;
failed_free_dyn:; // 释放动态申请的内存
@ -990,5 +991,4 @@ failed:;
failed_exceed_max:;
kerror("Failed to initialize controller: bus=%d, dev=%d, func=%d", dev_hdr->header.bus, dev_hdr->header.device, dev_hdr->header.func);
spin_unlock(&xhci_controller_init_lock);
}
#pragma GCC pop_options
}