libata updates for 2.6.33
PATCH 1/1 libata updates for 2.6.33
Nothing world-shakingly-notable. Notable notables:
- TRIM work from Christoph and mkp, to make SSD life a bit better
- PATA fixes and updates from Bart and Alan
- long overdue removal of 'experimental' tag from PATA driver submenu in Kconfig
- various bug fixes and minor updates
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/Kconfig | 41 +++++++----- drivers/ata/Makefile | 1 + drivers/ata/ahci.c | 28 ++++++++- drivers/ata/ata_generic.c | 5 +- drivers/ata/ata_piix.c | 6 +- drivers/ata/libata-acpi.c | 15 +++-- drivers/ata/libata-core.c | 7 ++ drivers/ata/libata-eh.c | 94 +++++++++++++++++++++++++++ drivers/ata/libata-scsi.c | 107 ++++++++++++++++++++++++++++++- drivers/ata/libata-sff.c | 2 +- drivers/ata/pata_ali.c | 4 +- drivers/ata/pata_cmd64x.c | 125 ++++++++++++++++++++++++++++++++----- drivers/ata/pata_cs5520.c | 39 +----------- drivers/ata/pata_cs5536.c | 2 +- drivers/ata/pata_efar.c | 9 ++- drivers/ata/pata_hpt366.c | 38 +++++------- drivers/ata/pata_hpt37x.c | 137 +++++++++++++++++++++------------------- drivers/ata/pata_hpt3x2n.c | 40 +++++------- drivers/ata/pata_hpt3x3.c | 11 +++- drivers/ata/pata_it8213.c | 27 ++++---- drivers/ata/pata_it821x.c | 2 +- drivers/ata/pata_legacy.c | 14 +++- drivers/ata/pata_marvell.c | 2 +- drivers/ata/pata_ns87415.c | 32 ++++++++-- drivers/ata/pata_oldpiix.c | 2 +- drivers/ata/pata_piccolo.c | 140 +++++++++++++++++++++++++++++++++++++++++ drivers/ata/pata_radisys.c | 4 +- drivers/ata/pata_rdc.c | 2 +- drivers/ata/pata_rz1000.c | 11 +++- drivers/ata/pata_sil680.c | 6 +- drivers/ata/pata_sis.c | 112 ++++++++++++++++++++++++++------- drivers/ata/pata_via.c | 56 +++++++++++++---- drivers/ata/sata_fsl.c | 18 +++--- drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_sil24.c | 9 +++ drivers/ide/ide-pci-generic.c | 3 +- include/linux/ata.h | 44 ++++++++++--- include/linux/libata.h | 3 +- include/linux/pci_ids.h | 7 +- 39 files changed, 913 insertions(+), 294 deletions(-) create mode 100644 drivers/ata/pata_piccolo.c
Alan Cox (6):
pata_via: Blacklist some combinations of Transcend Flash and via
pata_sis: Implement MWDMA for the UDMA 133 capable chips
pata_cmd64x: implement serialization as per notes [libata] PATA: Update experimental tags
pata_ali: Fix regression with old devices
pata_piccolo: Driver for old Toshiba chipsets
Bartlomiej Zolnierkiewicz (28):
pata_hpt37x: add proper cable detection methods
pata_hpt37x: unify ->pre_reset methods
pata_hpt3x2n: fix cable detection
pata_hpt{37x,3x2n}: add debounce delay to cable detection methods
libata: add comment documenting PIO latency issues on UP
libata: add private driver field to struct ata_device
ata_piix: fix MWDMA handling on PIIX3
pata_efar: fix wrong PIO timings being programmed
pata_efar: fix wrong MWDMA timings being programmed
pata_cs5520: remove dead VDMA support
pata_hpt3x3: Power Management fix
pata_it8213: fix UDMA handling
pata_it8213: fix wrong PIO timings being programmed
pata_it8213: fix PIO2 underclocking
pata_it8213: fix wrong MWDMA timings being programmed
pata_it8213: fix it8213_pre_reset() documentation
pata_legacy: fix QDI6580DP support
pata_legacy: fix access to control register for QDI6580
pata_legacy: add pointers to QDI65x0 documentation
pata_marvell: fix marvell_pre_reset() documentation
pata_ns87415: Power Management fix
pata_radisys: fix UDMA handling
pata_rz1000: Power Management fix
pata_sis: Power Management fix
pata_via: clear UDMA transfer mode bit for PIO and MWDMA [libata] MWDMA0 is unsupported on PIIX-like PATA controllers
pata_it8213: MWDMA0 is unsupported
pata_hpt3x2n: fix overclocked MWDMA0 timing
Benjamin Herrenschmidt (1):
libata/sff: Use ops->bmdma_stop instead of ata_bmdma_stop()
Christoph Hellwig (1):
libata: add translation for SCSI WRITE SAME (aka TRIM support)
Jiri Slaby (1):
pata_via: fix double put on isa bridge
Krzysztof Halasa (1):
pata_cs5536: use 32-bit BM DMA template instead of 16-bit.
Mark Nelson (1):
ahci: let users know that Promise PDC42819 support is limited to SATA devices
Martin K. Petersen (2):
libata: Report zeroed read after TRIM and max discard size
libata: Clarify ata_set_lba_range_entries function
Matthew Garrett (1):
ata: Don't require newlines for link_power_management_policy
Otavio Salvador (1):
pata-it821x: use PCI_DEVICE_ID_RDC_D1010 define
Robert Hancock (1):
libata: remove experimental tag on PATA drivers
Sergei Shtylyov (3):
pata_hpt{37x|3x2n}: fix timing register masks (take 2)
pata_hpt366: fix timing register documentation
ata: use pci_dev->revision
Shaohua Li (1):
ahci: disable SNotification capability for ich8
Tejun Heo (2):
libata-acpi: missing _SDD is not an error
libata: retry failed FLUSH if device didn't fail it
Thiago Farina (1):
sata_mv: Clean up hard coded array size calculation.
Vivek Mahajan (1):
sata_sil24: MSI support, disabled by default
ashish kalra (1):
sata_fsl: Add asynchronous notification support
drivers/ata/Kconfig +25 -16
@@ -3,7 +3,7 @@ # menuconfig ATA - tristate "Serial ATA (prod) and Parallel ATA (experimental) drivers" + tristate "Serial ATA and Parallel ATA drivers" depends on HAS_IOMEM depends on BLOCK depends on !(M32R || M68K) || BROKEN
@@ -374,8 +374,8 @@ config PATA_HPT366 If unsure, say N. config PATA_HPT37X - tristate "HPT 370/370A/371/372/374/302 PATA support (Experimental)" - depends on PCI && EXPERIMENTAL + tristate "HPT 370/370A/371/372/374/302 PATA support" + depends on PCI help This option enables support for the majority of the later HPT PATA controllers via the new ATA layer.
@@ -383,8 +383,8 @@ config PATA_HPT37X If unsure, say N. config PATA_HPT3X2N - tristate "HPT 372N/302N PATA support (Experimental)" - depends on PCI && EXPERIMENTAL + tristate "HPT 372N/302N PATA support" + depends on PCI help This option enables support for the N variant HPT PATA controllers via the new ATA layer
@@ -401,7 +401,7 @@ config PATA_HPT3X3 If unsure, say N. config PATA_HPT3X3_DMA - bool "HPT 343/363 DMA support (Experimental)" + bool "HPT 343/363 DMA support" depends on PATA_HPT3X3 help This option enables DMA support for the HPT343/363
@@ -510,8 +510,8 @@ config PATA_NETCELL If unsure, say N. config PATA_NINJA32 - tristate "Ninja32/Delkin Cardbus ATA support (Experimental)" - depends on PCI && EXPERIMENTAL + tristate "Ninja32/Delkin Cardbus ATA support" + depends on PCI help This option enables support for the Ninja32, Delkin and possibly other brands of Cardbus ATA adapter
@@ -573,6 +573,14 @@ config PATA_PCMCIA If unsure, say N. +config PATA_PDC2027X + tristate "Promise PATA 2027x support" + depends on PCI + help + This option enables support for Promise PATA pdc20268 to pdc20277 host adapters. + + If unsure, say N. + config PATA_PDC_OLD tristate "Older Promise PATA controller support" depends on PCI
@@ -643,14 +651,6 @@ config PATA_SERVERWORKS If unsure, say N. -config PATA_PDC2027X - tristate "Promise PATA 2027x support" - depends on PCI - help - This option enables support for Promise PATA pdc20268 to pdc20277 host adapters. - - If unsure, say N. - config PATA_SIL680 tristate "CMD / Silicon Image 680 PATA support" depends on PCI
@@ -667,6 +667,15 @@ config PATA_SIS If unsure, say N. +config PATA_TOSHIBA + tristate "Toshiba Piccolo support (Experimental)" + depends on PCI && EXPERIMENTAL + help + Support for the Toshiba Piccolo controllers. Currently only the + primary channel is supported by this driver. + + If unsure, say N. + config PATA_VIA tristate "VIA PATA support" depends on PCI
drivers/ata/Makefile +1 -0
@@ -63,6 +63,7 @@ obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o obj-$(CONFIG_PATA_SC1200) += pata_sc1200.o obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o obj-$(CONFIG_PATA_SIL680) += pata_sil680.o +obj-$(CONFIG_PATA_TOSHIBA) += pata_piccolo.o obj-$(CONFIG_PATA_VIA) += pata_via.o obj-$(CONFIG_PATA_WINBOND) += pata_sl82c105.o obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o
drivers/ata/ahci.c +26 -2
@@ -113,6 +113,7 @@ enum { board_ahci_mcp65 =6 , board_ahci_nopmp =7 , board_ahci_yesncq =8 , + board_ahci_nosntf =9 ,/* global controller registers */ HOST_CAP = 0x00, /* host capabilities */
@@ -235,6 +236,7 @@ enum {AHCI_HFLAG_NO_SUSPEND = (1 <<10 ),/* don't suspend */ AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 <<11 ),/* treat SRST timeout as link offline */ + AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf *//* ap->flags bits */
@@ -508,7 +510,7 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, -/* board_ahci_yesncq */ + [board_ahci_yesncq] = { AHCI_HFLAGS (AHCI_HFLAG_YES_NCQ), .flags = AHCI_FLAG_COMMON,
@@ -516,6 +518,14 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, + [board_ahci_nosntf] = + { + AHCI_HFLAGS (AHCI_HFLAG_NO_SNTF), + .flags = AHCI_FLAG_COMMON, + .pio_mask = ATA_PIO4, + .udma_mask = ATA_UDMA6, + .port_ops = &ahci_ops, + }, }; static const struct pci_device_id ahci_pci_tbl[] = {
@@ -531,7 +541,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x2683), board_ahci }, /* ESB2 */ { PCI_VDEVICE(INTEL, 0x27c6), board_ahci }, /* ICH7-M DH */ { PCI_VDEVICE(INTEL, 0x2821), board_ahci }, /* ICH8 */ - { PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* ICH8 */ + { PCI_VDEVICE(INTEL, 0x2822), board_ahci_nosntf }, /* ICH8 */ { PCI_VDEVICE(INTEL, 0x2824), board_ahci }, /* ICH8 */ { PCI_VDEVICE(INTEL, 0x2829), board_ahci }, /* ICH8M */ { PCI_VDEVICE(INTEL, 0x282a), board_ahci }, /* ICH8M */
@@ -849,6 +859,12 @@ static void ahci_save_initial_config(struct pci_dev *pdev, cap &= ~HOST_CAP_PMP ; } +if ((cap &HOST_CAP_SNTF ) && (hpriv->flags &AHCI_HFLAG_NO_SNTF )) { +dev_printk (KERN_INFO , &pdev->dev, +"controller can't do SNTF, turning off CAP_SNTF\n" ); + cap &= ~HOST_CAP_SNTF ; + } +if (pdev->vendor ==PCI_VENDOR_ID_JMICRON && pdev->device ==0x2361 && port_map !=1 ) { dev_printk(KERN_INFO, &pdev->dev,
@@ -2988,6 +3004,14 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (pdev->vendor ==PCI_VENDOR_ID_MARVELL && !marvell_enable)return -ENODEV ; +/* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode. +* At the moment, we can only use the AHCI mode. Let the users know +* that for SAS drives they're out of luck. +*/ +if (pdev->vendor ==PCI_VENDOR_ID_PROMISE ) +dev_printk (KERN_INFO , &pdev->dev,"PDC42819 " +"can only drive SATA devices with this driver\n" ); +/* acquire resources */ rc =pcim_enable_device (pdev);if (rc)
drivers/ata/ata_generic.c +4 -1
@@ -168,9 +168,12 @@ static struct pci_device_id ata_generic[] = { { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), }, { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), }, { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), }, - { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO), }, +#if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE) { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), }, { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), }, + { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_3), }, + { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_5), }, +#endif /* Must come last. If you add entries adjust this table appropriately */ { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, 1}, { 0, },
drivers/ata/ata_piix.c +3 -3
@@ -869,10 +869,10 @@ static void do_pata_set_dmamode(struct ata_port *ap, struct ata_device *adev, in (timings[pio][1 ] <<8 ); } -if (ap->udma_mask) { +if (ap->udma_mask) udma_enable &= ~(1 << devid); -pci_write_config_word (dev, master_port, master_data); - } + +pci_write_config_word (dev, master_port, master_data); }/* Don't scribble on 0x48 if the controller does not support UDMA */ if (ap->udma_mask)
drivers/ata/libata-acpi.c +9 -6
@@ -807,12 +807,11 @@ static int ata_acpi_exec_tfs(struct ata_device *dev, int *nr_executed)* EH context. * * RETURNS: -* 0 on success, -errno on failure. +* 0 on success, -ENOENT if _SDD doesn't exist, -errno on failure. */ static int ata_acpi_push_id (struct ata_device *dev) {struct ata_port *ap = dev->link->ap; -int err;acpi_status status;struct acpi_object_list input;union acpi_object in_params[1 ];
@@ -835,12 +834,16 @@ static int ata_acpi_push_id(struct ata_device *dev) status =acpi_evaluate_object (dev->acpi_handle,"_SDD" , &input,NULL );swap_buf_le16 (dev->id,ATA_ID_WORDS ); - err =ACPI_FAILURE (status) ? -EIO :0 ; -if (err <0 ) +if (status ==AE_NOT_FOUND ) +return -ENOENT ; + +if (ACPI_FAILURE (status)) {ata_dev_printk (dev,KERN_WARNING ,"ACPI _SDD failed (AE 0x%x)\n" , status); +return -EIO ; + } -return err; +return 0 ; }/**
@@ -971,7 +974,7 @@ int ata_acpi_on_devcfg(struct ata_device *dev)/* do _SDD if SATA */ if (acpi_sata) { rc =ata_acpi_push_id (dev); -if (rc) +if (rc && rc != -ENOENT ) goto acpi_err; }
drivers/ata/libata-core.c +7 -0
@@ -6616,6 +6616,13 @@ static int __init ata_init(void) {ata_parse_force_param (); +/* +* FIXME: In UP case, there is only one workqueue thread and if you +* have more than one PIO device, latency is bloody awful, with +* occasional multi-second "hiccups" as one PIO device waits for +* another. It's an ugly wart that users DO occasionally complain +* about; luckily most users have at most one PIO polled device. +*/ ata_wq =create_workqueue ("ata" );if (!ata_wq) goto free_force_tbl;
drivers/ata/libata-eh.c +94 -0
118 lines not on this page · raw message
drivers/ata/libata-scsi.c +105 -2
155 lines not on this page · raw message
drivers/ata/libata-sff.c +1 -1
@@ -2384,7 +2384,7 @@ void ata_sff_post_internal_cmd(struct ata_queued_cmd *qc) ap->hsm_task_state =HSM_ST_IDLE ;if (ap->ioaddr.bmdma_addr) -ata_bmdma_stop (qc); + ap->ops->bmdma_stop (qc);spin_unlock_irqrestore (ap->lock, flags); }
drivers/ata/pata_ali.c +3 -1
@@ -453,7 +453,9 @@ static void ali_init_chipset(struct pci_dev *pdev)/* Clear CD-ROM DMA write bit */ tmp &=0x7F ;/* Cable and UDMA */ -pci_write_config_byte (pdev,0x4B , tmp |0x09 ); +if (pdev->revision >=0xc2 ) + tmp |=0x01 ; +pci_write_config_byte (pdev,0x4B , tmp |0x08 );/* * CD_ROM DMA on (0x53 bit 0). Enable this even if we want * to use PIO. 0x53 bit 1 (rev 20 only) - enable FIFO control
drivers/ata/pata_cmd64x.c +110 -15
199 lines not on this page · raw message
drivers/ata/pata_cs5520.c +1 -38
@@ -90,48 +90,12 @@ static void cs5520_set_timings(struct ata_port *ap, struct ata_device *adev, int }/** -* cs5520_enable_dma - turn on DMA bits -* -* Turn on the DMA bits for this disk. Needed because the BIOS probably -* has not done the work for us. Belongs in the core SATA code. -*/ - -static void cs5520_enable_dma (struct ata_port *ap,struct ata_device *adev) -{ -/* Set the DMA enable/disable flag */ -u8 reg =ioread8 (ap->ioaddr.bmdma_addr +0x02 ); - reg |=1 <<(adev->devno +5 ); -iowrite8 (reg, ap->ioaddr.bmdma_addr +0x02 ); -} - -/** -* cs5520_set_dmamode - program DMA timings -* @ap: ATA port -* @adev: ATA device -* -* Program the DMA mode timings for the controller according to the pio -* clocking table. Note that this device sets the DMA timings to PIO -* mode values. This may seem bizarre but the 5520 architecture talks -* PIO mode to the disk and DMA mode to the controller so the underlying -* transfers are PIO timed. -*/ - -static void cs5520_set_dmamode (struct ata_port *ap,struct ata_device *adev) -{ -static const int dma_xlate[3 ] = {XFER_PIO_0 ,XFER_PIO_3 ,XFER_PIO_4 }; -cs5520_set_timings (ap, adev, dma_xlate[adev->dma_mode]); -cs5520_enable_dma (ap, adev); -} - -/** * cs5520_set_piomode - program PIO timings * @ap: ATA port * @adev: ATA device * * Program the PIO mode timings for the controller according to the pio -* clocking table. We know pio_mode will equal dma_mode because of the -* CS5520 architecture. At least once we turned DMA on and wrote a -* mode setter. +* clocking table. */ static void cs5520_set_piomode (struct ata_port *ap,struct ata_device *adev)
@@ -149,7 +113,6 @@ static struct ata_port_operations cs5520_port_ops = { .qc_prep = ata_sff_dumb_qc_prep, .cable_detect = ata_cable_40wire, .set_piomode = cs5520_set_piomode, - .set_dmamode = cs5520_set_dmamode, };static int __devinit cs5520_init_one (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/ata/pata_cs5536.c +1 -1
@@ -224,7 +224,7 @@ static struct scsi_host_template cs5536_sht = { };static struct ata_port_operations cs5536_port_ops = { - .inherits = &ata_bmdma_port_ops, + .inherits = &ata_bmdma32_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, .set_dmamode = cs5536_set_dmamode,
drivers/ata/pata_efar.c +5 -4
@@ -2,6 +2,7 @@* pata_efar.c - EFAR PIIX clone controller driver * * (C) 2005 Red Hat +* (C) 2009 Bartlomiej Zolnierkiewicz * * Some parts based on ata_piix.c by Jeff Garzik and others. *
@@ -118,12 +119,12 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev)int shift =4 * ap->port_no;u8 slave_data; - idetm_data &=0xCC0F ; + idetm_data &=0xFF0F ; idetm_data |= (control <<4 );/* Slave timing in separate register */ pci_read_config_byte (dev,0x44 , &slave_data); - slave_data &=0x0F << shift; + slave_data &= ap->port_no ?0x0F :0xF0 ; slave_data |= ((timings[pio][0 ] <<2 ) | timings[pio][1 ]) << shift;pci_write_config_byte (dev,0x44 , slave_data); }
@@ -200,7 +201,7 @@ static void efar_set_dmamode (struct ata_port *ap, struct ata_device *adev) master_data &=0xFF4F ;/* Mask out IORDY|TIME1|DMAONLY */ master_data |= control <<4 ;pci_read_config_byte (dev,0x44 , &slave_data); - slave_data &= (0x0F +0xE1 * ap->port_no); + slave_data &= ap->port_no ?0x0F :0xF0 ;/* Load the matching timing */ slave_data |= ((timings[pio][0 ] <<2 ) | timings[pio][1 ]) << (ap->port_no ?4 :0 );pci_write_config_byte (dev,0x44 , slave_data);
@@ -251,7 +252,7 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 , - .mwdma_mask =ATA_MWDMA2 , + .mwdma_mask =ATA_MWDMA12_ONLY , .udma_mask =ATA_UDMA4 , .port_ops = &efar_ops, };
drivers/ata/pata_hpt366.c +16 -22
@@ -27,7 +27,7 @@#include <linux/libata.h> #define DRV_NAME "pata_hpt366" -#define DRV_VERSION "0.6.2" +#define DRV_VERSION "0.6.7"struct hpt_clock {u8 xfer_mode;
@@ -36,24 +36,22 @@ struct hpt_clock {/* key for bus clock timings * bit -* 0:3 data_high_time. inactive time of DIOW_/DIOR_ for PIO and MW -* DMA. cycles = value + 1 -* 4:8 data_low_time. active time of DIOW_/DIOR_ for PIO and MW -* DMA. cycles = value + 1 -* 9:12 cmd_high_time. inactive time of DIOW_/DIOR_ during task file +* 0:3 data_high_time. Inactive time of DIOW_/DIOR_ for PIO and MW DMA. +* cycles = value + 1 +* 4:7 data_low_time. Active time of DIOW_/DIOR_ for PIO and MW DMA. +* cycles = value + 1 +* 8:11 cmd_high_time. Inactive time of DIOW_/DIOR_ during task file * register access. -* 13:17 cmd_low_time. active time of DIOW_/DIOR_ during task file +* 12:15 cmd_low_time. Active time of DIOW_/DIOR_ during task file * register access. -* 18:21 udma_cycle_time. clock freq and clock cycles for UDMA xfer. -* during task file register access. -* 22:24 pre_high_time. time to initialize 1st cycle for PIO and MW DMA -* xfer. -* 25:27 cmd_pre_high_time. time to initialize 1st PIO cycle for task +* 16:18 udma_cycle_time. Clock cycles for UDMA xfer? +* 19:21 pre_high_time. Time to initialize 1st cycle for PIO and MW DMA xfer. +* 22:24 cmd_pre_high_time. Time to initialize 1st PIO cycle for task file * register access. -* 28 UDMA enable -* 29 DMA enable -* 30 PIO_MST enable. if set, the chip is in bus master mode during -* PIO. +* 28 UDMA enable. +* 29 DMA enable. +* 30 PIO_MST enable. If set, the chip is in bus master mode during +* PIO xfer. * 31 FIFO enable. */
@@ -344,7 +342,6 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)const struct ata_port_info *ppi[] = { &info_hpt366,NULL };void *hpriv =NULL ; -u32 class_rev;u32 reg1;int rc;
@@ -352,13 +349,10 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (rc)return rc; -pci_read_config_dword (dev,PCI_CLASS_REVISION , &class_rev); - class_rev &=0xFF ; -/* May be a later chip in disguise. Check */ /* Newer chips are not in the HPT36x driver. Ignore them */ -if (class_rev >2 ) -return -ENODEV ; +if (dev->revision >2 ) +return -ENODEV ;hpt36x_init_chipset (dev);
drivers/ata/pata_hpt37x.c +71 -66
282 lines not on this page · raw message
drivers/ata/pata_hpt3x2n.c +18 -22
@@ -25,7 +25,7 @@#include <linux/libata.h> #define DRV_NAME "pata_hpt3x2n" -#define DRV_VERSION "0.3.4" +#define DRV_VERSION "0.3.7"enum {HPT_PCI_FAST = (1 <<31 ),
@@ -80,14 +80,13 @@ static struct hpt_clock hpt3x2n_clocks[] = { { XFER_MW_DMA_2, 0x2c829c62 }, { XFER_MW_DMA_1, 0x2c829c66 }, - { XFER_MW_DMA_0, 0x2c829d2c }, + { XFER_MW_DMA_0, 0x2c829d2e }, { XFER_PIO_4, 0x0c829c62 }, { XFER_PIO_3, 0x0c829c84 }, { XFER_PIO_2, 0x0c829ca6 }, { XFER_PIO_1, 0x0d029d26 }, { XFER_PIO_0, 0x0d029d5e }, - { 0, 0x0d029d5e } };/**
@@ -128,12 +127,15 @@ static int hpt3x2n_cable_detect(struct ata_port *ap)pci_read_config_byte (pdev,0x5B , &scr2);pci_write_config_byte (pdev,0x5B , scr2 & ~0x01 ); + +udelay (10 );/* debounce */ +/* Cable register now active */ pci_read_config_byte (pdev,0x5A , &ata66);/* Restore state */ pci_write_config_byte (pdev,0x5B , scr2); -if (ata66 & (1 << ap->port_no)) +if (ata66 & (2 >> ap->port_no))return ATA_CBL_PATA40 ;else return ATA_CBL_PATA80 ;
@@ -185,9 +187,8 @@ static void hpt3x2n_set_piomode(struct ata_port *ap, struct ata_device *adev)pci_read_config_dword (pdev, addr1, ®); mode =hpt3x2n_find_mode (ap, adev->pio_mode); - mode &= ~0x8000000 ;/* No FIFO in PIO */ - mode &= ~0x30070000 ;/* Leave config bits alone */ - reg &=0x30070000 ;/* Strip timing bits */ + mode &=0xCFC3FFFF ;/* Leave DMA bits alone */ + reg &= ~0xCFC3FFFF ;/* Strip timing bits */ pci_write_config_dword (pdev, addr1, reg | mode); }
@@ -204,8 +205,7 @@ static void hpt3x2n_set_dmamode(struct ata_port *ap, struct ata_device *adev) {struct pci_dev *pdev =to_pci_dev (ap->host->dev);u32 addr1, addr2; -u32 reg; -u32 mode; +u32 reg, mode, mask;u8 fast; addr1 =0x40 +4 * (adev->devno +2 * ap->port_no);
@@ -216,11 +216,12 @@ static void hpt3x2n_set_dmamode(struct ata_port *ap, struct ata_device *adev) fast &= ~0x07 ;pci_write_config_byte (pdev, addr2, fast); + mask = adev->dma_mode <XFER_UDMA_0 ?0x31C001FF :0x303C0000 ; +pci_read_config_dword (pdev, addr1, ®); mode =hpt3x2n_find_mode (ap, adev->dma_mode); - mode |=0x8000000 ;/* FIFO in MWDMA or UDMA */ - mode &= ~0xC0000000 ;/* Leave config bits alone */ - reg &=0xC0000000 ;/* Strip timing bits */ + mode &= mask; + reg &= ~mask;pci_write_config_dword (pdev, addr1, reg | mode); }
@@ -447,10 +448,8 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &hpt3x2n_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; - +u8 rev = dev->revision;u8 irqmask; -u32 class_rev; -unsigned int pci_mhz;unsigned int f_low, f_high;int adjust;
@@ -462,26 +461,23 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (rc)return rc; -pci_read_config_dword (dev,PCI_CLASS_REVISION , &class_rev); - class_rev &=0xFF ; -switch (dev->device) {case PCI_DEVICE_ID_TTI_HPT366 : -if (class_rev <6 ) +if (rev <6 )return -ENODEV ;break ;case PCI_DEVICE_ID_TTI_HPT371 : -if (class_rev <2 ) +if (rev <2 )return -ENODEV ;/* 371N if rev > 1 */ break ;case PCI_DEVICE_ID_TTI_HPT372 :/* 372N if rev >= 2*/ -if (class_rev <2 ) +if (rev <2 )return -ENODEV ;break ;case PCI_DEVICE_ID_TTI_HPT302 : -if (class_rev <2 ) +if (rev <2 )return -ENODEV ;break ;case PCI_DEVICE_ID_TTI_HPT372N :
drivers/ata/pata_hpt3x3.c +10 -1
@@ -255,8 +255,17 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)#ifdef CONFIG_PM static int hpt3x3_reinit_one (struct pci_dev *dev) { +struct ata_host *host =dev_get_drvdata (&dev->dev); +int rc; + + rc =ata_pci_device_do_resume (dev); +if (rc) +return rc; +hpt3x3_init_chipset (dev); -return ata_pci_device_resume (dev); + +ata_host_resume (host); +return 0 ; }#endif
drivers/ata/pata_it8213.c +13 -14
@@ -22,7 +22,7 @@#define DRV_VERSION "0.0.3"/** -* it8213_pre_reset - check for 40/80 pin +* it8213_pre_reset - probe begin * @link: link * @deadline: deadline jiffies for the operation *
@@ -92,18 +92,17 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) { 2, 1 }, { 2, 3 }, }; -if (pio >2 ) - control |=1 ;/* TIME1 enable */ +if (pio >1 ) + control |=1 ;/* TIME */ if (ata_pio_need_iordy (adev))/* PIO 3/4 require IORDY */ - control |=2 ;/* IORDY enable */ + control |=2 ;/* IE */ /* Bit 2 is set for ATAPI on the IT8213 - reverse of ICH/PIIX */ if (adev->class !=ATA_DEV_ATA ) - control |=4 ; + control |=4 ;/* PPE */ pci_read_config_word (dev, idetm_port, &idetm_data); -/* Enable PPE, IE and TIME as appropriate */ - +/* Set PPE, IE, and TIME as appropriate */ if (adev->devno ==0 ) { idetm_data &=0xCCF0 ; idetm_data |= control;
@@ -112,17 +111,17 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) }else {u8 slave_data; - idetm_data &=0xCC0F ; + idetm_data &=0xFF0F ; idetm_data |= (control <<4 );/* Slave timing in separate register */ pci_read_config_byte (dev,0x44 , &slave_data); slave_data &=0xF0 ; - slave_data |= ((timings[pio][0 ] <<2 ) | timings[pio][1 ]) <<4 ; + slave_data |= (timings[pio][0 ] <<2 ) | timings[pio][1 ];pci_write_config_byte (dev,0x44 , slave_data); } - idetm_data |=0x4000 ;/* Ensure SITRE is enabled */ + idetm_data |=0x4000 ;/* Ensure SITRE is set */ pci_write_config_word (dev, idetm_port, idetm_data); }
@@ -173,10 +172,10 @@ static void it8213_set_dmamode (struct ata_port *ap, struct ata_device *adev) udma_enable |= (1 << devid); -/* Load the UDMA mode number */ +/* Load the UDMA cycle time */ pci_read_config_word (dev,0x4A , &udma_timing); udma_timing &= ~(3 << (4 * devid)); - udma_timing |= (udma &3 ) << (4 * devid); + udma_timing |= u_speed << (4 * devid);pci_write_config_word (dev,0x4A , udma_timing);/* Load the clock selection */
@@ -211,7 +210,7 @@ static void it8213_set_dmamode (struct ata_port *ap, struct ata_device *adev) master_data &=0xFF4F ;/* Mask out IORDY|TIME1|DMAONLY */ master_data |= control <<4 ;pci_read_config_byte (dev,0x44 , &slave_data); - slave_data &= (0x0F +0xE1 * ap->port_no); + slave_data &=0xF0 ;/* Load the matching timing */ slave_data |= ((timings[pio][0 ] <<2 ) | timings[pio][1 ]) << (ap->port_no ?4 :0 );pci_write_config_byte (dev,0x44 , slave_data);
@@ -263,7 +262,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *enstatic const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 , - .mwdma_mask =ATA_MWDMA2 , + .mwdma_mask =ATA_MWDMA12_ONLY , .udma_mask =ATA_UDMA4 ,/* FIXME: want UDMA 100? */ .port_ops = &it8213_ops, };
drivers/ata/pata_it821x.c +1 -1
@@ -955,7 +955,7 @@ static int it821x_reinit_one(struct pci_dev *pdev)static const struct pci_device_id it821x[] = { {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8211 ), }, {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8212 ), }, - {PCI_VDEVICE (RDC ,0x1010 ), }, + {PCI_VDEVICE (RDC ,PCI_DEVICE_ID_RDC_D1010 ), }, { }, };
drivers/ata/pata_legacy.c +11 -3
@@ -25,6 +25,13 @@* http://www.ryston.cz/petr/vlb/pdc20230b.html * http://www.ryston.cz/petr/vlb/pdc20230c.html * http://www.ryston.cz/petr/vlb/pdc20630.html +* QDI65x0: +* http://www.ryston.cz/petr/vlb/qd6500.html +* http://www.ryston.cz/petr/vlb/qd6580.html +* +* QDI65x0 probe code based on drivers/ide/legacy/qd65xx.c +* Rewritten from the work of Colten Edwards <[email protected]> by +* Samuel Thibault <[email protected]> * * Unsupported but docs exist: * Appian/Adaptec AIC25VL01/Cirrus Logic PD7220
@@ -35,7 +42,7 @@* the MPIIX where the tuning is PCI side but the IDE is "ISA side". * * Specific support is included for the ht6560a/ht6560b/opti82c611a/ -* opti82c465mv/promise 20230c/20630/winbond83759A +* opti82c465mv/promise 20230c/20630/qdi65x0/winbond83759A * * Use the autospeed and pio_mask options with: * Appian ADI/2 aka CLPD7220 or AIC25VL01.
@@ -672,7 +679,7 @@ static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev)outb (timing, ld_qdi->timing +2 * ap->port_no);/* Clear the FIFO */ if (adev->class !=ATA_DEV_ATA ) -outb (0x5F , ld_qdi->timing +3 ); +outb (0x5F , (ld_qdi->timing &0xFFF0 ) +3 ); }/**
@@ -707,7 +714,7 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)outb (timing, ld_qdi->timing +2 * adev->devno);/* Clear the FIFO */ if (adev->class !=ATA_DEV_ATA ) -outb (0x5F , ld_qdi->timing +3 ); +outb (0x5F , (ld_qdi->timing &0xFFF0 ) +3 ); }/**
@@ -787,6 +794,7 @@ static struct ata_port_operations qdi6580_port_ops = {static struct ata_port_operations qdi6580dp_port_ops = { .inherits = &legacy_base_port_ops, .set_piomode = qdi6580dp_set_piomode, + .qc_issue = qdi_qc_issue, .sff_data_xfer = vlb32_data_xfer, };
drivers/ata/pata_marvell.c +1 -1
@@ -58,7 +58,7 @@ static int marvell_pata_active(struct pci_dev *pdev) }/** -* marvell_pre_reset - check for 40/80 pin +* marvell_pre_reset - probe begin * @link: link * @deadline: deadline jiffies for the operation *
drivers/ata/pata_ns87415.c +27 -5
@@ -325,6 +325,13 @@ static struct scsi_host_template ns87415_sht = { ATA_BMDMA_SHT(DRV_NAME), }; +static void ns87415_fixup (struct pci_dev *pdev) +{ +/* Select 512 byte sectors */ +pci_write_config_byte (pdev,0x55 ,0xEE ); +/* Select PIO0 8bit clocking */ +pci_write_config_byte (pdev,0x54 ,0xB7 ); +}/** * ns87415_init_one - Register 87415 ATA PCI device with kernel services
@@ -371,10 +378,8 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *eif (rc)return rc; -/* Select 512 byte sectors */ -pci_write_config_byte (pdev,0x55 ,0xEE ); -/* Select PIO0 8bit clocking */ -pci_write_config_byte (pdev,0x54 ,0xB7 ); +ns87415_fixup (pdev); +return ata_pci_sff_init_one (pdev, ppi, &ns87415_sht,NULL ); }
@@ -384,6 +389,23 @@ static const struct pci_device_id ns87415_pci_tbl[] = { { }/* terminate list */ }; +#ifdef CONFIG_PM +static int ns87415_reinit_one (struct pci_dev *pdev) +{ +struct ata_host *host =dev_get_drvdata (&pdev->dev); +int rc; + + rc =ata_pci_device_do_resume (pdev); +if (rc) +return rc; + +ns87415_fixup (pdev); + +ata_host_resume (host); +return 0 ; +} +#endif +static struct pci_driver ns87415_pci_driver = { .name =DRV_NAME , .id_table = ns87415_pci_tbl,
@@ -391,7 +413,7 @@ static struct pci_driver ns87415_pci_driver = { .remove = ata_pci_remove_one, #ifdef CONFIG_PM .suspend = ata_pci_device_suspend, - .resume = ata_pci_device_resume, + .resume = ns87415_reinit_one,#endif };
drivers/ata/pata_oldpiix.c +1 -1
@@ -239,7 +239,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *estatic const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 , - .mwdma_mask =ATA_MWDMA2 , + .mwdma_mask =ATA_MWDMA12_ONLY , .port_ops = &oldpiix_pata_ops, };const struct ata_port_info *ppi[] = { &info,NULL };
drivers/ata/pata_piccolo.c new file +140 -0
140 lines not on this page · raw message
drivers/ata/pata_radisys.c +2 -2
@@ -139,9 +139,9 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)pci_read_config_byte (dev,0x4A , &udma_mode);if (adev->xfer_mode ==XFER_UDMA_2 ) - udma_mode &= ~ (1 << adev->devno); + udma_mode &= ~(2 << (adev->devno *4 ));else /* UDMA 4 */ - udma_mode |= (1 << adev->devno); + udma_mode |= (2 << (adev->devno *4 ));pci_write_config_byte (dev,0x4A , udma_mode);
drivers/ata/pata_rdc.c +1 -1
@@ -284,7 +284,7 @@ static struct ata_port_info rdc_port_info = { .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = ATA_PIO4, - .mwdma_mask = ATA_MWDMA2, + .mwdma_mask = ATA_MWDMA12_ONLY, .udma_mask = ATA_UDMA5, .port_ops = &rdc_pata_ops, };
drivers/ata/pata_rz1000.c +10 -1
@@ -105,11 +105,20 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en#ifdef CONFIG_PM static int rz1000_reinit_one (struct pci_dev *pdev) { +struct ata_host *host =dev_get_drvdata (&pdev->dev); +int rc; + + rc =ata_pci_device_do_resume (pdev); +if (rc) +return rc; +/* If this fails on resume (which is a "cant happen" case), we must stop as any progress risks data loss */ if (rz1000_fifo_disable (pdev))panic ("rz1000 fifo" ); -return ata_pci_device_resume (pdev); + +ata_host_resume (host); +return 0 ; }#endif
drivers/ata/pata_sil680.c +2 -4
@@ -212,13 +212,11 @@ static struct ata_port_operations sil680_port_ops = {static u8 sil680_init_chip (struct pci_dev *pdev,int *try_mmio) { -u32 class_rev =0 ;u8 tmpbyte =0 ; -pci_read_config_dword (pdev,PCI_CLASS_REVISION , &class_rev); - class_rev &=0xff ;/* FIXME: double check */ -pci_write_config_byte (pdev,PCI_CACHE_LINE_SIZE , (class_rev) ?1 :255 ); +pci_write_config_byte (pdev,PCI_CACHE_LINE_SIZE , + pdev->revision ?1 :255 );pci_write_config_byte (pdev,0x80 ,0x00 );pci_write_config_byte (pdev,0x84 ,0x00 );
drivers/ata/pata_sis.c +88 -24
212 lines not on this page · raw message
drivers/ata/pata_via.c +44 -12
92 lines not on this page · raw message
drivers/ata/sata_fsl.c +10 -8
@@ -34,7 +34,7 @@ enum {SATA_FSL_HOST_FLAGS = (ATA_FLAG_SATA |ATA_FLAG_NO_LEGACY |ATA_FLAG_MMIO |ATA_FLAG_PIO_DMA | -ATA_FLAG_PMP |ATA_FLAG_NCQ ), +ATA_FLAG_PMP |ATA_FLAG_NCQ |ATA_FLAG_AN ),SATA_FSL_MAX_CMDS =SATA_FSL_QUEUE_DEPTH , SATA_FSL_CMD_HDR_SIZE = 16, /* 4 DWORDS */
@@ -132,7 +132,7 @@ enum {INT_ON_SINGL_DEVICE_ERR = (1 <<1 ),INT_ON_CMD_COMPLETE =1 , -INT_ON_ERROR =INT_ON_FATAL_ERR | +INT_ON_ERROR =INT_ON_FATAL_ERR |INT_ON_SNOTIFY_UPDATE | INT_ON_PHYRDY_CHG | INT_ON_SINGL_DEVICE_ERR,/*
@@ -153,7 +153,7 @@ enum {IE_ON_CMD_COMPLETE =1 ,DEFAULT_PORT_IRQ_ENABLE_MASK =IE_ON_FATAL_ERR |IE_ON_PHYRDY_CHG | -IE_ON_SIGNATURE_UPDATE | +IE_ON_SIGNATURE_UPDATE |IE_ON_SNOTIFY_UPDATE |IE_ON_SINGL_DEVICE_ERR |IE_ON_CMD_COMPLETE , EXT_INDIRECT_SEG_PRD_FLAG = (1 << 31),
@@ -992,9 +992,8 @@ static void sata_fsl_error_intr(struct ata_port *ap)*/ sata_fsl_scr_read (&ap->link,SCR_ERROR , &SError); -if (unlikely (SError &0xFFFF0000 )) { +if (unlikely (SError &0xFFFF0000 ))sata_fsl_scr_write (&ap->link,SCR_ERROR , SError); - }DPRINTK ("error_intr,hStat=0x%x,CE=0x%x,DE =0x%x,SErr=0x%x\n" , hstatus, cereg,ioread32 (hcr_base +DE ), SError);
@@ -1007,6 +1006,10 @@ static void sata_fsl_error_intr(struct ata_port *ap) freeze =1 ; } +/* Handle SDB FIS receive & notify update */ +if (hstatus &INT_ON_SNOTIFY_UPDATE ) +sata_async_notification (ap); +/* Handle PHYRDY change notification */ if (hstatus &INT_ON_PHYRDY_CHG ) {DPRINTK ("SATA FSL: PHYRDY change indication\n" );
@@ -1070,9 +1073,9 @@ static void sata_fsl_error_intr(struct ata_port *ap) }/* record error info */ -if (qc) { +if (qc) qc->err_mask |= err_mask; - }else +else ehi->err_mask |= err_mask; ehi->action |= action;
@@ -1103,7 +1106,6 @@ static void sata_fsl_host_intr(struct ata_port *ap)if (unlikely (SError &0xFFFF0000 )) {DPRINTK ("serror @host_intr : 0x%x\n" , SError);sata_fsl_error_intr (ap); - }if (unlikely (hstatus &INT_ON_ERROR )) {
drivers/ata/sata_mv.c +1 -1
@@ -2217,7 +2217,7 @@ static unsigned int mv_qc_issue_fis(struct ata_queued_cmd *qc)int err =0 ;ata_tf_to_fis (&qc->tf, link->pmp,1 , (void *)fis); - err =mv_send_fis (ap, fis,sizeof (fis) /sizeof (fis[0 ])); + err =mv_send_fis (ap, fis,ARRAY_SIZE (fis));if (err)return err;
drivers/ata/sata_sil24.c +9 -0
@@ -417,6 +417,10 @@ static struct ata_port_operations sil24_ops = {#endif }; +static int sata_sil24_msi;/* Disable MSI */ +module_param_named (msi, sata_sil24_msi, bool,S_IRUGO ); +MODULE_PARM_DESC (msi,"Enable MSI (Default: false)" ); +/* * Use bits 30-31 of port_flags to encode available port numbers. * Current maxium is 4.
@@ -1340,6 +1344,11 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)sil24_init_controller (host); +if (sata_sil24_msi && !pci_enable_msi (pdev)) { +dev_printk (KERN_INFO , &pdev->dev,"Using MSI\n" ); +pci_intx (pdev,0 ); + } +pci_set_master (pdev);return ata_host_activate (host, pdev->irq, sil24_interrupt,IRQF_SHARED , &sil24_sht);
drivers/ide/ide-pci-generic.c +2 -1
@@ -162,9 +162,10 @@ static const struct pci_device_id generic_pci_tbl[] = { #ifdef CONFIG_BLK_DEV_IDE_SATA { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8237_SATA), 5 }, #endif - { PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO), 4 }, { PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), 4 }, { PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), 4 }, + { PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_3), 4 }, + { PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_5), 4 }, { PCI_VDEVICE(NETCELL, PCI_DEVICE_ID_REVOLUTION), 6 }, /* * Must come last. If you add entries adjust
include/linux/ata.h +34 -10
84 lines not on this page · raw message
include/linux/libata.h +2 -1
@@ -365,7 +365,7 @@ enum {/* This should match the actual table size of * ata_eh_cmd_timeout_table in libata-eh.c. */ - ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 5, + ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6,/* Horkage types. May be set by libata or controller on drives (some horkage may be drive/controller pair dependant */
@@ -595,6 +595,7 @@ struct ata_device {unsigned int horkage;/* List of broken features */ unsigned long flags;/* ATA_DFLAG_xxx */ struct scsi_device *sdev;/* attached SCSI device */ +void *private_data;#ifdef CONFIG_ATA_ACPI acpi_handle acpi_handle;union acpi_object *gtf_cache;
include/linux/pci_ids.h +4 -3
@@ -1496,9 +1496,10 @@#define PCI_DEVICE_ID_SBE_WANXL400 0x0104#define PCI_VENDOR_ID_TOSHIBA 0x1179 -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102 -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103 -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105 +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0101 +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0102 +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_3 0x0103 +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_5 0x0105#define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a#define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f#define PCI_DEVICE_ID_TOSHIBA_TOPIC100 0x0617
Hello.
Quoted 12 lines · Jeff Garzik
Nothing world-shakingly-notable. Notable notables:
- TRIM work from Christoph and mkp, to make SSD life a bit better
- PATA fixes and updates from Bart and Alan
- long overdue removal of 'experimental' tag from PATA driver submenu inKconfig
- various bug fixes and minor updatesPlease pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
[...]
Quoted 3 lines
Alan Cox (6):
pata_via: Blacklist some combinations of Transcend Flash and via
pata_sis: Implement MWDMA for the UDMA 133 capable chips
Unfortunately, this patch contains a coding mistake. Probably too late
to correct it now though Linus hasn't pulled as yet...
MBR, Sergei
Quoted 18 lines · Sergei Shtylyov
Hello.
Quoted 8 lines · Jeff Garzik
Nothing world-shakingly-notable. Notable notables:
- TRIM work from Christoph and mkp, to make SSD life a bit better
- PATA fixes and updates from Bart and Alan
- long overdue removal of 'experimental' tag from PATA driver submenu inKconfig
- various bug fixes and minor updatesQuoted 5 lines
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
Quoted 8 lines
[...]
Quoted 3 lines
Alan Cox (6):
pata_via: Blacklist some combinations of Transcend Flash and viapata_sis: Implement MWDMA for the UDMA 133 capable chipsUnfortunately, this patch contains a coding mistake. Probably too late to correct it now though Linus hasn't pulled as yet...
Well, absence of a push does not necessarily imply absence of a pull :)
In fact it seems pretty normal these days that Linus collects a bunch
of pull requests, and then pushes them out later all in one batch.
But we can revert, absolutely, given the feedback from you and Bart...
Jeff