Unverified Commit 60192dd8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'memory-controller-drv-fixes-5.19' of... 

Merge tag 'memory-controller-drv-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/fixes

Memory controller drivers - fixes for v5.19

Broken in current cycle:
1. OMAP GPMC: fix Kconfig dependency for OMAP_GPMC, so it will not be visible
   for everyone (driver is specific to OMAP).

Broken before:
1. Mediatek SMI: fix missing put_device() in error paths.
2. Exynos DMC: fix OF node leaks in error paths.

* tag 'memory-controller-drv-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings
  memory: mtk-smi: add missing put_device() call in mtk_smi_device_link_common
  memory: omap-gpmc: OMAP_GPMC should depend on ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3

Link: https://lore.kernel.org/r/20220624081819.33617-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 416e95a4 1332661e

drivers/memory/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ config TI_EMIF 
config OMAP_GPMC

	tristate "Texas Instruments OMAP SoC GPMC driver"

	depends on OF_ADDRESS

	depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST

	select GPIOLIB

	help

	  This driver is for the General Purpose Memory Controller (GPMC)

drivers/memory/mtk-smi.c

+4 −1
Original line number Diff line number Diff line
@@ -404,13 +404,16 @@ static int mtk_smi_device_link_common(struct device *dev, struct device **com_de 
	of_node_put(smi_com_node);

	if (smi_com_pdev) {

		/* smi common is the supplier, Make sure it is ready before */

		if (!platform_get_drvdata(smi_com_pdev))

		if (!platform_get_drvdata(smi_com_pdev)) {

			put_device(&smi_com_pdev->dev);

			return -EPROBE_DEFER;

		}

		smi_com_dev = &smi_com_pdev->dev;

		link = device_link_add(dev, smi_com_dev,

				       DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);

		if (!link) {

			dev_err(dev, "Unable to link smi-common dev\n");

			put_device(&smi_com_pdev->dev);

			return -ENODEV;

		}

		*com_dev = smi_com_dev;

drivers/memory/samsung/exynos5422-dmc.c

+18 −11
Original line number Diff line number Diff line
@@ -1187,33 +1187,39 @@ static int of_get_dram_timings(struct exynos5_dmc *dmc) 


	dmc->timing_row = devm_kmalloc_array(dmc->dev, TIMING_COUNT,

					     sizeof(u32), GFP_KERNEL);

	if (!dmc->timing_row)

		return -ENOMEM;

	if (!dmc->timing_row) {

		ret = -ENOMEM;

		goto put_node;

	}



	dmc->timing_data = devm_kmalloc_array(dmc->dev, TIMING_COUNT,

					      sizeof(u32), GFP_KERNEL);

	if (!dmc->timing_data)

		return -ENOMEM;

	if (!dmc->timing_data) {

		ret = -ENOMEM;

		goto put_node;

	}



	dmc->timing_power = devm_kmalloc_array(dmc->dev, TIMING_COUNT,

					       sizeof(u32), GFP_KERNEL);

	if (!dmc->timing_power)

		return -ENOMEM;

	if (!dmc->timing_power) {

		ret = -ENOMEM;

		goto put_node;

	}



	dmc->timings = of_lpddr3_get_ddr_timings(np_ddr, dmc->dev,

						 DDR_TYPE_LPDDR3,

						 &dmc->timings_arr_size);

	if (!dmc->timings) {

		of_node_put(np_ddr);

		dev_warn(dmc->dev, "could not get timings from DT\n");

		return -EINVAL;

		ret = -EINVAL;

		goto put_node;

	}



	dmc->min_tck = of_lpddr3_get_min_tck(np_ddr, dmc->dev);

	if (!dmc->min_tck) {

		of_node_put(np_ddr);

		dev_warn(dmc->dev, "could not get tck from DT\n");

		return -EINVAL;

		ret = -EINVAL;

		goto put_node;

	}



	/* Sorted array of OPPs with frequency ascending */
@@ -1227,13 +1233,14 @@ static int of_get_dram_timings(struct exynos5_dmc *dmc) 
					     clk_period_ps);

	}



	of_node_put(np_ddr);



	/* Take the highest frequency's timings as 'bypass' */

	dmc->bypass_timing_row = dmc->timing_row[idx - 1];

	dmc->bypass_timing_data = dmc->timing_data[idx - 1];

	dmc->bypass_timing_power = dmc->timing_power[idx - 1];



put_node:

	of_node_put(np_ddr);

	return ret;

}