--- linux-2616-rc2-pata.orig/drivers/scsi/Makefile +++ linux-2616-rc2-pata/drivers/scsi/Makefile @@ -163,7 +163,8 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \ CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) zalon7xx-objs := zalon.o ncr53c8xx.o NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o -libata-objs := libata-core.o libata-scsi.o +libata-y := libata-core.o libata-scsi.o +libata-$(CONFIG_SCSI_SATA_ACPI) += libata-acpi.o oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o # Files generated that shall be removed upon make clean --- linux-2616-rc2-pata.orig/drivers/scsi/Kconfig +++ linux-2616-rc2-pata/drivers/scsi/Kconfig @@ -599,6 +599,19 @@ config SCSI_SATA_INTEL_COMBINED depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX) default y +config SCSI_SATA_ACPI + bool + depends on SCSI_SATA && ACPI && PCI + default y + help + This option adds support for SATA-related ACPI objects. + These ACPI objects add the ability to retrieve taskfiles + from the ACPI BIOS and write them to the disk controller. + These objects may be related to performance, security, + power management, or other areas. + You can disable this at kernel boot time by using the + option 'libata.noacpi'. + config SCSI_BUSLOGIC tristate "BusLogic SCSI support" depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API --- linux-2616-rc2-pata.orig/include/linux/libata.h +++ linux-2616-rc2-pata/include/linux/libata.h @@ -33,9 +33,11 @@ #include #include #include +#include /* - * compile-time options + * compile-time options: to be removed as soon as all the drivers are + * converted to the new debugging mechanism */ #undef ATA_DEBUG /* debugging output */ #undef ATA_VERBOSE_DEBUG /* yet more debugging output */ @@ -71,6 +73,38 @@ } #endif +/* NEW: debug levels */ +#define HAVE_LIBATA_MSG 1 + +enum { + ATA_MSG_DRV = 0x0001, + ATA_MSG_INFO = 0x0002, + ATA_MSG_PROBE = 0x0004, + ATA_MSG_WARN = 0x0008, + ATA_MSG_MALLOC = 0x0010, + ATA_MSG_CTL = 0x0020, + ATA_MSG_INTR = 0x0040, + ATA_MSG_ERR = 0x0080, +}; + +#define ata_msg_drv(p) ((p)->msg_enable & ATA_MSG_DRV) +#define ata_msg_info(p) ((p)->msg_enable & ATA_MSG_INFO) +#define ata_msg_probe(p) ((p)->msg_enable & ATA_MSG_PROBE) +#define ata_msg_warn(p) ((p)->msg_enable & ATA_MSG_WARN) +#define ata_msg_malloc(p) ((p)->msg_enable & ATA_MSG_MALLOC) +#define ata_msg_ctl(p) ((p)->msg_enable & ATA_MSG_CTL) +#define ata_msg_intr(p) ((p)->msg_enable & ATA_MSG_INTR) +#define ata_msg_err(p) ((p)->msg_enable & ATA_MSG_ERR) + +static inline u32 ata_msg_init(int dval, int default_msg_enable_bits) +{ + if (dval < 0 || dval >= (sizeof(u32) * 8)) + return default_msg_enable_bits; /* should be 0x1 - only driver info msgs */ + if (!dval) + return 0; + return (1 << dval) - 1; +} + /* defines only for the constants which don't work well as enums */ #define ATA_TAG_POISON 0xfafbfcfdU @@ -123,11 +157,10 @@ enum { * proper HSM is in place. */ ATA_FLAG_DEBUGMSG = (1 << 10), ATA_FLAG_NO_ATAPI = (1 << 11), /* No ATAPI support */ - ATA_FLAG_SUSPENDED = (1 << 12), /* port is suspended */ - ATA_FLAG_PIO_LBA48 = (1 << 13), /* Host DMA engine is LBA28 only */ ATA_FLAG_IRQ_MASK = (1 << 14), /* Mask IRQ in PIO xfers */ + ATA_FLAG_PATA_MODE = (1 << 15), /* port in PATA mode */ ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ @@ -200,6 +233,7 @@ struct scsi_device; struct ata_port_operations; struct ata_port; struct ata_queued_cmd; +struct GTM_buffer; /* typedefs */ typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc); @@ -318,6 +352,11 @@ struct ata_device { u16 cylinders; /* Number of cylinders */ u16 heads; /* Number of heads */ u16 sectors; /* Number of sectors per track */ + +#ifdef CONFIG_SCSI_SATA_ACPI + /* ACPI objects info */ + acpi_handle obj_handle; +#endif }; struct ata_port { @@ -338,6 +377,7 @@ struct ata_port { u8 ctl; /* cache of ATA control register */ u8 last_ctl; /* Cache last written value */ + u8 legacy_mode; unsigned int pio_mask; unsigned int mwdma_mask; unsigned int udma_mask; @@ -358,6 +398,13 @@ struct ata_port { struct work_struct pio_task; unsigned int hsm_task_state; unsigned long pio_task_timeout; + struct device *dev; + + u32 msg_enable; +#ifdef CONFIG_SCSI_SATA_ACPI + struct GTM_buffer *gtm; + void *gtm_object_area; +#endif void *private_data; }; @@ -645,9 +692,9 @@ static inline u8 ata_wait_idle(struct at if (status & (ATA_BUSY | ATA_DRQ)) { unsigned long l = ap->ioaddr.status_addr; - printk(KERN_WARNING - "ATA: abnormal status 0x%X on port 0x%lX\n", - status, l); + if (ata_msg_warn(ap)) + printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%lX\n", + status, l); } return status; @@ -739,7 +786,8 @@ static inline u8 ata_irq_ack(struct ata_ status = ata_busy_wait(ap, bits, 1000); if (status & bits) - DPRINTK("abnormal status 0x%X\n", status); + if (ata_msg_err(ap)) + printk(KERN_ERR "abnormal status 0x%X\n", status); /* get controller status; clear intr, err bits */ if (ap->flags & ATA_FLAG_MMIO) { @@ -757,8 +805,10 @@ static inline u8 ata_irq_ack(struct ata_ post_stat = inb(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); } - VPRINTK("irq ack: host_stat 0x%X, new host_stat 0x%X, drv_stat 0x%X\n", - host_stat, post_stat, status); + if (ata_msg_intr(ap)) + printk(KERN_INFO "%s: irq ack: host_stat 0x%X, new host_stat 0x%X, drv_stat 0x%X\n", + __FUNCTION__, + host_stat, post_stat, status); return status; } --- linux-2616-rc2-pata.orig/Documentation/DocBook/libata.tmpl +++ linux-2616-rc2-pata/Documentation/DocBook/libata.tmpl @@ -787,6 +787,12 @@ and other resources, etc. !Idrivers/scsi/libata-scsi.c + + libata ACPI interfaces/methods +!Edrivers/scsi/ata_acpi.c +!Idrivers/scsi/ata_acpi.c + + ATA errors & exceptions --- /dev/null +++ linux-2616-rc2-pata/drivers/scsi/libata-acpi.c @@ -0,0 +1,969 @@ +/* + * libata-acpi.c + * Provides ACPI support for PATA/SATA. + * + * Copyright (C) 2005 Intel Corp. + * Copyright (C) 2005 Randy Dunlap + */ + +#include +#include +#include +#include +#include +#include +#include "scsi.h" +#include +#include +#include "libata.h" + +#include +#include +#include +#include +#include +#include +#include + +#define SATA_ROOT_PORT(x) (((x) >> 16) & 0xffff) +#define SATA_PORT_NUMBER(x) ((x) & 0xffff) /* or NO_PORT_MULT */ +#define NO_PORT_MULT 0xffff +#define SATA_ADR_RSVD 0xffffffff + +#define REGS_PER_GTF 7 +struct taskfile_array { + u8 tfa[REGS_PER_GTF]; /* regs. 0x1f1 - 0x1f7 */ +}; + +struct GTM_buffer { + __u32 PIO_speed0; + __u32 DMA_speed0; + __u32 PIO_speed1; + __u32 DMA_speed1; + __u32 GTM_flags; +}; + +#define DEBUGGING 1 +/* note: adds function name and KERN_DEBUG */ +#ifdef DEBUGGING +#define DEBPRINT(fmt, args...) \ + printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ## args) +#else +#define DEBPRINT(fmt, args...) do {} while (0) +#endif /* DEBUGGING */ + +/** + * sata_get_dev_handle - finds acpi_handle and PCI device.function + * @dev: device to locate + * @handle: returned acpi_handle for @dev + * @pcidevfn: return PCI device.func for @dev + * + * This function is somewhat SATA-specific. Or at least the + * IDE and SCSI versions of this function are different, + * so it's not entirely generic code. + * + * Returns 0 on success, <0 on error. + */ +static int sata_get_dev_handle(struct device *dev, acpi_handle *handle, + acpi_integer *pcidevfn) +{ + struct pci_dev *pci_dev; + acpi_integer addr; + + pci_dev = to_pci_dev(dev); /* NOTE: PCI-specific */ + /* Please refer to the ACPI spec for the syntax of _ADR. */ + addr = (PCI_SLOT(pci_dev->devfn) << 16) | PCI_FUNC(pci_dev->devfn); + *pcidevfn = addr; + *handle = acpi_get_child(DEVICE_ACPI_HANDLE(dev->parent), addr); + printk(KERN_DEBUG "%s: SATA dev addr=0x%llx, handle=0x%p\n", + __FUNCTION__, (unsigned long long)addr, *handle); + if (!*handle) + return -ENODEV; + return 0; +} + +/** + * pata_get_dev_handle - finds acpi_handle and PCI device.function + * @dev: device to locate + * @handle: returned acpi_handle for @dev + * @pcidevfn: return PCI device.func for @dev + * + * The PATA and SATA versions of this function are different. + * + * Returns 0 on success, <0 on error. + */ +static int pata_get_dev_handle(struct device *dev, acpi_handle *handle, + acpi_integer *pcidevfn) +{ + unsigned int domain, bus, devnum, func; + acpi_integer addr; + acpi_handle dev_handle, parent_handle; + int scanned; + struct acpi_buffer buffer = {.length = ACPI_ALLOCATE_BUFFER, + .pointer = NULL}; + acpi_status status; + struct acpi_device_info *dinfo = NULL; + int ret = -ENODEV; + + printk(KERN_DEBUG "%s: enter: dev->bus_id='%s'\n", + __FUNCTION__, dev->bus_id); + if ((scanned = sscanf(dev->bus_id, "%x:%x:%x.%x", + &domain, &bus, &devnum, &func)) != 4) { + printk(KERN_DEBUG "%s: sscanf ret. %d\n", + __FUNCTION__, scanned); + goto err; + } + + dev_handle = DEVICE_ACPI_HANDLE(dev); + parent_handle = DEVICE_ACPI_HANDLE(dev->parent); + + status = acpi_get_object_info(parent_handle, &buffer); + if (ACPI_FAILURE(status)) { + printk(KERN_DEBUG "%s: get_object_info for parent failed\n", + __FUNCTION__); + goto err; + } + dinfo = buffer.pointer; + if (dinfo && (dinfo->valid & ACPI_VALID_ADR) && + dinfo->address == bus) { + /* ACPI spec for _ADR for PCI bus: */ + addr = (acpi_integer)(devnum << 16 | func); + *pcidevfn = addr; + *handle = dev_handle; + } else { + printk(KERN_DEBUG "%s: get_object_info for parent has wrong " + " bus: %llu, should be %d\n", + __FUNCTION__, + dinfo ? (unsigned long long)dinfo->address : -1ULL, + bus); + goto err; + } + + printk(KERN_DEBUG "%s: dev_handle: 0x%p, parent_handle: 0x%p\n", + __FUNCTION__, dev_handle, parent_handle); + printk(KERN_DEBUG + "%s: for dev=0x%x.%x, addr=0x%llx, parent=0x%p, *handle=0x%p\n", + __FUNCTION__, devnum, func, (unsigned long long)addr, + dev->parent, *handle); + if (!*handle) + goto err; + ret = 0; +err: + acpi_os_free(dinfo); + return ret; +} + +struct walk_info { /* can be trimmed some */ + struct device *dev; + struct acpi_device *adev; + acpi_handle handle; + acpi_integer pcidevfn; + unsigned int drivenum; + acpi_handle obj_handle; + struct ata_port *ataport; + struct ata_device *atadev; + u32 sata_adr; + int status; + char basepath[ACPI_PATHNAME_MAX]; + int basepath_len; +}; + +static acpi_status get_devices(acpi_handle handle, + u32 level, void *context, void **return_value) +{ + acpi_status status; + struct walk_info *winfo = context; + struct acpi_buffer namebuf = {ACPI_ALLOCATE_BUFFER, NULL}; + char *pathname; + struct acpi_buffer buffer; + struct acpi_device_info *dinfo; + + status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &namebuf); + if (status) + goto ret; + pathname = namebuf.pointer; + + buffer.length = ACPI_ALLOCATE_BUFFER; + buffer.pointer = NULL; + status = acpi_get_object_info(handle, &buffer); + + if (ACPI_SUCCESS(status)) { + dinfo = buffer.pointer; + + /* find full device path name for pcidevfn */ + if (dinfo && (dinfo->valid & ACPI_VALID_ADR) && + dinfo->address == winfo->pcidevfn) { + if (ata_msg_probe(winfo->ataport)) + printk(KERN_DEBUG + ":%s: matches pcidevfn (0x%llx)\n", + pathname, winfo->pcidevfn); + strlcpy(winfo->basepath, pathname, + sizeof(winfo->basepath)); + winfo->basepath_len = strlen(pathname); + goto out; + } + + /* if basepath is not yet known, ignore this object */ + if (!winfo->basepath_len) + goto out; + + /* if this object is in scope of basepath, maybe use it */ + if (strncmp(pathname, winfo->basepath, + winfo->basepath_len) == 0) { + if (!(dinfo->valid & ACPI_VALID_ADR)) + goto out; + if (ata_msg_probe(winfo->ataport)) + printk(KERN_DEBUG "GOT ONE: (%s) " + "root_port = 0x%llx, port_num = 0x%llx\n", + pathname, + SATA_ROOT_PORT(dinfo->address), + SATA_PORT_NUMBER(dinfo->address)); + /* heuristics: */ + if (SATA_PORT_NUMBER(dinfo->address) != NO_PORT_MULT) + if (ata_msg_probe(winfo->ataport)) + printk(KERN_DEBUG + "warning: don't know how to handle SATA port multiplier\n"); + if (SATA_ROOT_PORT(dinfo->address) == + winfo->ataport->port_no && + SATA_PORT_NUMBER(dinfo->address) == NO_PORT_MULT) { + if (ata_msg_probe(winfo->ataport)) + printk(KERN_DEBUG + "THIS ^^^^^ is the requested SATA drive (handle = 0x%p)\n", + handle); + winfo->sata_adr = dinfo->address; + winfo->obj_handle = handle; + } + } +out: + acpi_os_free(dinfo); + } + acpi_os_free(pathname); + +ret: + return status; +} + +/* Get the SATA drive _ADR object. */ +static int get_sata_adr(struct device *dev, acpi_handle handle, + acpi_integer pcidevfn, unsigned int drive, + struct ata_port *ap, + struct ata_device *atadev, u32 *dev_adr) +{ + acpi_status status; + struct walk_info *winfo; + int err = -ENOMEM; + + winfo = kzalloc(sizeof(struct walk_info), GFP_KERNEL); + if (!winfo) + goto out; + + winfo->dev = dev; + winfo->atadev = atadev; + winfo->ataport = ap; + if (acpi_bus_get_device(handle, &winfo->adev) < 0) + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "acpi_bus_get_device failed\n"); + winfo->handle = handle; + winfo->pcidevfn = pcidevfn; + winfo->drivenum = drive; + + status = acpi_get_devices(NULL, get_devices, winfo, NULL); + if (ACPI_FAILURE(status)) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: acpi_get_devices failed\n", + __FUNCTION__); + err = -ENODEV; + } else { + *dev_adr = winfo->sata_adr; + atadev->obj_handle = winfo->obj_handle; + err = 0; + } + kfree(winfo); +out: + return err; +} + +/** + * ata_acpi_push_id - send Identify data to a drive + * @ap: the ata_port for the drive + * @ix: drive index + * + * _SDD ACPI object: for SATA mode only. + * Must be after Identify (Packet) Device -- uses its data. + */ +int ata_acpi_push_id(struct ata_port *ap, unsigned int ix) +{ + acpi_handle handle; + acpi_integer pcidevfn; + int err = -ENODEV; + struct device *dev = ap->host_set->dev; + struct ata_device *atadev = &ap->device[ix]; + u32 dev_adr; + acpi_status status; + struct acpi_object_list input; + union acpi_object in_params[1]; + + if (ap->legacy_mode) { + printk(KERN_DEBUG "%s: should not be here for PATA mode\n", + __FUNCTION__); + return 0; + } + if (noacpi) + return 0; + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: ap->id: %d, ix = %d, port#: %d, hard_port#: %d\n", + __FUNCTION__, ap->id, ix, + ap->port_no, ap->hard_port_no); + + /* Don't continue if not a SATA device. */ + if (!ata_id_is_sata(atadev->id)) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: ata_id_is_sata is False\n", + __FUNCTION__); + goto out; + } + + /* Don't continue if device has no _ADR method. + * _SDD is intended for known motherboard devices. */ + err = sata_get_dev_handle(dev, &handle, &pcidevfn); + if (err < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: sata_get_dev_handle failed (%d\n", + __FUNCTION__, err); + goto out; + } + + /* Get this drive's _ADR info. if not already known. */ + if (!atadev->obj_handle) { + dev_adr = SATA_ADR_RSVD; + err = get_sata_adr(dev, handle, pcidevfn, ix, ap, atadev, + &dev_adr); + if (err < 0 || dev_adr == SATA_ADR_RSVD || + !atadev->obj_handle) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: get_sata_adr failed: " + "err=%d, dev_adr=%u, obj_handle=0x%p\n", + __FUNCTION__, err, dev_adr, + atadev->obj_handle); + goto out; + } + } + + /* Give the drive Identify data to the drive via the _SDD method */ + /* _SDD: set up input parameters */ + input.count = 1; + input.pointer = in_params; + in_params[0].type = ACPI_TYPE_BUFFER; + in_params[0].buffer.length = sizeof(atadev->id); + in_params[0].buffer.pointer = (u8 *)atadev->id; + /* Output buffer: _SDD has no output */ + + /* It's OK for _SDD to be missing too. */ + swap_buf_le16(atadev->id, ATA_ID_WORDS); + status = acpi_evaluate_object(atadev->obj_handle, "_SDD", &input, NULL); + swap_buf_le16(atadev->id, ATA_ID_WORDS); + + err = ACPI_FAILURE(status) ? -EIO : 0; + if (err < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "ata%u(%u): %s _SDD error: status = 0x%x\n", + ap->id, ap->device->devno, + __FUNCTION__, status); + } +out: + return err; +} +EXPORT_SYMBOL_GPL(ata_acpi_push_id); + +/** + * do_drive_get_GTF - get the drive bootup default taskfile settings + * @ap: the ata_port for the drive + * @atadev: target ata_device + * @gtf_length: number of bytes of _GTF data returned at @gtf_address + * @gtf_address: buffer containing _GTF taskfile arrays + * + * This applies to both PATA and SATA drives. + * + * The _GTF method has no input parameters. + * It returns a variable number of register set values (registers + * hex 1F1..1F7, taskfiles). + * The is not known in advance, so have ACPI-CA + * allocate the buffer as needed and return it, then free it later. + * + * The returned @gtf_length and @gtf_address are only valid if the + * function return value is 0. + */ +int do_drive_get_GTF(struct ata_port *ap, struct ata_device *atadev, + unsigned int *gtf_length, unsigned long *gtf_address, + unsigned long *obj_loc) +{ + acpi_status status; + acpi_handle handle; + acpi_integer pcidevfn; + u32 dev_adr; + struct acpi_buffer output; + union acpi_object *out_obj; + struct device *dev = ap->host_set->dev; + int err = -ENODEV; + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: ENTER: ap->id: %d, port#: %d, hard_port#: %d\n", + __FUNCTION__, ap->id, + ap->port_no, ap->hard_port_no); + + *gtf_length = 0; + *gtf_address = 0UL; + *obj_loc = 0UL; + + if (noacpi) + return 0; + + if (!ata_dev_present(atadev) || + (ap->flags & ATA_FLAG_PORT_DISABLED)) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: ERR: " + "ata_dev_present: %d, PORT_DISABLED: %lu\n", + __FUNCTION__, ata_dev_present(atadev), + ap->flags & ATA_FLAG_PORT_DISABLED); + goto out; + } + + /* Don't continue if device has no _ADR method. + * _GTF is intended for known motherboard devices. */ + if (ata_id_is_ata(atadev->id)) { + err = pata_get_dev_handle(dev, &handle, &pcidevfn); + if (err < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: pata_get_dev_handle failed (%d)\n", + __FUNCTION__, err); + goto out; + } + } else { + err = sata_get_dev_handle(dev, &handle, &pcidevfn); + if (err < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: sata_get_dev_handle failed (%d\n", + __FUNCTION__, err); + goto out; + } + } + + /* Get this drive's _ADR info. if not already known. */ + if (!atadev->obj_handle) { + dev_adr = SATA_ADR_RSVD; + err = get_sata_adr(dev, handle, pcidevfn, 0, ap, atadev, + &dev_adr); + if (ata_id_is_ata(atadev->id)) { + printk(KERN_DEBUG "%s: early exit\n", __FUNCTION__); + err = -1; + goto out; + } + if (err < 0 || dev_adr == SATA_ADR_RSVD || + !atadev->obj_handle) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: get_sata_adr failed: " + "err=%d, dev_adr=%u, obj_handle=0x%p\n", + __FUNCTION__, err, dev_adr, + atadev->obj_handle); + goto out; + } + } + + /* Setting up output buffer */ + output.length = ACPI_ALLOCATE_BUFFER; + output.pointer = NULL; /* ACPI-CA sets this; save/free it later */ + + /* _GTF has no input parameters */ + err = -EIO; + status = acpi_evaluate_object(atadev->obj_handle, "_GTF", + NULL, &output); + if (ACPI_FAILURE(status)) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: Run _GTF error: status = 0x%x\n", + __FUNCTION__, status); + goto out; + } + + if (!output.length || !output.pointer) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: Run _GTF: " + "length or ptr is NULL (0x%llx, 0x%p)\n", + __FUNCTION__, + (unsigned long long)output.length, + output.pointer); + acpi_os_free(output.pointer); + goto out; + } + + out_obj = output.pointer; + if (out_obj->type != ACPI_TYPE_BUFFER) { + acpi_os_free(output.pointer); + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: Run _GTF: error: " + "expected object type of ACPI_TYPE_BUFFER, " + "got 0x%x\n", + __FUNCTION__, out_obj->type); + err = -ENOENT; + goto out; + } + + if (!out_obj->buffer.length || !out_obj->buffer.pointer || + out_obj->buffer.length % REGS_PER_GTF) { + if (ata_msg_drv(ap)) + printk(KERN_ERR + "%s: unexpected GTF length (%d) or addr (0x%p)\n", + __FUNCTION__, out_obj->buffer.length, + out_obj->buffer.pointer); + err = -ENOENT; + goto out; + } + + *gtf_length = out_obj->buffer.length; + *gtf_address = (unsigned long)out_obj->buffer.pointer; + *obj_loc = (unsigned long)out_obj; + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: returning " + "gtf_length=%d, gtf_address=0x%lx, obj_loc=0x%lx\n", + __FUNCTION__, *gtf_length, *gtf_address, *obj_loc); + err = 0; +out: + return err; +} +EXPORT_SYMBOL_GPL(do_drive_get_GTF); + +/** + * taskfile_load_raw - send taskfile registers to host controller + * @ap: Port to which output is sent + * @gtf: raw ATA taskfile register set (0x1f1 - 0x1f7) + * + * Outputs ATA taskfile to standard ATA host controller using MMIO + * or PIO as indicated by the ATA_FLAG_MMIO flag. + * Writes the control, feature, nsect, lbal, lbam, and lbah registers. + * Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect, + * hob_lbal, hob_lbam, and hob_lbah. + * + * This function waits for idle (!BUSY and !DRQ) after writing + * registers. If the control register has a new value, this + * function also waits for idle after writing control and before + * writing the remaining registers. + * + * LOCKING: TBD: + * Inherited from caller. + */ +static void taskfile_load_raw(struct ata_port *ap, + struct ata_device *atadev, + const struct taskfile_array *gtf) +{ + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: (0x1f1-1f7): hex: " + "%02x %02x %02x %02x %02x %02x %02x\n", + __FUNCTION__, + gtf->tfa[0], gtf->tfa[1], gtf->tfa[2], + gtf->tfa[3], gtf->tfa[4], gtf->tfa[5], gtf->tfa[6]); + + if (ap->ops->qc_issue) { + struct ata_taskfile tf; + unsigned int err; + + ata_tf_init(ap, &tf, atadev->devno); + + /* convert gtf to tf */ + tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; /* TBD */ + tf.protocol = atadev->class == ATA_DEV_ATAPI ? + ATA_PROT_ATAPI_NODATA : ATA_PROT_NODATA; + tf.feature = gtf->tfa[0]; /* 0x1f1 */ + tf.nsect = gtf->tfa[1]; /* 0x1f2 */ + tf.lbal = gtf->tfa[2]; /* 0x1f3 */ + tf.lbam = gtf->tfa[3]; /* 0x1f4 */ + tf.lbah = gtf->tfa[4]; /* 0x1f5 */ + tf.device = gtf->tfa[5]; /* 0x1f6 */ + tf.command = gtf->tfa[6]; /* 0x1f7 */ + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "call ata_exec_internal:\n"); + err = ata_exec_internal(ap, atadev, &tf, DMA_NONE, NULL, 0); + if (err && ata_msg_probe(ap)) + printk(KERN_ERR "%s: ata_exec_internal failed: %u\n", + __FUNCTION__, err); + } else + if (ata_msg_warn(ap)) + printk(KERN_WARNING + "%s: SATA driver is missing qc_issue function entry points\n", + __FUNCTION__); +} + +/** + * do_drive_set_taskfiles - write the drive taskfile settings from _GTF + * @ap: the ata_port for the drive + * @atadev: target ata_device + * @gtf_length: total number of bytes of _GTF taskfiles + * @gtf_address: location of _GTF taskfile arrays + * + * This applies to both PATA and SATA drives. + * + * Write {gtf_address, length gtf_length} in groups of + * REGS_PER_GTF bytes. + */ +int do_drive_set_taskfiles(struct ata_port *ap, struct ata_device *atadev, + unsigned int gtf_length, unsigned long gtf_address) +{ + int err = -ENODEV; + int gtf_count = gtf_length / REGS_PER_GTF; + int ix; + struct taskfile_array *gtf; + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: ENTER: ap->id: %d, port#: %d, hard_port#: %d\n", + __FUNCTION__, ap->id, + ap->port_no, ap->hard_port_no); + + if (noacpi) + return 0; + if (!ata_id_is_sata(atadev->id)) { + printk(KERN_DEBUG "%s: skipping non-SATA drive\n", + __FUNCTION__); + return 0; + } + + if (!ata_dev_present(atadev) || + (ap->flags & ATA_FLAG_PORT_DISABLED)) + goto out; + if (!gtf_count) /* shouldn't be here */ + goto out; + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: total GTF bytes=%u (0x%x), gtf_count=%d, addr=0x%lx\n", + __FUNCTION__, gtf_length, gtf_length, gtf_count, + gtf_address); + if (gtf_length % REGS_PER_GTF) { + if (ata_msg_drv(ap)) + printk(KERN_ERR "%s: unexpected GTF length (%d)\n", + __FUNCTION__, gtf_length); + goto out; + } + + for (ix = 0; ix < gtf_count; ix++) { + gtf = (struct taskfile_array *) + (gtf_address + ix * REGS_PER_GTF); + + /* send all TaskFile registers (0x1f1-0x1f7) *in*that*order* */ + taskfile_load_raw(ap, atadev, gtf); + } + + err = 0; +out: + return err; +} +EXPORT_SYMBOL_GPL(do_drive_set_taskfiles); + +/** + * ata_acpi_exec_tfs - get then write drive taskfile settings + * @ap: the ata_port for the drive + * + * This applies to both PATA and SATA drives. + */ +int ata_acpi_exec_tfs(struct ata_port *ap) +{ + int ix; + int ret; + unsigned int gtf_length; + unsigned long gtf_address; + unsigned long obj_loc; + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: ENTER:\n", __FUNCTION__); + + if (noacpi) + return 0; + + for (ix = 0; ix < ATA_MAX_DEVICES; ix++) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: call get_GTF, ix=%d\n", + __FUNCTION__, ix); + ret = do_drive_get_GTF(ap, &ap->device[ix], + >f_length, >f_address, &obj_loc); + if (ret < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: get_GTF error (%d)\n", + __FUNCTION__, ret); + break; + } + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: call set_taskfiles, ix=%d\n", + __FUNCTION__, ix); + ret = do_drive_set_taskfiles(ap, &ap->device[ix], + gtf_length, gtf_address); + acpi_os_free((void *)obj_loc); + if (ret < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: set_taskfiles error (%d)\n", + __FUNCTION__, ret); + break; + } + } + + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: ret=%d\n", __FUNCTION__, ret); + + return ret; +} +EXPORT_SYMBOL_GPL(ata_acpi_exec_tfs); + +/** + * ata_acpi_get_timing - get the channel (controller) timings + * @ap: target ata_port (channel) + * + * For PATA ACPI, this function executes the _GTM ACPI method for the + * target channel. + * + * _GTM only applies to ATA controllers in PATA (legacy) mode, not to SATA. + * In legacy mode, ap->hard_port_no is channel (controller) number. + */ +void ata_acpi_get_timing(struct ata_port *ap) +{ + struct device *dev = ap->dev; + int err; + acpi_handle dev_handle; + acpi_integer pcidevfn; + acpi_handle chan_handle; + acpi_status status; + struct acpi_buffer output; + union acpi_object *out_obj; + struct GTM_buffer *gtm; + + if (noacpi) + goto out; + + if (!ap->legacy_mode) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: channel/controller not in legacy mode (%s)\n", + __FUNCTION__, dev->bus_id); + goto out; + } + + err = pata_get_dev_handle(dev, &dev_handle, &pcidevfn); + if (err < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: pata_get_dev_handle failed (%d)\n", + __FUNCTION__, err); + goto out; + } + + /* get child objects of dev_handle == channel objects, + * + _their_ children == drive objects */ + /* channel is ap->hard_port_no */ + chan_handle = acpi_get_child(dev_handle, ap->hard_port_no); + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: chan adr=%d: handle=0x%p\n", + __FUNCTION__, ap->hard_port_no, chan_handle); + if (!chan_handle) + goto out; + +#if 0 + /* TBD: also check ACPI object VALID bits */ + drive_handle = acpi_get_child(chan_handle, 0); + printk(KERN_DEBUG "%s: drive w/ adr=0: %c: 0x%p\n", + __FUNCTION__, + ap->device[0].class == ATA_DEV_NONE ? 'n' : 'v', + drive_handle); + drive_handle = acpi_get_child(chan_handle, 1); + printk(KERN_DEBUG "%s: drive w/ adr=1: %c: 0x%p\n", + __FUNCTION__, + ap->device[0].class == ATA_DEV_NONE ? 'n' : 'v', + drive_handle); +#endif + + /* Setting up output buffer for _GTM */ + output.length = ACPI_ALLOCATE_BUFFER; + output.pointer = NULL; /* ACPI-CA sets this; save/free it later */ + + /* _GTM has no input parameters */ + status = acpi_evaluate_object(chan_handle, "_GTM", + NULL, &output); + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: _GTM status: %d, outptr: 0x%p, outlen: 0x%llx\n", + __FUNCTION__, status, output.pointer, + (unsigned long long)output.length); + if (ACPI_FAILURE(status)) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: Run _GTM error: status = 0x%x\n", + __FUNCTION__, status); + goto out; + } + + if (!output.length || !output.pointer) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: Run _GTM: " + "length or ptr is NULL (0x%llx, 0x%p)\n", + __FUNCTION__, + (unsigned long long)output.length, + output.pointer); + acpi_os_free(output.pointer); + goto out; + } + + out_obj = output.pointer; + if (out_obj->type != ACPI_TYPE_BUFFER) { + acpi_os_free(output.pointer); + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: Run _GTM: error: " + "expected object type of ACPI_TYPE_BUFFER, " + "got 0x%x\n", + __FUNCTION__, out_obj->type); + goto out; + } + + if (!out_obj->buffer.length || !out_obj->buffer.pointer || + out_obj->buffer.length != sizeof(struct GTM_buffer)) { + acpi_os_free(output.pointer); + if (ata_msg_drv(ap)) + printk(KERN_ERR + "%s: unexpected _GTM length (0x%x)[should be 0x%x] or addr (0x%p)\n", + __FUNCTION__, out_obj->buffer.length, + sizeof(struct GTM_buffer), out_obj->buffer.pointer); + goto out; + } + + gtm = (struct GTM_buffer *)out_obj->buffer.pointer; + if (ata_msg_probe(ap)) { + printk(KERN_DEBUG "%s: _GTM info: ptr: 0x%p, len: 0x%x, exp.len: 0x%Zx\n", + __FUNCTION__, out_obj->buffer.pointer, + out_obj->buffer.length, sizeof(struct GTM_buffer)); + printk(KERN_DEBUG "%s: _GTM fields: 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\n", + __FUNCTION__, gtm->PIO_speed0, gtm->DMA_speed0, + gtm->PIO_speed1, gtm->DMA_speed1, gtm->GTM_flags); + } + + /* TBD: when to free gtm */ + ap->gtm = gtm; + kfree(ap->gtm_object_area); /* free previous then store new one */ + ap->gtm_object_area = out_obj; +out:; +} +EXPORT_SYMBOL_GPL(ata_acpi_get_timing); + +/** + * platform_set_timing - set the channel (controller) timings + * @ap: target ata_port (channel) + * + * For PATA ACPI, this function executes the _STM ACPI method for the + * target channel. + * + * _STM only applies to ATA controllers in PATA (legacy) mode, not to SATA. + * In legacy mode, ap->hard_port_no is channel (controller) number. + * + * _STM requires Identify Drive data, which must already be present in + * ata_device->id[] (i.e., it's not fetched here). + */ +void ata_acpi_push_timing(struct ata_port *ap) +{ + struct device *dev = ap->dev; + int err; + acpi_handle dev_handle; + acpi_integer pcidevfn; + acpi_handle chan_handle; + acpi_status status; + struct acpi_object_list input; + union acpi_object in_params[1]; + + if (noacpi) + goto out; + + if (!ap->legacy_mode) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: channel/controller not in legacy mode (%s)\n", + __FUNCTION__, dev->bus_id); + goto out; + } + + if (ap->device[0].id[49] || ap->device[1].id[49]) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: drive(s) on channel %d: missing Identify data\n", + __FUNCTION__, ap->hard_port_no); + goto out; + } + + err = pata_get_dev_handle(dev, &dev_handle, &pcidevfn); + if (err < 0) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: pata_get_dev_handle failed (%d)\n", + __FUNCTION__, err); + goto out; + } + + /* get child objects of dev_handle == channel objects, + * + _their_ children == drive objects */ + /* channel is ap->hard_port_no */ + chan_handle = acpi_get_child(dev_handle, ap->hard_port_no); + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: chan adr=%d: handle=0x%p\n", + __FUNCTION__, ap->hard_port_no, chan_handle); + if (!chan_handle) + goto out; + +#if 0 + /* TBD: also check ACPI object VALID bits */ + drive_handle = acpi_get_child(chan_handle, 0); + printk(KERN_DEBUG "%s: drive w/ adr=0: %c: 0x%p\n", + __FUNCTION__, + ap->device[0].class == ATA_DEV_NONE ? 'n' : 'v', + drive_handle); + drive_handle = acpi_get_child(chan_handle, 1); + printk(KERN_DEBUG "%s: drive w/ adr=1: %c: 0x%p\n", + __FUNCTION__, + ap->device[0].class == ATA_DEV_NONE ? 'n' : 'v', + drive_handle); +#endif + + /* Give the GTM buffer + drive Identify data to the channel via the + * _STM method: */ + /* setup input parameters buffer for _STM */ + input.count = 3; + input.pointer = in_params; + in_params[0].type = ACPI_TYPE_BUFFER; + in_params[0].buffer.length = sizeof(struct GTM_buffer); + in_params[0].buffer.pointer = (u8 *)ap->gtm; + in_params[1].type = ACPI_TYPE_BUFFER; + in_params[1].buffer.length = sizeof(ap->device[0].id); + in_params[1].buffer.pointer = (u8 *)ap->device[0].id; + in_params[2].type = ACPI_TYPE_BUFFER; + in_params[2].buffer.length = sizeof(ap->device[1].id); + in_params[2].buffer.pointer = (u8 *)ap->device[1].id; + /* Output buffer: _STM has no output */ + + swap_buf_le16(ap->device[0].id, ATA_ID_WORDS); + swap_buf_le16(ap->device[1].id, ATA_ID_WORDS); + status = acpi_evaluate_object(chan_handle, "_STM", &input, NULL); + swap_buf_le16(ap->device[0].id, ATA_ID_WORDS); + swap_buf_le16(ap->device[1].id, ATA_ID_WORDS); + if (ata_msg_probe(ap)) + printk(KERN_DEBUG "%s: _STM status: %d\n", + __FUNCTION__, status); + if (ACPI_FAILURE(status)) { + if (ata_msg_probe(ap)) + printk(KERN_DEBUG + "%s: Run _STM error: status = 0x%x\n", + __FUNCTION__, status); + goto out; + } + +out:; +} +EXPORT_SYMBOL_GPL(ata_acpi_push_timing); --- linux-2616-rc2-pata.orig/drivers/scsi/libata-core.c +++ linux-2616-rc2-pata/drivers/scsi/libata-core.c @@ -82,6 +82,14 @@ int atapi_enabled = 0; module_param(atapi_enabled, int, 0444); MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)"); +int noacpi = 0; +module_param(noacpi, int, 0444); +MODULE_PARM_DESC(noacpi, "Disables use of ACPI in suspend/resume when set"); + +int libata_printk = ATA_MSG_DRV; +module_param_named(printk, libata_printk, int, 0644); +MODULE_PARM_DESC(printk, "Set libata printk flags"); /* in linux/libata.h */ + MODULE_AUTHOR("Jeff Garzik"); MODULE_DESCRIPTION("Library module for ATA devices"); MODULE_LICENSE("GPL"); @@ -1112,7 +1120,7 @@ int ata_qc_complete_internal(struct ata_ * None. Should be called with kernel context, might sleep. */ -static unsigned +unsigned int ata_exec_internal(struct ata_port *ap, struct ata_device *dev, struct ata_taskfile *tf, int dma_dir, void *buf, unsigned int buflen) @@ -1301,11 +1309,11 @@ retry: /* print device capabilities */ printk(KERN_DEBUG "ata%u: dev %u cfg " - "49:%04x 82:%04x 83:%04x 84:%04x 85:%04x 86:%04x 87:%04x 88:%04x\n", - ap->id, device, dev->id[49], + "00:%04x 49:%04x 82:%04x 83:%04x 84:%04x 85:%04x 86:%04x 87:%04x 88:%04x 93:%04x\n", + ap->id, device, dev->id[0], dev->id[49], dev->id[82], dev->id[83], dev->id[84], dev->id[85], dev->id[86], dev->id[87], - dev->id[88]); + dev->id[88], dev->id[93]); /* * common ATA, ATAPI feature tests @@ -1461,6 +1469,8 @@ void ata_dev_config(struct ata_port *ap, if (ap->ops->dev_config) ap->ops->dev_config(ap, &ap->device[i]); + + ata_acpi_push_id(ap, i); } /** @@ -1501,6 +1511,8 @@ static int ata_bus_probe(struct ata_port if (ap->flags & ATA_FLAG_PORT_DISABLED) goto err_out_disable; + ata_acpi_exec_tfs(ap); + return 0; err_out_disable: @@ -4290,6 +4302,7 @@ int ata_device_resume(struct ata_port *a } if (!ata_dev_present(dev)) return 0; + ata_acpi_exec_tfs(ap); if (dev->class == ATA_DEV_ATA) ata_start_drive(ap, dev); @@ -4419,6 +4432,7 @@ static void ata_host_init(struct ata_por ap->port_no = port_no; ap->hard_port_no = ent->legacy_mode ? ent->hard_port_no : port_no; + ap->legacy_mode = ent->legacy_mode; ap->pio_mask = ent->pio_mask; ap->mwdma_mask = ent->mwdma_mask; ap->udma_mask = ent->udma_mask; @@ -4427,6 +4441,7 @@ static void ata_host_init(struct ata_por ap->cbl = ATA_CBL_NONE; ap->active_tag = ATA_TAG_POISON; ap->last_ctl = 0xFF; + ap->dev = ent->dev; INIT_WORK(&ap->packet_task, atapi_packet_task, ap); INIT_WORK(&ap->pio_task, ata_pio_task, ap); @@ -4539,10 +4554,13 @@ int ata_device_add(const struct ata_prob (ap->mwdma_mask << ATA_SHIFT_MWDMA) | (ap->pio_mask << ATA_SHIFT_PIO); + ap->msg_enable = libata_printk; + /* print per-port info to dmesg */ printk(KERN_INFO "ata%u: %cATA max %s cmd 0x%lX ctl 0x%lX " "bmdma 0x%lX irq %lu\n", ap->id, + ap->flags & ATA_FLAG_PATA_MODE ? 'P' : ap->flags & ATA_FLAG_SATA ? 'S' : 'P', ata_mode_string(xfer_mode_mask), ap->ioaddr.cmd_addr, @@ -4604,6 +4622,12 @@ int ata_device_add(const struct ata_prob ata_scsi_scan_host(ap); } + for (i = 0; i < ent->n_ports; i++) { + struct ata_port *ap = host_set->ports[i]; + + ata_acpi_get_timing(ap); + } + dev_set_drvdata(dev, host_set); VPRINTK("EXIT, returning %u\n", ent->n_ports); @@ -4823,6 +4847,7 @@ static struct ata_probe_ent *ata_pci_ini probe_ent->n_ports = 1; probe_ent->hard_port_no = port_num; probe_ent->private_data = port->private_data; + probe_ent->host_flags = port->host_flags; switch(port_num) { @@ -4883,14 +4908,21 @@ int ata_pci_init_one (struct pci_dev *pd else port[1] = port[0]; + printk(KERN_DEBUG "%s: pci_dev class+intf: 0x%x\n", + __FUNCTION__, pdev->class); if ((port[0]->host_flags & ATA_FLAG_NO_LEGACY) == 0 && (pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) { + printk(KERN_DEBUG "%s: NO_LEGACY == 0\n", __FUNCTION__); + port[0]->host_flags |= ATA_FLAG_PATA_MODE; + port[0]->host_flags &= ATA_FLAG_SATA; /* TODO: What if one channel is in native mode ... */ pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8); mask = (1 << 2) | (1 << 0); if ((tmp8 & mask) != mask) legacy_mode = (1 << 3); } + else + printk(KERN_DEBUG "%s: NO_LEGACY == 1\n", __FUNCTION__); /* FIXME... */ if ((!legacy_mode) && (n_ports > 2)) { --- linux-2616-rc2-pata.orig/drivers/scsi/libata.h +++ linux-2616-rc2-pata/drivers/scsi/libata.h @@ -41,6 +41,8 @@ struct ata_scsi_args { /* libata-core.c */ extern int atapi_enabled; +extern int noacpi; +extern int libata_printk; extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, struct ata_device *dev); extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc); @@ -52,6 +54,52 @@ extern void ata_dev_select(struct ata_po extern void swap_buf_le16(u16 *buf, unsigned int buf_words); extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg); extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg); +extern unsigned int ata_exec_internal(struct ata_port *ap, + struct ata_device *dev, + struct ata_taskfile *tf, + int dma_dir, void *buf, unsigned int buflen); + + +/* libata-acpi.c */ +#ifdef CONFIG_SCSI_SATA_ACPI +extern int ata_acpi_push_id(struct ata_port *ap, unsigned int ix); +extern int do_drive_get_GTF(struct ata_port *ap, struct ata_device *atadev, + unsigned int *gtf_length, unsigned long *gtf_address, + unsigned long *obj_loc); +extern int do_drive_set_taskfiles(struct ata_port *ap, struct ata_device *atadev, + unsigned int gtf_length, unsigned long gtf_address); +extern int ata_acpi_exec_tfs(struct ata_port *ap); +extern void ata_acpi_get_timing(struct ata_port *ap); +extern void ata_acpi_push_timing(struct ata_port *ap); +#else +static inline int ata_acpi_push_id(struct ata_port *ap, unsigned int ix) +{ + return 0; +} +static inline int do_drive_get_GTF(struct ata_port *ap, + struct ata_device *atadev, + unsigned int *gtf_length, unsigned long *gtf_address, + unsigned long *obj_loc) +{ + return 0; +} +static inline int do_drive_set_taskfiles(struct ata_port *ap, + struct ata_device *atadev, + unsigned int gtf_length, unsigned long gtf_address) +{ + return 0; +} +static inline int ata_acpi_exec_tfs(struct ata_port *ap) +{ + return 0; +} +static void ata_acpi_get_timing(struct ata_port *ap) +{ +} +static void ata_acpi_push_timing(struct ata_port *ap) +{ +} +#endif /* libata-scsi.c */ --- linux-2616-rc2-pata.orig/Documentation/kernel-parameters.txt +++ linux-2616-rc2-pata/Documentation/kernel-parameters.txt @@ -41,6 +41,7 @@ restrictions referred to are that the re ISAPNP ISA PnP code is enabled. ISDN Appropriate ISDN support is enabled. JOY Appropriate joystick support is enabled. + LIBATA libata driver is enabled. LP Printer support is enabled. LOOP Loopback device support is enabled. M68k M68k architecture is enabled. @@ -242,6 +243,9 @@ running once the system is up. ataflop= [HW,M68k] + atapi_enabled= [LIBATA] Enable discovery & support of ATAPI devices + Format: (0=off, 1=on) + atarimouse= [HW,MOUSE] Atari Mouse atascsi= [HW,SCSI] Atari SCSI @@ -981,6 +985,10 @@ running once the system is up. emulation library even if a 387 maths coprocessor is present. + noacpi= [LIBATA] Disables use of ACPI in libata suspend/resume + when set. + Format: + noalign [KNL,ARM] noapic [SMP,APIC] Tells the kernel to not make use of any @@ -1225,6 +1233,11 @@ running once the system is up. autoconfiguration. Ranges are in pairs (memory base and size). + printk= [LIBATA] Set libata printk level (mask). + The values are defined in include/linux/libata.h. + The default value is 1 (ATA_MSG_DRV). + Format: + profile= [KNL] Enable kernel profiling via /proc/profile Format: [schedule,] Param: "schedule" - profile schedule points.