FAILED: patch "[PATCH] thermal/drivers/int340x: Fix RFIM mailbox write commands" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2685c77b80a80c57e2a25a726b82fb31e6e212ab Mon Sep 17 00:00:00 2001
From: Sumeet Pawnikar <[email protected]>
Date: Thu, 23 Dec 2021 15:12:36 +0530
Subject: [PATCH] thermal/drivers/int340x: Fix RFIM mailbox write commands
The existing mail mechanism only supports writing of workload types.
However, mailbox command for RFIM (cmd = 0x08) also requires write operation which is ignored. This results in failing to store RFI restriction.
Fixint this requires enhancing mailbox writes for non workload commands too, so remove the check for MBOX_CMD_WORKLOAD_TYPE_WRITE in mailbox write to allow this other write commands to be supoorted.
At the same time, however, we have to make sure that there is no impact on read commands, by avoiding to write anything into the mailbox data register.
To properly implement that, add two separate functions for mbox read and write commands for the processor thermal workload command type. This helps to distinguish the read and write workload command types from each other while sending mbox commands.
drivers/thermal/intel/int340x_thermal/processor_thermal_device.h +2 -1
@@ -80,7 +80,8 @@ void proc_thermal_rfim_remove(struct pci_dev *pdev);int proc_thermal_mbox_add (struct pci_dev *pdev,struct proc_thermal_device *proc_priv);void proc_thermal_mbox_remove (struct pci_dev *pdev); -int processor_thermal_send_mbox_cmd (struct pci_dev *pdev,u16 cmd_id,u32 cmd_data,u64 *cmd_resp); +int processor_thermal_send_mbox_read_cmd (struct pci_dev *pdev,u16 id,u64 *resp); +int processor_thermal_send_mbox_write_cmd (struct pci_dev *pdev,u16 id,u32 data);int proc_thermal_add (struct device *dev,struct proc_thermal_device *priv);void proc_thermal_remove (struct proc_thermal_device *proc_priv);int proc_thermal_suspend (struct device *dev);
drivers/thermal/intel/int340x_thermal/processor_thermal_mbox.c +59 -41
167 lines not on this page · raw message
drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c +12 -11
@@ -9,6 +9,8 @@#include <linux/pci.h> #include "processor_thermal_device.h" +MODULE_IMPORT_NS (INT340X_THERMAL ); +struct mmio_reg {int read_only;u32 offset;
@@ -194,8 +196,7 @@ static ssize_t rfi_restriction_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { - u16 cmd_id = 0x0008; -u64 cmd_resp; + u16 id = 0x0008;u32 input;int ret;
@@ -203,7 +204,7 @@ static ssize_t rfi_restriction_store(struct device *dev,if (ret)return ret; - ret =processor_thermal_send_mbox_cmd (to_pci_dev (dev), cmd_id, input, &cmd_resp); + ret =processor_thermal_send_mbox_write_cmd (to_pci_dev (dev), id, input);if (ret)return ret;
@@ -214,30 +215,30 @@ static ssize_t rfi_restriction_show(struct device *dev,struct device_attribute *attr, char *buf) { - u16 cmd_id = 0x0007; -u64 cmd_resp; + u16 id = 0x0007; +u64 resp;int ret; - ret =processor_thermal_send_mbox_cmd (to_pci_dev (dev), cmd_id,0 , &cmd_resp); + ret =processor_thermal_send_mbox_read_cmd (to_pci_dev (dev), id, &resp);if (ret)return ret; -return sprintf (buf,"%llu\n" , cmd_resp); +return sprintf (buf,"%llu\n" , resp); }static ssize_t ddr_data_rate_show (struct device *dev,struct device_attribute *attr,char *buf) { -u16 cmd_id =0x0107 ; -u64 cmd_resp; +u16 id =0x0107 ; +u64 resp;int ret; - ret =processor_thermal_send_mbox_cmd (to_pci_dev (dev), cmd_id,0 , &cmd_resp); + ret =processor_thermal_send_mbox_read_cmd (to_pci_dev (dev), id, &resp);if (ret)return ret; -return sprintf (buf,"%llu\n" , cmd_resp); +return sprintf (buf,"%llu\n" , resp); }static DEVICE_ATTR_RW (rfi_restriction);