mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 17:58:23 +00:00
Revert "nvme: Fix error in nvme_setup_prps"
Dependent commit has unaddressed review comments.
This reverts commit c4eef59faa
.
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
7a9b768147
commit
8e2a782af3
1 changed files with 4 additions and 5 deletions
|
@ -100,7 +100,7 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
|
|||
}
|
||||
|
||||
nprps = DIV_ROUND_UP(length, page_size);
|
||||
num_pages = DIV_ROUND_UP(nprps + 1, prps_per_page);
|
||||
num_pages = DIV_ROUND_UP(nprps, prps_per_page);
|
||||
|
||||
if (nprps > dev->prp_entry_num) {
|
||||
free(dev->prp_pool);
|
||||
|
@ -119,11 +119,10 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
|
|||
prp_pool = dev->prp_pool;
|
||||
i = 0;
|
||||
while (nprps) {
|
||||
if (i == prps_per_page) {
|
||||
*(prp_pool + i) = *(prp_pool + i - 1);
|
||||
*(prp_pool + i - 1) = cpu_to_le64((ulong)prp_pool +
|
||||
if (i == ((page_size >> 3) - 1)) {
|
||||
*(prp_pool + i) = cpu_to_le64((ulong)prp_pool +
|
||||
page_size);
|
||||
i = 1;
|
||||
i = 0;
|
||||
prp_pool += page_size;
|
||||
}
|
||||
*(prp_pool + i++) = cpu_to_le64(dma_addr);
|
||||
|
|
Loading…
Reference in a new issue