Changes in 4.9.249 spi: bcm2835aux: Fix use-after-free on unbind spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe iwlwifi: pcie: limit memory read spin time arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. ARC: stack unwinding: don't assume non-current task is sleeping platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Input: cm109 - do not stomp on control URB Input: i8042 - add Acer laptops to the i8042 reset list pinctrl: amd: remove debounce filter setting in IRQ type setting scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" spi: Prevent adding devices below an unregistering controller net/mlx4_en: Avoid scheduling restart task if it is already running tcp: fix cwnd-limited bug for TSO deferral where we send nothing net: stmmac: delete the eee_ctrl_timer after napi disabled net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux net: bridge: vlan: fix error return code in __vlan_add() mac80211: mesh: fix mesh_pathtbl_init() error path USB: dummy-hcd: Fix uninitialized array use in init() USB: add RESET_RESUME quirk for Snapscan 1212 ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap xhci: Give USB2 ports time to enter U3 in bus suspend USB: sisusbvga: Make console support depend on BROKEN ALSA: pcm: oss: Fix potential out-of-bounds shift serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access pinctrl: merrifield: Set default bias in case no particular value given pinctrl: baytrail: Avoid clearing debounce value when turning it off scsi: bnx2i: Requires MMU can: softing: softing_netdev_open(): fix error handling RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling drm/tegra: sor: Disable clocks on error in tegra_sor_init() scsi: mpt3sas: Increase IOCInit request timeout to 30s dm table: Remove BUG_ON(in_interrupt()) soc/tegra: fuse: Fix index bug in get_process_id USB: serial: option: add interface-number sanity check to flag handling USB: gadget: f_acm: add support for SuperSpeed Plus USB: gadget: f_midi: setup SuperSpeed Plus descriptors USB: gadget: f_rndis: fix bitrate for SuperSpeed and above usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU HID: i2c-hid: add Vero K147 to descriptor override serial_core: Check for port state when tty is in error state media: msi2500: assign SPI bus number dynamically md: fix a warning caused by a race between concurrent md_ioctl()s Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() drm/gma500: fix double free of gma_connector RDMA/rxe: Compute PSN windows correctly ARM: p2v: fix handling of LPAE translation in BE mode crypto: talitos - Fix return type of current_desc_hdr() spi: img-spfi: fix reference leak in img_spfi_resume ASoC: pcm: DRAIN support reactivation arm64: dts: exynos: Correct psci compatible used on Exynos7 Bluetooth: Fix null pointer dereference in hci_event_packet() spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops RDMa/mthca: Work around -Wenum-conversion warning MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA staging: greybus: codecs: Fix reference counter leak in error handling media: solo6x10: fix missing snd_card_free in error handling case drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() Input: ads7846 - fix integer overflow on Rt calculation Input: ads7846 - fix unaligned access on 7845 powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe RDMA/cxgb4: Validate the number of CQEs memstick: fix a double-free bug in memstick_check ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host orinoco: Move context allocation after processing the skb cw1200: fix missing destroy_workqueue() on error in cw1200_init_common media: siano: fix memory leak of debugfs members in smsdvb_hotplug mips: cdmm: fix use-after-free in mips_cdmm_bus_discover HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() ARM: dts: at91: at91sam9rl: fix ADC triggers NFSv4.2: condition READDIR's mask for security label based on LSM state SUNRPC: xprt_load_transport() needs to support the netid "rdma6" lockd: don't use interval-based rebinding over TCP NFS: switch nfsiod to be an UNBOUND workqueue. vfio-pci: Use io_remap_pfn_range() for PCI IO memory media: saa7146: fix array overflow in vidioc_s_audio() clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() memstick: r592: Fix error return in r592_probe() ASoC: jz4740-i2s: add missed checks for clk_get() dm ioctl: fix error return code in target_message clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS scsi: pm80xx: Fix error return in pm8001_pci_probe() seq_buf: Avoid type mismatch for seq_buf_init scsi: fnic: Fix error return code in fnic_probe() powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create speakup: fix uninitialized flush_lock nfsd: Fix message level for normal termination nfs_common: need lock during iterate through the list x86/kprobes: Restore BTF if the single-stepping is cancelled clk: tegra: Fix duplicated SE clock entry extcon: max77693: Fix modalias string ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() irqchip/alpine-msi: Fix freeing of interrupts on allocation error path um: chan_xterm: Fix fd leak nfc: s3fwrn5: Release the nfc firmware powerpc/ps3: use dma_mapping_error() checkpatch: fix unescaped left brace net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function net: korina: fix return value watchdog: qcom: Avoid context switch in restart handler clk: ti: Fix memleak in ti_fapll_synth_setup perf record: Fix memory leak when using '--user-regs=?' to list registers qlcnic: Fix error code in probe clk: s2mps11: Fix a resource leak in error handling paths in the probe function cfg80211: initialize rekey_data Input: cros_ec_keyb - send 'scancodes' in addition to key events Input: goodix - add upside-down quirk for Teclast X98 Pro tablet media: gspca: Fix memory leak in probe media: sunxi-cir: ensure IR is handled when it is continuous media: netup_unidvb: Don't leak SPI master in probe error path Input: cyapa_gen6 - fix out-of-bounds stack access Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" ACPI: PNP: compare the string length in the matching_id() ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: usb-audio: Disable sample read check if firmware doesn't give back s390/dasd: prevent inconsistent LCU device data s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list staging: comedi: mf6x4: Fix AI end-of-conversion detection powerpc/perf: Exclude kernel samples while counting events in user space. USB: serial: mos7720: fix parallel-port state restore USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block() Btrfs: fix selftests failure due to uninitialized i_mode in test inodes btrfs: fix return value mixup in btrfs_get_extent ext4: fix a memory leak of ext4_free_data KVM: arm64: Introduce handling of AArch32 TTBCR2 traps powerpc/xmon: Change printk() to pr_cont() ceph: fix race in concurrent __ceph_remove_cap invocations jffs2: Fix GC exit abnormally jfs: Fix array index bounds check in dbAdjTree drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() spi: spi-sh: Fix use-after-free on unbind spi: davinci: Fix use-after-free on unbind spi: pic32: Don't leak DMA channels in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path soc: qcom: smp2p: Safely acquire spinlock without IRQs mtd: parser: cmdline: Fix parsing of part-names with colons iio: buffer: Fix demux update iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume iio:pressure:mpl3115: Force alignment of buffer clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 xen-blkback: set ring->xenblkd to NULL after kthread_stop() PCI: Fix pci_slot_release() NULL pointer dereference Linux 4.9.249 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I4829a32e2ea6e76eefea716f35f42ee02b75c265
308 lines
7.3 KiB
C
308 lines
7.3 KiB
C
/*
|
|
* Match running platform with pre-defined OPP values for CPUFreq
|
|
*
|
|
* Author: Ajit Pal Singh <ajitpal.singh@st.com>
|
|
* Lee Jones <lee.jones@linaro.org>
|
|
*
|
|
* Copyright (C) 2015 STMicroelectronics (R&D) Limited
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation
|
|
*/
|
|
|
|
#include <linux/cpu.h>
|
|
#include <linux/io.h>
|
|
#include <linux/mfd/syscon.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/pm_opp.h>
|
|
#include <linux/regmap.h>
|
|
|
|
#define VERSION_ELEMENTS 3
|
|
#define MAX_PCODE_NAME_LEN 7
|
|
|
|
#define VERSION_SHIFT 28
|
|
#define HW_INFO_INDEX 1
|
|
#define MAJOR_ID_INDEX 1
|
|
#define MINOR_ID_INDEX 2
|
|
|
|
/*
|
|
* Only match on "suitable for ALL versions" entries
|
|
*
|
|
* This will be used with the BIT() macro. It sets the
|
|
* top bit of a 32bit value and is equal to 0x80000000.
|
|
*/
|
|
#define DEFAULT_VERSION 31
|
|
|
|
enum {
|
|
PCODE = 0,
|
|
SUBSTRATE,
|
|
DVFS_MAX_REGFIELDS,
|
|
};
|
|
|
|
/**
|
|
* ST CPUFreq Driver Data
|
|
*
|
|
* @cpu_node CPU's OF node
|
|
* @syscfg_eng Engineering Syscon register map
|
|
* @regmap Syscon register map
|
|
*/
|
|
static struct sti_cpufreq_ddata {
|
|
struct device *cpu;
|
|
struct regmap *syscfg_eng;
|
|
struct regmap *syscfg;
|
|
} ddata;
|
|
|
|
static int sti_cpufreq_fetch_major(void) {
|
|
struct device_node *np = ddata.cpu->of_node;
|
|
struct device *dev = ddata.cpu;
|
|
unsigned int major_offset;
|
|
unsigned int socid;
|
|
int ret;
|
|
|
|
ret = of_property_read_u32_index(np, "st,syscfg",
|
|
MAJOR_ID_INDEX, &major_offset);
|
|
if (ret) {
|
|
dev_err(dev, "No major number offset provided in %s [%d]\n",
|
|
np->full_name, ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = regmap_read(ddata.syscfg, major_offset, &socid);
|
|
if (ret) {
|
|
dev_err(dev, "Failed to read major number from syscon [%d]\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
return ((socid >> VERSION_SHIFT) & 0xf) + 1;
|
|
}
|
|
|
|
static int sti_cpufreq_fetch_minor(void)
|
|
{
|
|
struct device *dev = ddata.cpu;
|
|
struct device_node *np = dev->of_node;
|
|
unsigned int minor_offset;
|
|
unsigned int minid;
|
|
int ret;
|
|
|
|
ret = of_property_read_u32_index(np, "st,syscfg-eng",
|
|
MINOR_ID_INDEX, &minor_offset);
|
|
if (ret) {
|
|
dev_err(dev,
|
|
"No minor number offset provided %s [%d]\n",
|
|
np->full_name, ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = regmap_read(ddata.syscfg_eng, minor_offset, &minid);
|
|
if (ret) {
|
|
dev_err(dev,
|
|
"Failed to read the minor number from syscon [%d]\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
return minid & 0xf;
|
|
}
|
|
|
|
static int sti_cpufreq_fetch_regmap_field(const struct reg_field *reg_fields,
|
|
int hw_info_offset, int field)
|
|
{
|
|
struct regmap_field *regmap_field;
|
|
struct reg_field reg_field = reg_fields[field];
|
|
struct device *dev = ddata.cpu;
|
|
unsigned int value;
|
|
int ret;
|
|
|
|
reg_field.reg = hw_info_offset;
|
|
regmap_field = devm_regmap_field_alloc(dev,
|
|
ddata.syscfg_eng,
|
|
reg_field);
|
|
if (IS_ERR(regmap_field)) {
|
|
dev_err(dev, "Failed to allocate reg field\n");
|
|
return PTR_ERR(regmap_field);
|
|
}
|
|
|
|
ret = regmap_field_read(regmap_field, &value);
|
|
if (ret) {
|
|
dev_err(dev, "Failed to read %s code\n",
|
|
field ? "SUBSTRATE" : "PCODE");
|
|
return ret;
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
static const struct reg_field sti_stih407_dvfs_regfields[DVFS_MAX_REGFIELDS] = {
|
|
[PCODE] = REG_FIELD(0, 16, 19),
|
|
[SUBSTRATE] = REG_FIELD(0, 0, 2),
|
|
};
|
|
|
|
static const struct reg_field *sti_cpufreq_match(void)
|
|
{
|
|
if (of_machine_is_compatible("st,stih407") ||
|
|
of_machine_is_compatible("st,stih410") ||
|
|
of_machine_is_compatible("st,stih418"))
|
|
return sti_stih407_dvfs_regfields;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static int sti_cpufreq_set_opp_info(void)
|
|
{
|
|
struct device *dev = ddata.cpu;
|
|
struct device_node *np = dev->of_node;
|
|
const struct reg_field *reg_fields;
|
|
unsigned int hw_info_offset;
|
|
unsigned int version[VERSION_ELEMENTS];
|
|
int pcode, substrate, major, minor;
|
|
int ret;
|
|
char name[MAX_PCODE_NAME_LEN];
|
|
|
|
reg_fields = sti_cpufreq_match();
|
|
if (!reg_fields) {
|
|
dev_err(dev, "This SoC doesn't support voltage scaling\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
ret = of_property_read_u32_index(np, "st,syscfg-eng",
|
|
HW_INFO_INDEX, &hw_info_offset);
|
|
if (ret) {
|
|
dev_warn(dev, "Failed to read HW info offset from DT\n");
|
|
substrate = DEFAULT_VERSION;
|
|
pcode = 0;
|
|
goto use_defaults;
|
|
}
|
|
|
|
pcode = sti_cpufreq_fetch_regmap_field(reg_fields,
|
|
hw_info_offset,
|
|
PCODE);
|
|
if (pcode < 0) {
|
|
dev_warn(dev, "Failed to obtain process code\n");
|
|
/* Use default pcode */
|
|
pcode = 0;
|
|
}
|
|
|
|
substrate = sti_cpufreq_fetch_regmap_field(reg_fields,
|
|
hw_info_offset,
|
|
SUBSTRATE);
|
|
if (substrate) {
|
|
dev_warn(dev, "Failed to obtain substrate code\n");
|
|
/* Use default substrate */
|
|
substrate = DEFAULT_VERSION;
|
|
}
|
|
|
|
use_defaults:
|
|
major = sti_cpufreq_fetch_major();
|
|
if (major < 0) {
|
|
dev_err(dev, "Failed to obtain major version\n");
|
|
/* Use default major number */
|
|
major = DEFAULT_VERSION;
|
|
}
|
|
|
|
minor = sti_cpufreq_fetch_minor();
|
|
if (minor < 0) {
|
|
dev_err(dev, "Failed to obtain minor version\n");
|
|
/* Use default minor number */
|
|
minor = DEFAULT_VERSION;
|
|
}
|
|
|
|
snprintf(name, MAX_PCODE_NAME_LEN, "pcode%d", pcode);
|
|
|
|
ret = dev_pm_opp_set_prop_name(dev, name);
|
|
if (ret) {
|
|
dev_err(dev, "Failed to set prop name\n");
|
|
return ret;
|
|
}
|
|
|
|
version[0] = BIT(major);
|
|
version[1] = BIT(minor);
|
|
version[2] = BIT(substrate);
|
|
|
|
ret = dev_pm_opp_set_supported_hw(dev, version, VERSION_ELEMENTS);
|
|
if (ret) {
|
|
dev_err(dev, "Failed to set supported hardware\n");
|
|
return ret;
|
|
}
|
|
|
|
dev_dbg(dev, "pcode: %d major: %d minor: %d substrate: %d\n",
|
|
pcode, major, minor, substrate);
|
|
dev_dbg(dev, "version[0]: %x version[1]: %x version[2]: %x\n",
|
|
version[0], version[1], version[2]);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sti_cpufreq_fetch_syscon_regsiters(void)
|
|
{
|
|
struct device *dev = ddata.cpu;
|
|
struct device_node *np = dev->of_node;
|
|
|
|
ddata.syscfg = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
|
|
if (IS_ERR(ddata.syscfg)) {
|
|
dev_err(dev, "\"st,syscfg\" not supplied\n");
|
|
return PTR_ERR(ddata.syscfg);
|
|
}
|
|
|
|
ddata.syscfg_eng = syscon_regmap_lookup_by_phandle(np, "st,syscfg-eng");
|
|
if (IS_ERR(ddata.syscfg_eng)) {
|
|
dev_err(dev, "\"st,syscfg-eng\" not supplied\n");
|
|
return PTR_ERR(ddata.syscfg_eng);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sti_cpufreq_init(void)
|
|
{
|
|
int ret;
|
|
|
|
if ((!of_machine_is_compatible("st,stih407")) &&
|
|
(!of_machine_is_compatible("st,stih410")) &&
|
|
(!of_machine_is_compatible("st,stih418")))
|
|
return -ENODEV;
|
|
|
|
ddata.cpu = get_cpu_device(0);
|
|
if (!ddata.cpu) {
|
|
dev_err(ddata.cpu, "Failed to get device for CPU0\n");
|
|
goto skip_voltage_scaling;
|
|
}
|
|
|
|
if (!of_get_property(ddata.cpu->of_node, "operating-points-v2", NULL)) {
|
|
dev_err(ddata.cpu, "OPP-v2 not supported\n");
|
|
goto skip_voltage_scaling;
|
|
}
|
|
|
|
ret = sti_cpufreq_fetch_syscon_regsiters();
|
|
if (ret)
|
|
goto skip_voltage_scaling;
|
|
|
|
ret = sti_cpufreq_set_opp_info();
|
|
if (!ret)
|
|
goto register_cpufreq_dt;
|
|
|
|
skip_voltage_scaling:
|
|
dev_err(ddata.cpu, "Not doing voltage scaling\n");
|
|
|
|
register_cpufreq_dt:
|
|
platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
|
|
|
|
return 0;
|
|
}
|
|
module_init(sti_cpufreq_init);
|
|
|
|
static const struct of_device_id __maybe_unused sti_cpufreq_of_match[] = {
|
|
{ .compatible = "st,stih407" },
|
|
{ .compatible = "st,stih410" },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sti_cpufreq_of_match);
|
|
|
|
MODULE_DESCRIPTION("STMicroelectronics CPUFreq/OPP driver");
|
|
MODULE_AUTHOR("Ajitpal Singh <ajitpal.singh@st.com>");
|
|
MODULE_AUTHOR("Lee Jones <lee.jones@linaro.org>");
|
|
MODULE_LICENSE("GPL v2");
|