mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
Pull MIPS updates from Ralf Baechle:
"This is the main pull request for MIPS for 4.7. Here's the summary of
the changes:
- ATH79: Support for DTB passuing using the UHI boot protocol
- ATH79: Remove support for builtin DTB.
- ATH79: Add zboot debug serial support.
- ATH79: Add initial support for Dragino MS14 (Dragine 2), Onion Omega
and DPT-Module.
- ATH79: Update devicetree clock support for AR9132 and AR9331.
- ATH79: Cleanup the DT code.
- ATH79: Support newer SOCs in ath79_ddr_ctrl_init.
- ATH79: Fix regression in PCI window initialization.
- BCM47xx: Move SPROM driver to drivers/firmware/
- BCM63xx: Enable partition parser in defconfig.
- BMIPS: BMIPS5000 has I cache filing from D cache
- BMIPS: BMIPS: Add cpu-feature-overrides.h
- BMIPS: Add Whirlwind support
- BMIPS: Adjust mips-hpt-frequency for BCM7435
- BMIPS: Remove maxcpus from BCM97435SVMB DTS
- BMIPS: Add missing 7038 L1 register cells to BCM7435
- BMIPS: Various tweaks to initialization code.
- BMIPS: Enable partition parser in defconfig.
- BMIPS: Cache tweaks.
- BMIPS: Add UART, I2C and SATA devices to DT.
- BMIPS: Add BCM6358 and BCM63268support
- BMIPS: Add device tree example for BCM6358.
- BMIPS: Improve Improve BCM6328 and BCM6368 device trees
- Lantiq: Add support for device tree file from boot loader
- Lantiq: Allow build with no built-in DT.
- Loongson 3: Reserve 32MB for RS780E integrated GPU.
- Loongson 3: Fix build error after ld-version.sh modification
- Loongson 3: Move chipset ACPI code from drivers to arch.
- Loongson 3: Speedup irq processing.
- Loongson 3: Add basic Loongson 3A support.
- Loongson 3: Set cache flush handlers to nop.
- Loongson 3: Invalidate special TLBs when needed.
- Loongson 3: Fast TLB refill handler.
- MT7620: Fallback strategy for invalid syscfg0.
- Netlogic: Fix CP0_EBASE redefinition warnings
- Octeon: Initialization fixes
- Octeon: Add DTS files for the D-Link DSR-1000N and EdgeRouter Lite
- Octeon: Enable add Octeon-drivers in cavium_octeon_defconfig
- Octeon: Correctly handle endian-swapped initramfs images.
- Octeon: Support CN73xx, CN75xx and CN78xx.
- Octeon: Remove dead code from cvmx-sysinfo.
- Octeon: Extend number of supported CPUs past 32.
- Octeon: Remove some code limiting NR_IRQS to 255.
- Octeon: Simplify octeon_irq_ciu_gpio_set_type.
- Octeon: Mark some functions __init in smp.c
- Octeon: Octeon: Add Octeon III CN7xxx interface detection
- PIC32: Add serial driver and bindings for it.
- PIC32: Add PIC32 deadman timer driver and bindings.
- PIC32: Add PIC32 clock timer driver and bindings.
- Pistachio: Determine SoC revision during boot
- Sibyte: Fix Kconfig dependencies of SIBYTE_BUS_WATCHER.
- Sibyte: Strip redundant comments from bcm1480_regs.h.
- Panic immediately if panic_on_oops is set.
- module: fix incorrect IS_ERR_VALUE macro usage.
- module: Make consistent use of pr_*
- Remove no longer needed work_on_cpu() call.
- Remove CONFIG_IPV6_PRIVACY from defconfigs.
- Fix registers of non-crashing CPUs in dumps.
- Handle MIPSisms in new vmcore_elf32_check_arch.
- Select CONFIG_HANDLE_DOMAIN_IRQ and make it work.
- Allow RIXI to be used on non-R2 or R6 cores.
- Reserve nosave data for hibernation
- Fix siginfo.h to use strict POSIX types.
- Don't unwind user mode with EVA.
- Fix watchpoint restoration
- Ptrace watchpoints for R6.
- Sync icache when it fills from dcache
- I6400 I-cache fills from dcache.
- Various MSA fixes.
- Cleanup MIPS_CPU_* definitions.
- Signal: Move generic copy_siginfo to signal.h
- Signal: Fix uapi include in exported asm/siginfo.h
- Timer fixes for sake of KVM.
- XPA TLB refill fixes.
- Treat perf counter feature
- Update John Crispin's email address
- Add PIC32 watchdog and bindings.
- Handle R10000 LL/SC bug in set_pte()
- cpufreq: Various fixes for Longson1.
- R6: Fix R2 emulation.
- mathemu: Cosmetic fix to ADDIUPC emulation, plenty of other small fixes
- ELF: ABI and FP fixes.
- Allow for relocatable kernel and use that to support KASLR.
- Fix CPC_BASE_ADDR mask
- Plenty fo smp-cps, CM, R6 and M6250 fixes.
- Make reset_control_ops const.
- Fix kernel command line handling of leading whitespace.
- Cleanups to cache handling.
- Add brcm, bcm6345-l1-intc device tree bindings.
- Use generic clkdev.h header
- Remove CLK_IS_ROOT usage.
- Misc small cleanups.
- CM: Fix compilation error when !MIPS_CM
- oprofile: Fix a preemption issue
- Detect DSP ASE v3 support:1"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (275 commits)
MIPS: pic32mzda: fix getting timer clock rate.
MIPS: ath79: fix regression in PCI window initialization
MIPS: ath79: make ath79_ddr_ctrl_init() compatible for newer SoCs
MIPS: Fix VZ probe gas errors with binutils <2.24
MIPS: perf: Fix I6400 event numbers
MIPS: DEC: Export `ioasic_ssr_lock' to modules
MIPS: MSA: Fix a link error on `_init_msa_upper' with older GCC
MIPS: CM: Fix compilation error when !MIPS_CM
MIPS: Fix genvdso error on rebuild
USB: ohci-jz4740: Remove obsolete driver
MIPS: JZ4740: Probe OHCI platform device via DT
MIPS: JZ4740: Qi LB60: Remove support for AVT2 variant
MIPS: pistachio: Determine SoC revision during boot
MIPS: BMIPS: Adjust mips-hpt-frequency for BCM7435
mips: mt7620: fallback to SDRAM when syscfg0 does not have a valid value for the memory type
MIPS: Prevent "restoration" of MSA context in non-MSA kernels
MIPS: cevt-r4k: Dynamically calculate min_delta_ns
MIPS: malta-time: Take seconds into account
MIPS: malta-time: Start GIC count before syncing to RTC
MIPS: Force CPUs to lose FP context during mode switches
...
208 lines
5.3 KiB
C
208 lines
5.3 KiB
C
#include <linux/err.h>
|
|
#include <linux/module.h>
|
|
#include <linux/reboot.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/hwmon.h>
|
|
#include <linux/hwmon-sysfs.h>
|
|
|
|
#include <loongson.h>
|
|
#include <boot_param.h>
|
|
#include <loongson_hwmon.h>
|
|
|
|
/*
|
|
* Loongson-3 series cpu has two sensors inside,
|
|
* each of them from 0 to 255,
|
|
* if more than 127, that is dangerous.
|
|
* here only provide sensor1 data, because it always hot than sensor0
|
|
*/
|
|
int loongson3_cpu_temp(int cpu)
|
|
{
|
|
u32 reg;
|
|
|
|
reg = LOONGSON_CHIPTEMP(cpu);
|
|
if ((read_c0_prid() & PRID_REV_MASK) == PRID_REV_LOONGSON3A_R1)
|
|
reg = (reg >> 8) & 0xff;
|
|
else
|
|
reg = ((reg >> 8) & 0xff) - 100;
|
|
|
|
return (int)reg * 1000;
|
|
}
|
|
|
|
static struct device *cpu_hwmon_dev;
|
|
|
|
static ssize_t get_hwmon_name(struct device *dev,
|
|
struct device_attribute *attr, char *buf);
|
|
static SENSOR_DEVICE_ATTR(name, S_IRUGO, get_hwmon_name, NULL, 0);
|
|
|
|
static struct attribute *cpu_hwmon_attributes[] = {
|
|
&sensor_dev_attr_name.dev_attr.attr,
|
|
NULL
|
|
};
|
|
|
|
/* Hwmon device attribute group */
|
|
static struct attribute_group cpu_hwmon_attribute_group = {
|
|
.attrs = cpu_hwmon_attributes,
|
|
};
|
|
|
|
/* Hwmon device get name */
|
|
static ssize_t get_hwmon_name(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
return sprintf(buf, "cpu-hwmon\n");
|
|
}
|
|
|
|
static ssize_t get_cpu0_temp(struct device *dev,
|
|
struct device_attribute *attr, char *buf);
|
|
static ssize_t get_cpu1_temp(struct device *dev,
|
|
struct device_attribute *attr, char *buf);
|
|
static ssize_t cpu0_temp_label(struct device *dev,
|
|
struct device_attribute *attr, char *buf);
|
|
static ssize_t cpu1_temp_label(struct device *dev,
|
|
struct device_attribute *attr, char *buf);
|
|
|
|
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, get_cpu0_temp, NULL, 1);
|
|
static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, cpu0_temp_label, NULL, 1);
|
|
static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, get_cpu1_temp, NULL, 2);
|
|
static SENSOR_DEVICE_ATTR(temp2_label, S_IRUGO, cpu1_temp_label, NULL, 2);
|
|
|
|
static const struct attribute *hwmon_cputemp1[] = {
|
|
&sensor_dev_attr_temp1_input.dev_attr.attr,
|
|
&sensor_dev_attr_temp1_label.dev_attr.attr,
|
|
NULL
|
|
};
|
|
|
|
static const struct attribute *hwmon_cputemp2[] = {
|
|
&sensor_dev_attr_temp2_input.dev_attr.attr,
|
|
&sensor_dev_attr_temp2_label.dev_attr.attr,
|
|
NULL
|
|
};
|
|
|
|
static ssize_t cpu0_temp_label(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
return sprintf(buf, "CPU 0 Temperature\n");
|
|
}
|
|
|
|
static ssize_t cpu1_temp_label(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
return sprintf(buf, "CPU 1 Temperature\n");
|
|
}
|
|
|
|
static ssize_t get_cpu0_temp(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
int value = loongson3_cpu_temp(0);
|
|
return sprintf(buf, "%d\n", value);
|
|
}
|
|
|
|
static ssize_t get_cpu1_temp(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
int value = loongson3_cpu_temp(1);
|
|
return sprintf(buf, "%d\n", value);
|
|
}
|
|
|
|
static int create_sysfs_cputemp_files(struct kobject *kobj)
|
|
{
|
|
int ret;
|
|
|
|
ret = sysfs_create_files(kobj, hwmon_cputemp1);
|
|
if (ret)
|
|
goto sysfs_create_temp1_fail;
|
|
|
|
if (loongson_sysconf.nr_cpus <= loongson_sysconf.cores_per_package)
|
|
return 0;
|
|
|
|
ret = sysfs_create_files(kobj, hwmon_cputemp2);
|
|
if (ret)
|
|
goto sysfs_create_temp2_fail;
|
|
|
|
return 0;
|
|
|
|
sysfs_create_temp2_fail:
|
|
sysfs_remove_files(kobj, hwmon_cputemp1);
|
|
|
|
sysfs_create_temp1_fail:
|
|
return -1;
|
|
}
|
|
|
|
static void remove_sysfs_cputemp_files(struct kobject *kobj)
|
|
{
|
|
sysfs_remove_files(&cpu_hwmon_dev->kobj, hwmon_cputemp1);
|
|
|
|
if (loongson_sysconf.nr_cpus > loongson_sysconf.cores_per_package)
|
|
sysfs_remove_files(&cpu_hwmon_dev->kobj, hwmon_cputemp2);
|
|
}
|
|
|
|
#define CPU_THERMAL_THRESHOLD 90000
|
|
static struct delayed_work thermal_work;
|
|
|
|
static void do_thermal_timer(struct work_struct *work)
|
|
{
|
|
int value = loongson3_cpu_temp(0);
|
|
if (value <= CPU_THERMAL_THRESHOLD)
|
|
schedule_delayed_work(&thermal_work, msecs_to_jiffies(5000));
|
|
else
|
|
orderly_poweroff(true);
|
|
}
|
|
|
|
static int __init loongson_hwmon_init(void)
|
|
{
|
|
int ret;
|
|
|
|
pr_info("Loongson Hwmon Enter...\n");
|
|
|
|
cpu_hwmon_dev = hwmon_device_register(NULL);
|
|
if (IS_ERR(cpu_hwmon_dev)) {
|
|
ret = -ENOMEM;
|
|
pr_err("hwmon_device_register fail!\n");
|
|
goto fail_hwmon_device_register;
|
|
}
|
|
|
|
ret = sysfs_create_group(&cpu_hwmon_dev->kobj,
|
|
&cpu_hwmon_attribute_group);
|
|
if (ret) {
|
|
pr_err("fail to create loongson hwmon!\n");
|
|
goto fail_sysfs_create_group_hwmon;
|
|
}
|
|
|
|
ret = create_sysfs_cputemp_files(&cpu_hwmon_dev->kobj);
|
|
if (ret) {
|
|
pr_err("fail to create cpu temperature interface!\n");
|
|
goto fail_create_sysfs_cputemp_files;
|
|
}
|
|
|
|
INIT_DEFERRABLE_WORK(&thermal_work, do_thermal_timer);
|
|
schedule_delayed_work(&thermal_work, msecs_to_jiffies(20000));
|
|
|
|
return ret;
|
|
|
|
fail_create_sysfs_cputemp_files:
|
|
sysfs_remove_group(&cpu_hwmon_dev->kobj,
|
|
&cpu_hwmon_attribute_group);
|
|
|
|
fail_sysfs_create_group_hwmon:
|
|
hwmon_device_unregister(cpu_hwmon_dev);
|
|
|
|
fail_hwmon_device_register:
|
|
return ret;
|
|
}
|
|
|
|
static void __exit loongson_hwmon_exit(void)
|
|
{
|
|
cancel_delayed_work_sync(&thermal_work);
|
|
remove_sysfs_cputemp_files(&cpu_hwmon_dev->kobj);
|
|
sysfs_remove_group(&cpu_hwmon_dev->kobj,
|
|
&cpu_hwmon_attribute_group);
|
|
hwmon_device_unregister(cpu_hwmon_dev);
|
|
}
|
|
|
|
module_init(loongson_hwmon_init);
|
|
module_exit(loongson_hwmon_exit);
|
|
|
|
MODULE_AUTHOR("Yu Xiang <xiangy@lemote.com>");
|
|
MODULE_AUTHOR("Huacai Chen <chenhc@lemote.com>");
|
|
MODULE_DESCRIPTION("Loongson CPU Hwmon driver");
|
|
MODULE_LICENSE("GPL");
|