michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/nvme: Rewrite how data pointer is filled

Browse source 
Former way was difficult to read, so let's have a better way which
easily follows the specifications.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2023-09-18 13:45:56 +02:00 • committed by Carles Cufí
commit 2caced752a
1 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
drivers/disk/nvme/nvme_cmd.c
View file

@ -567,6 +567,32 @@ static int nvme_cmd_qpair_fill_prp_list(struct nvme_cmd_qpair *qpair,
return 0; return 0;
} }
static int compute_n_prp(uintptr_t addr, uint32_t size)
{
int n_prp;
/* See Common Command Format, Data Pointer (DPTR) field */
n_prp = size / CONFIG_MMU_PAGE_SIZE;
if (n_prp == 0) {
n_prp = 1;
}
if (size != CONFIG_MMU_PAGE_SIZE) {
size = size % CONFIG_MMU_PAGE_SIZE;
}
if (n_prp == 1) {
if ((addr + (uintptr_t)size) > NVME_PRP_NEXT_PAGE(addr)) {
n_prp++;
}
} else if (size > 0) {
n_prp++;
}
return n_prp;
}
static int nvme_cmd_qpair_fill_dptr(struct nvme_cmd_qpair *qpair, static int nvme_cmd_qpair_fill_dptr(struct nvme_cmd_qpair *qpair,
struct nvme_request *request) struct nvme_request *request)
{ {
@ -581,16 +607,12 @@ static int nvme_cmd_qpair_fill_dptr(struct nvme_cmd_qpair *qpair,
return -EINVAL; return -EINVAL;
} }
n_prp = request->payload_size / qpair->ctrlr->page_size; n_prp = compute_n_prp((uintptr_t)request->payload,
if ((request->payload_size % qpair->ctrlr->page_size) || request->payload_size);
((uintptr_t)request->payload & NVME_PBAO_MASK)) {
n_prp++;
}
if (n_prp <= 2) { if (n_prp <= 2) {
request->cmd.dptr.prp1 = request->cmd.dptr.prp1 =
(uint64_t)sys_cpu_to_le64(request->payload); (uint64_t)sys_cpu_to_le64(request->payload);
if ((uintptr_t)request->payload & NVME_PBAO_MASK) { if (n_prp == 2) {
request->cmd.dptr.prp2 = (uint64_t)sys_cpu_to_le64( request->cmd.dptr.prp2 = (uint64_t)sys_cpu_to_le64(
NVME_PRP_NEXT_PAGE( NVME_PRP_NEXT_PAGE(
(uintptr_t)request->payload)); (uintptr_t)request->payload));