From 4d5470d13b00d28e2a35e9b2173ac96933b72f32 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 25 Nov 2022 15:18:41 +0800 Subject: [PATCH] Revert "x86: fix Bintel's ZHITAI Ti Plus 5000 fw bug" This reverts commit 857a955f1ead4122e45f7f3fe53b46159e1eee37. --- .../999-fix-nvme_ms_ids-bug.patch | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 target/linux/x86/patches-5.15/999-fix-nvme_ms_ids-bug.patch diff --git a/target/linux/x86/patches-5.15/999-fix-nvme_ms_ids-bug.patch b/target/linux/x86/patches-5.15/999-fix-nvme_ms_ids-bug.patch deleted file mode 100644 index bfdc3c59f..000000000 --- a/target/linux/x86/patches-5.15/999-fix-nvme_ms_ids-bug.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2bef3874236ab96d517dd2525aa8260507de24d3 Mon Sep 17 00:00:00 2001 -From: kingtous -Date: Fri, 8 Apr 2022 10:34:46 +0800 -Subject: [PATCH] fix: nvme_update_ns_info method should be called even if - nvme_ms_ids_equal return false - -I've encountered the suspend issue which causes NVMe SSD cannot be detected after reboot from Linux or wake from suspend. I've tried almost all popular Linux distributions like Ubuntu, Debian, Arch, Manjaro. None of them works with my NVMe SSD. -I changed a brand new SSD but it doesn't work either. Originally, if nvme_ns_ids_equal method returns false, the nvme ns info will not try to update and namespace suddenly be removed. This is the issue I've found causing my laptop SSD not detected after suspend or reboot from Linux. After removing 'goto out_free_id', the suspend issue has gone, everything works. -When nvme namespaced ids are not equal, we should also try to update namespace info, not just skip it. - -Signed-off-by: kingtous ---- - drivers/nvme/host/core.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index efb85c6d8e2d5d..89c6a9598558a2 100644 ---- a/drivers/nvme/host/core.c -+++ b/drivers/nvme/host/core.c -@@ -4056,7 +4056,6 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids) - if (!nvme_ns_ids_equal(&ns->head->ids, ids)) { - dev_err(ns->ctrl->device, - "identifiers changed for nsid %d\n", ns->head->ns_id); -- goto out_free_id; - } - - ret = nvme_update_ns_info(ns, id);