Skip to content

Commit 09fe2bf

Browse files
mpefloatious
authored andcommitted
ata: pata_macio: Fix max_segment_size with PAGE_SIZE == 64K
The pata_macio driver advertises a max_segment_size of 0xff00, because the hardware doesn't cope with requests >= 64K. However the SCSI core requires max_segment_size to be at least PAGE_SIZE, which is a problem for pata_macio when the kernel is built with 64K pages. In older kernels the SCSI core would just increase the segment size to be equal to PAGE_SIZE, however since the commit tagged below it causes a warning and the device fails to probe: WARNING: CPU: 0 PID: 26 at block/blk-settings.c:202 .blk_validate_limits+0x2f8/0x35c CPU: 0 PID: 26 Comm: kworker/u4:1 Not tainted 6.10.0-rc1 #1 Hardware name: PowerMac7,2 PPC970 0x390202 PowerMac ... NIP .blk_validate_limits+0x2f8/0x35c LR .blk_alloc_queue+0xc0/0x2f8 Call Trace: .blk_alloc_queue+0xc0/0x2f8 .blk_mq_alloc_queue+0x60/0xf8 .scsi_alloc_sdev+0x208/0x3c0 .scsi_probe_and_add_lun+0x314/0x52c .__scsi_add_device+0x170/0x1a4 .ata_scsi_scan_host+0x2bc/0x3e4 .async_port_probe+0x6c/0xa0 .async_run_entry_fn+0x60/0x1bc .process_one_work+0x228/0x510 .worker_thread+0x360/0x530 .kthread+0x134/0x13c .start_kernel_thread+0x10/0x14 ... scsi_alloc_sdev: Allocation failure during SCSI scanning, some SCSI devices might not be configured Although the hardware can't cope with a 64K segment, the driver already deals with that internally by splitting large requests in pata_macio_qc_prep(). That is how the driver has managed to function until now on 64K kernels. So fix the driver to advertise a max_segment_size of 64K, which avoids the warning and keeps the SCSI core happy. Fixes: afd53a3 ("scsi: core: Initialize scsi midlayer limits before allocating the queue") Reported-by: Guenter Roeck <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Reported-by: Doru Iorgulescu <[email protected]> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218858 Signed-off-by: Michael Ellerman <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: John Garry <[email protected]> Signed-off-by: Niklas Cassel <[email protected]>
1 parent 3cb648c commit 09fe2bf

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)