mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmK1cpcQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD1y/aD/4m8QVoJVc+LhFXihIAYj+HJfoWhjGARrB4
 ZHi8e8mSiqj9TJ04eCeQutMthqlKSHXG8NfMabUngoW6/RvVDuBkEWFzZAwNRz2T
 D6xKu0/6pG+OzweLiw24A+WtGa3qCOpJOtk+KfmfYxc2AVcNExQs1ZIkx1n9AIuc
 YkIG0NgQa3oSnAWAIvUlGlS8nx07Z2iB3tJNoDg1BeriDhGJ7tVVmKQYNlNkm+zu
 vG3y8Win7mj70wZxPsWsYVNAxikDhrD6sz1UrflRng2wpTTVw8SqcTid8C7Zq65k
 tLbezCTEWblo1nWk2I7JqBG8hosIlRLYH4+sRNg+SfrMuvQtdu2DboMiRK38p2hH
 0jdGq0snTobhCoJYnLHxtBsehtyqKM9w/YiklYNoKaHBias10UpX8C8811bpnjtP
 oxDJyL5W/HRAXBgGH/Wbgbu0KDM5cA98d8dcAp40Ez1WyZgpexIYtdBpuk+DrGY8
 j5jfpS+vYVZ1G7uYKi9Y2RsiPvqq3AgCKnvXk1GQmkjrx4cNoRCInL0+iIjM6xYb
 slhTVKlDBmEPQM2qUQmxFltS7+ump92/4RcsBlOpTCRjiD8kkoZln3y9L2pe9oEg
 LIuP5rWmsUfptrgMjhw2jhF769SoDKyx08MEpapZq8VlopvxyMPOeyzPolEU72hE
 Qa4g5PiK5Q==
 =EoXD
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmK11nQACgkQmmx57+YA
 GNl1yQ/+OqDC3mY2+8i3msrLFcCJwZUxmGZ6PtYyMJtVA/BzUGevwmUSsotMqmAl
 32LOYhHc1GFrP7pmOMIoW4yCvSLVAoNPIfHC7Qsq8mnkuujTk/tvybR598bqsXL8
 s+ognqPS6kMEw7X1PkR0CnSYB5MgVCWg2IuzzQQzpAWo7pUY4vC7K5gxrKJ1Qhkv
 T/3sq6KQ+Oozzsp6T/ZVNyLkEMtx2CIUM4XYXV6H2hx+8wWGgnBG/KWbxtr6lWaS
 mIJgfk0SiG/qgTjIXNDdLIfHLcE/GMMN+DAc52MSCGMVk6qmk7NVznCtng7/rAwh
 cWNS+5HBAbBOcXqtJUaNwXh4hC1T9qnwGfSNzF1aUTTzMgObdEKo9lD98W4UUglN
 D3RkX6KCWWqfmk6XUgjlkf6xMlzRvBtfzwhf+7jhEaRvXzIaQeveOoNpH0myWGmc
 k1qfPr5+Z7YAzHMQ5MeqJ7ZqHdr5pPc6TwQmWZNigQIw+yiXHrQE5I7znl/Efe+/
 Q9XaQg1km7vYF8g0TGxnQpPLJywM57X5t2ToV1wSjgYEsys7b9+mlEnTG9w6MwVU
 u3a2ZPTjyoOMwhNJ5IzmdEh3cdQQBJ/e4IWluu+e67Wjw3XIKiy5ah9NRbuCqDk2
 WeSZaiXQRABAW7uSYY1xZzcFoI6ZnH/Fk6Rkoi1nzrH6AdMibbQ=
 =WaIY
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-06-24 17:21:23 +02:00
parent 416e95a479 1332661e09
commit 60192dd85c
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/memory/Kconfig
View File

@ -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)

5
drivers/memory/mtk-smi.c
View File

@ -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;

29
drivers/memory/samsung/exynos5422-dmc.c
View File

@ -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;
}