Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-next' of... 

Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq material for 5.2 from MyungJoo Ham:

"This includes:
 - Number of bugfixes (mainly on exception handling or styles)
 - Exynos-bus: fix issues related with shutdown/reboot
 - Rockchip-dfi: code refactoring
 - RK3399: support trusted firmware
 - Added trace support for devfreq-event"

* 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: add tracing for scheduling work
  trace: events: add devfreq trace event file
  PM / devfreq: rk3399_dmc: Pass ODT and auto power down parameters to TF-A.
  PM / devfreq: rockchip-dfi: Move GRF definitions to a common place.
  PM / devfreq: exynos-bus: Suspend all devices on system shutdown
  PM / devfreq: Fix static checker warning in try_then_request_governor
  PM / devfreq: Restart previous governor if new governor fails to start
  PM / devfreq: tegra: remove unneeded variable
  PM / devfreq: rockchip-dfi: remove unneeded semicolon
  PM / devfreq: rk3399_dmc: remove unneeded semicolon
  PM / devfreq: consistent indentation
  PM / devfreq: fix missing check of return value in devfreq_add_device()
  PM / devfreq: fix mem leak in devfreq_add_device()
  PM / devfreq: Use of_node_name_eq for node name comparisons
parents dc4060a5 cf451adf

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4552,6 +4552,7 @@ S: Maintained 
F:	drivers/devfreq/

F:	include/linux/devfreq.h

F:	Documentation/devicetree/bindings/devfreq/

F:	include/trace/events/devfreq.h



DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)

M:	Chanwoo Choi <cw00.choi@samsung.com>

drivers/devfreq/devfreq-event.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev, 
	}



	list_for_each_entry(edev, &devfreq_event_list, node) {

		if (!strcmp(edev->desc->name, node->name))

		if (of_node_name_eq(node, edev->desc->name))

			goto out;

	}

	edev = NULL;

drivers/devfreq/devfreq.c

+59 −31
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#include <linux/of.h>

#include "governor.h"



#define CREATE_TRACE_POINTS

#include <trace/events/devfreq.h>



static struct class *devfreq_class;



/*
@@ -228,7 +231,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name) 
 * if is not found. This can happen when both drivers (the governor driver

 * and the driver that call devfreq_add_device) are built as modules.

 * devfreq_list_lock should be held by the caller. Returns the matched

 * governor's pointer.

 * governor's pointer or an error pointer.

 */

static struct devfreq_governor *try_then_request_governor(const char *name)

{
@@ -254,7 +257,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name) 
		/* Restore previous state before return */

		mutex_lock(&devfreq_list_lock);

		if (err)

			return NULL;

			return ERR_PTR(err);



		governor = find_devfreq_governor(name);

	}
@@ -394,6 +397,8 @@ static void devfreq_monitor(struct work_struct *work) 
	queue_delayed_work(devfreq_wq, &devfreq->work,

				msecs_to_jiffies(devfreq->profile->polling_ms));

	mutex_unlock(&devfreq->lock);



	trace_devfreq_monitor(devfreq);

}



/**
@@ -651,7 +656,7 @@ struct devfreq *devfreq_add_device(struct device *dev, 
		mutex_unlock(&devfreq->lock);

		err = set_freq_table(devfreq);

		if (err < 0)

			goto err_out;

			goto err_dev;

		mutex_lock(&devfreq->lock);

	}
@@ -683,16 +688,27 @@ struct devfreq *devfreq_add_device(struct device *dev, 
		goto err_out;

	}



	devfreq->trans_table =

		devm_kzalloc(&devfreq->dev,

	devfreq->trans_table = devm_kzalloc(&devfreq->dev,

			array3_size(sizeof(unsigned int),

				    devfreq->profile->max_state,

				    devfreq->profile->max_state),

			GFP_KERNEL);

	if (!devfreq->trans_table) {

		mutex_unlock(&devfreq->lock);

		err = -ENOMEM;

		goto err_devfreq;

	}



	devfreq->time_in_state = devm_kcalloc(&devfreq->dev,

			devfreq->profile->max_state,

			sizeof(unsigned long),

			GFP_KERNEL);

	if (!devfreq->time_in_state) {

		mutex_unlock(&devfreq->lock);

		err = -ENOMEM;

		goto err_devfreq;

	}



	devfreq->last_stat_updated = jiffies;



	srcu_init_notifier_head(&devfreq->transition_notifier_list);
@@ -726,7 +742,7 @@ struct devfreq *devfreq_add_device(struct device *dev, 


err_init:

	mutex_unlock(&devfreq_list_lock);



err_devfreq:

	devfreq_remove_device(devfreq);

	devfreq = NULL;

err_dev:
@@ -1113,7 +1129,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, 
	struct devfreq *df = to_devfreq(dev);

	int ret;

	char str_governor[DEVFREQ_NAME_LEN + 1];

	struct devfreq_governor *governor;

	const struct devfreq_governor *governor, *prev_governor;



	ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor);

	if (ret != 1)
@@ -1142,12 +1158,24 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, 
			goto out;

		}

	}

	prev_governor = df->governor;

	df->governor = governor;

	strncpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN);

	ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);

	if (ret)

	if (ret) {

		dev_warn(dev, "%s: Governor %s not started(%d)\n",

			 __func__, df->governor->name, ret);

		df->governor = prev_governor;

		strncpy(df->governor_name, prev_governor->name,

			DEVFREQ_NAME_LEN);

		ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);

		if (ret) {

			dev_err(dev,

				"%s: reverting to Governor %s failed (%d)\n",

				__func__, df->governor_name, ret);

			df->governor = NULL;

		}

	}

out:

	mutex_unlock(&devfreq_list_lock);
@@ -1518,8 +1546,8 @@ static void devm_devfreq_opp_release(struct device *dev, void *res) 
}



/**

 * devm_ devfreq_register_opp_notifier()

 *		- Resource-managed devfreq_register_opp_notifier()

 * devm_devfreq_register_opp_notifier() - Resource-managed

 *					  devfreq_register_opp_notifier()

 * @dev:	The devfreq user device. (parent of devfreq)

 * @devfreq:	The devfreq object.

 */
@@ -1547,8 +1575,8 @@ int devm_devfreq_register_opp_notifier(struct device *dev, 
EXPORT_SYMBOL(devm_devfreq_register_opp_notifier);



/**

 * devm_devfreq_unregister_opp_notifier()

 *		- Resource-managed devfreq_unregister_opp_notifier()

 * devm_devfreq_unregister_opp_notifier() - Resource-managed

 *					    devfreq_unregister_opp_notifier()

 * @dev:	The devfreq user device. (parent of devfreq)

 * @devfreq:	The devfreq object.

 */

drivers/devfreq/event/exynos-ppmu.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static int of_get_devfreq_events(struct device_node *np, 
			if (!ppmu_events[i].name)

				continue;



			if (!of_node_cmp(node->name, ppmu_events[i].name))

			if (of_node_name_eq(node, ppmu_events[i].name))

				break;

		}

drivers/devfreq/event/rockchip-dfi.c

+8 −17
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/list.h>

#include <linux/of.h>



#include <soc/rockchip/rk3399_grf.h>



#define RK3399_DMC_NUM_CH	2



/* DDRMON_CTRL */
@@ -43,18 +45,6 @@ 
#define DDRMON_CH1_COUNT_NUM		0x3c

#define DDRMON_CH1_DFI_ACCESS_NUM	0x40



/* pmu grf */

#define PMUGRF_OS_REG2	0x308

#define DDRTYPE_SHIFT	13

#define DDRTYPE_MASK	7



enum {

	DDR3 = 3,

	LPDDR3 = 6,

	LPDDR4 = 7,

	UNUSED = 0xFF

};



struct dmc_usage {

	u32 access;

	u32 total;
@@ -83,16 +73,17 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) 
	u32 ddr_type;



	/* get ddr type */

	regmap_read(info->regmap_pmu, PMUGRF_OS_REG2, &val);

	ddr_type = (val >> DDRTYPE_SHIFT) & DDRTYPE_MASK;

	regmap_read(info->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);

	ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &

		    RK3399_PMUGRF_DDRTYPE_MASK;



	/* clear DDRMON_CTRL setting */

	writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL);



	/* set ddr type to dfi */

	if (ddr_type == LPDDR3)

	if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3)

		writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL);

	else if (ddr_type == LPDDR4)

	else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4)

		writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL);



	/* enable count, use software mode */
@@ -211,7 +202,7 @@ static int rockchip_dfi_probe(struct platform_device *pdev) 
	if (IS_ERR(data->clk)) {

		dev_err(dev, "Cannot get the clk dmc_clk\n");

		return PTR_ERR(data->clk);

	};

	}



	/* try to find the optional reference to the pmu syscon */

	node = of_parse_phandle(np, "rockchip,pmu", 0);