ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atapi_drv: Add LBA48 support 

Fixes #678
This commit is contained in:
Ivan Loskutov 2013-03-01 18:25:39 +04:00 committed by Norman Feske
parent 5725c4c122
commit 33b59a6276
2 changed files with 70 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
os/src/drivers/atapi/ata_device.cc
View File

@ -77,6 +77,14 @@ void Ata::Device::probe_dma()
0L,
buffer,
1L, 0 )) {
unsigned command_set = buffer[164] + (buffer[165] << 8) + (buffer[166] << 16) + (buffer[167] << 24);
_lba48 = false;
if (command_set & (1 << 26) )
_lba48 = true;
Genode::printf( "LBA%d\n", _lba48 ? 48 : 28 );
Genode::printf("UDMA Modes supported:\n");
@ -106,12 +114,22 @@ void Ata::Device::read_capacity()
enum { CMD_NATIVE_MAX_ADDRESS = 0xf8 };
if (!reg_non_data_lba28(dev_num(), CMD_NATIVE_MAX_ADDRESS, 0, 1, 0UL)) {
if (_lba48) {
if (!reg_non_data_lba48(dev_num(), CMD_NATIVE_MAX_ADDRESS, 0, 1, 0UL, 0UL)) {
_block_end = _pio->inb(CB_SN); /* 0 - 7 */
_block_end |= _pio->inb(CB_CL) << 8; /* 8 - 15 */
_block_end |= _pio->inb(CB_CH) << 16; /* 16 - 23 */
_block_end |= (_pio->inb(CB_DH) & 0xf) << 24; /* 24 - 27 */
_block_end = _pio->inb(CB_SN); /* 0 - 7 */
_block_end |= _pio->inb(CB_CL) << 8; /* 8 - 15 */
_block_end |= _pio->inb(CB_CH) << 16; /* 16 - 23 */
_block_end |= _pio->inb(CB_DH) << 24; /* 24 - 31 */
}
} else {
if (!reg_non_data_lba28(dev_num(), CMD_NATIVE_MAX_ADDRESS, 0, 1, 0UL)) {
_block_end = _pio->inb(CB_SN); /* 0 - 7 */
_block_end |= _pio->inb(CB_CL) << 8; /* 8 - 15 */
_block_end |= _pio->inb(CB_CH) << 16; /* 16 - 23 */
_block_end |= (_pio->inb(CB_DH) & 0xf) << 24; /* 24 - 27 */
}
}
if (verbose)
@ -132,14 +150,30 @@ void Ata::Device::read(unsigned long block_nr,
PDBG("DMA read: block %lu, c %lu, offset: %08lx, base: %08lx",
block_nr, c, offset, _base_addr);
if (dma_pci_lba28(dev_num(), CMD_READ_DMA, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c))
throw Io_error();
if (!_lba48)
{
if (dma_pci_lba28(dev_num(), CMD_READ_DMA, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c))
throw Io_error();
} else {
if (dma_pci_lba48(dev_num(), CMD_READ_DMA_EXT, 0, c, 0, block_nr,
(unsigned char *)(_base_addr + offset), c))
throw Io_error();
}
}
else {
if (!_lba48)
{
if (reg_pio_data_in_lba28(dev_num(), CMD_READ_SECTORS, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c, 0))
throw Io_error();
} else {
if (reg_pio_data_in_lba48(dev_num(), CMD_READ_SECTORS_EXT, 0, c, 0, block_nr,
(unsigned char *)(_base_addr + offset), c, 0))
throw Io_error();
}
}
else
if (reg_pio_data_in_lba28(dev_num(), CMD_READ_SECTORS, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c, 0))
throw Io_error();
count -= c;
block_nr += c;
@ -160,14 +194,31 @@ void Ata::Device::write(unsigned long block_nr,
PDBG("DMA read: block %lu, c %lu, offset: %08lx, base: %08lx",
block_nr, c, offset, _base_addr);
if (dma_pci_lba28(dev_num(), CMD_WRITE_DMA, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c))
if (!_lba48)
{
if (dma_pci_lba28(dev_num(), CMD_WRITE_DMA, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c))
throw Io_error();
}
else {
if (dma_pci_lba48(dev_num(), CMD_WRITE_DMA_EXT, 0, c, 0, block_nr,
(unsigned char *)(_base_addr + offset), c))
throw Io_error();
}
}
else {
if (!_lba48)
{
if (reg_pio_data_out_lba28(dev_num(), CMD_WRITE_SECTORS, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c, 0))
throw Io_error();
} else {
if (reg_pio_data_out_lba48(dev_num(), CMD_WRITE_SECTORS_EXT, 0, c, 0, block_nr,
(unsigned char *)(_base_addr + offset), c, 0))
throw Io_error();
}
}
else
if (reg_pio_data_out_lba28(dev_num(), CMD_WRITE_SECTORS, 0, c, block_nr,
(unsigned char *)(_base_addr + offset), c, 0))
throw Io_error();
count -= c;
block_nr += c;

1
os/src/drivers/atapi/ata_device.h
View File

@ -45,6 +45,7 @@ namespace Ata {
unsigned _block_end;
unsigned _block_size;
Genode::addr_t _base_addr;
bool _lba48;
protected: