linaro-kernel August 2013

linaro-kernel@lists.linaro.org

110 participants
185 discussions

[PATCH V5 0/6]USB: OHCI: more bus glues as separate modules

by Manjunath Goudar

These patches are for separating the SOC On-Chip ohci host controller from ohci-hcd host code into its own driver module. This work is part of enabling multi-platform kernels on ARM; it would be nice to have in 3.12. V2: In patch 5/6 and 6/6: -Set non-standard fields in hc_driver manually, rather than relying on an expanded struct ohci_driver_overrides. -Save orig_ohci_hub_control and orig_ohci_hub_status_data rather than relying on ohci_hub_control and hub_status_data being exported. In patch 1/6 to 4/6 -ohci_setup() has been removed because it is called in .reset member of the ohci_hc_driver structure. V3: In patch 5/6 and 6/6: -ohci_setup() has been removed because it is called in .reset member of the ohci_hc_driver structure. In patch 5/6: -The ohci_restart() function is not required in current scenario, only discarding connection state of integrated transceivers is sufficient, for this directly handling ohci->hc_control. In patch 2/6 : -rewritten if (config->otg || config->rwc) block statements into two separate 'if blocks' to handle below scenarios 1. config->otg set scenario. 2. if any of these (config->otg, config->rwc) are set, this scenario should be handled only after ohci_setup() In patch 1/6 and 4/6: No change. V4: In patch 1/6 and 4/6: No change. In patch 2/6 : -usb_remove_hcd() function is required a valid clock that is what omap_ohci_clock_power(0) is called after hcd shutdown. In patch 3/6 : -V3 modification revert back, only ohci->regs setting write() function has been removed because ohci->regs doesn't get set until usb_add_hcd. In patch 5/6 : - Removed extra space after "tristate". - Removed extra space between function name and '(' characters. - MODULE_ALIAS line moved to last statement of ohci-at91 file. In patch 6/6 : - Removed extra space before the '='. - Moved /* forward definitions */ line before the declarations of functions. V5: In patch 1/6 to 5/6 - No change. In patch 6/6: - String "s3cxxxx" is replaced by "s3c2410". Manjunath Goudar (6): USB: OHCI: make ohci-exynos a separate driver USB: OHCI: make ohci-omap a separate driver USB: OHCI: make ohci-omap3 a separate driver USB: OHCI: make ohci-spear a separate driver USB: OHCI: make ohci-at91 a separate driver USB: OHCI: make ohci-s3c2410 a separate driver drivers/usb/host/Kconfig | 30 ++++++- drivers/usb/host/Makefile | 6 ++ drivers/usb/host/ohci-at91.c | 153 ++++++++++++++++------------------- drivers/usb/host/ohci-exynos.c | 167 ++++++++++++++++----------------------- drivers/usb/host/ohci-hcd.c | 108 ------------------------- drivers/usb/host/ohci-omap.c | 156 +++++++++++++----------------------- drivers/usb/host/ohci-omap3.c | 118 +++++++++------------------ drivers/usb/host/ohci-s3c2410.c | 128 +++++++++++++----------------- drivers/usb/host/ohci-spear.c | 140 +++++++++++++------------------- 9 files changed, 374 insertions(+), 632 deletions(-) -- 1.7.9.5

11 years, 4 months

[RFC][PATCH] clk: debugfs add clk_rate_fops to debugfs mux

by Zhangfei Gao

MUX could choose parent accordingly when set_rate. Add clk_rate_fops to debug whether mux choose correct parent Example: cat clk_summary clock enable_cnt prepare_cnt rate --------------------------------------------------------------------- osc24mhz 3 3 24000000 bpll 1 1 4294967295 bpll_fout3 0 0 200000000 sfc_mux 0 0 200000000 sfc 0 0 200000000 cat osc24mhz/bpll/bpll_fout3/sfc_mux/sfc/clk_rate 200000000 echo 24000000 > osc24mhz/bpll/bpll_fout3/sfc_mux/sfc/clk_rate cat clk_summary clock enable_cnt prepare_cnt rate --------------------------------------------------------------------- osc24mhz 3 3 24000000 sfc_mux 0 0 24000000 sfc 0 0 24000000 bpll 1 1 4294967295 bpll_fout3 0 0 200000000 cat osc24mhz/sfc_mux/sfc/clk_rate 24000000 Signed-off-by: Zhangfei Gao <zhangfei.gao(a)linaro.org> --- drivers/clk/clk.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 373cd54..327b698 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -226,6 +226,33 @@ static const struct file_operations clk_dump_fops = { .release = single_release, }; +static int clk_rate_fops_get(void *data, u64 *rate) +{ + struct clk *clk = data; + + *rate = clk->rate; + + return 0; +}; + +static int clk_rate_fops_set(void *data, u64 rate) +{ + struct clk *clk = data; + int ret = 0; + + ret = clk_prepare_enable(clk); + if (ret) + goto out; + clk_set_rate(clk, rate); + clk_disable_unprepare(clk); + +out: + return ret; +}; + +DEFINE_SIMPLE_ATTRIBUTE(clk_rate_fops, clk_rate_fops_get, + clk_rate_fops_set, "%llu\n"); + /* caller must hold prepare_lock */ static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry) { @@ -243,8 +270,8 @@ static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry) clk->dentry = d; - d = debugfs_create_u32("clk_rate", S_IRUGO, clk->dentry, - (u32 *)&clk->rate); + d = debugfs_create_file("clk_rate", S_IWUSR | S_IRUGO, clk->dentry, + clk, &clk_rate_fops); if (!d) goto err_out; -- 1.7.9.5

11 years, 4 months

[PATCH 1/3] ASoC: tlv320aic26: Remove direct use of internal I/O functions

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Use the core to do I/O rather than directly calling the driver operations in order to support further refactoring. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/tlv320aic26.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index b192cd4..a4f9360 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -174,9 +174,9 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, dev_dbg(&aic26->spi->dev, "Setting PLLM to %d.%04d\n", jval, dval); qval = 0; reg = 0x8000 | qval << 11 | pval << 8 | jval << 2; - aic26_reg_write(codec, AIC26_REG_PLL_PROG1, reg); + snd_soc_write(codec, AIC26_REG_PLL_PROG1, reg); reg = dval << 2; - aic26_reg_write(codec, AIC26_REG_PLL_PROG2, reg); + snd_soc_write(codec, AIC26_REG_PLL_PROG2, reg); /* Audio Control 3 (master mode, fsref rate) */ reg = aic26_reg_read_cache(codec, AIC26_REG_AUDIO_CTRL3); @@ -185,13 +185,13 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, reg |= 0x0800; if (fsref == 48000) reg |= 0x2000; - aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg); + snd_soc_write(codec, AIC26_REG_AUDIO_CTRL3, reg); /* Audio Control 1 (FSref divisor) */ reg = aic26_reg_read_cache(codec, AIC26_REG_AUDIO_CTRL1); reg &= ~0x0fff; reg |= wlen | aic26->datfm | (divisor << 3) | divisor; - aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL1, reg); + snd_soc_write(codec, AIC26_REG_AUDIO_CTRL1, reg); return 0; } @@ -212,7 +212,7 @@ static int aic26_mute(struct snd_soc_dai *dai, int mute) reg |= 0x8080; else reg &= ~0x8080; - aic26_reg_write(codec, AIC26_REG_DAC_GAIN, reg); + snd_soc_write(codec, AIC26_REG_DAC_GAIN, reg); return 0; } @@ -348,7 +348,7 @@ static ssize_t aic26_keyclick_set(struct device *dev, val = aic26_reg_read_cache(aic26->codec, AIC26_REG_AUDIO_CTRL2); val |= 0x8000; - aic26_reg_write(aic26->codec, AIC26_REG_AUDIO_CTRL2, val); + snd_soc_write(aic26->codec, AIC26_REG_AUDIO_CTRL2, val); return count; } @@ -368,20 +368,20 @@ static int aic26_probe(struct snd_soc_codec *codec) dev_info(codec->dev, "Probing AIC26 SoC CODEC driver\n"); /* Reset the codec to power on defaults */ - aic26_reg_write(codec, AIC26_REG_RESET, 0xBB00); + snd_soc_write(codec, AIC26_REG_RESET, 0xBB00); /* Power up CODEC */ - aic26_reg_write(codec, AIC26_REG_POWER_CTRL, 0); + snd_soc_write(codec, AIC26_REG_POWER_CTRL, 0); /* Audio Control 3 (master mode, fsref rate) */ - reg = aic26_reg_read(codec, AIC26_REG_AUDIO_CTRL3); + reg = snd_soc_read(codec, AIC26_REG_AUDIO_CTRL3); reg &= ~0xf800; reg |= 0x0800; /* set master mode */ - aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg); + snd_soc_write(codec, AIC26_REG_AUDIO_CTRL3, reg); /* Fill register cache */ for (i = 0; i < codec->driver->reg_cache_size; i++) - aic26_reg_read(codec, i); + snd_soc_read(codec, i); /* Register the sysfs files for debugging */ /* Create SysFS files */ -- 1.8.4.rc2

11 years, 4 months

[PATCH] ASoC: imx: Add MODULE_LICENSE to DMA drivers

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Reported-by: Ben Hutchings <ben(a)decadent.org.uk> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/fsl/imx-pcm-dma.c | 2 ++ sound/soc/fsl/imx-pcm-fiq.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index f323ce0..aa6de5c 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -73,3 +73,5 @@ void imx_pcm_dma_exit(struct platform_device *pdev) snd_dmaengine_pcm_unregister(&pdev->dev); } EXPORT_SYMBOL_GPL(imx_pcm_dma_exit); + +MODULE_LICENSE("GPL"); diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c index 3b2ba99..34043c5 100644 --- a/sound/soc/fsl/imx-pcm-fiq.c +++ b/sound/soc/fsl/imx-pcm-fiq.c @@ -408,3 +408,5 @@ void imx_pcm_fiq_exit(struct platform_device *pdev) snd_soc_unregister_platform(&pdev->dev); } EXPORT_SYMBOL_GPL(imx_pcm_fiq_exit); + +MODULE_LICENSE("GPL"); -- 1.8.4.rc2

11 years, 4 months

[PATCH 00/31] CPUFreq: Implement light weight ->target(): for 3.13

by Viresh Kumar

Currently prototype of cpufreq_drivers target routines is: int target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation); And most of the drivers call cpufreq_frequency_table_target() to get a valid index of their frequency table which is closest to the target_freq. And they don't use target_freq and relation after it. So, it makes sense to just do this work in cpufreq core before calling cpufreq_frequency_table_target() and simply pass index instead. But this can be done only with drivers which expose their frequency table with cpufreq core. For others we need to stick with the old prototype of target() until those drivers are converted to expose frequency tables. So, in order not to break those special drivers first patch renames ->target() to ->target_old() and the following patches will define the new prototype and convert existing drivers one by one. There are 12 drivers after this patchset which still use the heavy weight version, i.e. target_old() and 39 drivers have adopted this new approach. Once those 12 drivers are also moved to use .target(), .target_old() will be removed completely. This is part 3 of my generic cpufreq cleanup stuff.. First two are posted here and this one is rebased of them: 1: cpufreq: Introduce cpufreq_table_validate_and_show() https://lkml.org/lkml/2013/8/8/263 2: cpufreq: define generic routines for cpufreq drivers https://lkml.org/lkml/2013/8/10/48 After this patchset this is the diffstat for 107 patches: 54 files changed, 357 insertions(+), 1411 deletions(-) All these are pushed here: https://git.linaro.org/gitweb?p=people/vireshk/linux.git;a=shortlog;h=refs/… -- viresh Cc: Andrew Lunn <andrew(a)lunn.ch> Cc: David S. Miller <davem(a)davemloft.net> Cc: Dmitry Eremin-Solenikov <dbaryshkov(a)gmail.com> Cc: Eric Miao <eric.y.miao(a)gmail.com> Cc: Jesper Nilsson <jesper.nilsson(a)axis.com> Cc: John Crispin <blogic(a)openwrt.org> Cc: Kukjin Kim <kgene.kim(a)samsung.com> Cc: Linus Walleij <linus.walleij(a)linaro.org> Cc: linux-cris-kernel(a)axis.com Cc: Mikael Starvik <starvik(a)axis.com> Cc: Santosh Shilimkar <santosh.shilimkar(a)ti.com> Cc: Sekhar Nori <nsekhar(a)ti.com> Cc: Shawn Guo <shawn.guo(a)linaro.org> Cc: sparclinux(a)vger.kernel.org Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Steven Miao <realmz6(a)gmail.com> Cc: Tony Luck <tony.luck(a)intel.com> Viresh Kumar (31): cpufreq: rename ->target() as ->target_old() cpufreq: Implement light weight ->target() routine cpufreq: acpi: Covert to light weight ->target() routine cpufreq: arm_big_little: Covert to light weight ->target() routine cpufreq: blackfin: Covert to light weight ->target() routine cpufreq: cpu0: Covert to light weight ->target() routine cpufreq: cris: Covert to light weight ->target() routine cpufreq: davinci: Covert to light weight ->target() routine cpufreq: dbx500: Covert to light weight ->target() routine cpufreq: e_powersaver: Covert to light weight ->target() routine cpufreq: elanfreq: Covert to light weight ->target() routine cpufreq: exynos: Covert to light weight ->target() routine cpufreq: ia64: Covert to light weight ->target() routine cpufreq: imx6q: Covert to light weight ->target() routine cpufreq: kirkwood: Covert to light weight ->target() routine cpufreq: longhaul: Covert to light weight ->target() routine cpufreq: loongson2: Covert to light weight ->target() routine cpufreq: maple: Covert to light weight ->target() routine cpufreq: omap: Covert to light weight ->target() routine cpufreq: p4: Covert to light weight ->target() routine cpufreq: pasemi: Covert to light weight ->target() routine cpufreq: pmac32: Covert to light weight ->target() routine cpufreq: powernow: Covert to light weight ->target() routine cpufreq: ppc: Covert to light weight ->target() routine cpufreq: pxa: Covert to light weight ->target() routine cpufreq: s3c64xx: Covert to light weight ->target() routine cpufreq: sc520: Covert to light weight ->target() routine cpufreq: sparc: Covert to light weight ->target() routine cpufreq: SPEAr: Covert to light weight ->target() routine cpufreq: speedstep: Covert to light weight ->target() routine cpufreq: tegra: Covert to light weight ->target() routine drivers/cpufreq/acpi-cpufreq.c | 19 +++-------- drivers/cpufreq/arm_big_little.c | 15 +++------ drivers/cpufreq/at32ap-cpufreq.c | 2 +- drivers/cpufreq/blackfin-cpufreq.c | 15 ++------- drivers/cpufreq/cpufreq-cpu0.c | 15 +-------- drivers/cpufreq/cpufreq-nforce2.c | 2 +- drivers/cpufreq/cpufreq.c | 59 ++++++++++++++++++++++++++-------- drivers/cpufreq/cris-artpec3-cpufreq.c | 16 +-------- drivers/cpufreq/cris-etraxfs-cpufreq.c | 15 +-------- drivers/cpufreq/davinci-cpufreq.c | 14 ++------ drivers/cpufreq/dbx500-cpufreq.c | 14 ++------ drivers/cpufreq/e_powersaver.c | 15 ++------- drivers/cpufreq/elanfreq.c | 32 ++---------------- drivers/cpufreq/exynos-cpufreq.c | 19 ++--------- drivers/cpufreq/exynos5440-cpufreq.c | 11 ++----- drivers/cpufreq/gx-suspmod.c | 2 +- drivers/cpufreq/ia64-acpi-cpufreq.c | 19 ++--------- drivers/cpufreq/imx6q-cpufreq.c | 15 +-------- drivers/cpufreq/integrator-cpufreq.c | 2 +- drivers/cpufreq/kirkwood-cpufreq.c | 17 ++-------- drivers/cpufreq/longhaul.c | 11 +------ drivers/cpufreq/loongson2_cpufreq.c | 19 +++-------- drivers/cpufreq/maple-cpufreq.c | 14 ++------ drivers/cpufreq/omap-cpufreq.c | 29 ++--------------- drivers/cpufreq/p4-clockmod.c | 16 ++------- drivers/cpufreq/pasemi-cpufreq.c | 10 +----- drivers/cpufreq/pcc-cpufreq.c | 2 +- drivers/cpufreq/pmac32-cpufreq.c | 10 ++---- drivers/cpufreq/pmac64-cpufreq.c | 15 ++------- drivers/cpufreq/powernow-k6.c | 33 +++---------------- drivers/cpufreq/powernow-k7.c | 20 ++---------- drivers/cpufreq/powernow-k8.c | 22 ++++--------- drivers/cpufreq/ppc-corenet-cpufreq.c | 13 ++------ drivers/cpufreq/ppc_cbe_cpufreq.c | 10 +----- drivers/cpufreq/pxa2xx-cpufreq.c | 11 +------ drivers/cpufreq/pxa3xx-cpufreq.c | 15 ++------- drivers/cpufreq/s3c2416-cpufreq.c | 2 +- drivers/cpufreq/s3c24xx-cpufreq.c | 2 +- drivers/cpufreq/s3c64xx-cpufreq.c | 16 ++------- drivers/cpufreq/s5pv210-cpufreq.c | 2 +- drivers/cpufreq/sa1100-cpufreq.c | 2 +- drivers/cpufreq/sa1110-cpufreq.c | 2 +- drivers/cpufreq/sc520_freq.c | 17 +--------- drivers/cpufreq/sh-cpufreq.c | 2 +- drivers/cpufreq/sparc-us2e-cpufreq.c | 19 ++--------- drivers/cpufreq/sparc-us3-cpufreq.c | 21 ++---------- drivers/cpufreq/spear-cpufreq.c | 10 ++---- drivers/cpufreq/speedstep-centrino.c | 24 ++++---------- drivers/cpufreq/speedstep-ich.c | 22 +++---------- drivers/cpufreq/speedstep-smi.c | 18 +++-------- drivers/cpufreq/tegra-cpufreq.c | 10 ++---- drivers/cpufreq/unicore2-cpufreq.c | 2 +- include/linux/cpufreq.h | 4 ++- 53 files changed, 161 insertions(+), 582 deletions(-) -- 1.7.12.rc2.18.g61b472e

11 years, 4 months

[PATCH 1/2] ASoC: pcm3008: Add DAPM support

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Make it possible to connect external devices to the CODEC and ensure continued operation with non-DAPM support removed from the core. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/pcm3008.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c index 8b9b378..19f5028 100644 --- a/sound/soc/codecs/pcm3008.c +++ b/sound/soc/codecs/pcm3008.c @@ -28,6 +28,22 @@ #include "pcm3008.h" +static const struct snd_soc_dapm_widget pcm3008_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("VINL"), +SND_SOC_DAPM_INPUT("VINR"), + +SND_SOC_DAPM_OUTPUT("VOUTL"), +SND_SOC_DAPM_OUTPUT("VOUTR"), +}; + +static const struct snd_soc_dapm_route pcm3008_dapm_routes[] = { + { "PCM3008 Capture", NULL, "VINL" }, + { "PCM3008 Capture", NULL, "VINR" }, + + { "VOUTL", NULL, "PCM3008 Playback" }, + { "VOUTR", NULL, "PCM3008 Playback" }, +}; + #define PCM3008_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ SNDRV_PCM_RATE_48000) @@ -77,6 +93,10 @@ static int pcm3008_soc_resume(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = { .suspend = pcm3008_soc_suspend, .resume = pcm3008_soc_resume, + .dapm_widgets = pcm3008_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(pcm3008_dapm_widgets), + .dapm_routes = pcm3008_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(pcm3008_dapm_routes), }; static int pcm3008_codec_probe(struct platform_device *pdev) -- 1.8.4.rc2

11 years, 4 months

[RFC][PATCH 1/2] ARM64: add cpu topology definition

by Hanjun Guo

Power aware scheduling needs the cpu topology information to improve the cpu scheduler decision making. For ARM64, we can get the topology from the MPIDR register which defines the the affinity of processors. This patch is mainly based on arch/arm/kernel/topology.c written by Vincent Guittot, and replaced the topology array with per cpu variable. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- arch/arm64/Kconfig | 9 +++ arch/arm64/include/asm/cputype.h | 11 ++++ arch/arm64/include/asm/topology.h | 41 ++++++++++++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/smp.c | 6 ++ arch/arm64/kernel/topology.c | 128 +++++++++++++++++++++++++++++++++++++ 6 files changed, 196 insertions(+) create mode 100644 arch/arm64/include/asm/topology.h create mode 100644 arch/arm64/kernel/topology.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 9737e97..f0ce91b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -150,6 +150,15 @@ config SMP If you don't know what to do here, say N. +config ARM64_CPU_TOPOLOGY + bool "Support cpu topology definition" + depends on SMP && ARM64 + default y + help + Support ARM64 cpu topology definition. The MPIDR register defines + affinity between processors which is then used to describe the cpu + topology of an ARM64 System. + config NR_CPUS int "Maximum number of CPUs (2-32)" range 2 32 diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index 5fe138e..68b55af 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -30,6 +30,17 @@ #define MPIDR_HWID_BITMASK 0xff00ffffff +#define MPIDR_SMP_BITMASK (0x1 << 30) +#define MPIDR_MT_BITMASK (0x1 << 24) + +#define MPIDR_LEVEL_BITS 8 +#define MPIDR_LEVEL_MASK ((1 << MPIDR_LEVEL_BITS) - 1) + +#define MPIDR_AFFINITY_LEVEL_0(mpidr) ((mpidr) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_1(mpidr) ((mpidr >> 8) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_2(mpidr) ((mpidr >> 16) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_3(mpidr) ((mpidr >> 32) & MPIDR_LEVEL_MASK) + #define read_cpuid(reg) ({ \ u64 __val; \ asm("mrs %0, " reg : "=r" (__val)); \ diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h new file mode 100644 index 0000000..8631808 --- /dev/null +++ b/arch/arm64/include/asm/topology.h @@ -0,0 +1,41 @@ +#ifndef _ASM_ARM64_TOPOLOGY_H +#define _ASM_ARM64_TOPOLOGY_H + +#ifdef CONFIG_ARM64_CPU_TOPOLOGY + +#include <linux/cpumask.h> + +struct cputopo_arm64 { + int thread_id; + int core_id; + int socket_id; + cpumask_t thread_sibling; + cpumask_t core_sibling; +}; + +DECLARE_PER_CPU(struct cputopo_arm64, cpu_topology); + +#define cpu_topo(cpu) per_cpu(cpu_topology, cpu) + +#define topology_physical_package_id(cpu) (cpu_topo(cpu).socket_id) +#define topology_core_id(cpu) (cpu_topo(cpu).core_id) +#define topology_core_cpumask(cpu) (&cpu_topo(cpu).core_sibling) +#define topology_thread_cpumask(cpu) (&cpu_topo(cpu).thread_sibling) + +#define mc_capable() (cpu_topo(0).socket_id != -1) +#define smt_capable() (cpu_topo(0).thread_id != -1) + +void init_cpu_topology(void); +void store_cpu_topology(unsigned int cpuid); +const struct cpumask *cpu_coregroup_mask(int cpu); + +#else + +static inline void init_cpu_topology(void) { } +static inline void store_cpu_topology(unsigned int cpuid) { } + +#endif + +#include <asm-generic/topology.h> + +#endif /* _ASM_ARM64_TOPOLOGY_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 7b4b564..a47c359 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -18,6 +18,7 @@ arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o smp_psci.o arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +arm64-obj-$(CONFIG_ARM64_CPU_TOPOLOGY) += topology.o obj-y += $(arm64-obj-y) vdso/ obj-m += $(arm64-obj-m) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index fee5cce..197b1da 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -39,6 +39,7 @@ #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/cputype.h> +#include <asm/topology.h> #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> @@ -215,6 +216,8 @@ asmlinkage void secondary_start_kernel(void) local_irq_enable(); local_fiq_enable(); + store_cpu_topology(cpu); + /* * OK, it's off to the idle thread for us */ @@ -387,6 +390,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus) int cpu, err; unsigned int ncores = num_possible_cpus(); + init_cpu_topology(); + store_cpu_topology(smp_processor_id()); + /* * are we trying to boot more cores than exist? */ diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c new file mode 100644 index 0000000..1eb0435 --- /dev/null +++ b/arch/arm64/kernel/topology.c @@ -0,0 +1,128 @@ +/* + * arch/arm64/kernel/topology.c + * + * Copyright (C) 2013 Linaro Limited. + * Written by: Hanjun Guo + * + * based on arch/arm/kernel/topology.c + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ + +#include <linux/cpu.h> +#include <linux/cpumask.h> +#include <linux/init.h> +#include <linux/percpu.h> +#include <linux/sched.h> + +#include <asm/cputype.h> +#include <asm/topology.h> + +DEFINE_PER_CPU(struct cputopo_arm64, cpu_topology); + +const struct cpumask *cpu_coregroup_mask(int cpu) +{ + return &cpu_topo(cpu).core_sibling; +} + +void update_siblings_masks(unsigned int cpuid) +{ + struct cputopo_arm64 *topo, *cpuid_topo = &cpu_topo(cpuid); + int cpu; + + /* update core and thread sibling masks */ + for_each_possible_cpu(cpu) { + topo = &cpu_topo(cpu); + + if (cpuid_topo->socket_id != topo->socket_id) + continue; + + cpumask_set_cpu(cpuid, &topo->core_sibling); + if (cpu != cpuid) + cpumask_set_cpu(cpu, &cpuid_topo->core_sibling); + + if (cpuid_topo->core_id != topo->core_id) + continue; + + cpumask_set_cpu(cpuid, &topo->thread_sibling); + if (cpu != cpuid) + cpumask_set_cpu(cpu, &cpuid_topo->thread_sibling); + } + smp_wmb(); +} + +/* + * store_cpu_topology is called at boot when only one cpu is running + * and with the mutex cpu_hotplug.lock locked, when several cpus have booted, + * which prevents simultaneous write access to cpu_topology array + */ +void store_cpu_topology(unsigned int cpuid) +{ + struct cputopo_arm64 *cpuid_topo = &cpu_topo(cpuid); + u64 mpidr; + + /* If the cpu topology has been already set, just return */ + if (cpuid_topo->core_id != -1) + return; + + mpidr = read_cpuid_mpidr(); + + /* create cpu topology mapping */ + if (!(mpidr & MPIDR_SMP_BITMASK)) { + /* + * This is a multiprocessor system + * multiprocessor format & multiprocessor mode field are set + */ + + if (mpidr & MPIDR_MT_BITMASK) { + /* core performance interdependency */ + cpuid_topo->thread_id = MPIDR_AFFINITY_LEVEL_0(mpidr); + cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL_1(mpidr); + cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL_2(mpidr); + } else { + /* largely independent cores */ + cpuid_topo->thread_id = -1; + cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL_0(mpidr); + cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL_1(mpidr); + } + } else { + /* + * This is an uniprocessor system + * we are in multiprocessor format but uniprocessor system + * or in the old uniprocessor format + */ + cpuid_topo->thread_id = -1; + cpuid_topo->core_id = 0; + cpuid_topo->socket_id = -1; + } + + update_siblings_masks(cpuid); + + printk(KERN_INFO "CPU%u: thread %d, cpu %d, socket %d, mpidr 0x%llx\n", + cpuid, cpu_topo(cpuid).thread_id, + cpu_topo(cpuid).core_id, + cpu_topo(cpuid).socket_id, mpidr); +} + +/* + * init_cpu_topology is called at boot when only one cpu is running + * which prevent simultaneous write access to cpu_topology array + */ +void __init init_cpu_topology(void) +{ + unsigned int cpu; + + /* init core mask */ + for_each_possible_cpu(cpu) { + struct cputopo_arm64 *topo = &cpu_topo(cpu); + + topo->thread_id = -1; + topo->core_id = -1; + topo->socket_id = -1; + cpumask_clear(&topo->core_sibling); + cpumask_clear(&topo->thread_sibling); + } + smp_wmb(); +} -- 1.7.9.5

11 years, 4 months

[PATCH 00/35] cpufreq: Introduce cpufreq_table_validate_and_show()

by Viresh Kumar

This is actually part of a bigger patchset which will change declaration of cpufreq_driver->target() to include index instead of target_freq and relation and hence cpufreq drivers wouldn't require to cpufreq_frequency_table_target() anymore. Almost every cpufreq driver is required to validate its frequency table with: cpufreq_frequency_table_cpuinfo() and then expose it to cpufreq core with: cpufreq_frequency_table_get_attr(). This patch creates another helper routine cpufreq_table_validate_and_show() that will do both these steps in a single call and will return 0 for success, error otherwise. This also fixes potential bugs in cpufreq drivers where people have called cpufreq_frequency_table_get_attr() before calling cpufreq_frequency_table_cpuinfo(), as the later may fail. Viresh Kumar (35): cpufreq: Add new helper cpufreq_table_validate_and_show() cpufreq: pxa: call cpufreq_frequency_table_get_attr() cpufreq: s3cx4xx: call cpufreq_frequency_table_get_attr() cpufreq: sparc: call cpufreq_frequency_table_get_attr() cpufreq: acpi-cpufreq: use cpufreq_table_validate_and_show() cpufreq: arm_big_little: use cpufreq_table_validate_and_show() cpufreq: blackfin: use cpufreq_table_validate_and_show() cpufreq: cpufreq-cpu0: use cpufreq_table_validate_and_show() cpufreq: cris: use cpufreq_table_validate_and_show() cpufreq: davinci: use cpufreq_table_validate_and_show() cpufreq: dbx500: use cpufreq_table_validate_and_show() cpufreq: e_powersaver: use cpufreq_table_validate_and_show() cpufreq: elanfreq: use cpufreq_table_validate_and_show() cpufreq: exynos: use cpufreq_table_validate_and_show() cpufreq: ia64-acpi: use cpufreq_table_validate_and_show() cpufreq: imx6q: use cpufreq_table_validate_and_show() cpufreq: kirkwood: use cpufreq_table_validate_and_show() cpufreq: longhaul: use cpufreq_table_validate_and_show() cpufreq: loongson2: use cpufreq_table_validate_and_show() cpufreq: maple: use cpufreq_table_validate_and_show() cpufreq: omap: use cpufreq_table_validate_and_show() cpufreq: p4-clockmod: use cpufreq_table_validate_and_show() cpufreq: pasemi: use cpufreq_table_validate_and_show() cpufreq: pmac: use cpufreq_table_validate_and_show() cpufreq: powernow: use cpufreq_table_validate_and_show() cpufreq: ppc: use cpufreq_table_validate_and_show() cpufreq: pxa: use cpufreq_table_validate_and_show() cpufreq: s3cx4xx: use cpufreq_table_validate_and_show() cpufreq: s5pv210: use cpufreq_table_validate_and_show() cpufreq: sc520: use cpufreq_table_validate_and_show() cpufreq: sh: use cpufreq_table_validate_and_show() cpufreq: sparc: use cpufreq_table_validate_and_show() cpufreq: spear: use cpufreq_table_validate_and_show() cpufreq: speedstep: use cpufreq_table_validate_and_show() cpufreq: tegra: use cpufreq_table_validate_and_show() drivers/cpufreq/acpi-cpufreq.c | 4 +--- drivers/cpufreq/arm_big_little.c | 4 +--- drivers/cpufreq/blackfin-cpufreq.c | 3 +-- drivers/cpufreq/cpufreq-cpu0.c | 4 +--- drivers/cpufreq/cris-artpec3-cpufreq.c | 10 +--------- drivers/cpufreq/cris-etraxfs-cpufreq.c | 10 +--------- drivers/cpufreq/davinci-cpufreq.c | 6 ++---- drivers/cpufreq/dbx500-cpufreq.c | 6 ++---- drivers/cpufreq/e_powersaver.c | 3 +-- drivers/cpufreq/elanfreq.c | 8 +------- drivers/cpufreq/exynos-cpufreq.c | 4 +--- drivers/cpufreq/exynos5440-cpufreq.c | 4 +--- drivers/cpufreq/freq_table.c | 12 ++++++++++++ drivers/cpufreq/ia64-acpi-cpufreq.c | 4 +--- drivers/cpufreq/imx6q-cpufreq.c | 3 +-- drivers/cpufreq/kirkwood-cpufreq.c | 10 +--------- drivers/cpufreq/longhaul.c | 8 +------- drivers/cpufreq/loongson2_cpufreq.c | 5 +---- drivers/cpufreq/maple-cpufreq.c | 4 +--- drivers/cpufreq/omap-cpufreq.c | 4 +--- drivers/cpufreq/p4-clockmod.c | 3 +-- drivers/cpufreq/pasemi-cpufreq.c | 4 +--- drivers/cpufreq/pmac32-cpufreq.c | 3 +-- drivers/cpufreq/pmac64-cpufreq.c | 4 +--- drivers/cpufreq/powernow-k6.c | 9 +-------- drivers/cpufreq/powernow-k7.c | 4 +--- drivers/cpufreq/powernow-k8.c | 4 +--- drivers/cpufreq/ppc-corenet-cpufreq.c | 3 +-- drivers/cpufreq/ppc_cbe_cpufreq.c | 4 +--- drivers/cpufreq/pxa2xx-cpufreq.c | 8 +++++--- drivers/cpufreq/pxa3xx-cpufreq.c | 2 +- drivers/cpufreq/s3c2416-cpufreq.c | 4 +--- drivers/cpufreq/s3c24xx-cpufreq.c | 2 +- drivers/cpufreq/s3c64xx-cpufreq.c | 2 +- drivers/cpufreq/s5pv210-cpufreq.c | 4 +--- drivers/cpufreq/sc520_freq.c | 9 +-------- drivers/cpufreq/sh-cpufreq.c | 6 +++--- drivers/cpufreq/sparc-us2e-cpufreq.c | 2 +- drivers/cpufreq/sparc-us3-cpufreq.c | 2 +- drivers/cpufreq/spear-cpufreq.c | 5 ++--- drivers/cpufreq/speedstep-centrino.c | 10 +--------- drivers/cpufreq/speedstep-ich.c | 9 +-------- drivers/cpufreq/speedstep-smi.c | 8 +------- drivers/cpufreq/tegra-cpufreq.c | 4 +--- include/linux/cpufreq.h | 2 ++ 45 files changed, 66 insertions(+), 167 deletions(-) -- 1.7.12.rc2.18.g61b472e

11 years, 4 months

[PATCH 00/15] cpufreq: initialize drivers .owner field with THIS_MODULE

by Viresh Kumar

CPUFreq core does following at multiple places: module_{get|put}(cpufreq_driver->owner)). This is done to make sure module doesn't get unloaded if it is currently in use. This will work only if the .owner field of cpufreq driver is initialized with a valid pointer. This field wasn't initialized for many cpufreq driver, lets initialize it with THIS_MODULE. Rebased over: v3.11-rc3 and pushed here: https://git.linaro.org/gitweb?p=people/vireshk/linux.git;a=shortlog;h=refs/… Viresh Kumar (15): cpufreq: arm_big_little: initialize .owner field with THIS_MODULE cpufreq: cpufreq-cpu0: initialize .owner field with THIS_MODULE cpufreq: davinci: initialize .owner field with THIS_MODULE cpufreq: dbx500: initialize .owner field with THIS_MODULE cpufreq: exynos: initialize .owner field with THIS_MODULE cpufreq: imx6q: initialize .owner field with THIS_MODULE cpufreq: integrator: initialize .owner field with THIS_MODULE cpufreq: omap: initialize .owner field with THIS_MODULE cpufreq: pxa: initialize .owner field with THIS_MODULE cpufreq: s3c24xx: initialize .owner field with THIS_MODULE cpufreq: s5pv210: initialize .owner field with THIS_MODULE cpufreq: sa11**: initialize .owner field with THIS_MODULE cpufreq: SPEAr: initialize .owner field with THIS_MODULE cpufreq: Tegra: initialize .owner field with THIS_MODULE cpufreq: Unicore: initialize .owner field with THIS_MODULE drivers/cpufreq/arm_big_little.c | 1 + drivers/cpufreq/cpufreq-cpu0.c | 1 + drivers/cpufreq/davinci-cpufreq.c | 1 + drivers/cpufreq/dbx500-cpufreq.c | 1 + drivers/cpufreq/exynos-cpufreq.c | 1 + drivers/cpufreq/exynos5440-cpufreq.c | 1 + drivers/cpufreq/imx6q-cpufreq.c | 1 + drivers/cpufreq/integrator-cpufreq.c | 1 + drivers/cpufreq/omap-cpufreq.c | 1 + drivers/cpufreq/pxa2xx-cpufreq.c | 1 + drivers/cpufreq/pxa3xx-cpufreq.c | 1 + drivers/cpufreq/s3c24xx-cpufreq.c | 1 + drivers/cpufreq/s5pv210-cpufreq.c | 1 + drivers/cpufreq/sa1100-cpufreq.c | 1 + drivers/cpufreq/sa1110-cpufreq.c | 1 + drivers/cpufreq/spear-cpufreq.c | 1 + drivers/cpufreq/tegra-cpufreq.c | 1 + drivers/cpufreq/unicore2-cpufreq.c | 1 + 18 files changed, 18 insertions(+) -- 1.7.12.rc2.18.g61b472e

11 years, 4 months

[PATCH 0/3] cpufreq: sa11x0: cleanups for 3.13

by Viresh Kumar

Hi Rafael/Russell, These patches would be part of this patchset finally, sending it separately as I didn't wanted to send other patches in that series.. https://lkml.org/lkml/2013/8/10/48 (Above series was rebased over https://lkml.org/lkml/2013/8/8/263 and hence this patchset too).. These first exposes frequency table and then uses cpufreq generic routines (which uses exposed table) instead of its own .verify() routine. Later I will send another patch that would be part of this series: http://lkml.org/lkml/2013/8/12/406 (I need to send that series again today and so not sending that patch twice, once here and then in that series).. All these patches are pushed here with all dependencies: https://git.linaro.org/gitweb?p=people/vireshk/linux.git;a=shortlog;h=refs/… Viresh Kumar (3): cpufreq: sa11x0: Expose frequency table cpufreq: sa11x0: let cpufreq core initialize struct policy fields cpufreq: sa11x0: Use generic cpufreq routines arch/arm/mach-sa1100/generic.c | 65 +++++++++++++--------------------------- arch/arm/mach-sa1100/generic.h | 2 +- drivers/cpufreq/sa1100-cpufreq.c | 9 +++--- drivers/cpufreq/sa1110-cpufreq.c | 9 +++--- 4 files changed, 30 insertions(+), 55 deletions(-) -- 1.7.12.rc2.18.g61b472e

11 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel August 2013