tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-04-18 05:38:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix missing BlkDev locks in AHCI read/write methods.

Browse source
This commit is contained in:
TomAwezome 2021-06-17 03:43:29 -04:00
parent 138e503ccd
commit 413b73db76
2 changed files with 18 additions and 3 deletions

BIN
Zenith-latest-2021-06-16-20_14_58.iso → Zenith-latest-2021-06-17-03_05_20.iso
View file

Binary file not shown.

21
src/Kernel/BlkDev/DiskAHCI.CC
View file

@ -343,6 +343,7 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
I64 i, buf_size, buf_size_tmp, byte_count, prdt_len, cmd_slot = AHCIPortCmdSlotGet(bd->port_num);
CPortCmdHeader *cmd_header = AHCIPortActiveHeaderGet(bd->port_num, cmd_slot);
U8 *internal_buf_tmp, *internal_buf;
Bool unlock;
if (port->signature != AHCI_PxSIG_ATA)
{
@ -357,6 +358,8 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
throw('AHCI');
}
unlock = BlkDevLock(bd);
//Determine buffer size and PRDT length.
buf_size = buf_size_tmp = count * BLK_SIZE;
prdt_len = (buf_size - 1) / AHCI_PRD_MAX_BYTES + 1;
@ -429,6 +432,9 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
MemCopy(buf, internal_buf, buf_size);
}
if (unlock)
BlkDevUnlock(bd);
return cmd_header->prd_byte_count;
}
@ -464,7 +470,8 @@ I64 AHCIAtaBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
I64 AHCIAtaBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
{//Write 'blk' amount of blocks to AHCI disk device. Returns num of bytes transferred between memory and disk.
I64 byte_count = 0;
I64 byte_count = 0;
if (!count)
return 0;
if (count <= AHCI_PRDT_MAX_BLOCKS)
@ -486,10 +493,11 @@ I64 AHCIAtaBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
}
byte_count += AHCIAtaBlksRW(bd, buf, blk, count, TRUE);
}
return byte_count;
}
I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
{//Read 'blk' amount of blocks from from AHCI ATAPI device. Returns num of bytes transferred.
CPortCmdTable *cmd_table;
CFisH2D *cmd_fis;
@ -498,6 +506,7 @@ I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
CPortCmdHeader *cmd_header = AHCIPortActiveHeaderGet(bd->port_num, cmd_slot);
U8 *internal_buf, *internal_buf_tmp;
CAtapiReadCmd read_cmd;
Bool unlock;
if (port->signature != AHCI_PxSIG_ATAPI)
{
@ -507,6 +516,9 @@ I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
if (count < 1)
return 0;
if (lock)
unlock = BlkDevLock(bd);
buf_size = buf_size_tmp = count * DVD_BLK_SIZE;
prdt_len = (buf_size - 1) / AHCI_PRD_MAX_BYTES + 1;
@ -571,6 +583,9 @@ I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
MemCopy(buf, internal_buf, buf_size);
}
if (lock && unlock)
BlkDevUnlock(bd);
return cmd_header->prd_byte_count;
}
@ -704,7 +719,7 @@ Bool AHCIBootDVDProbeAll(CBlkDev *bd)
AHCIPortInit(bd, port, i);
AHCIAtapiBlksRead(bd, buf, sys_boot_blk, 1);
AHCIAtapiBlksRead(bd, buf, sys_boot_blk, 1, FALSE);
kernel = buf + sys_boot_src.u16[1] << BLK_SIZE_BITS;