Skip to content

Commit e693c50

Browse files
committed
Merge tag 'ata-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Pull ata fix from Niklas Cassel: - Fix a regression for the PATA MacIO driver were it would fail to probe because of the recent changes of initializing the limits in SCSI core * tag 'ata-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux: ata: pata_macio: Fix max_segment_size with PAGE_SIZE == 64K
2 parents 2e32d58 + 09fe2bf commit e693c50

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/ata/pata_macio.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -915,10 +915,13 @@ static const struct scsi_host_template pata_macio_sht = {
915915
.sg_tablesize = MAX_DCMDS,
916916
/* We may not need that strict one */
917917
.dma_boundary = ATA_DMA_BOUNDARY,
918-
/* Not sure what the real max is but we know it's less than 64K, let's
919-
* use 64K minus 256
918+
/*
919+
* The SCSI core requires the segment size to cover at least a page, so
920+
* for 64K page size kernels this must be at least 64K. However the
921+
* hardware can't handle 64K, so pata_macio_qc_prep() will split large
922+
* requests.
920923
*/
921-
.max_segment_size = MAX_DBDMA_SEG,
924+
.max_segment_size = SZ_64K,
922925
.device_configure = pata_macio_device_configure,
923926
.sdev_groups = ata_common_sdev_groups,
924927
.can_queue = ATA_DEF_QUEUE,

0 commit comments

Comments
 (0)