Commit 1d2c8200 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

gdrom: support highmem 



The gdrom driver only has a single reference to the virtual address of
the bio data, and uses that only to get the physical address.  Switch
to deriving the physical address from the page directly and thus avoid
bounce buffering highmem data.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210406061648.811275-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a425711c

drivers/cdrom/gdrom.c

+2 −3
Original line number Diff line number Diff line
@@ -583,7 +583,8 @@ static blk_status_t gdrom_readdisk_dma(struct request *req) 
	read_command->cmd[1] = 0x20;

	block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET;

	block_cnt = blk_rq_sectors(req)/GD_TO_BLK;

	__raw_writel(virt_to_phys(bio_data(req->bio)), GDROM_DMA_STARTADDR_REG);

	__raw_writel(page_to_phys(bio_page(req->bio)) + bio_offset(rq->bio),

			GDROM_DMA_STARTADDR_REG);

	__raw_writel(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG);

	__raw_writel(1, GDROM_DMA_DIRECTION_REG);

	__raw_writel(1, GDROM_DMA_ENABLE_REG);
@@ -789,8 +790,6 @@ static int probe_gdrom(struct platform_device *devptr) 
		goto probe_fail_requestq;

	}



	blk_queue_bounce_limit(gd.gdrom_rq, BLK_BOUNCE_HIGH);



	err = probe_gdrom_setupqueue();

	if (err)

		goto probe_fail_toc;