Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79c48ccf authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-pci: serialize pci resets 



Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent bf9ae8c5

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int nvme_reset_ctrl(struct nvme_ctrl *ctrl) 
}

EXPORT_SYMBOL_GPL(nvme_reset_ctrl);



static int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)

int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)

{

	int ret;
@@ -104,6 +104,7 @@ static int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl) 
		flush_work(&ctrl->reset_work);

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_reset_ctrl_sync);



static void nvme_delete_ctrl_work(struct work_struct *work)

{

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count); 
void nvme_start_keep_alive(struct nvme_ctrl *ctrl);

void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);

int nvme_reset_ctrl(struct nvme_ctrl *ctrl);

int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl);

int nvme_delete_ctrl(struct nvme_ctrl *ctrl);

int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl);

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -2537,7 +2537,7 @@ static void nvme_reset_prepare(struct pci_dev *pdev) 
static void nvme_reset_done(struct pci_dev *pdev)

{

	struct nvme_dev *dev = pci_get_drvdata(pdev);

	nvme_reset_ctrl(&dev->ctrl);

	nvme_reset_ctrl_sync(&dev->ctrl);

}



static void nvme_shutdown(struct pci_dev *pdev)