On Sat, Jul 13, 2013 at 03:42:55AM +0400, Sergei Shtylyov wrote: >>>>> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c >>>>> index 86d5220..e8275fa 100644 >>>>> --- a/drivers/scsi/scsi_lib.c >>>>> +++ b/drivers/scsi/scsi_lib.c >>>>> @@ -1668,7 +1668,7 @@ u64 scsi_calculate_bounce_limit(struct >>>>> Scsi_Host *shost) >>>>> >>>>> host_dev = scsi_get_device(shost); >>>>> if (host_dev && host_dev->dma_mask) >>>>> - bounce_limit = *host_dev->dma_mask; >>>>> + bounce_limit = dma_max_pfn(host_dev) << PAGE_SHIFT; > >>>> You definitely forgot -1 here. > >>> Please explain your point. > >> Previously, 'bounce_limit' would look like 0xffffffff (unless I'm >> mistaken), now it would look like 0xfffff000 which is hardly what we're >> looking for, no? > > Although, -1 won't give us the correct result in this case, it's more > like + PAGE_SIZE - 1. And where it's used is blk_bounce_limit(), the first which that does is convert it back to a PFN, losing the bottom bits again... I'm tempted to suggest converting the whole thing to just deal with PFNs rather than bytes since we only deal with "can we DMA to this" on a per-page basis. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
