diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2011-08-19 15:08:08 -0500 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2011-08-19 15:08:08 -0500 |
| commit | 243223ae638e95cb6744f335010595c4de30d13c (patch) | |
| tree | 536d20b959bc6e31cf60c113c34eaed5064ddb87 /src/dev/ide_disk.hh | |
| parent | 999cd8aef5dfa3c22b02b55420608fbb8d7e7822 (diff) | |
| download | gem5-243223ae638e95cb6744f335010595c4de30d13c.tar.xz | |
IDE: Fix issues with new PIIX kernel driver and our model.
The driver can read the IDE config register as a 32 bit register since
some adapters use bit 18 as a disable channel bit. If the size isn't
set in a PRD it should be 64K according to the SPEC (and driver) not
128K.
Diffstat (limited to 'src/dev/ide_disk.hh')
| -rw-r--r-- | src/dev/ide_disk.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/dev/ide_disk.hh b/src/dev/ide_disk.hh index 0595e18cf..af42bd2c9 100644 --- a/src/dev/ide_disk.hh +++ b/src/dev/ide_disk.hh @@ -46,10 +46,11 @@ class ChunkGenerator; -#define DMA_BACKOFF_PERIOD 200 +#define DMA_BACKOFF_PERIOD 200 -#define MAX_DMA_SIZE (131072) // 128K -#define MAX_MULTSECT (128) +#define MAX_DMA_SIZE 0x20000 // 128K +#define MAX_SINGLE_DMA_SIZE 0x10000 +#define MAX_MULTSECT (128) #define PRD_BASE_MASK 0xfffffffe #define PRD_COUNT_MASK 0xfffe @@ -72,7 +73,7 @@ class PrdTableEntry { uint32_t getByteCount() { - return ((entry.byteCount == 0) ? MAX_DMA_SIZE : + return ((entry.byteCount == 0) ? MAX_SINGLE_DMA_SIZE : (entry.byteCount & PRD_COUNT_MASK)); } |