PATCH: fixup incomplete ident blocks on ITE raid volumes
drivers/ide/ide-probe.c +47 -2
@@ -542,7 +542,51 @@ }/** -* probe_for_drives - upper level drive probe +* ident_quirks - drive ident mangler +* @drive: drive to check +* +* Take the returned ident block for the drive and see if it +* is one of the broken ones. We still broken ident fixups in +* multiple places, we should migrate some of the others here. +*/ +static void ident_quirks (ide_drive_t *drive) +{ +struct hd_driveid *id = drive->id; +u16 *idbits = (u16 *)id; + +if (strstr (id->model,"Integrated Technology Express" )) + { +/* IT821x raid volume with bogus ident block */ +if (id->lba_capacity >=0x200000 ) + { + id->sectors =63 ; + id->heads =255 ; + } +else + { + id->sectors =32 ; + id->heads =64 ; + } + id->cyls =1 + id->lba_capacity_2 / (id->heads * id->sectors); +/* LBA28 is ok, DMA is ok, UDMA data is valid */ + id->capability |=3 ; + id->field_valid |=7 ; +/* LBA48 is ok */ + id->command_set_2 |=0x0400 ; + id->cfs_enable_2 |=0x0400 ; +/* Flush is ok */ + id->cfs_enable_2 |=0x3000 ; +printk (KERN_WARNING "%s: IT8212 %sRAID %d volume" , + drive->name, + idbits[147 ] ?"Bootable " :"" , + idbits[129 ]); +if (idbits[129 ] !=1 ) +printk ("(%dK stripe)" , idbits[146 ]); +printk (".\n" ); + } +} +/** +* probe_for_drive - upper level drive probe * @drive: drive to probe for * * probe_for_drive() tests for existence of a given drive using do_probe()
@@ -553,7 +597,7 @@* still be 0) */ -static inline u8 probe_for_drive (ide_drive_t *drive) +static u8 probe_for_drive (ide_drive_t *drive) {/* * In order to keep things simple we have an id
@@ -602,6 +646,7 @@ drive->present =0 ; } } +ident_quirks (drive);/* drive was found */ }if (!drive->present)
Quoted 75 lines · Alan Cox
diff -u --new-file --recursive --exclude-from
/usr/src/excludelinux.vanilla-2.6.8-rc3/drivers/ide/ide-probe.clinux-2.6.8-rc3/drivers/ide/ide-probe.cdrivers/ide/ide-probe.c +47
-2@@ -542,7 +542,51 @@ }/** -* probe_for_drives - upper level drive probe +* ident_quirks - drive ident mangler +* @drive: drive to check +* +* Take the returned ident block for the drive and see if it +* is one of the broken ones. We still broken ident fixups in +* multiple places, we should migrate some of the others here. +*/ +static void ident_quirks (ide_drive_t *drive) +{ +struct hd_driveid *id = drive->id; +u16 *idbits = (u16 *)id; + +if (strstr (id->model,"Integrated Technology Express" )) + { +/* IT821x raid volume with bogus ident block */ +if (id->lba_capacity >=0x200000 ) + { + id->sectors =63 ; + id->heads =255 ; + } +else + { + id->sectors =32 ; + id->heads =64 ; + } + id->cyls =1 + id->lba_capacity_2 / (id->heads * id->sectors); +/* LBA28 is ok, DMA is ok, UDMA data is valid */ + id->capability |=3 ; + id->field_valid |=7 ; +/* LBA48 is ok */ + id->command_set_2 |=0x0400 ; + id->cfs_enable_2 |=0x0400 ; +/* Flush is ok */ + id->cfs_enable_2 |=0x3000 ; +printk (KERN_WARNING "%s: IT8212 %sRAID %d volume" , + drive->name, + idbits[147 ] ?"Bootable " :"" , + idbits[129 ]); +if (idbits[129 ] !=1 ) +printk ("(%dK stripe)" , idbits[146 ]); +printk (".\n" ); + } +} +/** +* probe_for_drive - upper level drive probe * @drive: drive to probe for * * probe_for_drive() tests for existence of a given drive using do_probe() @@ -553,7 +597,7 @@* still be 0) */ -static inline u8 probe_for_drive (ide_drive_t *drive) +static u8 probe_for_drive (ide_drive_t *drive) {/* * In order to keep things simple we have an id @@ -602,6 +646,7 @@ drive->present =0 ; } } +ident_quirks (drive);/* drive was found */ }if (!drive->present)
Quoted 2 lines
Signed-off-by Alan Cox
This one is cause this:
---
LD .tmp_vmlinux1
drivers/built-in.o(.text+0x6ef1f): In function `ident_quirks':
: undefined reference to `__udivdi3'
make: *** [.tmp_vmlinux1] Error 1
---
Regards,
Signature · 1 line
Martin Schlemmer
Quoted 3 lines · Martin Schlemmer
drivers/ide/ide-probe.c line 571
Quoted 3 lines
drivers/ide/ide-probe.c +3
-0+ } + id->cyls =1 + id->lba_capacity_2 / (id->heads * id->sectors); +/* LBA28 is ok, DMA is ok, UDMA data is valid */
Change that to use sector_div() and it should be fine. My gcc didn't end up generating internal gcc library helpers for that so I didnt notice.
Quoted 7 lines · Alan Cox
Quoted 2 lines · Bartlomiej Zolnierkiewicz
This should be part of ITE driver patch and be compiled only when ITE driver is going to be used or even better - there should be new callback for that.
Nice theory but doesn't work that way. The ITE drive will do this even if you don't have the ITE driver compiled in because it'll be seen as the mainboard legacy controller (or generic) in some systems.
By way of more explanation here. The ITE chip does some interesting things. Its got two modes. The first is a generic nodescript and slightly irritatingly designed IDE device. The second runs stuff via an onboard microcontroller which can do stuff like fire transactions up on both busses and then do the DMA to both at once.
The firmware when you have raid volumes fakes up identity blocks (badly) and the device is IDE class and capable of being your main IDE controller. In that situation even the generic PIO driver will see the RAID volumes and get confused by the ident blocks.
There is a second problem too resulting from this. Not only might the IT8212 module not be loaded, but even if it is we probe the generic IDE devices with the generic PIO and then attach the PCI driver on top of it. That one can be dealt with by using a little bit of care but the fact generic IDE sees them I think means it has to be in the generic ide probe code. A later patch removes the geometry stuff as I fixed that properly in ide-disk so it isn't needed now.
Alan
This should be part of ITE driver patch and be compiled only when ITE driver is going to be used or even better - there should be new callback for that.
Quoted 77 lines · Alan Cox
diff -u --new-file --recursive --exclude-from
/usr/src/excludelinux.vanilla-2.6.8-rc3/drivers/ide/ide-probe.clinux-2.6.8-rc3/drivers/ide/ide-probe.c---linux.vanilla-2.6.8-rc3/drivers/ide/ide-probe.c2004-08-09
15:51:00.000000000 +0100 +++linux-2.6.8-rc3/drivers/ide/ide-probe.c2004-08-14 21:03:03.000000000 +0100drivers/ide/ide-probe.c +47
-2@@ -542,7 +542,51 @@ }/** -* probe_for_drives - upper level drive probe +* ident_quirks - drive ident mangler +* @drive: drive to check +* +* Take the returned ident block for the drive and see if it +* is one of the broken ones. We still broken ident fixups in +* multiple places, we should migrate some of the others here. +*/ +static void ident_quirks (ide_drive_t *drive) +{ +struct hd_driveid *id = drive->id; +u16 *idbits = (u16 *)id; + +if (strstr (id->model,"Integrated Technology Express" )) + { +/* IT821x raid volume with bogus ident block */ +if (id->lba_capacity >=0x200000 ) + { + id->sectors =63 ; + id->heads =255 ; + } +else + { + id->sectors =32 ; + id->heads =64 ; + } + id->cyls =1 + id->lba_capacity_2 / (id->heads * id->sectors); +/* LBA28 is ok, DMA is ok, UDMA data is valid */ + id->capability |=3 ; + id->field_valid |=7 ; +/* LBA48 is ok */ + id->command_set_2 |=0x0400 ; + id->cfs_enable_2 |=0x0400 ; +/* Flush is ok */ + id->cfs_enable_2 |=0x3000 ; +printk (KERN_WARNING "%s: IT8212 %sRAID %d volume" , + drive->name, + idbits[147 ] ?"Bootable " :"" , + idbits[129 ]); +if (idbits[129 ] !=1 ) +printk ("(%dK stripe)" , idbits[146 ]); +printk (".\n" ); + } +} +/** +* probe_for_drive - upper level drive probe * @drive: drive to probe for * * probe_for_drive() tests for existence of a given drive using do_probe() @@ -553,7 +597,7 @@* still be 0) */ -static inline u8 probe_for_drive (ide_drive_t *drive) +static u8 probe_for_drive (ide_drive_t *drive) {/* * In order to keep things simple we have an id @@ -602,6 +646,7 @@ drive->present =0 ; } } +ident_quirks (drive);/* drive was found */ }if (!drive->present)
Quoted 2 lines · Bartlomiej Zolnierkiewicz
This should be part of ITE driver patch and be compiled only when ITE driver is going to be used or even better - there should be new callback for that.
Nice theory but doesn't work that way. The ITE drive will do this even if you don't have the ITE driver compiled in because it'll be seen as the mainboard legacy controller (or generic) in some systems.
Alan