mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: trm290: do hook dma_host_{on,off} methods (take 2) ide: fix cable detection for SATA bridges ide: workaround suspend bug for ACPI IDE
This commit is contained in:
commit
318851b08f
3 changed files with 58 additions and 13 deletions
|
@ -16,6 +16,7 @@
|
|||
#include <acpi/acpi.h>
|
||||
#include <linux/ide.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/dmi.h>
|
||||
|
||||
#include <acpi/acpi_bus.h>
|
||||
#include <acpi/acnames.h>
|
||||
|
@ -65,6 +66,37 @@ extern int ide_noacpi;
|
|||
extern int ide_noacpitfs;
|
||||
extern int ide_noacpionboot;
|
||||
|
||||
static bool ide_noacpi_psx;
|
||||
static int no_acpi_psx(const struct dmi_system_id *id)
|
||||
{
|
||||
ide_noacpi_psx = true;
|
||||
printk(KERN_NOTICE"%s detected - disable ACPI _PSx.\n", id->ident);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct dmi_system_id ide_acpi_dmi_table[] = {
|
||||
/* Bug 9673. */
|
||||
/* We should check if this is because ACPI NVS isn't save/restored. */
|
||||
{
|
||||
.callback = no_acpi_psx,
|
||||
.ident = "HP nx9005",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies Ltd."),
|
||||
DMI_MATCH(DMI_BIOS_VERSION, "KAM1.60")
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
static int ide_acpi_blacklist(void)
|
||||
{
|
||||
static int done;
|
||||
if (done)
|
||||
return 0;
|
||||
done = 1;
|
||||
dmi_check_system(ide_acpi_dmi_table);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* ide_get_dev_handle - finds acpi_handle and PCI device.function
|
||||
* @dev: device to locate
|
||||
|
@ -623,7 +655,7 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on)
|
|||
{
|
||||
int unit;
|
||||
|
||||
if (ide_noacpi)
|
||||
if (ide_noacpi || ide_noacpi_psx)
|
||||
return;
|
||||
|
||||
DEBPRINT("ENTER:\n");
|
||||
|
@ -668,6 +700,8 @@ void ide_acpi_init(ide_hwif_t *hwif)
|
|||
struct ide_acpi_drive_link *master;
|
||||
struct ide_acpi_drive_link *slave;
|
||||
|
||||
ide_acpi_blacklist();
|
||||
|
||||
hwif->acpidata = kzalloc(sizeof(struct ide_acpi_hwif_link), GFP_KERNEL);
|
||||
if (!hwif->acpidata)
|
||||
return;
|
||||
|
|
|
@ -612,12 +612,12 @@ 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)
|
||||
return 1;
|
||||
|
||||
if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
|
||||
goto no_80w;
|
||||
|
||||
if (ide_dev_is_sata(id))
|
||||
return 1;
|
||||
|
||||
/*
|
||||
* FIXME:
|
||||
* - force bit13 (80c cable present) check also for !ivb devices
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
/*
|
||||
* linux/drivers/ide/pci/trm290.c Version 1.02 Mar. 18, 2000
|
||||
* linux/drivers/ide/pci/trm290.c Version 1.05 Dec. 26, 2007
|
||||
*
|
||||
* Copyright (c) 1997-1998 Mark Lord
|
||||
* Copyright (c) 2007 MontaVista Software, Inc. <source@mvista.com>
|
||||
* May be copied or modified under the terms of the GNU General Public License
|
||||
*
|
||||
* June 22, 2004 - get rid of check_region
|
||||
|
@ -177,7 +178,7 @@ static void trm290_selectproc (ide_drive_t *drive)
|
|||
trm290_prepare_drive(drive, drive->using_dma);
|
||||
}
|
||||
|
||||
static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
|
||||
static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)
|
||||
{
|
||||
BUG_ON(HWGROUP(drive)->handler != NULL); /* paranoia check */
|
||||
ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
|
||||
|
@ -185,7 +186,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
|
|||
outb(command, IDE_COMMAND_REG);
|
||||
}
|
||||
|
||||
static int trm290_ide_dma_setup(ide_drive_t *drive)
|
||||
static int trm290_dma_setup(ide_drive_t *drive)
|
||||
{
|
||||
ide_hwif_t *hwif = drive->hwif;
|
||||
struct request *rq = hwif->hwgroup->rq;
|
||||
|
@ -215,7 +216,7 @@ static int trm290_ide_dma_setup(ide_drive_t *drive)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void trm290_ide_dma_start(ide_drive_t *drive)
|
||||
static void trm290_dma_start(ide_drive_t *drive)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -240,6 +241,14 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
|
|||
return (status == 0x00ff);
|
||||
}
|
||||
|
||||
static void trm290_dma_host_on(ide_drive_t *drive)
|
||||
{
|
||||
}
|
||||
|
||||
static void trm290_dma_host_off(ide_drive_t *drive)
|
||||
{
|
||||
}
|
||||
|
||||
static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
|
||||
{
|
||||
unsigned int cfgbase = 0;
|
||||
|
@ -280,11 +289,13 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
|
|||
|
||||
ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
|
||||
|
||||
hwif->dma_setup = &trm290_ide_dma_setup;
|
||||
hwif->dma_exec_cmd = &trm290_ide_dma_exec_cmd;
|
||||
hwif->dma_start = &trm290_ide_dma_start;
|
||||
hwif->ide_dma_end = &trm290_ide_dma_end;
|
||||
hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
|
||||
hwif->dma_host_off = &trm290_dma_host_off;
|
||||
hwif->dma_host_on = &trm290_dma_host_on;
|
||||
hwif->dma_setup = &trm290_dma_setup;
|
||||
hwif->dma_exec_cmd = &trm290_dma_exec_cmd;
|
||||
hwif->dma_start = &trm290_dma_start;
|
||||
hwif->ide_dma_end = &trm290_ide_dma_end;
|
||||
hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
|
||||
|
||||
hwif->selectproc = &trm290_selectproc;
|
||||
#if 1
|
||||
|
|
Loading…
Reference in a new issue