linaro-kernel November 2013

linaro-kernel@lists.linaro.org

85 participants
204 discussions

[PATCH V3] cpufreq: Make sure CPU is running on a freq from freq-table

by Viresh Kumar

Sometimes boot loaders set CPU frequency to a value outside of frequency table present with cpufreq core. In such cases CPU might be unstable if it has to run on that frequency for long duration of time and so its better to set it to a frequency which is specified in freq-table. This also makes cpufreq stats inconsistent as cpufreq-stats would fail to register because current frequency of CPU isn't found in freq-table. Because we don't want this change to effect boot process badly, we go for the next freq which is >= policy->cur ('cur' must be set by now, otherwise we will end up setting freq to lowest of the table as 'cur' is initialized to zero). In case current frequency doesn't match any frequency from freq-table, we throw warnings to user, so that user can get this fixed in their bootloaders or freq-tables. On some systems we can't really say what frequency we're running at the moment and so for these we have added another flag: CPUFREQ_SKIP_INITIAL_FREQ_CHECK. Reported-by: Carlos Hernandez <ceh(a)ti.com> Reported-and-tested-by: Nishanth Menon <nm(a)ti.com> Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- V2->V3: - Added BUG_ON() - Added another flag: CPUFREQ_SKIP_INITIAL_FREQ_CHECK drivers/cpufreq/cpufreq.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/cpufreq/freq_table.c | 24 ++++++++++++++++++++++++ include/linux/cpufreq.h | 11 +++++++++++ 3 files changed, 73 insertions(+) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 02d534d..1a8bf5d 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1038,6 +1038,44 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, } } + /* + * Sometimes boot loaders set CPU frequency to a value outside of + * frequency table present with cpufreq core. In such cases CPU might be + * unstable if it has to run on that frequency for long duration of time + * and so its better to set it to a frequency which is specified in + * freq-table. This also makes cpufreq stats inconsistent as + * cpufreq-stats would fail to register because current frequency of CPU + * isn't found in freq-table. + * + * Because we don't want this change to effect boot process badly, we go + * for the next freq which is >= policy->cur ('cur' must be set by now, + * otherwise we will end up setting freq to lowest of the table as 'cur' + * is initialized to zero). + * + * We are passing target-freq as "policy->cur - 1" otherwise + * __cpufreq_driver_target() would simply fail, as policy->cur will be + * equal to target-freq. + */ + if (!(cpufreq_driver->flags & CPUFREQ_SKIP_INITIAL_FREQ_CHECK) + && has_target()) { + /* Are we running at unknown frequency ? */ + ret = cpufreq_frequency_table_get_index(policy, policy->cur); + if (ret == -EINVAL) { + /* Warn user and fix it */ + pr_warn("%s: CPU%d: running at invalid freq: %u KHz\n", + __func__, policy->cpu, policy->cur); + /* + * Reaching here after boot in a few seconds may not + * mean that system will remain stable at "unknown" + * frequency for longer duration. Hence, a BUG_ON(). + */ + BUG_ON(__cpufreq_driver_target(policy, policy->cur - 1, + CPUFREQ_RELATION_L)); + pr_warn("%s: CPU%d: frequency changed to: %u KHz\n", + __func__, policy->cpu, policy->cur); + } + } + /* related cpus should atleast have policy->cpus */ cpumask_or(policy->related_cpus, policy->related_cpus, policy->cpus); diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c index 3458d27..0d6cc0e 100644 --- a/drivers/cpufreq/freq_table.c +++ b/drivers/cpufreq/freq_table.c @@ -178,7 +178,31 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy, } EXPORT_SYMBOL_GPL(cpufreq_frequency_table_target); +int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy, + unsigned int freq) +{ + struct cpufreq_frequency_table *table; + int index = -EINVAL, i = 0; + + table = cpufreq_frequency_get_table(policy->cpu); + if (unlikely(!table)) { + pr_debug("%s: Unable to find freq_table\n", __func__); + return -ENOENT; + } + + for (; table[i].frequency != CPUFREQ_TABLE_END; i++) { + if (table[i].frequency == freq) { + index = i; + break; + } + } + + return index; +} +EXPORT_SYMBOL_GPL(cpufreq_frequency_table_get_index); + static DEFINE_PER_CPU(struct cpufreq_frequency_table *, cpufreq_show_table); + /** * show_available_freqs - show available frequencies for the specified CPU */ diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index dc196bb..7109c62 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -252,6 +252,15 @@ struct cpufreq_driver { */ #define CPUFREQ_ASYNC_NOTIFICATION (1 << 4) +/* + * Set by drivers which don't want cpufreq core to check if CPU is running at a + * frequency present in freq-table exposed by the driver. For other drivers if + * CPU is found running at an out of table freq, we will try to set it to a freq + * from the table. And if that fails, we will stop further boot process by + * issuing a BUG_ON(). + */ +#define CPUFREQ_SKIP_INITIAL_FREQ_CHECK (1 << 5) + int cpufreq_register_driver(struct cpufreq_driver *driver_data); int cpufreq_unregister_driver(struct cpufreq_driver *driver_data); @@ -439,6 +448,8 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation, unsigned int *index); +int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy, + unsigned int freq); void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy); ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf); -- 1.7.12.rc2.18.g61b472e

10 years, 5 months

[PATCH V2] cpufreq: Make sure CPU is running on a freq from freq-table

by Viresh Kumar

10 years, 5 months

mainline boot: 29 pass, 1 fail (v3.13-rc1-252-gdda9cc3)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: mainline Git describe: v3.13-rc1-252-gdda9cc3 Failed boot tests (console logs at the end) =========================================== omap3-beagle-xm: FAIL: omap2plus_defconfig Full Report =========== omap2plus_defconfig ------------------- am335x-boneblack PASS: 0 min 32.8 sec omap3-beagle-xm FAIL: 0 min 44.2 sec am335x-bone PASS: 0 min 26.6 sec omap4-panda PASS: 0 min 59.5 sec omap4-panda-es PASS: 1 min 4.1 sec omap3-tobi,3730storm PASS: 0 min 24.0 sec omap3-tobi,3530overo PASS: 0 min 22.0 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 20.0 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 19.1 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.3 sec imx6q-wandboard PASS: 0 min 16.6 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 21.9 sec armada-370-mirabox PASS: 0 min 20.1 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 28.2 sec tegra30-beaver PASS: 0 min 16.9 sec am335x-boneblack PASS: 0 min 34.8 sec omap3-beagle-xm PASS: 0 min 48.4 sec sun7i-a20-cubieboard2 PASS: 0 min 13.0 sec armada-370-mirabox PASS: 0 min 20.7 sec omap4-panda PASS: 1 min 1.7 sec omap4-panda-es PASS: 1 min 1.2 sec armada-xp-openblocks-ax3-4 PASS: 0 min 23.0 sec imx6dl-wandboard,wand-solo PASS: 0 min 17.4 sec am335x-bone PASS: 0 min 33.4 sec imx6q-wandboard PASS: 0 min 16.8 sec omap3-tobi,3730storm PASS: 0 min 22.4 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.8 sec omap3-tobi,3530overo PASS: 0 min 19.9 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 28.6 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.3 sec Console logs for failures ========================= omap2plus_defconfig ------------------- omap3-beagle-xm: FAIL: last 24 lines of boot log: ------------------------------------------------- Waiting for Ethernet connection... done. Using sms0 device TFTP from server 192.168.1.2; our IP address is 192.168.1.152 Filename 'tmp/3730xm-iauAPC/omap3-beagle-xm.dtb'. Load address: 0x81f00000 Loading: *T ## 2 KiB/s done Bytes transferred = 14773 (39b5 hex) OMAP3 beagleboard.org #printenv bootargs printenv bootargs bootargs=console=ttyO2,115200n8 earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 ip=192.168.1.152:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none OMAP3 beagleboard.org # bootz ${loadaddr} - 0x81f00000 bootz ${loadaddr} - 0x81f00000 ## Flattened Device Tree blob at 81f00000 Booting using the fdt blob at 0x81f00000 Loading Device Tree to 8fff9000, end 8ffff9b4 ... OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 44.19 seconds. # PYBOOT: Result: FAIL

10 years, 5 months

[PATCH] ASoC: adsp: Use async writes where possible

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> This will allow a marginal speed improvement when used with a bus that supports async I/O by reducing the amount of context thrashing between writes, allowing the bus to be more fully utilised. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/wm_adsp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 46ec0e9744d4..6b1c01c66e64 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1468,8 +1468,8 @@ static int wm_adsp2_ena(struct wm_adsp *dsp) unsigned int val; int ret, count; - ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, - ADSP2_SYS_ENA, ADSP2_SYS_ENA); + ret = regmap_update_bits_async(dsp->regmap, dsp->base + ADSP2_CONTROL, + ADSP2_SYS_ENA, ADSP2_SYS_ENA); if (ret != 0) return ret; @@ -1521,9 +1521,9 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, val = (val & ARIZONA_SYSCLK_FREQ_MASK) >> ARIZONA_SYSCLK_FREQ_SHIFT; - ret = regmap_update_bits(dsp->regmap, - dsp->base + ADSP2_CLOCKING, - ADSP2_CLK_SEL_MASK, val); + ret = regmap_update_bits_async(dsp->regmap, + dsp->base + ADSP2_CLOCKING, + ADSP2_CLK_SEL_MASK, val); if (ret != 0) { adsp_err(dsp, "Failed to set clock rate: %d\n", ret); @@ -1586,10 +1586,10 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, if (ret != 0) goto err; - ret = regmap_update_bits(dsp->regmap, - dsp->base + ADSP2_CONTROL, - ADSP2_CORE_ENA | ADSP2_START, - ADSP2_CORE_ENA | ADSP2_START); + ret = regmap_update_bits_async(dsp->regmap, + dsp->base + ADSP2_CONTROL, + ADSP2_CORE_ENA | ADSP2_START, + ADSP2_CORE_ENA | ADSP2_START); if (ret != 0) goto err; -- 1.8.4.4

10 years, 5 months

[PATCH 1/3] ASoC: ak4642: Convert to module_i2c_driver()

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> The device does not support anything other than I2C (at least with the current driver) so save code. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/ak4642.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 2f861c9b1d69..5bb18e913fa5 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -511,7 +511,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4648 = { .num_dapm_routes = ARRAY_SIZE(ak4642_intercon), }; -#if IS_ENABLED(CONFIG_I2C) static struct of_device_id ak4642_of_match[]; static int ak4642_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) @@ -571,27 +570,8 @@ static struct i2c_driver ak4642_i2c_driver = { .remove = ak4642_i2c_remove, .id_table = ak4642_i2c_id, }; -#endif -static int __init ak4642_modinit(void) -{ - int ret = 0; -#if IS_ENABLED(CONFIG_I2C) - ret = i2c_add_driver(&ak4642_i2c_driver); -#endif - return ret; - -} -module_init(ak4642_modinit); - -static void __exit ak4642_exit(void) -{ -#if IS_ENABLED(CONFIG_I2C) - i2c_del_driver(&ak4642_i2c_driver); -#endif - -} -module_exit(ak4642_exit); +module_i2c_driver(ak4642_i2c_driver); MODULE_DESCRIPTION("Soc AK4642 driver"); MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori(a)renesas.com>"); -- 1.8.4.4

10 years, 5 months

mainline boot: 29 pass, 1 fail (v3.13-rc1-229-ge7c0d3d)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: mainline Git describe: v3.13-rc1-229-ge7c0d3d Failed boot tests (console logs at the end) =========================================== armada-xp-openblocks-ax3-4: FAIL: multi_v7_defconfig Full Report =========== omap2plus_defconfig ------------------- am335x-boneblack PASS: 0 min 27.8 sec omap3-beagle-xm PASS: 0 min 54.6 sec am335x-bone PASS: 0 min 26.6 sec omap4-panda PASS: 1 min 4.4 sec omap4-panda-es PASS: 1 min 3.8 sec omap3-tobi,3730storm PASS: 0 min 24.1 sec omap3-tobi,3530overo PASS: 0 min 21.7 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.0 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 18.1 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.3 sec imx6q-wandboard PASS: 0 min 16.5 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 21.9 sec armada-370-mirabox PASS: 0 min 20.0 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 25.5 sec tegra30-beaver PASS: 0 min 16.9 sec am335x-boneblack PASS: 0 min 34.7 sec omap3-beagle-xm PASS: 0 min 46.7 sec sun7i-a20-cubieboard2 PASS: 0 min 13.0 sec armada-370-mirabox PASS: 0 min 20.6 sec omap4-panda PASS: 1 min 1.3 sec omap4-panda-es PASS: 1 min 1.8 sec armada-xp-openblocks-ax3-4 FAIL: 2 min 22.2 sec imx6dl-wandboard,wand-solo PASS: 0 min 17.5 sec am335x-bone PASS: 0 min 33.4 sec imx6q-wandboard PASS: 0 min 15.7 sec omap3-tobi,3730storm PASS: 0 min 22.4 sec imx6dl-wandboard,wand-dual PASS: 0 min 17.8 sec omap3-tobi,3530overo PASS: 0 min 20.2 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 29.0 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.4 sec Console logs for failures ========================= multi_v7_defconfig ------------------ armada-xp-openblocks-ax3-4: FAIL: last 24 lines of boot log: ------------------------------------------------------------ [ 159.456843] hub 2-0:1.0: USB hub found [ 159.460641] hub 2-0:1.0: 1 port detected [ 159.464766] SPEAr-ehci: EHCI SPEAr driver [ 159.468841] tegra-ehci: Tegra EHCI driver [ 159.473092] usbcore: registered new interface driver usb-storage [ 159.479741] mousedev: PS/2 mouse device common for all mice [ 159.486043] sdhci: Secure Digital Host Controller Interface driver [ 159.492260] sdhci: Copyright(c) Pierre Ossman [ 159.496830] sdhci-pltfm: SDHCI platform and OF driver helper [ 159.502917] usbcore: registered new interface driver usbhid [ 159.508503] usbhid: USB HID core driver [ 159.512495] TCP: cubic registered [ 159.516115] NET: Registered protocol family 10 [ 159.520958] sit: IPv6 over IPv4 tunneling driver [ 159.525932] Key type dns_resolver registered [ 159.530273] Registering SWP/SWPB emulation handler [ 159.535568] /home/build/work/batch/drivers/rtc/hctosys.c: unable to open rtc device (rtc0) [ 159.690558] ata1: SATA link down (SStatus 0 SControl F300) [ 160.040552] ata2: SATA link down (SStatus 0 SControl F300) [ 160.046329] Freeing unused kernel memory: 476K (c0655000 - c06cc000) ~$off # PYBOOT: Exception: userspace: ERROR: Never found root shell # PYBOOT: Time: 142.18 seconds. # PYBOOT: Result: FAIL

10 years, 5 months

next boot: 30 pass, 0 fail (next-20131128)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: next Git describe: next-20131128 Full Report =========== omap2plus_defconfig ------------------- am335x-boneblack PASS: 0 min 27.9 sec omap3-beagle-xm PASS: 0 min 52.3 sec am335x-bone PASS: 0 min 31.7 sec omap4-panda PASS: 1 min 3.6 sec omap4-panda-es PASS: 1 min 4.3 sec omap3-tobi,3730storm PASS: 0 min 21.1 sec omap3-tobi,3530overo PASS: 0 min 21.8 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.1 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 18.2 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.4 sec imx6q-wandboard PASS: 0 min 16.8 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 22.1 sec armada-370-mirabox PASS: 0 min 20.0 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 29.7 sec tegra30-beaver PASS: 0 min 16.7 sec am335x-boneblack PASS: 0 min 34.8 sec omap3-beagle-xm PASS: 0 min 50.0 sec sun7i-a20-cubieboard2 PASS: 0 min 13.0 sec armada-370-mirabox PASS: 0 min 20.7 sec omap4-panda PASS: 1 min 0.8 sec omap4-panda-es PASS: 1 min 2.5 sec armada-xp-openblocks-ax3-4 PASS: 0 min 22.8 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.5 sec am335x-bone PASS: 0 min 33.5 sec imx6q-wandboard PASS: 0 min 15.9 sec omap3-tobi,3730storm PASS: 0 min 22.7 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.7 sec omap3-tobi,3530overo PASS: 0 min 20.0 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 27.6 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.4 sec

10 years, 5 months

[PATCH] i2c: davinci: raw read and write endian fix

by Taras Kondratiuk

I2C IP block expect LE data, but CPU may operate in BE mode. Need to use endian neutral functions to read/write h/w registers. I.e instead of __raw_read[lw] and __raw_write[lw] functions code need to use read[lw]_relaxed and write[lw]_relaxed functions. If the first simply reads/writes register, the second will byteswap it if host operates in BE mode. Changes are trivial sed like replacement of __raw_xxx functions with xxx_relaxed variant. Signed-off-by: Taras Kondratiuk <taras.kondratiuk(a)linaro.org> --- Based on Linus' master tip (b4789b8). Tested on Keystone2 EVM. drivers/i2c/busses/i2c-davinci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 132369f..a629447 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -125,12 +125,12 @@ static struct davinci_i2c_platform_data davinci_i2c_platform_data_default = { static inline void davinci_i2c_write_reg(struct davinci_i2c_dev *i2c_dev, int reg, u16 val) { - __raw_writew(val, i2c_dev->base + reg); + writew_relaxed(val, i2c_dev->base + reg); } static inline u16 davinci_i2c_read_reg(struct davinci_i2c_dev *i2c_dev, int reg) { - return __raw_readw(i2c_dev->base + reg); + return readw_relaxed(i2c_dev->base + reg); } /* Generate a pulse on the i2c clock pin. */ -- 1.7.9.5

10 years, 5 months

easy kernel crash on TC2 with mainline kernel

by Nicolas Pitre

I've been banging my head on this one for quite a while now. The problem is that there is very little debug out put available. Could you see if you get the same? Mainline kernel (I'm using commit 527d151131 right now but older kernels are also affected). Most interesting config options: CONFIG_BL_SWITCHER=n CONFIG_ARCH_VEXPRESS_TC2_PM=y CONFIG_ARM_BIG_LITTLE_CPUIDLE=y CONFIG_ARM_BIG_LITTLE_CPUFREQ=y CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=y To crash the kernel within 5 seconds: #!/bin/bash echo 0 > /sys/kernel/bL_switcher/active sleep 1 while true; do for i in 0 1 2 3 do echo 0 > /sys/devices/system/cpu/cpu$i/online done for i in 3 2 1 0 do echo 1 > /sys/devices/system/cpu/cpu$i/online done for i in 4 3 2 1 do echo 0 > /sys/devices/system/cpu/cpu$i/online done for i in 1 2 3 4 do echo 1 > /sys/devices/system/cpu/cpu$i/online done done What I get is: [...] CPU1: Booted secondary processor CPU0: Booted secondary processor Unable to handle kernel NULL pointer dereference at virtual address 0000000c pgd = c0004000 [ the output stops there ] The last CPU to be booted up is not always the same. Are you able to reproduce? Nicolas

10 years, 5 months

[PATCH v2] ARM: OMAP4/highbank: Flush L2 cache before disabling

by Taras Kondratiuk

Kexec disables outer cache before jumping to reboot code, but it doesn't flush it explicitly. Flush is done implicitly inside of l2x0_disable(). But some SoC's override default .disable handler and don't flush cache. This may lead to a corrupted memory during Kexec reboot on these platforms. This patch adds cache flush inside of OMAP4 and Highbank outer_cache.disable() handlers to make it consistent with default l2x0_disable(). Acked-by: Rob Herring <rob.herring(a)calxeda.com> Acked-by: Santosh Shilimkar <santosh.shilimkar(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Taras Kondratiuk <taras.kondratiuk(a)linaro.org> --- I was not aware about Russell's patch tracker process, so this patch was not hooked there. Highbank moved to PSCI since then, so patch has to be slightly modified. Rob, are you still ok with this patch? v1..v2: Removed changes in highbank_suspend_finish since after commit dd68eb0 "ARM: highbank: adapt to use ARM PSCI calls" cache is not explicitly disabled there. v1: http://www.spinics.net/lists/linux-omap/msg98318.html RFC v2: https://patchwork.kernel.org/patch/2990231/ Make the fix specific to platforms that don't use l2x0_disable(). RFC v1: https://patchwork.kernel.org/patch/2974431/ Based on v3.13-rc1 --- arch/arm/mach-highbank/highbank.c | 1 + arch/arm/mach-omap2/omap4-common.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index b3d7e56..ae17150 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -50,6 +50,7 @@ static void __init highbank_scu_map_io(void) static void highbank_l2x0_disable(void) { + outer_flush_all(); /* Disable PL310 L2 Cache controller */ highbank_smc1(0x102, 0x0); } diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index b39efd4..c0ab9b2 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -162,6 +162,7 @@ void __iomem *omap4_get_l2cache_base(void) static void omap4_l2x0_disable(void) { + outer_flush_all(); /* Disable PL310 L2 Cache controller */ omap_smc1(0x102, 0x0); } -- 1.7.9.5

10 years, 5 months

← Newer
1
2
3
4
5
6
7
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel November 2013