diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-16 13:41:00 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-16 13:41:00 -0300 |
commit | 5af9b6bf49c2179e9d73592f18b0eeb6478a3ec7 (patch) | |
tree | b17d9806c8e19b91f4b5ca990d9cf274d95419a8 /libre/kernel26-libre-lts/libata-alignment.patch | |
parent | bdee87d6999868e7bf83cd276c9e6117581891d8 (diff) | |
download | abslibre-5af9b6bf49c2179e9d73592f18b0eeb6478a3ec7.tar.gz abslibre-5af9b6bf49c2179e9d73592f18b0eeb6478a3ec7.tar.bz2 abslibre-5af9b6bf49c2179e9d73592f18b0eeb6478a3ec7.zip |
kernel26-libre-lts-2.6.32.33-1
Diffstat (limited to 'libre/kernel26-libre-lts/libata-alignment.patch')
-rw-r--r-- | libre/kernel26-libre-lts/libata-alignment.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/libre/kernel26-libre-lts/libata-alignment.patch b/libre/kernel26-libre-lts/libata-alignment.patch deleted file mode 100644 index edd96f3b1..000000000 --- a/libre/kernel26-libre-lts/libata-alignment.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur linux-2.6.32.orig/drivers/ata/libata-scsi.c linux-2.6.32/drivers/ata/libata-scsi.c ---- linux-2.6.32.orig/drivers/ata/libata-scsi.c 2009-12-03 14:51:21.000000000 +1100 -+++ linux-2.6.32/drivers/ata/libata-scsi.c 2011-01-22 20:32:53.353775375 +1100 -@@ -1099,13 +1099,13 @@ - /* configure max sectors */ - blk_queue_max_sectors(sdev->request_queue, dev->max_sectors); - -+ sdev->sector_size = ATA_SECT_SIZE; -+ - if (dev->class == ATA_DEV_ATAPI) { - struct request_queue *q = sdev->request_queue; - void *buf; - -- /* set the min alignment and padding */ -- blk_queue_update_dma_alignment(sdev->request_queue, -- ATA_DMA_PAD_SZ - 1); -+ /* set DMA padding */ - blk_queue_update_dma_pad(sdev->request_queue, - ATA_DMA_PAD_SZ - 1); - -@@ -1119,12 +1119,24 @@ - - blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN); - } else { -- /* ATA devices must be sector aligned */ -- blk_queue_update_dma_alignment(sdev->request_queue, -- ATA_SECT_SIZE - 1); - sdev->manage_start_stop = 1; - } - -+ /* -+ * ata_pio_sectors() expects buffer for each sector to not cross -+ * page boundary. Enforce it by requiring buffers to be sector -+ * aligned, which works iff sector_size is not larger than -+ * PAGE_SIZE. ATAPI devices also need the alignment as -+ * IDENTIFY_PACKET is executed as ATA_PROT_PIO. -+ */ -+ if (sdev->sector_size > PAGE_SIZE) -+ ata_dev_printk(dev, KERN_WARNING, -+ "sector_size=%u > PAGE_SIZE, PIO may malfunction\n", -+ sdev->sector_size); -+ -+ blk_queue_update_dma_alignment(sdev->request_queue, -+ sdev->sector_size - 1); -+ - if (dev->flags & ATA_DFLAG_AN) - set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); - |