Page MenuHomeFreeBSD
Files F141736443

D14053.diff
No OneTemporary
Actions

D14053.diff
View Options

Index: head/sys/dev/nvme/nvme.c
===================================================================
--- head/sys/dev/nvme/nvme.c
+++ head/sys/dev/nvme/nvme.c
@@ -469,6 +469,5 @@
* the request passed or failed.
*/
memcpy(&status->cpl, cpl, sizeof(*cpl));
- wmb();
- status->done = TRUE;
+ atomic_store_rel_int(&status->done, 1);
}
Index: head/sys/dev/nvme/nvme_ctrlr.c
===================================================================
--- head/sys/dev/nvme/nvme_ctrlr.c
+++ head/sys/dev/nvme/nvme_ctrlr.c
@@ -404,10 +404,10 @@
{
struct nvme_completion_poll_status status;
- status.done = FALSE;
+ status.done = 0;
nvme_ctrlr_cmd_identify_controller(ctrlr, &ctrlr->cdata,
nvme_completion_poll_cb, &status);
- while (status.done == FALSE)
+ while (!atomic_load_acq_int(&status.done))
pause("nvme", 1);
if (nvme_completion_is_error(&status.cpl)) {
nvme_printf(ctrlr, "nvme_identify_controller failed!\n");
@@ -431,10 +431,10 @@
struct nvme_completion_poll_status status;
int cq_allocated, sq_allocated;
- status.done = FALSE;
+ status.done = 0;
nvme_ctrlr_cmd_set_num_queues(ctrlr, ctrlr->num_io_queues,
nvme_completion_poll_cb, &status);
- while (status.done == FALSE)
+ while (!atomic_load_acq_int(&status.done))
pause("nvme", 1);
if (nvme_completion_is_error(&status.cpl)) {
nvme_printf(ctrlr, "nvme_ctrlr_set_num_qpairs failed!\n");
@@ -470,20 +470,20 @@
for (i = 0; i < ctrlr->num_io_queues; i++) {
qpair = &ctrlr->ioq[i];
- status.done = FALSE;
+ status.done = 0;
nvme_ctrlr_cmd_create_io_cq(ctrlr, qpair, qpair->vector,
nvme_completion_poll_cb, &status);
- while (status.done == FALSE)
+ while (!atomic_load_acq_int(&status.done))
pause("nvme", 1);
if (nvme_completion_is_error(&status.cpl)) {
nvme_printf(ctrlr, "nvme_create_io_cq failed!\n");
return (ENXIO);
}
- status.done = FALSE;
+ status.done = 0;
nvme_ctrlr_cmd_create_io_sq(qpair->ctrlr, qpair,
nvme_completion_poll_cb, &status);
- while (status.done == FALSE)
+ while (!atomic_load_acq_int(&status.done))
pause("nvme", 1);
if (nvme_completion_is_error(&status.cpl)) {
nvme_printf(ctrlr, "nvme_create_io_sq failed!\n");
@@ -693,10 +693,10 @@
ctrlr->async_event_config.raw = 0xFF;
ctrlr->async_event_config.bits.reserved = 0;
- status.done = FALSE;
+ status.done = 0;
nvme_ctrlr_cmd_get_feature(ctrlr, NVME_FEAT_TEMPERATURE_THRESHOLD,
0, NULL, 0, nvme_completion_poll_cb, &status);
- while (status.done == FALSE)
+ while (!atomic_load_acq_int(&status.done))
pause("nvme", 1);
if (nvme_completion_is_error(&status.cpl) ||
(status.cpl.cdw0 & 0xFFFF) == 0xFFFF ||
Index: head/sys/dev/nvme/nvme_private.h
===================================================================
--- head/sys/dev/nvme/nvme_private.h
+++ head/sys/dev/nvme/nvme_private.h
@@ -128,7 +128,7 @@
struct nvme_completion_poll_status {
struct nvme_completion cpl;
- boolean_t done;
+ int done;
};
#define NVME_REQUEST_VADDR 1

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 10, 4:11 PM (7 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27600544
Default Alt Text
D14053.diff (2 KB)

Event Timeline