Changes in 4.9.183 rapidio: fix a NULL pointer dereference when create_workqueue() fails fs/fat/file.c: issue flush after the writeback of FAT sysctl: return -EINVAL if val violates minmax ipc: prevent lockup on alloc_msg and free_msg ARM: prevent tracing IPI_CPU_BACKTRACE hugetlbfs: on restore reserve error path retain subpool reservation mem-hotplug: fix node spanned pages when we have a node with only ZONE_MOVABLE mm/cma.c: fix crash on CMA allocation if bitmap allocation fails mm/cma_debug.c: fix the break condition in cma_maxchunk_get() mm/slab.c: fix an infinite loop in leaks_show() kernel/sys.c: prctl: fix false positive in validate_prctl_map() drivers: thermal: tsens: Don't print error message on -EPROBE_DEFER mfd: tps65912-spi: Add missing of table registration mfd: intel-lpss: Set the device in reset state when init mfd: twl6040: Fix device init errors for ACCCTL register perf/x86/intel: Allow PEBS multi-entry in watermark mode drm/bridge: adv7511: Fix low refresh rate selection objtool: Don't use ignore flag for fake jumps pwm: meson: Use the spin-lock only to protect register modifications ntp: Allow TAI-UTC offset to be set to zero f2fs: fix to avoid panic in do_recover_data() f2fs: fix to clear dirty inode in error path of f2fs_iget() f2fs: fix to do sanity check on valid block count of segment configfs: fix possible use-after-free in configfs_register_group uml: fix a boot splat wrt use of cpu_all_mask watchdog: imx2_wdt: Fix set_timeout for big timeout values watchdog: fix compile time error of pretimeout governors iommu/vt-d: Set intel_iommu_gfx_mapped correctly ALSA: hda - Register irq handler after the chip initialization nvmem: core: fix read buffer in place fuse: retrieve: cap requested size to negotiated max_write nfsd: allow fh_want_write to be called twice x86/PCI: Fix PCI IRQ routing table memory leak platform/chrome: cros_ec_proto: check for NULL transfer function soc: mediatek: pwrap: Zero initialize rdata in pwrap_init_cipher clk: rockchip: Turn on "aclk_dmac1" for suspend on rk3288 ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ahb" clock to SDMA ARM: dts: imx7d: Specify IMX7D_CLK_IPG as "ipg" clock to SDMA ARM: dts: imx6ul: Specify IMX6UL_CLK_IPG as "ipg" clock to SDMA ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ipg" clock to SDMA ARM: dts: imx6qdl: Specify IMX6QDL_CLK_IPG as "ipg" clock to SDMA PCI: rpadlpar: Fix leaked device_node references in add/remove paths platform/x86: intel_pmc_ipc: adding error handling PCI: rcar: Fix a potential NULL pointer dereference PCI: rcar: Fix 64bit MSI message address handling video: hgafb: fix potential NULL pointer dereference video: imsttfb: fix potential NULL pointer dereferences PCI: xilinx: Check for __get_free_pages() failure gpio: gpio-omap: add check for off wake capable gpios dmaengine: idma64: Use actual device for DMA transfers pwm: tiehrpwm: Update shadow register for disabling PWMs ARM: dts: exynos: Always enable necessary APIO_1V8 and ABB_1V8 regulators on Arndale Octa pwm: Fix deadlock warning when removing PWM device ARM: exynos: Fix undefined instruction during Exynos5422 resume Revert "Bluetooth: Align minimum encryption key size for LE and BR/EDR connections" ALSA: seq: Cover unsubscribe_port() in list_mutex ALSA: oxfw: allow PCM capture for Stanton SCS.1m libata: Extend quirks for the ST1000LM024 drives with NOLPM quirk mm/list_lru.c: fix memory leak in __memcg_init_list_lru_node fs/ocfs2: fix race in ocfs2_dentry_attach_lock() signal/ptrace: Don't leak unitialized kernel memory with PTRACE_PEEK_SIGINFO ptrace: restore smp_rmb() in __ptrace_may_access() media: v4l2-ioctl: clear fields in s_parm i2c: acorn: fix i2c warning bcache: fix stack corruption by PRECEDING_KEY() cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css() ASoC: cs42xx8: Add regcache mask dirty ASoC: fsl_asrc: Fix the issue about unsupported rate x86/uaccess, kcov: Disable stack protector ALSA: seq: Protect in-kernel ioctl calls with mutex ALSA: seq: Fix race of get-subscription call vs port-delete ioctls Revert "ALSA: seq: Protect in-kernel ioctl calls with mutex" Drivers: misc: fix out-of-bounds access in function param_set_kgdbts_var scsi: lpfc: add check for loss of ndlp when sending RRQ arm64/mm: Inhibit huge-vmap with ptdump scsi: bnx2fc: fix incorrect cast to u64 on shift operation selftests/timers: Add missing fflush(stdout) calls usbnet: ipheth: fix racing condition KVM: x86/pmu: do not mask the value that is written to fixed PMUs KVM: s390: fix memory slot handling for KVM_SET_USER_MEMORY_REGION drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define() usb: dwc2: Fix DMA cache alignment issues USB: Fix chipmunk-like voice when using Logitech C270 for recording audio. USB: usb-storage: Add new ID to ums-realtek USB: serial: pl2303: add Allied Telesis VT-Kit3 USB: serial: option: add support for Simcom SIM7500/SIM7600 RNDIS mode USB: serial: option: add Telit 0x1260 and 0x1261 compositions rtc: pcf8523: don't return invalid date when battery is low ax25: fix inconsistent lock state in ax25_destroy_timer be2net: Fix number of Rx queues used for flow hashing ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero lapb: fixed leak of control-blocks. neigh: fix use-after-free read in pneigh_get_next sunhv: Fix device naming inconsistency between sunhv_console and sunhv_reg Revert "staging: vc04_services: prevent integer overflow in create_pagelist()" perf/x86/intel/ds: Fix EVENT vs. UEVENT PEBS constraints selftests: netfilter: missing error check when setting up veth interface mISDN: make sure device name is NUL terminated x86/CPU/AMD: Don't force the CPB cap when running under a hypervisor perf/ring_buffer: Fix exposing a temporarily decreased data_head perf/ring_buffer: Add ordering to rb->nest increment gpio: fix gpio-adp5588 build errors net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE() i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr configfs: Fix use-after-free when accessing sd->s_dentry perf data: Fix 'strncat may truncate' build failure with recent gcc perf record: Fix s390 missing module symbol and warning for non-root users ia64: fix build errors by exporting paddr_to_nid() KVM: PPC: Book3S: Use new mutex to synchronize access to rtas token list KVM: PPC: Book3S HV: Don't take kvm->lock around kvm_for_each_vcpu net: sh_eth: fix mdio access in sh_eth_close() for R-Car Gen2 and RZ/A1 SoCs scsi: libcxgbi: add a check for NULL pointer in cxgbi_check_route() scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask scsi: libsas: delete sas port if expander discover failed mlxsw: spectrum: Prevent force of 56G Abort file_remove_privs() for non-reg. files Linux 4.9.183 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
202 lines
4.4 KiB
C
202 lines
4.4 KiB
C
/*
|
|
* Copyright (c) 2015, The Linux Foundation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 and
|
|
* only version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/pm.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/thermal.h>
|
|
#include "tsens.h"
|
|
|
|
static int tsens_get_temp(void *data, int *temp)
|
|
{
|
|
const struct tsens_sensor *s = data;
|
|
struct tsens_device *tmdev = s->tmdev;
|
|
|
|
return tmdev->ops->get_temp(tmdev, s->id, temp);
|
|
}
|
|
|
|
static int tsens_get_trend(void *p, int trip, enum thermal_trend *trend)
|
|
{
|
|
const struct tsens_sensor *s = p;
|
|
struct tsens_device *tmdev = s->tmdev;
|
|
|
|
if (tmdev->ops->get_trend)
|
|
return tmdev->ops->get_trend(tmdev, s->id, trend);
|
|
|
|
return -ENOTSUPP;
|
|
}
|
|
|
|
static int __maybe_unused tsens_suspend(struct device *dev)
|
|
{
|
|
struct tsens_device *tmdev = dev_get_drvdata(dev);
|
|
|
|
if (tmdev->ops && tmdev->ops->suspend)
|
|
return tmdev->ops->suspend(tmdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __maybe_unused tsens_resume(struct device *dev)
|
|
{
|
|
struct tsens_device *tmdev = dev_get_drvdata(dev);
|
|
|
|
if (tmdev->ops && tmdev->ops->resume)
|
|
return tmdev->ops->resume(tmdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
|
|
|
|
static const struct of_device_id tsens_table[] = {
|
|
{
|
|
.compatible = "qcom,msm8916-tsens",
|
|
.data = &data_8916,
|
|
}, {
|
|
.compatible = "qcom,msm8974-tsens",
|
|
.data = &data_8974,
|
|
}, {
|
|
.compatible = "qcom,msm8996-tsens",
|
|
.data = &data_8996,
|
|
},
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, tsens_table);
|
|
|
|
static const struct thermal_zone_of_device_ops tsens_of_ops = {
|
|
.get_temp = tsens_get_temp,
|
|
.get_trend = tsens_get_trend,
|
|
};
|
|
|
|
static int tsens_register(struct tsens_device *tmdev)
|
|
{
|
|
int i;
|
|
struct thermal_zone_device *tzd;
|
|
u32 *hw_id, n = tmdev->num_sensors;
|
|
|
|
hw_id = devm_kcalloc(tmdev->dev, n, sizeof(u32), GFP_KERNEL);
|
|
if (!hw_id)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < tmdev->num_sensors; i++) {
|
|
tmdev->sensor[i].tmdev = tmdev;
|
|
tmdev->sensor[i].id = i;
|
|
tzd = devm_thermal_zone_of_sensor_register(tmdev->dev, i,
|
|
&tmdev->sensor[i],
|
|
&tsens_of_ops);
|
|
if (IS_ERR(tzd))
|
|
continue;
|
|
tmdev->sensor[i].tzd = tzd;
|
|
if (tmdev->ops->enable)
|
|
tmdev->ops->enable(tmdev, i);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int tsens_probe(struct platform_device *pdev)
|
|
{
|
|
int ret, i;
|
|
struct device *dev;
|
|
struct device_node *np;
|
|
struct tsens_sensor *s;
|
|
struct tsens_device *tmdev;
|
|
const struct tsens_data *data;
|
|
const struct of_device_id *id;
|
|
|
|
if (pdev->dev.of_node)
|
|
dev = &pdev->dev;
|
|
else
|
|
dev = pdev->dev.parent;
|
|
|
|
np = dev->of_node;
|
|
|
|
id = of_match_node(tsens_table, np);
|
|
if (id)
|
|
data = id->data;
|
|
else
|
|
data = &data_8960;
|
|
|
|
if (data->num_sensors <= 0) {
|
|
dev_err(dev, "invalid number of sensors\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
tmdev = devm_kzalloc(dev, sizeof(*tmdev) +
|
|
data->num_sensors * sizeof(*s), GFP_KERNEL);
|
|
if (!tmdev)
|
|
return -ENOMEM;
|
|
|
|
tmdev->dev = dev;
|
|
tmdev->num_sensors = data->num_sensors;
|
|
tmdev->ops = data->ops;
|
|
for (i = 0; i < tmdev->num_sensors; i++) {
|
|
if (data->hw_ids)
|
|
tmdev->sensor[i].hw_id = data->hw_ids[i];
|
|
else
|
|
tmdev->sensor[i].hw_id = i;
|
|
}
|
|
|
|
if (!tmdev->ops || !tmdev->ops->init || !tmdev->ops->get_temp)
|
|
return -EINVAL;
|
|
|
|
ret = tmdev->ops->init(tmdev);
|
|
if (ret < 0) {
|
|
dev_err(dev, "tsens init failed\n");
|
|
return ret;
|
|
}
|
|
|
|
if (tmdev->ops->calibrate) {
|
|
ret = tmdev->ops->calibrate(tmdev);
|
|
if (ret < 0) {
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(dev, "tsens calibration failed\n");
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
ret = tsens_register(tmdev);
|
|
|
|
platform_set_drvdata(pdev, tmdev);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int tsens_remove(struct platform_device *pdev)
|
|
{
|
|
struct tsens_device *tmdev = platform_get_drvdata(pdev);
|
|
|
|
if (tmdev->ops->disable)
|
|
tmdev->ops->disable(tmdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver tsens_driver = {
|
|
.probe = tsens_probe,
|
|
.remove = tsens_remove,
|
|
.driver = {
|
|
.name = "qcom-tsens",
|
|
.pm = &tsens_pm_ops,
|
|
.of_match_table = tsens_table,
|
|
},
|
|
};
|
|
module_platform_driver(tsens_driver);
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("QCOM Temperature Sensor driver");
|
|
MODULE_ALIAS("platform:qcom-tsens");
|