From: Sasha Levin Date: Mon, 2 Jan 2023 03:25:58 +0000 (-0500) Subject: Fixes for 5.4 X-Git-Tag: v6.0.17~31 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df9c6f6151056e394625360daef920447e02f88a;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/ata-ahci-fix-pcs-quirk-application-for-suspend.patch b/queue-5.4/ata-ahci-fix-pcs-quirk-application-for-suspend.patch new file mode 100644 index 00000000000..23929c27b2e --- /dev/null +++ b/queue-5.4/ata-ahci-fix-pcs-quirk-application-for-suspend.patch @@ -0,0 +1,148 @@ +From fd721d44555daffdd8dcc42920b7088a3169a640 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 9 Dec 2022 09:26:34 +0000 +Subject: ata: ahci: Fix PCS quirk application for suspend + +From: Adam Vodopjan + +[ Upstream commit 37e14e4f3715428b809e4df9a9958baa64c77d51 ] + +Since kernel 5.3.4 my laptop (ICH8M controller) does not see Kingston +SV300S37A60G SSD disk connected into a SATA connector on wake from +suspend. The problem was introduced in c312ef176399 ("libata/ahci: Drop +PCS quirk for Denverton and beyond"): the quirk is not applied on wake +from suspend as it originally was. + +It is worth to mention the commit contained another bug: the quirk is +not applied at all to controllers which require it. The fix commit +09d6ac8dc51a ("libata/ahci: Fix PCS quirk application") landed in 5.3.8. +So testing my patch anywhere between commits c312ef176399 and +09d6ac8dc51a is pointless. + +Not all disks trigger the problem. For example nothing bad happens with +Western Digital WD5000LPCX HDD. + +Test hardware: +- Acer 5920G with ICH8M SATA controller +- sda: some SATA HDD connnected into the DVD drive IDE port with a + SATA-IDE caddy. It is a boot disk +- sdb: Kingston SV300S37A60G SSD connected into the only SATA port + +Sample "dmesg --notime | grep -E '^(sd |ata)'" output on wake: + +sd 0:0:0:0: [sda] Starting disk +sd 2:0:0:0: [sdb] Starting disk +ata4: SATA link down (SStatus 4 SControl 300) +ata3: SATA link down (SStatus 4 SControl 300) +ata1.00: ACPI cmd ef/03:0c:00:00:00:a0 (SET FEATURES) filtered out +ata1.00: ACPI cmd ef/03:42:00:00:00:a0 (SET FEATURES) filtered out +ata1: FORCE: cable set to 80c +ata5: SATA link down (SStatus 0 SControl 300) +ata3: SATA link down (SStatus 4 SControl 300) +ata3: SATA link down (SStatus 4 SControl 300) +ata3.00: disabled +sd 2:0:0:0: rejecting I/O to offline device +ata3.00: detaching (SCSI 2:0:0:0) +sd 2:0:0:0: [sdb] Start/Stop Unit failed: Result: hostbyte=DID_NO_CONNECT + driverbyte=DRIVER_OK +sd 2:0:0:0: [sdb] Synchronizing SCSI cache +sd 2:0:0:0: [sdb] Synchronize Cache(10) failed: Result: + hostbyte=DID_BAD_TARGET driverbyte=DRIVER_OK +sd 2:0:0:0: [sdb] Stopping disk +sd 2:0:0:0: [sdb] Start/Stop Unit failed: Result: hostbyte=DID_BAD_TARGET + driverbyte=DRIVER_OK + +Commit c312ef176399 dropped ahci_pci_reset_controller() which internally +calls ahci_reset_controller() and applies the PCS quirk if needed after +that. It was called each time a reset was required instead of just +ahci_reset_controller(). This patch puts the function back in place. + +Fixes: c312ef176399 ("libata/ahci: Drop PCS quirk for Denverton and beyond") +Signed-off-by: Adam Vodopjan +Signed-off-by: Damien Le Moal +Signed-off-by: Sasha Levin +--- + drivers/ata/ahci.c | 32 +++++++++++++++++++++++--------- + 1 file changed, 23 insertions(+), 9 deletions(-) + +diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c +index 6f572967b555..4069c2a79daa 100644 +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -81,6 +81,7 @@ enum board_ids { + static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); + static void ahci_remove_one(struct pci_dev *dev); + static void ahci_shutdown_one(struct pci_dev *dev); ++static void ahci_intel_pcs_quirk(struct pci_dev *pdev, struct ahci_host_priv *hpriv); + static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, + unsigned long deadline); + static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, +@@ -639,6 +640,25 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev, + ahci_save_initial_config(&pdev->dev, hpriv); + } + ++static int ahci_pci_reset_controller(struct ata_host *host) ++{ ++ struct pci_dev *pdev = to_pci_dev(host->dev); ++ struct ahci_host_priv *hpriv = host->private_data; ++ int rc; ++ ++ rc = ahci_reset_controller(host); ++ if (rc) ++ return rc; ++ ++ /* ++ * If platform firmware failed to enable ports, try to enable ++ * them here. ++ */ ++ ahci_intel_pcs_quirk(pdev, hpriv); ++ ++ return 0; ++} ++ + static void ahci_pci_init_controller(struct ata_host *host) + { + struct ahci_host_priv *hpriv = host->private_data; +@@ -841,7 +861,7 @@ static int ahci_pci_device_runtime_resume(struct device *dev) + struct ata_host *host = pci_get_drvdata(pdev); + int rc; + +- rc = ahci_reset_controller(host); ++ rc = ahci_pci_reset_controller(host); + if (rc) + return rc; + ahci_pci_init_controller(host); +@@ -876,7 +896,7 @@ static int ahci_pci_device_resume(struct device *dev) + ahci_mcp89_apple_enable(pdev); + + if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { +- rc = ahci_reset_controller(host); ++ rc = ahci_pci_reset_controller(host); + if (rc) + return rc; + +@@ -1741,12 +1761,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) + /* save initial config */ + ahci_pci_save_initial_config(pdev, hpriv); + +- /* +- * If platform firmware failed to enable ports, try to enable +- * them here. +- */ +- ahci_intel_pcs_quirk(pdev, hpriv); +- + /* prepare host */ + if (hpriv->cap & HOST_CAP_NCQ) { + pi.flags |= ATA_FLAG_NCQ; +@@ -1856,7 +1870,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) + if (rc) + return rc; + +- rc = ahci_reset_controller(host); ++ rc = ahci_pci_reset_controller(host); + if (rc) + return rc; + +-- +2.35.1 + diff --git a/queue-5.4/hid-multitouch-fix-asus-expertbook-p2-p2451fa-trackp.patch b/queue-5.4/hid-multitouch-fix-asus-expertbook-p2-p2451fa-trackp.patch new file mode 100644 index 00000000000..fcb4e0b3e19 --- /dev/null +++ b/queue-5.4/hid-multitouch-fix-asus-expertbook-p2-p2451fa-trackp.patch @@ -0,0 +1,53 @@ +From 904cae4860487a03dc143f71ebc2be3490b8b424 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Nov 2022 17:57:05 +0100 +Subject: HID: multitouch: fix Asus ExpertBook P2 P2451FA trackpoint +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: José Expósito + +[ Upstream commit 4eab1c2fe06c98a4dff258dd64800b6986c101e9 ] + +The HID descriptor of this device contains two mouse collections, one +for mouse emulation and the other for the trackpoint. + +Both collections get merged and, because the first one defines X and Y, +the movemenent events reported by the trackpoint collection are +ignored. + +Set the MT_CLS_WIN_8_FORCE_MULTI_INPUT class for this device to be able +to receive its reports. + +This fix is similar to/based on commit 40d5bb87377a ("HID: multitouch: +enable multi-input as a quirk for some devices"). + +Link: https://gitlab.freedesktop.org/libinput/libinput/-/issues/825 +Reported-by: Akito +Tested-by: Akito +Signed-off-by: José Expósito +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-multitouch.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c +index 463a8deae37e..9db327654580 100644 +--- a/drivers/hid/hid-multitouch.c ++++ b/drivers/hid/hid-multitouch.c +@@ -1953,6 +1953,10 @@ static const struct hid_device_id mt_devices[] = { + HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, + USB_VENDOR_ID_ELAN, 0x313a) }, + ++ { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, ++ HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, ++ USB_VENDOR_ID_ELAN, 0x3148) }, ++ + /* Elitegroup panel */ + { .driver_data = MT_CLS_SERIAL, + MT_USB_DEVICE(USB_VENDOR_ID_ELITEGROUP, +-- +2.35.1 + diff --git a/queue-5.4/hid-plantronics-additional-pids-for-double-volume-ke.patch b/queue-5.4/hid-plantronics-additional-pids-for-double-volume-ke.patch new file mode 100644 index 00000000000..0b34d3dfe3d --- /dev/null +++ b/queue-5.4/hid-plantronics-additional-pids-for-double-volume-ke.patch @@ -0,0 +1,81 @@ +From 146cb5dd124f7b20537b44972f8d712cbd59f6df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 8 Dec 2022 15:05:06 -0800 +Subject: HID: plantronics: Additional PIDs for double volume key presses quirk + +From: Terry Junge + +[ Upstream commit 3d57f36c89d8ba32b2c312f397a37fd1a2dc7cfc ] + +I no longer work for Plantronics (aka Poly, aka HP) and do not have +access to the headsets in order to test. However, as noted by Maxim, +the other 32xx models that share the same base code set as the 3220 +would need the same quirk. This patch adds the PIDs for the rest of +the Blackwire 32XX product family that require the quirk. + +Plantronics Blackwire 3210 Series (047f:c055) +Plantronics Blackwire 3215 Series (047f:c057) +Plantronics Blackwire 3225 Series (047f:c058) + +Quote from previous patch by Maxim Mikityanskiy +Plantronics Blackwire 3220 Series (047f:c056) sends HID reports twice +for each volume key press. This patch adds a quirk to hid-plantronics +for this product ID, which will ignore the second volume key press if +it happens within 5 ms from the last one that was handled. + +The patch was tested on the mentioned model only, it shouldn't affect +other models, however, this quirk might be needed for them too. +Auto-repeat (when a key is held pressed) is not affected, because the +rate is about 3 times per second, which is far less frequent than once +in 5 ms. +End quote + +Signed-off-by: Terry Junge +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 3 +++ + drivers/hid/hid-plantronics.c | 9 +++++++++ + 2 files changed, 12 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 6d550681869f..222f525c3d04 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -938,7 +938,10 @@ + #define USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S 0x8003 + + #define USB_VENDOR_ID_PLANTRONICS 0x047f ++#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3210_SERIES 0xc055 + #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES 0xc056 ++#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3215_SERIES 0xc057 ++#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES 0xc058 + + #define USB_VENDOR_ID_PANASONIC 0x04da + #define USB_DEVICE_ID_PANABOARD_UBT780 0x1044 +diff --git a/drivers/hid/hid-plantronics.c b/drivers/hid/hid-plantronics.c +index e81b7cec2d12..3d414ae194ac 100644 +--- a/drivers/hid/hid-plantronics.c ++++ b/drivers/hid/hid-plantronics.c +@@ -198,9 +198,18 @@ static int plantronics_probe(struct hid_device *hdev, + } + + static const struct hid_device_id plantronics_devices[] = { ++ { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, ++ USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3210_SERIES), ++ .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, + { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, + USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES), + .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, ++ USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3215_SERIES), ++ .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, ++ USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES), ++ .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, + { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) }, + { } + }; +-- +2.35.1 + diff --git a/queue-5.4/nvme-fix-the-nvme_cmd_effects_cse_mask-definition.patch b/queue-5.4/nvme-fix-the-nvme_cmd_effects_cse_mask-definition.patch new file mode 100644 index 00000000000..aec9f028267 --- /dev/null +++ b/queue-5.4/nvme-fix-the-nvme_cmd_effects_cse_mask-definition.patch @@ -0,0 +1,46 @@ +From a2634ac2ec20cec4eab054fa287b55ec6d67d94e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Dec 2022 10:30:45 +0100 +Subject: nvme: fix the NVME_CMD_EFFECTS_CSE_MASK definition + +From: Christoph Hellwig + +[ Upstream commit 685e6311637e46f3212439ce2789f8a300e5050f ] + +3 << 16 does not generate the correct mask for bits 16, 17 and 18. +Use the GENMASK macro to generate the correct mask instead. + +Fixes: 84fef62d135b ("nvme: check admin passthru command effects") +Signed-off-by: Christoph Hellwig +Reviewed-by: Keith Busch +Reviewed-by: Sagi Grimberg +Reviewed-by: Kanchan Joshi +Signed-off-by: Sasha Levin +--- + include/linux/nvme.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/linux/nvme.h b/include/linux/nvme.h +index 3eca4f7d8510..ff0ee07b1e8f 100644 +--- a/include/linux/nvme.h ++++ b/include/linux/nvme.h +@@ -7,6 +7,7 @@ + #ifndef _LINUX_NVME_H + #define _LINUX_NVME_H + ++#include + #include + #include + +@@ -469,7 +470,7 @@ enum { + NVME_CMD_EFFECTS_NCC = 1 << 2, + NVME_CMD_EFFECTS_NIC = 1 << 3, + NVME_CMD_EFFECTS_CCC = 1 << 4, +- NVME_CMD_EFFECTS_CSE_MASK = 3 << 16, ++ NVME_CMD_EFFECTS_CSE_MASK = GENMASK(18, 16), + NVME_CMD_EFFECTS_UUID_SEL = 1 << 19, + }; + +-- +2.35.1 + diff --git a/queue-5.4/nvme-pci-add-a-blank-line-after-declarations.patch b/queue-5.4/nvme-pci-add-a-blank-line-after-declarations.patch new file mode 100644 index 00000000000..84d60affb1b --- /dev/null +++ b/queue-5.4/nvme-pci-add-a-blank-line-after-declarations.patch @@ -0,0 +1,60 @@ +From d748ca1246af36e2ff1c7c8d52665324c5fff82e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jul 2020 10:49:21 +0800 +Subject: nvme-pci: add a blank line after declarations + +From: Baolin Wang + +[ Upstream commit 4e523547e2bf755d40cb10e85795c2f9620ff3fb ] + +Add a blank line after declarations to make code more readable. + +Signed-off-by: Baolin Wang +Reviewed-by: Sagi Grimberg +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Stable-dep-of: c89a529e823d ("nvme-pci: fix mempool alloc size") +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/pci.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index 5d62d1042c0e..c31fb6902c71 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -1076,6 +1076,7 @@ static irqreturn_t nvme_irq(int irq, void *data) + static irqreturn_t nvme_irq_check(int irq, void *data) + { + struct nvme_queue *nvmeq = data; ++ + if (nvme_cqe_pending(nvmeq)) + return IRQ_WAKE_THREAD; + return IRQ_NONE; +@@ -1470,6 +1471,7 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, + + if (q_size_aligned * nr_io_queues > dev->cmb_size) { + u64 mem_per_q = div_u64(dev->cmb_size, nr_io_queues); ++ + mem_per_q = round_down(mem_per_q, dev->ctrl.page_size); + q_depth = div_u64(mem_per_q, entry_size); + +@@ -2940,6 +2942,7 @@ static void nvme_reset_done(struct pci_dev *pdev) + static void nvme_shutdown(struct pci_dev *pdev) + { + struct nvme_dev *dev = pci_get_drvdata(pdev); ++ + nvme_disable_prepare_reset(dev, true); + } + +@@ -3070,6 +3073,7 @@ static int nvme_suspend(struct device *dev) + static int nvme_simple_suspend(struct device *dev) + { + struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev)); ++ + return nvme_disable_prepare_reset(ndev, true); + } + +-- +2.35.1 + diff --git a/queue-5.4/nvme-pci-fix-doorbell-buffer-value-endianness.patch b/queue-5.4/nvme-pci-fix-doorbell-buffer-value-endianness.patch new file mode 100644 index 00000000000..292321a454c --- /dev/null +++ b/queue-5.4/nvme-pci-fix-doorbell-buffer-value-endianness.patch @@ -0,0 +1,100 @@ +From defb86457b767c18ded2646c6b2f5d55d4c4b76c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Dec 2022 09:58:07 +0100 +Subject: nvme-pci: fix doorbell buffer value endianness + +From: Klaus Jensen + +[ Upstream commit b5f96cb719d8ba220b565ddd3ba4ac0d8bcfb130 ] + +When using shadow doorbells, the event index and the doorbell values are +written to host memory. Prior to this patch, the values written would +erroneously be written in host endianness. This causes trouble on +big-endian platforms. Fix this by adding missing endian conversions. + +This issue was noticed by Guenter while testing various big-endian +platforms under QEMU[1]. A similar fix required for hw/nvme in QEMU is +up for review as well[2]. + + [1]: https://lore.kernel.org/qemu-devel/20221209110022.GA3396194@roeck-us.net/ + [2]: https://lore.kernel.org/qemu-devel/20221212114409.34972-4-its@irrelevant.dk/ + +Fixes: f9f38e33389c ("nvme: improve performance for virtual NVMe devices") +Reported-by: Guenter Roeck +Signed-off-by: Klaus Jensen +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/pci.c | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index 10fe7a7a2163..5d62d1042c0e 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -117,9 +117,9 @@ struct nvme_dev { + mempool_t *iod_mempool; + + /* shadow doorbell buffer support: */ +- u32 *dbbuf_dbs; ++ __le32 *dbbuf_dbs; + dma_addr_t dbbuf_dbs_dma_addr; +- u32 *dbbuf_eis; ++ __le32 *dbbuf_eis; + dma_addr_t dbbuf_eis_dma_addr; + + /* host memory buffer support: */ +@@ -187,10 +187,10 @@ struct nvme_queue { + #define NVMEQ_SQ_CMB 1 + #define NVMEQ_DELETE_ERROR 2 + #define NVMEQ_POLLED 3 +- u32 *dbbuf_sq_db; +- u32 *dbbuf_cq_db; +- u32 *dbbuf_sq_ei; +- u32 *dbbuf_cq_ei; ++ __le32 *dbbuf_sq_db; ++ __le32 *dbbuf_cq_db; ++ __le32 *dbbuf_sq_ei; ++ __le32 *dbbuf_cq_ei; + struct completion delete_done; + }; + +@@ -311,11 +311,11 @@ static inline int nvme_dbbuf_need_event(u16 event_idx, u16 new_idx, u16 old) + } + + /* Update dbbuf and return true if an MMIO is required */ +-static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db, +- volatile u32 *dbbuf_ei) ++static bool nvme_dbbuf_update_and_check_event(u16 value, __le32 *dbbuf_db, ++ volatile __le32 *dbbuf_ei) + { + if (dbbuf_db) { +- u16 old_value; ++ u16 old_value, event_idx; + + /* + * Ensure that the queue is written before updating +@@ -323,8 +323,8 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db, + */ + wmb(); + +- old_value = *dbbuf_db; +- *dbbuf_db = value; ++ old_value = le32_to_cpu(*dbbuf_db); ++ *dbbuf_db = cpu_to_le32(value); + + /* + * Ensure that the doorbell is updated before reading the event +@@ -334,7 +334,8 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db, + */ + mb(); + +- if (!nvme_dbbuf_need_event(*dbbuf_ei, value, old_value)) ++ event_idx = le32_to_cpu(*dbbuf_ei); ++ if (!nvme_dbbuf_need_event(event_idx, value, old_value)) + return false; + } + +-- +2.35.1 + diff --git a/queue-5.4/nvme-pci-use-the-consistent-return-type-of-nvme_pci_.patch b/queue-5.4/nvme-pci-use-the-consistent-return-type-of-nvme_pci_.patch new file mode 100644 index 00000000000..67dbe469335 --- /dev/null +++ b/queue-5.4/nvme-pci-use-the-consistent-return-type-of-nvme_pci_.patch @@ -0,0 +1,38 @@ +From 1334339945a0beed85953a5585970e0c6d4c5b3c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jul 2020 10:49:23 +0800 +Subject: nvme-pci: use the consistent return type of nvme_pci_iod_alloc_size() + +From: Baolin Wang + +[ Upstream commit 9056fc9fc514ecd2457a59c575863ecb07c4fa5e ] + +The nvme_pci_iod_alloc_size() should return 'size_t' type to be +consistent with the sizeof return value. + +Signed-off-by: Baolin Wang +Reviewed-by: Sagi Grimberg +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Stable-dep-of: c89a529e823d ("nvme-pci: fix mempool alloc size") +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/pci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index c31fb6902c71..2b723d113bb3 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -363,7 +363,7 @@ static int nvme_pci_npages_sgl(unsigned int num_seg) + return DIV_ROUND_UP(num_seg * sizeof(struct nvme_sgl_desc), PAGE_SIZE); + } + +-static unsigned int nvme_pci_iod_alloc_size(struct nvme_dev *dev, ++static size_t nvme_pci_iod_alloc_size(struct nvme_dev *dev, + unsigned int size, unsigned int nseg, bool use_sgl) + { + size_t alloc_size; +-- +2.35.1 + diff --git a/queue-5.4/nvme-resync-include-linux-nvme.h-with-nvmecli.patch b/queue-5.4/nvme-resync-include-linux-nvme.h-with-nvmecli.patch new file mode 100644 index 00000000000..153d439fdfe --- /dev/null +++ b/queue-5.4/nvme-resync-include-linux-nvme.h-with-nvmecli.patch @@ -0,0 +1,175 @@ +From 80827d0405aaf76f3be6a22a30c5ffc71fa28979 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2019 11:16:07 -0600 +Subject: nvme: resync include/linux/nvme.h with nvmecli + +From: Revanth Rajashekar + +[ Upstream commit 48c9e85b23464a7d1e3ebd70b79cc3a2d97d3222 ] + +Update enumerations and structures in include/linux/nvme.h +to resync with the nvmecli. + +All the updates are mentioned in the ratified NVMe 1.4 spec +https://nvmexpress.org/wp-content/uploads/NVM-Express-1_4-2019.06.10-Ratified.pdf + +Reviewed-by: Christoph Hellwig +Signed-off-by: Revanth Rajashekar +Signed-off-by: Keith Busch +Signed-off-by: Jens Axboe +Stable-dep-of: 685e6311637e ("nvme: fix the NVME_CMD_EFFECTS_CSE_MASK definition") +Signed-off-by: Sasha Levin +--- + include/linux/nvme.h | 53 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 50 insertions(+), 3 deletions(-) + +diff --git a/include/linux/nvme.h b/include/linux/nvme.h +index a260cd754f28..3eca4f7d8510 100644 +--- a/include/linux/nvme.h ++++ b/include/linux/nvme.h +@@ -107,8 +107,22 @@ enum { + NVME_REG_AQA = 0x0024, /* Admin Queue Attributes */ + NVME_REG_ASQ = 0x0028, /* Admin SQ Base Address */ + NVME_REG_ACQ = 0x0030, /* Admin CQ Base Address */ +- NVME_REG_CMBLOC = 0x0038, /* Controller Memory Buffer Location */ ++ NVME_REG_CMBLOC = 0x0038, /* Controller Memory Buffer Location */ + NVME_REG_CMBSZ = 0x003c, /* Controller Memory Buffer Size */ ++ NVME_REG_BPINFO = 0x0040, /* Boot Partition Information */ ++ NVME_REG_BPRSEL = 0x0044, /* Boot Partition Read Select */ ++ NVME_REG_BPMBL = 0x0048, /* Boot Partition Memory Buffer ++ * Location ++ */ ++ NVME_REG_PMRCAP = 0x0e00, /* Persistent Memory Capabilities */ ++ NVME_REG_PMRCTL = 0x0e04, /* Persistent Memory Region Control */ ++ NVME_REG_PMRSTS = 0x0e08, /* Persistent Memory Region Status */ ++ NVME_REG_PMREBS = 0x0e0c, /* Persistent Memory Region Elasticity ++ * Buffer Size ++ */ ++ NVME_REG_PMRSWTP = 0x0e10, /* Persistent Memory Region Sustained ++ * Write Throughput ++ */ + NVME_REG_DBS = 0x1000, /* SQ 0 Tail Doorbell */ + }; + +@@ -295,6 +309,14 @@ enum { + NVME_CTRL_OACS_DIRECTIVES = 1 << 5, + NVME_CTRL_OACS_DBBUF_SUPP = 1 << 8, + NVME_CTRL_LPA_CMD_EFFECTS_LOG = 1 << 1, ++ NVME_CTRL_CTRATT_128_ID = 1 << 0, ++ NVME_CTRL_CTRATT_NON_OP_PSP = 1 << 1, ++ NVME_CTRL_CTRATT_NVM_SETS = 1 << 2, ++ NVME_CTRL_CTRATT_READ_RECV_LVLS = 1 << 3, ++ NVME_CTRL_CTRATT_ENDURANCE_GROUPS = 1 << 4, ++ NVME_CTRL_CTRATT_PREDICTABLE_LAT = 1 << 5, ++ NVME_CTRL_CTRATT_NAMESPACE_GRANULARITY = 1 << 7, ++ NVME_CTRL_CTRATT_UUID_LIST = 1 << 9, + }; + + struct nvme_lbaf { +@@ -352,6 +374,9 @@ enum { + NVME_ID_CNS_NS_PRESENT = 0x11, + NVME_ID_CNS_CTRL_NS_LIST = 0x12, + NVME_ID_CNS_CTRL_LIST = 0x13, ++ NVME_ID_CNS_SCNDRY_CTRL_LIST = 0x15, ++ NVME_ID_CNS_NS_GRANULARITY = 0x16, ++ NVME_ID_CNS_UUID_LIST = 0x17, + }; + + enum { +@@ -409,7 +434,8 @@ struct nvme_smart_log { + __u8 avail_spare; + __u8 spare_thresh; + __u8 percent_used; +- __u8 rsvd6[26]; ++ __u8 endu_grp_crit_warn_sumry; ++ __u8 rsvd7[25]; + __u8 data_units_read[16]; + __u8 data_units_written[16]; + __u8 host_reads[16]; +@@ -423,7 +449,11 @@ struct nvme_smart_log { + __le32 warning_temp_time; + __le32 critical_comp_time; + __le16 temp_sensor[8]; +- __u8 rsvd216[296]; ++ __le32 thm_temp1_trans_count; ++ __le32 thm_temp2_trans_count; ++ __le32 thm_temp1_total_time; ++ __le32 thm_temp2_total_time; ++ __u8 rsvd232[280]; + }; + + struct nvme_fw_slot_info_log { +@@ -440,6 +470,7 @@ enum { + NVME_CMD_EFFECTS_NIC = 1 << 3, + NVME_CMD_EFFECTS_CCC = 1 << 4, + NVME_CMD_EFFECTS_CSE_MASK = 3 << 16, ++ NVME_CMD_EFFECTS_UUID_SEL = 1 << 19, + }; + + struct nvme_effects_log { +@@ -563,6 +594,7 @@ enum nvme_opcode { + nvme_cmd_compare = 0x05, + nvme_cmd_write_zeroes = 0x08, + nvme_cmd_dsm = 0x09, ++ nvme_cmd_verify = 0x0c, + nvme_cmd_resv_register = 0x0d, + nvme_cmd_resv_report = 0x0e, + nvme_cmd_resv_acquire = 0x11, +@@ -806,10 +838,14 @@ enum nvme_admin_opcode { + nvme_admin_ns_mgmt = 0x0d, + nvme_admin_activate_fw = 0x10, + nvme_admin_download_fw = 0x11, ++ nvme_admin_dev_self_test = 0x14, + nvme_admin_ns_attach = 0x15, + nvme_admin_keep_alive = 0x18, + nvme_admin_directive_send = 0x19, + nvme_admin_directive_recv = 0x1a, ++ nvme_admin_virtual_mgmt = 0x1c, ++ nvme_admin_nvme_mi_send = 0x1d, ++ nvme_admin_nvme_mi_recv = 0x1e, + nvme_admin_dbbuf = 0x7C, + nvme_admin_format_nvm = 0x80, + nvme_admin_security_send = 0x81, +@@ -873,6 +909,7 @@ enum { + NVME_FEAT_PLM_CONFIG = 0x13, + NVME_FEAT_PLM_WINDOW = 0x14, + NVME_FEAT_HOST_BEHAVIOR = 0x16, ++ NVME_FEAT_SANITIZE = 0x17, + NVME_FEAT_SW_PROGRESS = 0x80, + NVME_FEAT_HOST_ID = 0x81, + NVME_FEAT_RESV_MASK = 0x82, +@@ -883,6 +920,10 @@ enum { + NVME_LOG_FW_SLOT = 0x03, + NVME_LOG_CHANGED_NS = 0x04, + NVME_LOG_CMD_EFFECTS = 0x05, ++ NVME_LOG_DEVICE_SELF_TEST = 0x06, ++ NVME_LOG_TELEMETRY_HOST = 0x07, ++ NVME_LOG_TELEMETRY_CTRL = 0x08, ++ NVME_LOG_ENDURANCE_GROUP = 0x09, + NVME_LOG_ANA = 0x0c, + NVME_LOG_DISC = 0x70, + NVME_LOG_RESERVATION = 0x80, +@@ -1290,7 +1331,11 @@ enum { + NVME_SC_SGL_INVALID_OFFSET = 0x16, + NVME_SC_SGL_INVALID_SUBTYPE = 0x17, + ++ NVME_SC_SANITIZE_FAILED = 0x1C, ++ NVME_SC_SANITIZE_IN_PROGRESS = 0x1D, ++ + NVME_SC_NS_WRITE_PROTECTED = 0x20, ++ NVME_SC_CMD_INTERRUPTED = 0x21, + + NVME_SC_LBA_RANGE = 0x80, + NVME_SC_CAP_EXCEEDED = 0x81, +@@ -1328,6 +1373,8 @@ enum { + NVME_SC_NS_NOT_ATTACHED = 0x11a, + NVME_SC_THIN_PROV_NOT_SUPP = 0x11b, + NVME_SC_CTRL_LIST_INVALID = 0x11c, ++ NVME_SC_BP_WRITE_PROHIBITED = 0x11e, ++ NVME_SC_PMR_SAN_PROHIBITED = 0x123, + + /* + * I/O Command Set Specific - NVM commands: +-- +2.35.1 + diff --git a/queue-5.4/objtool-fix-segfault.patch b/queue-5.4/objtool-fix-segfault.patch new file mode 100644 index 00000000000..854d32870f6 --- /dev/null +++ b/queue-5.4/objtool-fix-segfault.patch @@ -0,0 +1,40 @@ +From 389cf3da8a90fe45dc1936207a5ac4c62ac071fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Nov 2022 23:27:46 +0530 +Subject: objtool: Fix SEGFAULT + +From: Christophe Leroy + +[ Upstream commit efb11fdb3e1a9f694fa12b70b21e69e55ec59c36 ] + +find_insn() will return NULL in case of failure. Check insn in order +to avoid a kernel Oops for NULL pointer dereference. + +Tested-by: Naveen N. Rao +Reviewed-by: Naveen N. Rao +Acked-by: Josh Poimboeuf +Acked-by: Peter Zijlstra (Intel) +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20221114175754.1131267-9-sv@linux.ibm.com +Signed-off-by: Sasha Levin +--- + tools/objtool/check.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/objtool/check.c b/tools/objtool/check.c +index bae6b261481d..ccf5580442d2 100644 +--- a/tools/objtool/check.c ++++ b/tools/objtool/check.c +@@ -162,7 +162,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, + return false; + + insn = find_insn(file, func->sec, func->offset); +- if (!insn->func) ++ if (!insn || !insn->func) + return false; + + func_for_each_insn_all(file, func, insn) { +-- +2.35.1 + diff --git a/queue-5.4/powerpc-msi-fix-deassociation-of-msi-descriptors.patch b/queue-5.4/powerpc-msi-fix-deassociation-of-msi-descriptors.patch new file mode 100644 index 00000000000..92982ebd312 --- /dev/null +++ b/queue-5.4/powerpc-msi-fix-deassociation-of-msi-descriptors.patch @@ -0,0 +1,100 @@ +From 34fc35508d334897a23bf224c4d92512ac63260c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 17 Dec 2022 10:46:44 +0000 +Subject: powerpc/msi: Fix deassociation of MSI descriptors + +From: Marc Zyngier + +[ Upstream commit 4545c6a3d6ba71747eaa984c338ddd745e56e23f ] + +Since 2f2940d16823 ("genirq/msi: Remove filter from +msi_free_descs_free_range()"), the core MSI code relies on the +msi_desc->irq field to have been cleared before the descriptor +can be freed, as it indicates that there is no association with +a device anymore. + +The irq domain code provides this guarantee, and so does s390, +which is one of the two architectures not using irq domains for +MSIs. + +Powerpc, however, is missing this particular requirements, +leading in a splat and leaked MSI descriptors. + +Adding the now required irq reset to the handful of powerpc backends +that implement MSIs fixes that particular problem. + +Reported-by: Guenter Roeck +Signed-off-by: Marc Zyngier +Link: https://lore.kernel.org/r/70dab88e-6119-0c12-7c6a-61bcbe239f66@roeck-us.net +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/4xx/hsta_msi.c | 1 + + arch/powerpc/platforms/cell/axon_msi.c | 1 + + arch/powerpc/platforms/pasemi/msi.c | 1 + + arch/powerpc/sysdev/fsl_msi.c | 1 + + arch/powerpc/sysdev/mpic_u3msi.c | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/arch/powerpc/platforms/4xx/hsta_msi.c b/arch/powerpc/platforms/4xx/hsta_msi.c +index c950fed43b32..4f65bd0cf111 100644 +--- a/arch/powerpc/platforms/4xx/hsta_msi.c ++++ b/arch/powerpc/platforms/4xx/hsta_msi.c +@@ -117,6 +117,7 @@ static void hsta_teardown_msi_irqs(struct pci_dev *dev) + msi_bitmap_free_hwirqs(&ppc4xx_hsta_msi.bmp, irq, 1); + pr_debug("%s: Teardown IRQ %u (index %u)\n", __func__, + entry->irq, irq); ++ entry->irq = 0; + } + } + +diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c +index ba33140e671d..d141f64150e8 100644 +--- a/arch/powerpc/platforms/cell/axon_msi.c ++++ b/arch/powerpc/platforms/cell/axon_msi.c +@@ -295,6 +295,7 @@ static void axon_msi_teardown_msi_irqs(struct pci_dev *dev) + + irq_set_msi_desc(entry->irq, NULL); + irq_dispose_mapping(entry->irq); ++ entry->irq = 0; + } + } + +diff --git a/arch/powerpc/platforms/pasemi/msi.c b/arch/powerpc/platforms/pasemi/msi.c +index d38944a1e258..76393c158ada 100644 +--- a/arch/powerpc/platforms/pasemi/msi.c ++++ b/arch/powerpc/platforms/pasemi/msi.c +@@ -69,6 +69,7 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev) + hwirq = virq_to_hw(entry->irq); + irq_set_msi_desc(entry->irq, NULL); + irq_dispose_mapping(entry->irq); ++ entry->irq = 0; + msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, ALLOC_CHUNK); + } + +diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c +index d276c5e96445..5c3f3173638e 100644 +--- a/arch/powerpc/sysdev/fsl_msi.c ++++ b/arch/powerpc/sysdev/fsl_msi.c +@@ -132,6 +132,7 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev) + msi_data = irq_get_chip_data(entry->irq); + irq_set_msi_desc(entry->irq, NULL); + irq_dispose_mapping(entry->irq); ++ entry->irq = 0; + msi_bitmap_free_hwirqs(&msi_data->bitmap, hwirq, 1); + } + +diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c +index 3861023d378a..43686c82e483 100644 +--- a/arch/powerpc/sysdev/mpic_u3msi.c ++++ b/arch/powerpc/sysdev/mpic_u3msi.c +@@ -111,6 +111,7 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev) + hwirq = virq_to_hw(entry->irq); + irq_set_msi_desc(entry->irq, NULL); + irq_dispose_mapping(entry->irq); ++ entry->irq = 0; + msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, 1); + } + +-- +2.35.1 + diff --git a/queue-5.4/powerpc-rtas-avoid-device-tree-lookups-in-rtas_os_te.patch b/queue-5.4/powerpc-rtas-avoid-device-tree-lookups-in-rtas_os_te.patch new file mode 100644 index 00000000000..e9bb4c84f82 --- /dev/null +++ b/queue-5.4/powerpc-rtas-avoid-device-tree-lookups-in-rtas_os_te.patch @@ -0,0 +1,77 @@ +From 932893ca4bfc7b8fc37834713040875a29dc5646 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Nov 2022 09:07:41 -0600 +Subject: powerpc/rtas: avoid device tree lookups in rtas_os_term() + +From: Nathan Lynch + +[ Upstream commit ed2213bfb192ab51f09f12e9b49b5d482c6493f3 ] + +rtas_os_term() is called during panic. Its behavior depends on a couple +of conditions in the /rtas node of the device tree, the traversal of +which entails locking and local IRQ state changes. If the kernel panics +while devtree_lock is held, rtas_os_term() as currently written could +hang. + +Instead of discovering the relevant characteristics at panic time, +cache them in file-static variables at boot. Note the lookup for +"ibm,extended-os-term" is converted to of_property_read_bool() since it +is a boolean property, not an RTAS function token. + +Signed-off-by: Nathan Lynch +Reviewed-by: Nicholas Piggin +Reviewed-by: Andrew Donnellan +[mpe: Incorporate suggested change from Nick] +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20221118150751.469393-4-nathanl@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/rtas.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c +index 35e246e39705..8ec69ea81fb4 100644 +--- a/arch/powerpc/kernel/rtas.c ++++ b/arch/powerpc/kernel/rtas.c +@@ -714,6 +714,7 @@ void __noreturn rtas_halt(void) + + /* Must be in the RMO region, so we place it here */ + static char rtas_os_term_buf[2048]; ++static s32 ibm_os_term_token = RTAS_UNKNOWN_SERVICE; + + void rtas_os_term(char *str) + { +@@ -725,14 +726,13 @@ void rtas_os_term(char *str) + * this property may terminate the partition which we want to avoid + * since it interferes with panic_timeout. + */ +- if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term") || +- RTAS_UNKNOWN_SERVICE == rtas_token("ibm,extended-os-term")) ++ if (ibm_os_term_token == RTAS_UNKNOWN_SERVICE) + return; + + snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str); + + do { +- status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL, ++ status = rtas_call(ibm_os_term_token, 1, 1, NULL, + __pa(rtas_os_term_buf)); + } while (rtas_busy_delay(status)); + +@@ -1215,6 +1215,13 @@ void __init rtas_initialize(void) + no_entry = of_property_read_u32(rtas.dev, "linux,rtas-entry", &entry); + rtas.entry = no_entry ? rtas.base : entry; + ++ /* ++ * Discover these now to avoid device tree lookups in the ++ * panic path. ++ */ ++ if (of_property_read_bool(rtas.dev, "ibm,extended-os-term")) ++ ibm_os_term_token = rtas_token("ibm,os-term"); ++ + /* If RTAS was found, allocate the RMO buffer for it and look for + * the stop-self token if any + */ +-- +2.35.1 + diff --git a/queue-5.4/powerpc-rtas-avoid-scheduling-in-rtas_os_term.patch b/queue-5.4/powerpc-rtas-avoid-scheduling-in-rtas_os_term.patch new file mode 100644 index 00000000000..a1554639cdf --- /dev/null +++ b/queue-5.4/powerpc-rtas-avoid-scheduling-in-rtas_os_term.patch @@ -0,0 +1,67 @@ +From 6cda8daf880be82712797b94105952a826d8b6a5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Nov 2022 09:07:42 -0600 +Subject: powerpc/rtas: avoid scheduling in rtas_os_term() + +From: Nathan Lynch + +[ Upstream commit 6c606e57eecc37d6b36d732b1ff7e55b7dc32dd4 ] + +It's unsafe to use rtas_busy_delay() to handle a busy status from +the ibm,os-term RTAS function in rtas_os_term(): + +Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b +BUG: sleeping function called from invalid context at arch/powerpc/kernel/rtas.c:618 +in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 1, name: swapper/0 +preempt_count: 2, expected: 0 +CPU: 7 PID: 1 Comm: swapper/0 Tainted: G D 6.0.0-rc5-02182-gf8553a572277-dirty #9 +Call Trace: +[c000000007b8f000] [c000000001337110] dump_stack_lvl+0xb4/0x110 (unreliable) +[c000000007b8f040] [c0000000002440e4] __might_resched+0x394/0x3c0 +[c000000007b8f0e0] [c00000000004f680] rtas_busy_delay+0x120/0x1b0 +[c000000007b8f100] [c000000000052d04] rtas_os_term+0xb8/0xf4 +[c000000007b8f180] [c0000000001150fc] pseries_panic+0x50/0x68 +[c000000007b8f1f0] [c000000000036354] ppc_panic_platform_handler+0x34/0x50 +[c000000007b8f210] [c0000000002303c4] notifier_call_chain+0xd4/0x1c0 +[c000000007b8f2b0] [c0000000002306cc] atomic_notifier_call_chain+0xac/0x1c0 +[c000000007b8f2f0] [c0000000001d62b8] panic+0x228/0x4d0 +[c000000007b8f390] [c0000000001e573c] do_exit+0x140c/0x1420 +[c000000007b8f480] [c0000000001e586c] make_task_dead+0xdc/0x200 + +Use rtas_busy_delay_time() instead, which signals without side effects +whether to attempt the ibm,os-term RTAS call again. + +Signed-off-by: Nathan Lynch +Reviewed-by: Nicholas Piggin +Reviewed-by: Andrew Donnellan +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20221118150751.469393-5-nathanl@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/rtas.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c +index 8ec69ea81fb4..139377f37b74 100644 +--- a/arch/powerpc/kernel/rtas.c ++++ b/arch/powerpc/kernel/rtas.c +@@ -731,10 +731,15 @@ void rtas_os_term(char *str) + + snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str); + ++ /* ++ * Keep calling as long as RTAS returns a "try again" status, ++ * but don't use rtas_busy_delay(), which potentially ++ * schedules. ++ */ + do { + status = rtas_call(ibm_os_term_token, 1, 1, NULL, + __pa(rtas_os_term_buf)); +- } while (rtas_busy_delay(status)); ++ } while (rtas_busy_delay_time(status)); + + if (status != 0) + printk(KERN_EMERG "ibm,os-term call failed %d\n", status); +-- +2.35.1 + diff --git a/queue-5.4/series b/queue-5.4/series index d2cdb28de14..4cd28655528 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -451,3 +451,15 @@ gcov-add-support-for-checksum-field.patch media-dvbdev-fix-build-warning-due-to-comments.patch media-dvbdev-fix-refcnt-bug.patch cifs-fix-oops-during-encryption.patch +nvme-pci-fix-doorbell-buffer-value-endianness.patch +nvme-pci-add-a-blank-line-after-declarations.patch +nvme-pci-use-the-consistent-return-type-of-nvme_pci_.patch +ata-ahci-fix-pcs-quirk-application-for-suspend.patch +nvme-resync-include-linux-nvme.h-with-nvmecli.patch +nvme-fix-the-nvme_cmd_effects_cse_mask-definition.patch +objtool-fix-segfault.patch +powerpc-rtas-avoid-device-tree-lookups-in-rtas_os_te.patch +powerpc-rtas-avoid-scheduling-in-rtas_os_term.patch +powerpc-msi-fix-deassociation-of-msi-descriptors.patch +hid-multitouch-fix-asus-expertbook-p2-p2451fa-trackp.patch +hid-plantronics-additional-pids-for-double-volume-ke.patch