Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for MIPS for Linux 4.1.  Most
  noteworthy:

   - Add more Octeon-optimized crypto functions
   - Octeon crypto preemption and locking fixes
   - Little endian support for Octeon
   - Use correct CSR to soft reset Octeons
   - Support LEDs on the Octeon-based DSR-1000N
   - Fix PCI interrupt mapping for the Octeon-based DSR-1000N
   - Mark prom_free_prom_memory() as __init for a number of systems
   - Support for Imagination's Pistachio SOC.  This includes arch and
     CLK bits.  I'd like to merge pinctrl bits later
   - Improve parallelism of csum_partial for certain pipelines
   - Organize DTB files in subdirs like other architectures
   - Implement read_sched_clock for all MIPS platforms other than
     Octeon
   - Massive series of 38 fixes and cleanups for the FPU emulator /
     kernel
   - Further FPU remulator work to support new features.  This sits on a
     separate branch which also has been pulled into the 4.1 KVM branch
   - Clean up and fixes for the SEAD3 eval board; remove unused file
   - Various updates for Netlogic platforms
   - A number of small updates for Loongson 3 platforms
   - Increase the memory limit for ATH79 platforms to 256MB
   - A fair number of fixes and updates for BCM47xx platforms
   - Finish the implementation of XPA support
   - MIPS FDC support.  No, not floppy controller but Fast Debug Channel :)
   - Detect the R16000 used in SGI legacy platforms
   - Fix Kconfig dependencies for the SSB bus support"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (265 commits)
  MIPS: Makefile: Fix MIPS ASE detection code
  MIPS: asm: elf: Set O32 default FPU flags
  MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
  MIPS: Kconfig: Disable SMP/CPS for 64-bit
  MIPS: Hibernate: flush TLB entries earlier
  MIPS: smp-cps: cpu_set FPU mask if FPU present
  MIPS: lose_fpu(): Disable FPU when MSA enabled
  MIPS: ralink: add missing symbol for RALINK_ILL_ACC
  MIPS: ralink: Fix bad config symbol in PCI makefile.
  SSB: fix Kconfig dependencies
  MIPS: Malta: Detect and fix bad memsize values
  Revert "MIPS: Avoid pipeline stalls on some MIPS32R2 cores."
  MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
  MIPS: Fix cpu_has_mips_r2_exec_hazard.
  MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
  MIPS: asm: spinlock: Fix addiu instruction for R10000_LLSC_WAR case
  MIPS: r4kcache: Use correct base register for MIPS R6 cache flushes
  MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter
  MIPS: unaligned: Fix regular load/store instruction emulation for EVA
  MIPS: unaligned: Surround load/store macros in do {} while statements
  ...

6 files changed, 393 insertions, 0 deletions

diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
index 09fde58b12e0..0adccbf5c83f 100644
--- a/drivers/platform/Kconfig
+++ b/drivers/platform/Kconfig
@@ -1,6 +1,9 @@
 if X86
 source "drivers/platform/x86/Kconfig"
 endif
+if MIPS
+source "drivers/platform/mips/Kconfig"
+endif
 if GOLDFISH
 source "drivers/platform/goldfish/Kconfig"
 endif
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
index 3656b7b17b99..ca2692510733 100644
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_X86)               += x86/
+obj-$(CONFIG_MIPS)              += mips/
 obj-$(CONFIG_OLPC)              += olpc/
 obj-$(CONFIG_GOLDFISH)          += goldfish/
 obj-$(CONFIG_CHROME_PLATFORMS)  += chrome/
diff --git a/drivers/platform/mips/Kconfig b/drivers/platform/mips/Kconfig
new file mode 100644
index 000000000000..125e569017be
--- /dev/null
+++ b/drivers/platform/mips/Kconfig
@@ -0,0 +1,30 @@
+#
+# MIPS Platform Specific Drivers
+#
+
+menuconfig MIPS_PLATFORM_DEVICES
+        bool "MIPS Platform Specific Device Drivers"
+        default y
+        help
+          Say Y here to get to see options for device drivers of various
+          MIPS platforms, including vendor-specific netbook/laptop/desktop
+          extension and hardware monitor drivers. This option itself does
+          not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
+
+if MIPS_PLATFORM_DEVICES
+
+config MIPS_ACPI
+        bool
+        default y if LOONGSON_MACH3X
+
+config CPU_HWMON
+        tristate "Loongson CPU HWMon Driver"
+        depends on LOONGSON_MACH3X
+        select HWMON
+        default y
+        help
+          Loongson-3A/3B CPU Hwmon (temperature sensor) driver.
+
+endif # MIPS_PLATFORM_DEVICES
diff --git a/drivers/platform/mips/Makefile b/drivers/platform/mips/Makefile
new file mode 100644
index 000000000000..43412849b195
--- /dev/null
+++ b/drivers/platform/mips/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MIPS_ACPI) += acpi_init.o
+obj-$(CONFIG_CPU_HWMON) += cpu_hwmon.o
diff --git a/drivers/platform/mips/acpi_init.c b/drivers/platform/mips/acpi_init.c
new file mode 100644
index 000000000000..dbdad79ead8f
--- /dev/null
+++ b/drivers/platform/mips/acpi_init.c
@@ -0,0 +1,150 @@
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/export.h>
+
+#define SBX00_ACPI_IO_BASE 0x800
+#define SBX00_ACPI_IO_SIZE 0x100
+
+#define ACPI_PM_EVT_BLK         (SBX00_ACPI_IO_BASE + 0x00) /* 4 bytes */
+#define ACPI_PM_CNT_BLK         (SBX00_ACPI_IO_BASE + 0x04) /* 2 bytes */
+#define ACPI_PMA_CNT_BLK        (SBX00_ACPI_IO_BASE + 0x0F) /* 1 byte */
+#define ACPI_PM_TMR_BLK         (SBX00_ACPI_IO_BASE + 0x18) /* 4 bytes */
+#define ACPI_GPE0_BLK           (SBX00_ACPI_IO_BASE + 0x10) /* 8 bytes */
+#define ACPI_END                (SBX00_ACPI_IO_BASE + 0x80)
+
+#define PM_INDEX        0xCD6
+#define PM_DATA         0xCD7
+#define PM2_INDEX       0xCD0
+#define PM2_DATA        0xCD1
+
+/*
+ * SCI interrupt need acpi space, allocate here
+ */
+
+static int __init register_acpi_resource(void)
+{
+        request_region(SBX00_ACPI_IO_BASE, SBX00_ACPI_IO_SIZE, "acpi");
+        return 0;
+}
+
+static void pmio_write_index(u16 index, u8 reg, u8 value)
+{
+        outb(reg, index);
+        outb(value, index + 1);
+}
+
+static u8 pmio_read_index(u16 index, u8 reg)
+{
+        outb(reg, index);
+        return inb(index + 1);
+}
+
+void pm_iowrite(u8 reg, u8 value)
+{
+        pmio_write_index(PM_INDEX, reg, value);
+}
+EXPORT_SYMBOL(pm_iowrite);
+
+u8 pm_ioread(u8 reg)
+{
+        return pmio_read_index(PM_INDEX, reg);
+}
+EXPORT_SYMBOL(pm_ioread);
+
+void pm2_iowrite(u8 reg, u8 value)
+{
+        pmio_write_index(PM2_INDEX, reg, value);
+}
+EXPORT_SYMBOL(pm2_iowrite);
+
+u8 pm2_ioread(u8 reg)
+{
+        return pmio_read_index(PM2_INDEX, reg);
+}
+EXPORT_SYMBOL(pm2_ioread);
+
+static void acpi_hw_clear_status(void)
+{
+        u16 value;
+
+        /* PMStatus: Clear WakeStatus/PwrBtnStatus */
+        value = inw(ACPI_PM_EVT_BLK);
+        value |= (1 << 8 | 1 << 15);
+        outw(value, ACPI_PM_EVT_BLK);
+
+        /* GPEStatus: Clear all generated events */
+        outl(inl(ACPI_GPE0_BLK), ACPI_GPE0_BLK);
+}
+
+void acpi_registers_setup(void)
+{
+        u32 value;
+
+        /* PM Status Base */
+        pm_iowrite(0x20, ACPI_PM_EVT_BLK & 0xff);
+        pm_iowrite(0x21, ACPI_PM_EVT_BLK >> 8);
+
+        /* PM Control Base */
+        pm_iowrite(0x22, ACPI_PM_CNT_BLK & 0xff);
+        pm_iowrite(0x23, ACPI_PM_CNT_BLK >> 8);
+
+        /* GPM Base */
+        pm_iowrite(0x28, ACPI_GPE0_BLK & 0xff);
+        pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
+
+        /* ACPI End */
+        pm_iowrite(0x2e, ACPI_END & 0xff);
+        pm_iowrite(0x2f, ACPI_END >> 8);
+
+        /* IO Decode: When AcpiDecodeEnable set, South-Bridge uses the contents
+         * of the PM registers at index 0x20~0x2B to decode ACPI I/O address. */
+        pm_iowrite(0x0e, 1 << 3);
+
+        /* SCI_EN set */
+        outw(1, ACPI_PM_CNT_BLK);
+
+        /* Enable to generate SCI */
+        pm_iowrite(0x10, pm_ioread(0x10) | 1);
+
+        /* GPM3/GPM9 enable */
+        value = inl(ACPI_GPE0_BLK + 4);
+        outl(value | (1 << 14) | (1 << 22), ACPI_GPE0_BLK + 4);
+
+        /* Set GPM9 as input */
+        pm_iowrite(0x8d, pm_ioread(0x8d) & (~(1 << 1)));
+
+        /* Set GPM9 as non-output */
+        pm_iowrite(0x94, pm_ioread(0x94) | (1 << 3));
+
+        /* GPM3 config ACPI trigger SCIOUT */
+        pm_iowrite(0x33, pm_ioread(0x33) & (~(3 << 4)));
+
+        /* GPM9 config ACPI trigger SCIOUT */
+        pm_iowrite(0x3d, pm_ioread(0x3d) & (~(3 << 2)));
+
+        /* GPM3 config falling edge trigger */
+        pm_iowrite(0x37, pm_ioread(0x37) & (~(1 << 6)));
+
+        /* No wait for STPGNT# in ACPI Sx state */
+        pm_iowrite(0x7c, pm_ioread(0x7c) | (1 << 6));
+
+        /* Set GPM3 pull-down enable */
+        value = pm2_ioread(0xf6);
+        value |= ((1 << 7) | (1 << 3));
+        pm2_iowrite(0xf6, value);
+
+        /* Set GPM9 pull-down enable */
+        value = pm2_ioread(0xf8);
+        value |= ((1 << 5) | (1 << 1));
+        pm2_iowrite(0xf8, value);
+}
+
+int __init sbx00_acpi_init(void)
+{
+        register_acpi_resource();
+        acpi_registers_setup();
+        acpi_hw_clear_status();
+
+        return 0;
+}
diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c
new file mode 100644
index 000000000000..0f6c63e17049
--- /dev/null
+++ b/drivers/platform/mips/cpu_hwmon.c
@@ -0,0 +1,207 @@
+#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 (loongson_sysconf.cputype == Loongson_3A)
+                reg = (reg >> 8) & 0xff;
+        else if (loongson_sysconf.cputype == Loongson_3B)
+                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 Temprature\n");
+}
+
+static ssize_t cpu1_temp_label(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "CPU 1 Temprature\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 temprature 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");