diff options
| author | Stefan Agner <stefan@agner.ch> | 2021-10-04 11:24:51 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-12 16:49:21 -0400 |
| commit | 30ac0b496b842ee38d941a3790c8c004f6275d04 (patch) | |
| tree | d78ee5a5191925fea04c293bfcfb4f9ce47b8929 | |
| parent | 2c6bcab6e6e11030611b785d5bad50484424b128 (diff) | |
| download | u-boot-WIP/2021-10-12-assorted-fixes-and-updates.zip u-boot-WIP/2021-10-12-assorted-fixes-and-updates.tar.gz u-boot-WIP/2021-10-12-assorted-fixes-and-updates.tar.bz2 | |
nvme: invalidate correct memory range after readWIP/2021-10-12-assorted-fixes-and-updates
The current code invalidates the range after the read buffer since the
buffer pointer gets incremented in the read loop. Use a temporary
pointer to make sure we have a pristine pointer to invalidate the
correct memory range after read.
Fixes: 704e040a51d2 ("nvme: Apply cache operations on the DMA buffers")
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Stefan Agner <stefan@agner.ch>
| -rw-r--r-- | drivers/nvme/nvme.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index f6465ea..3c529a2 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -743,6 +743,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr, u64 prp2; u64 total_len = blkcnt << desc->log2blksz; u64 temp_len = total_len; + uintptr_t temp_buffer = (uintptr_t)buffer; u64 slba = blknr; u16 lbas = 1 << (dev->max_transfer_shift - ns->lba_shift); @@ -770,19 +771,19 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr, } if (nvme_setup_prps(dev, &prp2, - lbas << ns->lba_shift, (ulong)buffer)) + lbas << ns->lba_shift, temp_buffer)) return -EIO; c.rw.slba = cpu_to_le64(slba); slba += lbas; c.rw.length = cpu_to_le16(lbas - 1); - c.rw.prp1 = cpu_to_le64((ulong)buffer); + c.rw.prp1 = cpu_to_le64(temp_buffer); c.rw.prp2 = cpu_to_le64(prp2); status = nvme_submit_sync_cmd(dev->queues[NVME_IO_Q], &c, NULL, IO_TIMEOUT); if (status) break; temp_len -= (u32)lbas << ns->lba_shift; - buffer += lbas << ns->lba_shift; + temp_buffer += lbas << ns->lba_shift; } if (read) |