mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 05:50:53 +07:00
ide: ide_dev_is_sata() -> ata_id_is_sata()
* Use optimized ATA version check from Sergei in ata_id_is_sata(). * ide_dev_is_sata() -> ata_id_is_sata() Cc: Jeff Garzik <jgarzik@pobox.com> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
5d5870f0a2
commit
367d7e78dd
@ -630,7 +630,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
|
||||
printk(KERN_DEBUG "%s: skipping word 93 validity check\n",
|
||||
drive->name);
|
||||
|
||||
if (ide_dev_is_sata(id) && !ivb)
|
||||
if (ata_id_is_sata(id) && !ivb)
|
||||
return 1;
|
||||
|
||||
if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
|
||||
|
@ -654,7 +654,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)
|
||||
case HPT372A:
|
||||
case HPT372N:
|
||||
case HPT374 :
|
||||
if (ide_dev_is_sata(drive->id))
|
||||
if (ata_id_is_sata(drive->id))
|
||||
mask &= ~0x0e;
|
||||
/* Fall thru */
|
||||
default:
|
||||
@ -674,7 +674,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
|
||||
case HPT372A:
|
||||
case HPT372N:
|
||||
case HPT374 :
|
||||
if (ide_dev_is_sata(drive->id))
|
||||
if (ata_id_is_sata(drive->id))
|
||||
return 0x00;
|
||||
/* Fall thru */
|
||||
default:
|
||||
|
@ -645,7 +645,15 @@ static inline unsigned int ata_id_major_version(const u16 *id)
|
||||
|
||||
static inline int ata_id_is_sata(const u16 *id)
|
||||
{
|
||||
return ata_id_major_version(id) >= 5 && id[ATA_ID_HW_CONFIG] == 0;
|
||||
/*
|
||||
* See if word 93 is 0 AND drive is at least ATA-5 compatible
|
||||
* verifying that word 80 by casting it to a signed type --
|
||||
* this trick allows us to filter out the reserved values of
|
||||
* 0x0000 and 0xffff along with the earlier ATA revisions...
|
||||
*/
|
||||
if (id[ATA_ID_HW_CONFIG] == 0 && (short)id[ATA_ID_MAJOR_VER] >= 0x0020)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ata_id_has_tpm(const u16 *id)
|
||||
|
@ -1382,19 +1382,6 @@ const char *ide_xfer_verbose(u8 mode);
|
||||
extern void ide_toggle_bounce(ide_drive_t *drive, int on);
|
||||
extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
|
||||
|
||||
static inline int ide_dev_is_sata(u16 *id)
|
||||
{
|
||||
/*
|
||||
* See if word 93 is 0 AND drive is at least ATA-5 compatible
|
||||
* verifying that word 80 by casting it to a signed type --
|
||||
* this trick allows us to filter out the reserved values of
|
||||
* 0x0000 and 0xffff along with the earlier ATA revisions...
|
||||
*/
|
||||
if (id[ATA_ID_HW_CONFIG] == 0 && (short)id[ATA_ID_MAJOR_VER] >= 0x0020)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
u64 ide_get_lba_addr(struct ide_taskfile *, int);
|
||||
u8 ide_dump_status(ide_drive_t *, const char *, u8);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user