Commit e693c502 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2e32d580 09fe2bfa

drivers/ata/pata_macio.c

+6 −3
Original line number Diff line number Diff line
@@ -915,10 +915,13 @@ static const struct scsi_host_template pata_macio_sht = { 
	.sg_tablesize		= MAX_DCMDS,

	/* We may not need that strict one */

	.dma_boundary		= ATA_DMA_BOUNDARY,

	/* Not sure what the real max is but we know it's less than 64K, let's

	 * use 64K minus 256

	/*

	 * The SCSI core requires the segment size to cover at least a page, so

	 * for 64K page size kernels this must be at least 64K. However the

	 * hardware can't handle 64K, so pata_macio_qc_prep() will split large

	 * requests.

	 */

	.max_segment_size	= MAX_DBDMA_SEG,

	.max_segment_size	= SZ_64K,

	.device_configure	= pata_macio_device_configure,

	.sdev_groups		= ata_common_sdev_groups,

	.can_queue		= ATA_DEF_QUEUE,