Commit b894685c authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Rafael J. Wysocki
Browse files

thermal: int340x: processor_thermal: Move mailbox code to common module 



The processor thermal mailbox is used for workload type request and
also in the processor thermal RFIM module. So, move the workload type
request code to its own module from the current processor thermal
mailbox module.

processor_thermal_mailbox.c contains only mailbox read/write related
source code. The source related to workload_types requests is moved to
a module processor_thermal_wt_req.c.

In addition
 - Rename PROC_THERMAL_FEATURE_MBOX to PROC_THERMAL_FEATURE_WT_REQ.
 - proc_thermal_mbox_add(), which adds workload type sysfs attribute group
   is renamed to proc_thermal_wt_req_add().
 - proc_thermal_mbox_remove() is renamed to proc_thermal_wt_req_remove().

While here, resolve check patch warnings for 100 columns for only modified
lines.

No functional changes are expected.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent fb2c1024

drivers/thermal/intel/int340x_thermal/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,5 +10,6 @@ obj-$(CONFIG_INT340X_THERMAL) += processor_thermal_device_pci.o 
obj-$(CONFIG_PROC_THERMAL_MMIO_RAPL) += processor_thermal_rapl.o

obj-$(CONFIG_INT340X_THERMAL)	+= processor_thermal_rfim.o

obj-$(CONFIG_INT340X_THERMAL)	+= processor_thermal_mbox.o

obj-$(CONFIG_INT340X_THERMAL)	+= processor_thermal_wt_req.o

obj-$(CONFIG_INT3406_THERMAL)	+= int3406_thermal.o

obj-$(CONFIG_ACPI_THERMAL_REL)	+= acpi_thermal_rel.o

drivers/thermal/intel/int340x_thermal/processor_thermal_device.c

+4 −4
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ int proc_thermal_mmio_add(struct pci_dev *pdev, 
		}

	}



	if (feature_mask & PROC_THERMAL_FEATURE_MBOX) {

		ret = proc_thermal_mbox_add(pdev, proc_priv);

	if (feature_mask & PROC_THERMAL_FEATURE_WT_REQ) {

		ret = proc_thermal_wt_req_add(pdev, proc_priv);

		if (ret) {

			dev_err(&pdev->dev, "failed to add MBOX interface\n");

			goto err_rem_rfim;
@@ -374,8 +374,8 @@ void proc_thermal_mmio_remove(struct pci_dev *pdev, struct proc_thermal_device * 
	    proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DVFS)

		proc_thermal_rfim_remove(pdev);



	if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_MBOX)

		proc_thermal_mbox_remove(pdev);

	if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_WT_REQ)

		proc_thermal_wt_req_remove(pdev);

}

EXPORT_SYMBOL_GPL(proc_thermal_mmio_remove);

drivers/thermal/intel/int340x_thermal/processor_thermal_device.h

+9 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct rapl_mmio_regs { 
#define PROC_THERMAL_FEATURE_RAPL	0x01

#define PROC_THERMAL_FEATURE_FIVR	0x02

#define PROC_THERMAL_FEATURE_DVFS	0x04

#define PROC_THERMAL_FEATURE_MBOX	0x08

#define PROC_THERMAL_FEATURE_WT_REQ	0x08

#define PROC_THERMAL_FEATURE_DLVR	0x10



#if IS_ENABLED(CONFIG_PROC_THERMAL_MMIO_RAPL)
@@ -80,8 +80,14 @@ static void __maybe_unused proc_thermal_rapl_remove(void) 
int proc_thermal_rfim_add(struct pci_dev *pdev, struct proc_thermal_device *proc_priv);

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 proc_thermal_wt_req_add(struct pci_dev *pdev, struct proc_thermal_device *proc_priv);

void proc_thermal_wt_req_remove(struct pci_dev *pdev);



#define MBOX_CMD_WORKLOAD_TYPE_READ	0x0E

#define MBOX_CMD_WORKLOAD_TYPE_WRITE	0x0F



#define MBOX_DATA_BIT_AC_DC		30

#define MBOX_DATA_BIT_VALID		31



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);

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

+7 −3
Original line number Diff line number Diff line
@@ -350,9 +350,13 @@ static SIMPLE_DEV_PM_OPS(proc_thermal_pci_pm, proc_thermal_pci_suspend, 
			 proc_thermal_pci_resume);



static const struct pci_device_id proc_thermal_pci_ids[] = {

	{ PCI_DEVICE_DATA(INTEL, ADL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },

	{ PCI_DEVICE_DATA(INTEL, MTLP_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX | PROC_THERMAL_FEATURE_DLVR) },

	{ PCI_DEVICE_DATA(INTEL, RPL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_MBOX) },

	{ PCI_DEVICE_DATA(INTEL, ADL_THERMAL, PROC_THERMAL_FEATURE_RAPL |

	  PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_WT_REQ) },

	{ PCI_DEVICE_DATA(INTEL, MTLP_THERMAL, PROC_THERMAL_FEATURE_RAPL |

	  PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_WT_REQ |

	  PROC_THERMAL_FEATURE_DLVR) },

	{ PCI_DEVICE_DATA(INTEL, RPL_THERMAL, PROC_THERMAL_FEATURE_RAPL |

	  PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_DVFS | PROC_THERMAL_FEATURE_WT_REQ) },

	{ },

};

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci_legacy.c

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ static const struct pci_device_id proc_thermal_pci_ids[] = { 
	{ PCI_DEVICE_DATA(INTEL, ICL_THERMAL, PROC_THERMAL_FEATURE_RAPL) },

	{ PCI_DEVICE_DATA(INTEL, JSL_THERMAL, 0) },

	{ PCI_DEVICE_DATA(INTEL, SKL_THERMAL, PROC_THERMAL_FEATURE_RAPL) },

	{ PCI_DEVICE_DATA(INTEL, TGL_THERMAL, PROC_THERMAL_FEATURE_RAPL | PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_MBOX) },

	{ PCI_DEVICE_DATA(INTEL, TGL_THERMAL, PROC_THERMAL_FEATURE_RAPL |

	  PROC_THERMAL_FEATURE_FIVR | PROC_THERMAL_FEATURE_WT_REQ) },

	{ },

};