Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: OneNAND: Fix page offset handling at 2KiB pagesize

When use the 2KiB pagesize, it should be set the correct page offset.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

authored by

Kyungmin Park and committed by
David Woodhouse
08b3af30 daf05ec0

+5 -2
+5 -2
drivers/mtd/onenand/samsung.c
··· 651 651 void __iomem *p; 652 652 void *buf = (void *) buffer; 653 653 dma_addr_t dma_src, dma_dst; 654 - int err, page_dma = 0; 654 + int err, ofs, page_dma = 0; 655 655 struct device *dev = &onenand->pdev->dev; 656 656 657 657 p = this->base + area; ··· 677 677 if (!page) 678 678 goto normal; 679 679 680 + /* Page offset */ 681 + ofs = ((size_t) buf & ~PAGE_MASK); 680 682 page_dma = 1; 683 + 681 684 /* DMA routine */ 682 685 dma_src = onenand->phys_base + (p - this->base); 683 - dma_dst = dma_map_page(dev, page, 0, count, DMA_FROM_DEVICE); 686 + dma_dst = dma_map_page(dev, page, ofs, count, DMA_FROM_DEVICE); 684 687 } else { 685 688 /* DMA routine */ 686 689 dma_src = onenand->phys_base + (p - this->base);