Commit d8d3e49b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back earlier Intel thermal drivers updates for 7.1

parents 7dfe9846 40927abf

drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c

+20 −5
Original line number Diff line number Diff line
@@ -402,17 +402,31 @@ static ssize_t rfi_restriction_show(struct device *dev, 
	return sysfs_emit(buf, "%llu\n", resp);

}



 /* ddr_data_rate */

static const struct mmio_reg nvl_ddr_data_rate_reg = { 1, 0xE0, 10, 0x3FF, 2};



static const struct mmio_reg *ddr_data_rate_reg;



static ssize_t ddr_data_rate_show(struct device *dev,

				  struct device_attribute *attr,

				  char *buf)

{

	u16 id = 0x0107;

	u64 resp;



	if (ddr_data_rate_reg) {

		u16 reg_val;



		pci_read_config_word(to_pci_dev(dev), ddr_data_rate_reg->offset, &reg_val);

		resp = (reg_val >> ddr_data_rate_reg->shift) & ddr_data_rate_reg->mask;

		resp = (resp * 3333) / 100;

	} else {

		const u16 id = 0x0107;

		int ret;



		ret = processor_thermal_send_mbox_read_cmd(to_pci_dev(dev), id, &resp);

		if (ret)

			return ret;

	}



	return sysfs_emit(buf, "%llu\n", resp);

}
@@ -461,6 +475,7 @@ int proc_thermal_rfim_add(struct pci_dev *pdev, struct proc_thermal_device *proc 
		case PCI_DEVICE_ID_INTEL_NVL_H_THERMAL:

		case PCI_DEVICE_ID_INTEL_NVL_S_THERMAL:

			dlvr_mmio_regs_table = nvl_dlvr_mmio_regs;

			ddr_data_rate_reg = &nvl_ddr_data_rate_reg;

			break;

		default:

			dlvr_mmio_regs_table = dlvr_mmio_regs;

drivers/thermal/intel/intel_hfi.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ void intel_hfi_offline(unsigned int cpu) 
	mutex_lock(&hfi_instance_lock);

	cpumask_clear_cpu(cpu, hfi_instance->cpus);



	if (!cpumask_weight(hfi_instance->cpus))

	if (cpumask_empty(hfi_instance->cpus))

		hfi_disable();



	mutex_unlock(&hfi_instance_lock);