tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-27 15:56:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try setting CFL bits in AHCIPortIdentify.

Browse source
This commit is contained in:
TomAwezome 2022-10-03 05:12:43 -04:00
parent af27249c43
commit 008e68cc29
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Kernel/BlkDev/DiskAHCI.ZC
View file

@ -270,7 +270,7 @@ error:
if (sys_boot_src.u16[0] == BOOT_SRC_DVD) if (sys_boot_src.u16[0] == BOOT_SRC_DVD)
"\n"; "\n";
 if (Bt(&port->interrupt_status, AHCI_PxIf_TFE)) //Second safety check if (Bt(&port->interrupt_status, AHCI_PxIf_TFE)) //Second safety check
goto error; goto error;
} }
@ -579,8 +579,9 @@ U0 AHCIPortIdentify(CBlkDev *bd)
{ {
"AHCI: DEBUG: AHCIPortIdentify variable check 1\n"; "AHCI: DEBUG: AHCIPortIdentify variable check 1\n";
"___________\n"; "___________\n";
"cmd_header->desc: 0x%016X\n", cmd_header->desc;
"port->cmd_issue: 0x%016X\n", port->cmd_issue; "port->cmd_issue: 0x%016X\n", port->cmd_issue;
"port->device_sleep: 0x%016X\n", port->device_sleep;  "port->device_sleep: 0x%016X\n", port->device_sleep;
"port->fis_switch_ctrl: 0x%016X\n", port->fis_switch_ctrl; "port->fis_switch_ctrl: 0x%016X\n", port->fis_switch_ctrl;
"___________\n"; "___________\n";
} }
@ -599,6 +600,9 @@ U0 AHCIPortIdentify(CBlkDev *bd)
cmd_table->prdt[0].data_byte_count = 512 - 1; //Zero-based value cmd_table->prdt[0].data_byte_count = 512 - 1; //Zero-based value
cmd_header->prdt_len = 1; //1 PRD, as described above, which contains the address to put the ID record. cmd_header->prdt_len = 1; //1 PRD, as described above, which contains the address to put the ID record.
cmd_header->desc &= ~0b11111; // clear CFL bits
cmd_header->desc |= sizeof(CFisH2D) / 4; // set CFL to size of FIS (represented as U32)
//Setup command FIS //Setup command FIS
cmd_fis = cmd_table->cmd_fis; cmd_fis = cmd_table->cmd_fis;
@ -620,14 +624,7 @@ U0 AHCIPortIdentify(CBlkDev *bd)
{ {
"AHCI: DEBUG: AHCIPortIdentify variable check 2\n"; "AHCI: DEBUG: AHCIPortIdentify variable check 2\n";
"___________\n"; "___________\n";
"bd : 0x%016X\n", bd; "cmd_header->desc: 0x%016X\n", cmd_header->desc;
"cmd_table: 0x%016X\n", cmd_table;
"cmd_fis: 0x%016X\n", cmd_fis;
"port: 0x%016X\n", port;
"cmd_slot: %d\n", cmd_slot;
"cmd_header: 0x%016X\n", cmd_header;
"dev_id_record: 0x%016X\n", dev_id_record;
"port->signature: 0x%016X\n", port->signature;
"cmd_fis->command: 0x%016X\n", cmd_fis->command; "cmd_fis->command: 0x%016X\n", cmd_fis->command;
"port->cmd_issue: 0x%016X\n", port->cmd_issue; "port->cmd_issue: 0x%016X\n", port->cmd_issue;
"port->device_sleep: 0x%016X\n", port->device_sleep; "port->device_sleep: 0x%016X\n", port->device_sleep;