libata updates
PATCH 1/1 libata updates
Various fixes, and sata_mv suspend/resume support.
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/libata-scsi.c | 2 +- drivers/ata/libata-sff.c | 2 +- drivers/ata/pata_hpt3x2n.c | 64 ++++++++++--------- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_mv.c | 144 ++++++++++++++++++++++++++++++++++++------ 5 files changed, 163 insertions(+), 51 deletions(-) mode change 100644 => 100755 drivers/ata/sata_mv.c
Christoph Hellwig (1):
libata: use the WRITE_SAME_16 define
H Hartley Sweeten (1):
pata_octeon_cf: use resource_size(), to fix resource sizing bug
Jeff Garzik (1):
sata_mv: remove pointless NULL test
Robert Hancock (1):
libata: fix reporting of drained bytes when clearing DRQ
Saeed Bishara (6):
sata_mv: increase PIO IORDY timeout
sata_mv: support clkdev framework
sata_mv: add power management support for the platform driver
sata_mv: move the PCI bar description initialization code
sata_mv: store the board_idx into the host private data
sata_mv: add power management support for the PCI controllers.
Sergei Shtylyov (1):
pata_hpt3x2n: fix clock turnaround
drivers/ata/libata-scsi.c +1 -1
@@ -3022,7 +3022,7 @@ static inline ata_xlat_func_t ata_get_xlat_func(struct ata_device *dev, u8 cmd)case WRITE_16 :return ata_scsi_rw_xlat; -case 0x93 /*WRITE_SAME_16*/ : +case WRITE_SAME_16 :return ata_scsi_write_same_xlat;case SYNCHRONIZE_CACHE :
drivers/ata/libata-sff.c +1 -1
@@ -2275,7 +2275,7 @@ void ata_sff_drain_fifo(struct ata_queued_cmd *qc) ap = qc->ap;/* Drain up to 64K of data before we give up this recovery method */ for (count =0 ; (ap->ops->sff_check_status (ap) &ATA_DRQ ) - && count <32768 ; count++) + && count <65536 ; count +=2 )ioread16 (ap->ioaddr.data_addr);/* Can become DEBUG later */
drivers/ata/pata_hpt3x2n.c +35 -29
126 lines not on this page · raw message
drivers/ata/pata_octeon_cf.c +1 -1
@@ -853,7 +853,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)return -EINVAL ; cs1 =devm_ioremap_nocache (&pdev->dev, res_cs1->start, - res_cs0->end - res_cs1->start +1 ); +resource_size (res_cs1));if (!cs1)return -ENOMEM ;
drivers/ata/sata_mv.c +125 -19
274 lines not on this page · raw message
Quoted 10 lines · Jeff Garzik
to receive the following updates:
drivers/ata/libata-scsi.c | 2 +- drivers/ata/libata-sff.c | 2 +- drivers/ata/pata_hpt3x2n.c | 64 ++++++++++--------- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_mv.c | 144 ++++++++++++++++++++++++++++++++++++------ 5 files changed, 163 insertions(+), 51 deletions(-) mode change 100644 => 100755 drivers/ata/sata_mv.c
WTF is that mode change?
It's introduced by commit 6481f2b52cd5411ea6342b749daf0e4f3b390d7b:
"sata_mv: add power management support for the platform driver", and it's totally nonsensical.
I fixed that crazy stuff when merging, but you should look at your own summaries a bit, and should have noticed that it was crazy. That file isn't an executable.
Linus
Quoted 14 lines · Linus Torvalds
Quoted 10 lines · Jeff Garzik
to receive the following updates:
drivers/ata/libata-scsi.c | 2 +- drivers/ata/libata-sff.c | 2 +- drivers/ata/pata_hpt3x2n.c | 64 ++++++++++--------- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_mv.c | 144 ++++++++++++++++++++++++++++++++++++------ 5 files changed, 163 insertions(+), 51 deletions(-)mode change 100644 => 100755
drivers/ata/sata_mv.cWTF is that mode change?
Quoted 7 lines
It's introduced by commit
6481f2b52cd5411ea6342b749daf0e4f3b390d7b:
"sata_mv: add power management support for the platform driver", and it's totally nonsensical.I fixed that crazy stuff when merging, but you should look at your own summaries a bit, and should have noticed that it was crazy. That file isn't an executable.
Whoops, you're absolutely right. That's broken.
Jeff