linaro-kernel March 2014

linaro-kernel@lists.linaro.org

86 participants
221 discussions

[PATCH v2 0/4] [RFC] Support for creating generic host_bridge from device tree

by Liviu Dudau

This is v2 of my attempt to add support for a generic pci_host_bridge controller created from a description passed in the device tree. Changes from v1: - Add patch to fix conversion of IO ranges into IO resources. - Added a domain_nr member to pci_host_bridge structure, and a new function to create a root bus in a given domain number. In order to facilitate that I propose changing the order of initialisation between pci_host_bridge and it's related bus in pci_create_root_bus() as sort of a rever of 7b5436635800. This is done in patch 1/4 and 2/4. - Added a simple allocator of domain numbers in drivers/pci/host-bridge.c. The code will first try to get a domain id from of_alias_get_id(..., "pci-domain") and if that fails assign the next unallocated domain id. - Changed the name of the function that creates the generic host bridge from pci_host_bridge_of_init to of_create_pci_host_bridge and exported as GPL symbol. v1 thread here: https://lkml.org/lkml/2014/2/3/380 The following is an edit of the original blurb: Following the discussion started here [1], I now have a proposal for tackling generic support for host bridges described via device tree. It is an initial stab at it, to try to get feedback and suggestions, but it is functional enough that I have PCI Express for arm64 working on an FPGA using the patch that I am also publishing that adds support for PCI for that platform. Looking at the existing architectures that fit the requirements (use of device tree and PCI) yields the powerpc and microblaze as generic enough to make them candidates for conversion. I have a tentative patch for microblaze that I can only compile test it, unfortunately using qemu-microblaze leads to an early crash in the kernel. As Bjorn has mentioned in the previous discussion, the idea is to add to struct pci_host_bridge enough data to be able to reduce the size or remove the architecture specific pci_controller structure. arm64 support actually manages to get rid of all the architecture static data and has no pci_controller structure defined. For host bridge drivers that means a change of API unless architectures decide to provide a compatibility layer (comments here please). In order to initialise a host bridge with the new API, the following example code is sufficient for a _probe() function: static int myhostbridge_probe(struct platform_device *pdev) { int err; struct device_node *dev; struct pci_host_bridge *bridge; struct myhostbridge_port *pp; resource_size_t lastbus; dev = pdev->dev.of_node; if (!of_device_is_available(dev)) { pr_warn("%s: disabled\n", dev->full_name); return -ENODEV; } pp = kzalloc(sizeof(struct myhostbridge_port), GFP_KERNEL); if (!pp) return -ENOMEM; bridge = of_create_pci_host_bridge(&pdev->dev, &myhostbridge_ops, pp); if (!bridge) { err = -EINVAL; goto bridge_init_fail; } err = myhostbridge_setup(bridge->bus); if (err) goto bridge_init_fail; /* We always enable PCI domains and we keep domain 0 backward * compatible in /proc for video cards */ pci_add_flags(PCI_ENABLE_PROC_DOMAINS | PCI_COMPAT_DOMAIN_0); pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC); lastbus = pci_scan_child_bus(bridge->bus); pci_bus_update_busn_res_end(bridge->bus, lastbus); pci_assign_unassigned_bus_resources(bridge->bus); pci_bus_add_devices(bridge->bus); return 0; bridge_init_fail: kfree(pp); return err; } [1] http://thread.gmane.org/gmane.linux.kernel.pci/25946 Best regards, Liviu Liviu Dudau (4): pci: OF: Fix the conversion of IO ranges into IO resources. pci: Create pci_host_bridge before its associated bus in pci_create_root_bus. pci: Introduce a domain number for pci_host_bridge. pci: Add support for creating a generic host_bridge from device tree drivers/of/address.c | 31 +++++++++++ drivers/pci/host-bridge.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 66 ++++++++++++++-------- include/linux/of_address.h | 13 +---- include/linux/pci.h | 17 ++++++ 5 files changed, 227 insertions(+), 34 deletions(-) -- 1.9.0

10 years, 3 months

queue boot: 17 pass, 1 fail (v3.10.33)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: queue Git describe: v3.10.33 Failed boot tests (console logs at the end) =========================================== imx6dl-wandboard,wand-solo: FAIL: imx_v6_v7_defconfig Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 14.7 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 52.3 sec omap3-beagle-xm PASS: 1 min 2.7 sec legacy,3530beagle PASS: 0 min 45.5 sec omap4-panda PASS: 1 min 3.1 sec omap3-tobi PASS: 0 min 33.8 sec am335x-bone PASS: 0 min 26.2 sec omap4-panda-es PASS: 1 min 11.5 sec legacy,3730storm PASS: 0 min 20.7 sec legacy,3530overo PASS: 0 min 21.3 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 18.3 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 17.4 sec imx6dl-wandboard,wand-solo FAIL: 0 min 31.4 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 21.4 sec armada-370-mirabox PASS: 0 min 19.6 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 29.9 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 16.4 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 16.3 sec Console logs for failures ========================= imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-solo: FAIL: last 80 lines of boot log: ------------------------------------------------------------ Connected to wand-solo console [channel connected] (~$quit to exit) (user:khilman) is already connected ~$hardreset Command(wand-solo console)> hardreset (user:khilman) Reboot wand-solo Reboot: wand-solo ; phidget 2 2 : off, sleep, on U-Boot 2013.04-00012-g0b44183-dirty (May 15 2013 - 16:16:11) CPU: Freescale i.MX6SOLO rev1.1 at 792 MHz Reset cause: POR Board: Wandboard DRAM: 512 MiB WARNING: Caches not enabled MMC: FSL_SDHC: 0 *** Warning - bad CRC, using default env 0 => ~$off # PYBOOT: Exception: ERROR: Could not break into autoboot. # PYBOOT: Time: 31.39 seconds. # PYBOOT: Result: FAIL

10 years, 3 months

queue boot: 41 pass, 0 fail (v3.13.6)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: queue Git describe: v3.13.6 Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 14.9 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 57.7 sec am335x-boneblack PASS: 0 min 25.4 sec omap3-beagle-xm PASS: 0 min 58.0 sec legacy,3530beagle PASS: 0 min 57.3 sec omap4-panda PASS: 1 min 7.4 sec omap3-tobi PASS: 0 min 22.3 sec am335x-bone PASS: 0 min 27.1 sec omap4-panda-es PASS: 1 min 2.4 sec legacy,3730storm PASS: 0 min 20.5 sec legacy,3530overo PASS: 0 min 23.9 sec multi_lpae_defconfig -------------------- sun7i-a20-cubieboard2 PASS: 0 min 13.5 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.0 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 18.4 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.2 sec imx6q-wandboard PASS: 0 min 16.8 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 11.5 sec sun4i-a10-cubieboard PASS: 0 min 12.4 sec bcm_defconfig ------------- bcm28155-ap PASS: 0 min 58.8 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 30.1 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 29.2 sec tegra30-beaver PASS: 0 min 16.5 sec am335x-boneblack PASS: 0 min 22.2 sec omap3-beagle-xm PASS: 0 min 58.7 sec sun7i-a20-cubieboard2 PASS: 0 min 13.4 sec armada-370-mirabox PASS: 0 min 20.6 sec omap4-panda PASS: 1 min 2.9 sec armada-xp-openblocks-ax3-4 PASS: 0 min 22.7 sec sun4i-a10-cubieboard PASS: 0 min 17.6 sec bcm28155-ap PASS: 1 min 4.1 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.0 sec omap3-tobi PASS: 0 min 20.6 sec am335x-bone PASS: 0 min 23.9 sec imx6q-wandboard PASS: 0 min 17.1 sec omap4-panda-es PASS: 1 min 5.3 sec imx6dl-wandboard,wand-dual PASS: 0 min 18.1 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 28.7 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.4 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 16.4 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 21.9 sec armada-370-mirabox PASS: 0 min 19.9 sec

10 years, 3 months

next boot: 43 pass, 2 fail (next-20140307)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: next Git describe: next-20140307 Failed boot tests (console logs at the end) =========================================== sun7i-a20-cubieboard2: FAIL: multi_lpae_defconfig ste-snowball: FAIL: multi_v7_defconfig Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 15.2 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 51.1 sec am335x-boneblack PASS: 0 min 25.6 sec omap3-beagle-xm PASS: 0 min 58.6 sec legacy,3530beagle PASS: 0 min 52.8 sec omap4-panda PASS: 1 min 4.1 sec omap3-overo-tobi PASS: 0 min 23.0 sec am335x-bone PASS: 0 min 27.2 sec omap3-overo-storm-tobi PASS: 0 min 25.7 sec omap5-uevm PASS: 1 min 2.0 sec omap4-panda-es PASS: 1 min 8.2 sec legacy,3730storm PASS: 0 min 20.2 sec legacy,3530overo PASS: 0 min 20.9 sec multi_lpae_defconfig -------------------- omap5-uevm PASS: 1 min 45.0 sec sun7i-a20-cubieboard2 FAIL: 0 min 19.6 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.1 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 18.3 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.3 sec imx6q-wandboard PASS: 0 min 16.7 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 12.7 sec sun4i-a10-cubieboard PASS: 0 min 15.3 sec bcm_defconfig ------------- bcm28155-ap PASS: 0 min 53.6 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 30.1 sec multi_v7_defconfig ------------------ qcom-apq8074-dragonboard PASS: 1 min 4.1 sec ste-snowball FAIL: 0 min 33.8 sec tegra30-beaver PASS: 0 min 19.5 sec am335x-boneblack PASS: 0 min 23.5 sec omap3-beagle-xm PASS: 0 min 51.6 sec sun7i-a20-cubieboard2 PASS: 0 min 14.2 sec armada-370-mirabox PASS: 0 min 22.3 sec omap4-panda PASS: 0 min 53.9 sec armada-xp-openblocks-ax3-4 PASS: 0 min 25.0 sec sun4i-a10-cubieboard PASS: 0 min 18.6 sec bcm28155-ap PASS: 1 min 4.2 sec omap3-overo-tobi PASS: 0 min 21.9 sec imx6dl-wandboard,wand-solo PASS: 0 min 17.7 sec am335x-bone PASS: 0 min 26.3 sec omap3-overo-storm-tobi PASS: 0 min 24.7 sec omap5-uevm PASS: 1 min 51.5 sec imx6q-wandboard PASS: 0 min 16.2 sec omap4-panda-es PASS: 0 min 52.9 sec imx6dl-wandboard,wand-dual PASS: 0 min 17.9 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 33.2 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.1 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 17.1 sec Console logs for failures ========================= multi_lpae_defconfig -------------------- sun7i-a20-cubieboard2: FAIL: last 80 lines of boot log: ------------------------------------------------------- setenv ethaddr 22:71:81:DA:53:EA sun7i# setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 sun7i# setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' sun7i# setenv initrd_high 0xffffffff setenv initrd_high 0xffffffff sun7i# if test -n ${initenv}; then run initenv; fi if test -n ${initenv}; then run initenv; fi sun7i# if test -n ${preboot}; then run preboot; fi if test -n ${preboot}; then run preboot; fi sun7i#setenv autoload no; setenv autoboot no setenv autoload no; setenv autoboot no sun7i# dhcp dhcp ENET Speed is 100 Mbps - FULL duplex connection BOOTP broadcast 1 DHCP client bound to address 192.168.1.153 sun7i# setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 sun7i# if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi sun7i# tftp 0x40008000 192.168.1.2:tmp/cubie2-n0OAR2/zImage tftp 0x40008000 192.168.1.2:tmp/cubie2-n0OAR2/zImage Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'tmp/cubie2-n0OAR2/zImage'. Load address: 0x40008000 Loading: *################################################################# ################################################################# ################################################################# ################################################################# ##################################################### 2.7 MiB/s done Bytes transferred = 4581968 (45ea50 hex) sun7i# tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'buildroot.cpio.gz.uboot'. Load address: 0x42000000 Loading: *############################################ 2.7 MiB/s done Bytes transferred = 642602 (9ce2a hex) sun7i# tftp 0x41000000 192.168.1.2:tmp/cubie2-n0OAR2/sun7i-a20-cubieboard2.dtb tftp 0x41000000 192.168.1.2:tmp/cubie2-n0OAR2/sun7i-a20-cubieboard2.dtb Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'tmp/cubie2-n0OAR2/sun7i-a20-cubieboard2.dtb'. Load address: 0x41000000 Loading: *# 2.3 MiB/s done Bytes transferred = 12228 (2fc4 hex) sun7i# printenv bootargs printenv bootargs bootargs=console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 ip=192.168.1.153:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none sun7i# bootz 0x40008000 0x42000000 0x41000000 bootz 0x40008000 0x42000000 0x41000000 Kernel image @ 0x40008000 [ 0x000000 - 0x45ea50 ] ## Loading init Ramdisk from Legacy Image at 42000000 ... Image Name: Created: 2014-02-07 19:37:29 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 642538 Bytes = 627.5 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 41000000 Booting using the fdt blob at 0x41000000 Loading Device Tree to 40ff9000, end 40ffefc3 ... OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 19.58 seconds. # PYBOOT: Result: FAIL multi_v7_defconfig ------------------ ste-snowball: FAIL: last 80 lines of boot log: ---------------------------------------------- (user:khilman) Reboot snowball Reboot: snowball ; ip9258 2 2 : ('off', 6, 'on') , sleep 6, MCDE: startup failed sec_bridge: ISSWAPI_FLUSH_BOOT_CODE: 2 EMMC: 0, MMC: 1 In: serial Out: serial Err: serial Net: smc911x-0 Hit any key to stop autoboot: 1 0 U8500 $ U8500 $ version U8500 $ versionsetenv ethaddr 6e:e6:84:36:8e:9e U-Boot 2009.11 (sept. 19 2011 - 17:03:11) U8500 $ setenv ethaddr 6e:e6:84:36:8e:9esetenv bootargs console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4 Can't overwrite "ethaddr" U8500 $ setenv bootargs console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' U8500 $ setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none'if test -n ${initenv}; then run initenv; fi U8500 $ if test -n ${initenv}; then run initenv; fiif test -n ${preboot}; then run preboot; fi U8500 $ if test -n ${preboot}; then run preboot; fisetenv autoload no; setenv autoboot no U8500 $ setenv autoload no; setenv autoboot nodhcp U8500 $ dhcp smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC 6e:e6:84:36:8e:9e BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 192.168.1.159 U8500 $ setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 U8500 $ if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi U8500 $ tftp 0x00800000 192.168.1.2:tmp/snowball-mJsNwS/tmpB9YheT-uImage tftp 0x00800000 192.168.1.2:tmp/snowball-mJsNwS/tmpB9YheT-uImage smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC 6e:e6:84:36:8e:9e Using smc911x-0 device TFTP from server 192.168.1.2; our IP address is 192.168.1.159 Filename 'tmp/snowball-mJsNwS/tmpB9YheT-uImage'. Load address: 0x800000 Loading: *################################################################# ################################################################# ################################################################# ################################################################# ###################################################### done Bytes transferred = 4597737 (4627e9 hex) U8500 $ printenv bootargs printenv bootargs bootargs=console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4 ip=192.168.1.159:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none U8500 $ bootm 0x00800000 bootm 0x00800000 ## Booting kernel from Legacy Image at 00800000 ... Image Name: Linux Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 4597673 Bytes = 4.4 MB Load Address: 00008000 Entry Point: 00008000 Loading Kernel Image ... OK OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 33.75 seconds. # PYBOOT: Result: FAIL

10 years, 3 months

[PATCH] ASoC: pcm512x: Split out bus drivers

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Move to the new style of defining the bus interfaces in separate modules in order to simplify dependencies. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/Kconfig | 18 +++++- sound/soc/codecs/Makefile | 4 ++ sound/soc/codecs/pcm512x-i2c.c | 71 ++++++++++++++++++++++ sound/soc/codecs/pcm512x-spi.c | 69 +++++++++++++++++++++ sound/soc/codecs/pcm512x.c | 133 +++-------------------------------------- sound/soc/codecs/pcm512x.h | 9 +++ 6 files changed, 175 insertions(+), 129 deletions(-) create mode 100644 sound/soc/codecs/pcm512x-i2c.c create mode 100644 sound/soc/codecs/pcm512x-spi.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f2383eb..3a6046f 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -66,7 +66,8 @@ config SND_SOC_ALL_CODECS select SND_SOC_PCM1681 if I2C select SND_SOC_PCM1792A if SPI_MASTER select SND_SOC_PCM3008 - select SND_SOC_PCM512x if SND_SOC_I2C_AND_SPI + select SND_SOC_PCM512x_I2C if I2C + select SND_SOC_PCM512x_SPI if SPI_MASTER select SND_SOC_RT5631 if I2C select SND_SOC_RT5640 if I2C select SND_SOC_SGTL5000 if I2C @@ -362,8 +363,19 @@ config SND_SOC_PCM3008 tristate config SND_SOC_PCM512x - tristate "Texas Instruments PCM512x CODECs" - select REGMAP + tristate + +config SND_SOC_PCM512x_I2C + tristate "Texas Instruments PCM512x CODECs - I2C" + depends on I2C + select SND_SOC_PCM512x + select REGMAP_I2C + +config SND_SOC_PCM512x_SPI + tristate "Texas Instruments PCM512x CODECs - SPI" + depends on SPI_MASTER + select SND_SOC_PCM512x + select REGMAP_SPI config SND_SOC_RT5631 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 6af7a55..ac7025c 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -54,6 +54,8 @@ snd-soc-pcm1681-objs := pcm1681.o snd-soc-pcm1792a-codec-objs := pcm1792a.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-pcm512x-objs := pcm512x.o +snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o +snd-soc-pcm512x-spi-objs := pcm512x-spi.o snd-soc-rt5631-objs := rt5631.o snd-soc-rt5640-objs := rt5640.o snd-soc-sgtl5000-objs := sgtl5000.o @@ -197,6 +199,8 @@ obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o obj-$(CONFIG_SND_SOC_PCM1792A) += snd-soc-pcm1792a-codec.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o +obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o +obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o diff --git a/sound/soc/codecs/pcm512x-i2c.c b/sound/soc/codecs/pcm512x-i2c.c new file mode 100644 index 0000000..4d62230 --- /dev/null +++ b/sound/soc/codecs/pcm512x-i2c.c @@ -0,0 +1,71 @@ +/* + * Driver for the PCM512x CODECs + * + * Author: Mark Brown <broonie(a)linaro.org> + * Copyright 2014 Linaro Ltd + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/i2c.h> + +#include "pcm512x.h" + +static int pcm512x_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct regmap *regmap; + + regmap = devm_regmap_init_i2c(i2c, &pcm512x_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + return pcm512x_probe(&i2c->dev, regmap); +} + +static int pcm512x_i2c_remove(struct i2c_client *i2c) +{ + pcm512x_remove(&i2c->dev); + return 0; +} + +static const struct i2c_device_id pcm512x_i2c_id[] = { + { "pcm5121", }, + { "pcm5122", }, + { } +}; +MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id); + +static const struct of_device_id pcm512x_of_match[] = { + { .compatible = "ti,pcm5121", }, + { .compatible = "ti,pcm5122", }, + { } +}; +MODULE_DEVICE_TABLE(of, pcm512x_of_match); + +static struct i2c_driver pcm512x_i2c_driver = { + .probe = pcm512x_i2c_probe, + .remove = pcm512x_i2c_remove, + .id_table = pcm512x_i2c_id, + .driver = { + .name = "pcm512x", + .owner = THIS_MODULE, + .of_match_table = pcm512x_of_match, + .pm = &pcm512x_pm_ops, + }, +}; + +module_i2c_driver(pcm512x_i2c_driver); + +MODULE_DESCRIPTION("ASoC PCM512x codec driver - I2C"); +MODULE_AUTHOR("Mark Brown <broonie(a)linaro.org>"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/pcm512x-spi.c b/sound/soc/codecs/pcm512x-spi.c new file mode 100644 index 0000000..f297058 --- /dev/null +++ b/sound/soc/codecs/pcm512x-spi.c @@ -0,0 +1,69 @@ +/* + * Driver for the PCM512x CODECs + * + * Author: Mark Brown <broonie(a)linaro.org> + * Copyright 2014 Linaro Ltd + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/spi/spi.h> + +#include "pcm512x.h" + +static int pcm512x_spi_probe(struct spi_device *spi) +{ + struct regmap *regmap; + int ret; + + regmap = devm_regmap_init_spi(spi, &pcm512x_regmap); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + return ret; + } + + return pcm512x_probe(&spi->dev, regmap); +} + +static int pcm512x_spi_remove(struct spi_device *spi) +{ + pcm512x_remove(&spi->dev); + return 0; +} + +static const struct spi_device_id pcm512x_spi_id[] = { + { "pcm5121", }, + { "pcm5122", }, + { }, +}; +MODULE_DEVICE_TABLE(spi, pcm512x_spi_id); + +static const struct of_device_id pcm512x_of_match[] = { + { .compatible = "ti,pcm5121", }, + { .compatible = "ti,pcm5122", }, + { } +}; +MODULE_DEVICE_TABLE(of, pcm512x_of_match); + +static struct spi_driver pcm512x_spi_driver = { + .probe = pcm512x_spi_probe, + .remove = pcm512x_spi_remove, + .id_table = pcm512x_spi_id, + .driver = { + .name = "pcm512x", + .owner = THIS_MODULE, + .of_match_table = pcm512x_of_match, + .pm = &pcm512x_pm_ops, + }, +}; + +module_spi_driver(pcm512x_spi_driver); diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index a035ba8..0014d14 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -18,11 +18,9 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/clk.h> -#include <linux/i2c.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> -#include <linux/spi/spi.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/tlv.h> @@ -375,7 +373,7 @@ static const struct regmap_range_cfg pcm512x_range = { .window_start = 0, .window_len = 0x100, }; -static const struct regmap_config pcm512x_regmap = { +const struct regmap_config pcm512x_regmap = { .reg_bits = 8, .val_bits = 8, @@ -391,14 +389,7 @@ static const struct regmap_config pcm512x_regmap = { .cache_type = REGCACHE_RBTREE, }; -static const struct of_device_id pcm512x_of_match[] = { - { .compatible = "ti,pcm5121", }, - { .compatible = "ti,pcm5122", }, - { } -}; -MODULE_DEVICE_TABLE(of, pcm512x_of_match); - -static int pcm512x_probe(struct device *dev, struct regmap *regmap) +int pcm512x_probe(struct device *dev, struct regmap *regmap) { struct pcm512x_priv *pcm512x; int i, ret; @@ -510,8 +501,9 @@ err: pcm512x->supplies); return ret; } +EXPORT_SYMBOL_GPL(pcm512x_probe); -static void pcm512x_remove(struct device *dev) +void pcm512x_remove(struct device *dev) { struct pcm512x_priv *pcm512x = dev_get_drvdata(dev); @@ -522,6 +514,7 @@ static void pcm512x_remove(struct device *dev) regulator_bulk_disable(ARRAY_SIZE(pcm512x->supplies), pcm512x->supplies); } +EXPORT_SYMBOL_GPL(pcm512x_remove); static int pcm512x_suspend(struct device *dev) { @@ -585,122 +578,10 @@ static int pcm512x_resume(struct device *dev) return 0; } -static const struct dev_pm_ops pcm512x_pm_ops = { +const struct dev_pm_ops pcm512x_pm_ops = { SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL) }; - -#if IS_ENABLED(CONFIG_I2C) -static int pcm512x_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) -{ - struct regmap *regmap; - - regmap = devm_regmap_init_i2c(i2c, &pcm512x_regmap); - if (IS_ERR(regmap)) - return PTR_ERR(regmap); - - return pcm512x_probe(&i2c->dev, regmap); -} - -static int pcm512x_i2c_remove(struct i2c_client *i2c) -{ - pcm512x_remove(&i2c->dev); - return 0; -} - -static const struct i2c_device_id pcm512x_i2c_id[] = { - { "pcm5121", }, - { "pcm5122", }, - { } -}; -MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id); - -static struct i2c_driver pcm512x_i2c_driver = { - .probe = pcm512x_i2c_probe, - .remove = pcm512x_i2c_remove, - .id_table = pcm512x_i2c_id, - .driver = { - .name = "pcm512x", - .owner = THIS_MODULE, - .of_match_table = pcm512x_of_match, - .pm = &pcm512x_pm_ops, - }, -}; -#endif - -#if defined(CONFIG_SPI_MASTER) -static int pcm512x_spi_probe(struct spi_device *spi) -{ - struct regmap *regmap; - int ret; - - regmap = devm_regmap_init_spi(spi, &pcm512x_regmap); - if (IS_ERR(regmap)) { - ret = PTR_ERR(regmap); - return ret; - } - - return pcm512x_probe(&spi->dev, regmap); -} - -static int pcm512x_spi_remove(struct spi_device *spi) -{ - pcm512x_remove(&spi->dev); - return 0; -} - -static const struct spi_device_id pcm512x_spi_id[] = { - { "pcm5121", }, - { "pcm5122", }, - { }, -}; -MODULE_DEVICE_TABLE(spi, pcm512x_spi_id); - -static struct spi_driver pcm512x_spi_driver = { - .probe = pcm512x_spi_probe, - .remove = pcm512x_spi_remove, - .id_table = pcm512x_spi_id, - .driver = { - .name = "pcm512x", - .owner = THIS_MODULE, - .of_match_table = pcm512x_of_match, - .pm = &pcm512x_pm_ops, - }, -}; -#endif - -static int __init pcm512x_modinit(void) -{ - int ret = 0; - -#if IS_ENABLED(CONFIG_I2C) - ret = i2c_add_driver(&pcm512x_i2c_driver); - if (ret) { - printk(KERN_ERR "Failed to register pcm512x I2C driver: %d\n", - ret); - } -#endif -#if defined(CONFIG_SPI_MASTER) - ret = spi_register_driver(&pcm512x_spi_driver); - if (ret != 0) { - printk(KERN_ERR "Failed to register pcm512x SPI driver: %d\n", - ret); - } -#endif - return ret; -} -module_init(pcm512x_modinit); - -static void __exit pcm512x_exit(void) -{ -#if IS_ENABLED(CONFIG_I2C) - i2c_del_driver(&pcm512x_i2c_driver); -#endif -#if defined(CONFIG_SPI_MASTER) - spi_unregister_driver(&pcm512x_spi_driver); -#endif -} -module_exit(pcm512x_exit); +EXPORT_SYMBOL_GPL(pcm512x_pm_ops); MODULE_DESCRIPTION("ASoC PCM512x codec driver"); MODULE_AUTHOR("Mark Brown <broonie(a)linaro.org>"); diff --git a/sound/soc/codecs/pcm512x.h b/sound/soc/codecs/pcm512x.h index ac4a52c..6ee76aa 100644 --- a/sound/soc/codecs/pcm512x.h +++ b/sound/soc/codecs/pcm512x.h @@ -17,6 +17,9 @@ #ifndef _SND_SOC_PCM512X #define _SND_SOC_PCM512X +#include <linux/pm.h> +#include <linux/regmap.h> + #define PCM512x_VIRT_BASE 0x100 #define PCM512x_PAGE_LEN 0x100 #define PCM512x_PAGE_BASE(n) (PCM512x_VIRT_BASE + (PCM512x_PAGE_LEN * n)) @@ -159,4 +162,10 @@ #define PCM512x_AGBR_SHIFT 0 #define PCM512x_AGBL_SHIFT 4 +extern const struct dev_pm_ops pcm512x_pm_ops; +extern const struct regmap_config pcm512x_regmap; + +int pcm512x_probe(struct device *dev, struct regmap *regmap); +void pcm512x_remove(struct device *dev); + #endif -- 1.9.0

10 years, 3 months

[PATCH] ASoC: pcm512x: Fix duplicate const warning

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/pcm512x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 3a0bbb6..a035ba8 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -203,10 +203,10 @@ static const unsigned int pcm512x_dsp_program_values[] = { 7, }; -static const SOC_VALUE_ENUM_SINGLE_DECL(pcm512x_dsp_program, - PCM512x_DSP_PROGRAM, 0, 0x1f, - pcm512x_dsp_program_texts, - pcm512x_dsp_program_values); +static SOC_VALUE_ENUM_SINGLE_DECL(pcm512x_dsp_program, + PCM512x_DSP_PROGRAM, 0, 0x1f, + pcm512x_dsp_program_texts, + pcm512x_dsp_program_values); static const char * const pcm512x_clk_missing_text[] = { "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s" -- 1.9.0

10 years, 3 months

[PATCH v5 0/3] [RFC] Add support for PCI in AArch64

by Liviu Dudau

Hi, This patch adds support for PCI to AArch64. It is based on my v5 patch that adds support for creating generic host bridge structure from device tree. With that in place, I was able to boot a platform that has PCIe host bridge support and use a PCIe network card. Changes from v4: - Fixed the pci_domain_nr() implementation for arm64. Now we use find_pci_host_bride() to find the host bridge before we retrieve the domain number. Changes from v3: - Added Acks accumulated so far ;) - Still carrying Catalin's patch for moving the PCI_IO_BASE until it lands in linux-next or mainline, in order to ease applying the series Changes from v2: - Implement an arch specific version of pci_register_io_range() and pci_address_to_pio(). - Return 1 from pci_proc_domain(). Changes from v1: - Added Catalin's patch for moving the PCI_IO_BASE location and extend its size to 16MB - Integrated Arnd's version of pci_ioremap_io that uses a bitmap for keeping track of assigned IO space and returns an io_offset. At the moment the code is added in arch/arm64 but it can be moved in drivers/pci. - Added a fix for the generic ioport_map() function when !CONFIG_GENERIC_IOMAP as suggested by Arnd. v4 thread here: https://lkml.org/lkml/2014/3/3/298 v3 thread here: https://lkml.org/lkml/2014/2/28/211 v2 thread here: https://lkml.org/lkml/2014/2/27/255 v1 thread here: https://lkml.org/lkml/2014/2/3/389 The API used is different from the one used by ARM architecture. There is no pci_common_init_dev() function and no hw_pci structure, as that is no longer needed. Once the last signature is added to the legal agreement, I will post the host bridge driver code that I am using. Meanwhile, here is an example of what the probe function looks like, posted as an example: static int myhostbridge_probe(struct platform_device *pdev) { int err; struct device_node *dev; struct pci_host_bridge *bridge; struct myhostbridge_port *pp; resource_size_t lastbus; dev = pdev->dev.of_node; if (!of_device_is_available(dev)) { pr_warn("%s: disabled\n", dev->full_name); return -ENODEV; } pp = kzalloc(sizeof(struct myhostbridge_port), GFP_KERNEL); if (!pp) return -ENOMEM; bridge = of_create_pci_host_bridge(&pdev->dev, &myhostbridge_ops, pp); if (IS_ERR(bridge)) { err = PTR_ERR(bridge); goto bridge_create_fail; } err = myhostbridge_setup(bridge->bus); if (err) goto bridge_setup_fail; /* We always enable PCI domains and we keep domain 0 backward * compatible in /proc for video cards */ pci_add_flags(PCI_ENABLE_PROC_DOMAINS); pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC); lastbus = pci_scan_child_bus(bridge->bus); pci_bus_update_busn_res_end(bridge->bus, lastbus); pci_assign_unassigned_bus_resources(bridge->bus); pci_bus_add_devices(bridge->bus); return 0; bridge_setup_fail: put_device(&bridge->dev); device_unregister(&bridge->dev); bridge_create_fail: kfree(pp); return err; } Best regards, Liviu Catalin Marinas (1): arm64: Extend the PCI I/O space to 16MB Liviu Dudau (2): Fix ioport_map() for !CONFIG_GENERIC_IOMAP cases. arm64: Add architecture support for PCI Documentation/arm64/memory.txt | 16 ++-- arch/arm64/Kconfig | 19 ++++- arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/io.h | 5 +- arch/arm64/include/asm/pci.h | 49 ++++++++++++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/pci.c | 178 +++++++++++++++++++++++++++++++++++++++++ include/asm-generic/io.h | 2 +- 8 files changed, 261 insertions(+), 10 deletions(-) create mode 100644 arch/arm64/include/asm/pci.h create mode 100644 arch/arm64/kernel/pci.c -- 1.9.0

10 years, 3 months

[PATCH V6 Resend 1/5] cpufreq: suspend governors on system suspend/hibernate

by Viresh Kumar

This patch adds cpufreq suspend/resume calls to dpm_{suspend|resume}() for handling suspend/resume of cpufreq governors. Lan Tianyu (Intel) & Jinhyuk Choi (Broadcom) found an issue where tunables configuration for clusters/sockets with non-boot CPUs was getting lost after suspend/resume, as we were notifying governors with CPUFREQ_GOV_POLICY_EXIT on removal of the last cpu for that policy and so deallocating memory for tunables. This is fixed by this patch as we don't allow any operation on governors after device suspend and before device resume now. We could have added these callbacks at dpm_{suspend|resume}_noirq() level but the problem here is that most of the devices (i.e. devices with ->suspend() callbacks) have already been suspended by now and so if drivers want to change frequency before suspending, then it might not be possible for many platforms (which depend on other peripherals like i2c, regulators, etc). Reported-and-tested-by: Lan Tianyu <tianyu.lan(a)intel.com> Reported-by: Jinhyuk Choi <jinchoi(a)broadcom.com> Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- V5->V6: 1-2-3/7 merged into 1/5 drivers/base/power/main.c | 5 +++ drivers/cpufreq/cpufreq.c | 111 +++++++++++++++++++++++----------------------- include/linux/cpufreq.h | 8 ++++ 3 files changed, 69 insertions(+), 55 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 42355e4..86d5e4f 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -29,6 +29,7 @@ #include <linux/async.h> #include <linux/suspend.h> #include <trace/events/power.h> +#include <linux/cpufreq.h> #include <linux/cpuidle.h> #include <linux/timer.h> @@ -866,6 +867,8 @@ void dpm_resume(pm_message_t state) mutex_unlock(&dpm_list_mtx); async_synchronize_full(); dpm_show_time(starttime, state, NULL); + + cpufreq_resume(); } /** @@ -1434,6 +1437,8 @@ int dpm_suspend(pm_message_t state) might_sleep(); + cpufreq_suspend(); + mutex_lock(&dpm_list_mtx); pm_transition = state; async_error = 0; diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 56b7b1b..2e43c08 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -26,7 +26,7 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <linux/syscore_ops.h> +#include <linux/suspend.h> #include <linux/tick.h> #include <trace/events/power.h> @@ -47,6 +47,9 @@ static LIST_HEAD(cpufreq_policy_list); static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor); #endif +/* Flag to suspend/resume CPUFreq governors */ +static bool cpufreq_suspended; + static inline bool has_target(void) { return cpufreq_driver->target_index || cpufreq_driver->target; @@ -1576,82 +1579,77 @@ static struct subsys_interface cpufreq_interface = { }; /** - * cpufreq_bp_suspend - Prepare the boot CPU for system suspend. + * cpufreq_suspend() - Suspend CPUFreq governors * - * This function is only executed for the boot processor. The other CPUs - * have been put offline by means of CPU hotplug. + * Called during system wide Suspend/Hibernate cycles for suspending governors + * as some platforms can't change frequency after this point in suspend cycle. + * Because some of the devices (like: i2c, regulators, etc) they use for + * changing frequency are suspended quickly after this point. */ -static int cpufreq_bp_suspend(void) +void cpufreq_suspend(void) { - int ret = 0; - - int cpu = smp_processor_id(); struct cpufreq_policy *policy; - pr_debug("suspending cpu %u\n", cpu); + if (!cpufreq_driver) + return; - /* If there's no policy for the boot CPU, we have nothing to do. */ - policy = cpufreq_cpu_get(cpu); - if (!policy) - return 0; + if (!has_target()) + return; - if (cpufreq_driver->suspend) { - ret = cpufreq_driver->suspend(policy); - if (ret) - printk(KERN_ERR "cpufreq: suspend failed in ->suspend " - "step on CPU %u\n", policy->cpu); + pr_debug("%s: Suspending Governors\n", __func__); + + list_for_each_entry(policy, &cpufreq_policy_list, policy_list) { + if (__cpufreq_governor(policy, CPUFREQ_GOV_STOP)) + pr_err("%s: Failed to stop governor for policy: %p\n", + __func__, policy); + else if (cpufreq_driver->suspend + && cpufreq_driver->suspend(policy)) + pr_err("%s: Failed to suspend driver: %p\n", __func__, + policy); } - cpufreq_cpu_put(policy); - return ret; + cpufreq_suspended = true; } /** - * cpufreq_bp_resume - Restore proper frequency handling of the boot CPU. + * cpufreq_resume() - Resume CPUFreq governors * - * 1.) resume CPUfreq hardware support (cpufreq_driver->resume()) - * 2.) schedule call cpufreq_update_policy() ASAP as interrupts are - * restored. It will verify that the current freq is in sync with - * what we believe it to be. This is a bit later than when it - * should be, but nonethteless it's better than calling - * cpufreq_driver->get() here which might re-enable interrupts... - * - * This function is only executed for the boot CPU. The other CPUs have not - * been turned on yet. + * Called during system wide Suspend/Hibernate cycle for resuming governors that + * are suspended with cpufreq_suspend(). */ -static void cpufreq_bp_resume(void) +void cpufreq_resume(void) { - int ret = 0; - - int cpu = smp_processor_id(); struct cpufreq_policy *policy; - pr_debug("resuming cpu %u\n", cpu); + if (!cpufreq_driver) + return; - /* If there's no policy for the boot CPU, we have nothing to do. */ - policy = cpufreq_cpu_get(cpu); - if (!policy) + if (!has_target()) return; - if (cpufreq_driver->resume) { - ret = cpufreq_driver->resume(policy); - if (ret) { - printk(KERN_ERR "cpufreq: resume failed in ->resume " - "step on CPU %u\n", policy->cpu); - goto fail; - } - } + pr_debug("%s: Resuming Governors\n", __func__); - schedule_work(&policy->update); + cpufreq_suspended = false; -fail: - cpufreq_cpu_put(policy); -} + list_for_each_entry(policy, &cpufreq_policy_list, policy_list) { + if (__cpufreq_governor(policy, CPUFREQ_GOV_START) + || __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS)) + pr_err("%s: Failed to start governor for policy: %p\n", + __func__, policy); + else if (cpufreq_driver->resume + && cpufreq_driver->resume(policy)) + pr_err("%s: Failed to resume driver: %p\n", __func__, + policy); -static struct syscore_ops cpufreq_syscore_ops = { - .suspend = cpufreq_bp_suspend, - .resume = cpufreq_bp_resume, -}; + /* + * schedule call cpufreq_update_policy() for boot CPU, i.e. last + * policy in list. It will verify that the current freq is in + * sync with what we believe it to be. + */ + if (list_is_last(&policy->policy_list, &cpufreq_policy_list)) + schedule_work(&policy->update); + } +} /** * cpufreq_get_current_driver - return current driver's name @@ -1868,6 +1866,10 @@ static int __cpufreq_governor(struct cpufreq_policy *policy, struct cpufreq_governor *gov = NULL; #endif + /* Don't start any governor operations if we are entering suspend */ + if (cpufreq_suspended) + return 0; + if (policy->governor->max_transition_latency && policy->cpuinfo.transition_latency > policy->governor->max_transition_latency) { @@ -2407,7 +2409,6 @@ static int __init cpufreq_core_init(void) cpufreq_global_kobject = kobject_create(); BUG_ON(!cpufreq_global_kobject); - register_syscore_ops(&cpufreq_syscore_ops); return 0; } diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 4d89e0e..94ed907 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -296,6 +296,14 @@ cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy) policy->cpuinfo.max_freq); } +#ifdef CONFIG_CPU_FREQ +void cpufreq_suspend(void); +void cpufreq_resume(void); +#else +static inline void cpufreq_suspend(void) {} +static inline void cpufreq_resume(void) {} +#endif + /********************************************************************* * CPUFREQ NOTIFIER INTERFACE * *********************************************************************/ -- 1.7.12.rc2.18.g61b472e

10 years, 3 months

[PATCH V2 1/3] cpufreq: move call to __find_governor() to cpufreq_init_policy()

by Viresh Kumar

We call __find_governor() during addition of first CPU of every policy from __cpufreq_add_dev() to find the last governor used for this CPU before it was hotplugged-out. After that we call cpufreq_parse_governor() in cpufreq_init_policy() either with this governor or default governor. And right after that policy->governor is set to NULL. There is no functional problem here with this code, but it is just that some of the code required in cpufreq_init_policy() is being called by its caller, i.e. __cpufreq_add_dev(). So, it would make more sense to get all these together at a single place to make code more readable. So, instead of doing this move the relevant parts to cpufreq_init_policy() policy only and initialize policy->governor to NULL at the beginning. In order to clean the code a bit more, some of the #ifdefs for CONFIG_HOTPLUG_CPU are also removed which used to maintain the last governor used for any CPU. Keeping that code wouldn't harm us much but would improve the cleanliness of code. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- V1->V2: - Improved commit logs - Removed unrelated whitespace changes - Removed some #ifdef CONFIG_HOTPLUG_CPU to clean code a bit. drivers/cpufreq/cpufreq.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 56b7b1b..fff2968 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -42,10 +42,8 @@ static DEFINE_RWLOCK(cpufreq_driver_lock); DEFINE_MUTEX(cpufreq_governor_lock); static LIST_HEAD(cpufreq_policy_list); -#ifdef CONFIG_HOTPLUG_CPU /* This one keeps track of the previously set governor of a removed CPU */ static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor); -#endif static inline bool has_target(void) { @@ -879,18 +877,25 @@ err_out_kobj_put: static void cpufreq_init_policy(struct cpufreq_policy *policy) { + struct cpufreq_governor *gov = NULL; struct cpufreq_policy new_policy; int ret = 0; memcpy(&new_policy, policy, sizeof(*policy)); + /* Update governor of new_policy to the governor used before hotplug */ + gov = __find_governor(per_cpu(cpufreq_cpu_governor, policy->cpu)); + if (gov) + pr_debug("Restoring governor %s for cpu %d\n", + policy->governor->name, policy->cpu); + else + gov = CPUFREQ_DEFAULT_GOVERNOR; + + new_policy.governor = gov; + /* Use the default policy if its valid. */ if (cpufreq_driver->setpolicy) - cpufreq_parse_governor(policy->governor->name, - &new_policy.policy, NULL); - - /* assure that the starting sequence is run in cpufreq_set_policy */ - policy->governor = NULL; + cpufreq_parse_governor(gov->name, &new_policy.policy, NULL); /* set default policy */ ret = cpufreq_set_policy(policy, &new_policy); @@ -949,6 +954,8 @@ static struct cpufreq_policy *cpufreq_policy_restore(unsigned int cpu) read_unlock_irqrestore(&cpufreq_driver_lock, flags); + policy->governor = NULL; + return policy; } @@ -1036,7 +1043,6 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, unsigned long flags; #ifdef CONFIG_HOTPLUG_CPU struct cpufreq_policy *tpolicy; - struct cpufreq_governor *gov; #endif if (cpu_is_offline(cpu)) @@ -1094,7 +1100,6 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, else policy->cpu = cpu; - policy->governor = CPUFREQ_DEFAULT_GOVERNOR; cpumask_copy(policy->cpus, cpumask_of(cpu)); init_completion(&policy->kobj_unregister); @@ -1179,15 +1184,6 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, blocking_notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_START, policy); -#ifdef CONFIG_HOTPLUG_CPU - gov = __find_governor(per_cpu(cpufreq_cpu_governor, cpu)); - if (gov) { - policy->governor = gov; - pr_debug("Restoring governor %s for cpu %d\n", - policy->governor->name, cpu); - } -#endif - if (!frozen) { ret = cpufreq_add_dev_interface(policy, dev); if (ret) @@ -1312,11 +1308,9 @@ static int __cpufreq_remove_dev_prepare(struct device *dev, } } -#ifdef CONFIG_HOTPLUG_CPU if (!cpufreq_driver->setpolicy) strncpy(per_cpu(cpufreq_cpu_governor, cpu), policy->governor->name, CPUFREQ_NAME_LEN); -#endif down_read(&policy->rwsem); cpus = cpumask_weight(policy->cpus); @@ -1955,9 +1949,7 @@ EXPORT_SYMBOL_GPL(cpufreq_register_governor); void cpufreq_unregister_governor(struct cpufreq_governor *governor) { -#ifdef CONFIG_HOTPLUG_CPU int cpu; -#endif if (!governor) return; @@ -1965,14 +1957,12 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor) if (cpufreq_disabled()) return; -#ifdef CONFIG_HOTPLUG_CPU for_each_present_cpu(cpu) { if (cpu_online(cpu)) continue; if (!strcmp(per_cpu(cpufreq_cpu_governor, cpu), governor->name)) strcpy(per_cpu(cpufreq_cpu_governor, cpu), "\0"); } -#endif mutex_lock(&cpufreq_governor_mutex); list_del(&governor->governor_list); -- 1.7.12.rc2.18.g61b472e

10 years, 3 months

next boot: 45 pass, 2 fail (next-20140306)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: next Git describe: next-20140306 Failed boot tests (console logs at the end) =========================================== ste-snowball: FAIL: multi_v7_defconfig omap4-panda: FAIL: multi_v7_defconfig Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 15.3 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 50.7 sec am335x-boneblack PASS: 0 min 25.6 sec omap3-beagle-xm PASS: 1 min 0.9 sec legacy,3530beagle PASS: 1 min 19.7 sec omap4-panda PASS: 1 min 6.7 sec omap3-overo-tobi PASS: 0 min 23.0 sec am335x-bone PASS: 0 min 28.0 sec omap3-overo-storm-tobi PASS: 0 min 25.4 sec omap5-uevm PASS: 1 min 5.6 sec omap4-panda-es PASS: 1 min 6.7 sec legacy,3730storm PASS: 0 min 23.5 sec legacy,3530overo PASS: 0 min 20.9 sec multi_lpae_defconfig -------------------- omap5-uevm PASS: 1 min 48.8 sec sun7i-a20-cubieboard2 PASS: 0 min 14.3 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.2 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 18.3 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.4 sec imx6q-wandboard PASS: 0 min 16.7 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 12.8 sec sun4i-a10-cubieboard PASS: 0 min 17.0 sec bcm_defconfig ------------- bcm28155-ap PASS: 0 min 58.9 sec mvebu_v7_defconfig ------------------ armada-xp-openblocks-ax3-4 PASS: 0 min 22.1 sec armada-370-mirabox PASS: 0 min 20.2 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 37.1 sec multi_v7_defconfig ------------------ qcom-apq8074-dragonboard PASS: 0 min 59.4 sec ste-snowball FAIL: 0 min 33.5 sec tegra30-beaver PASS: 0 min 19.5 sec am335x-boneblack PASS: 0 min 23.9 sec omap3-beagle-xm PASS: 0 min 50.9 sec sun7i-a20-cubieboard2 PASS: 0 min 14.3 sec armada-370-mirabox PASS: 0 min 22.3 sec omap4-panda FAIL: 2 min 18.8 sec armada-xp-openblocks-ax3-4 PASS: 0 min 25.1 sec sun4i-a10-cubieboard PASS: 0 min 18.7 sec bcm28155-ap PASS: 1 min 4.1 sec omap3-overo-tobi PASS: 0 min 21.7 sec imx6dl-wandboard,wand-solo PASS: 0 min 17.8 sec am335x-bone PASS: 0 min 26.3 sec omap3-overo-storm-tobi PASS: 0 min 24.7 sec omap5-uevm PASS: 1 min 52.4 sec imx6q-wandboard PASS: 0 min 16.2 sec omap4-panda-es PASS: 0 min 50.4 sec imx6dl-wandboard,wand-dual PASS: 0 min 17.9 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 33.2 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.1 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 17.1 sec Console logs for failures ========================= multi_v7_defconfig ------------------ ste-snowball: FAIL: last 80 lines of boot log: ---------------------------------------------- (user:khilman) Reboot snowball Reboot: snowball ; ip9258 2 2 : ('off', 6, 'on') , sleep 6, MCDE: startup failed sec_bridge: ISSWAPI_FLUSH_BOOT_CODE: 2 EMMC: 0, MMC: 1 In: serial Out: serial Err: serial Net: smc911x-0 Hit any key to stop autoboot: 1 0 U8500 $ U8500 $ version U8500 $ versionsetenv ethaddr 6e:e6:84:36:8e:9e U-Boot 2009.11 (sept. 19 2011 - 17:03:11) U8500 $ setenv ethaddr 6e:e6:84:36:8e:9esetenv bootargs console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4 Can't overwrite "ethaddr" U8500 $ setenv bootargs console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' U8500 $ setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none'if test -n ${initenv}; then run initenv; fi U8500 $ if test -n ${initenv}; then run initenv; fiif test -n ${preboot}; then run preboot; fi U8500 $ if test -n ${preboot}; then run preboot; fisetenv autoload no; setenv autoboot no U8500 $ setenv autoload no; setenv autoboot nodhcp U8500 $ dhcp smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC 6e:e6:84:36:8e:9e BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 192.168.1.159 U8500 $ setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 U8500 $ if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi U8500 $ tftp 0x00800000 192.168.1.2:tmp/snowball-2zSz_r/tmpPkFIZV-uImage tftp 0x00800000 192.168.1.2:tmp/snowball-2zSz_r/tmpPkFIZV-uImage smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC 6e:e6:84:36:8e:9e Using smc911x-0 device TFTP from server 192.168.1.2; our IP address is 192.168.1.159 Filename 'tmp/snowball-2zSz_r/tmpPkFIZV-uImage'. Load address: 0x800000 Loading: *################################################################# ################################################################# ################################################################# ################################################################# ##################################################### done Bytes transferred = 4590977 (460d81 hex) U8500 $printenv bootargs printenv bootargs bootargs=console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4 ip=192.168.1.159:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none U8500 $ bootm 0x00800000 bootm 0x00800000 ## Booting kernel from Legacy Image at 00800000 ... Image Name: Linux Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 4590913 Bytes = 4.4 MB Load Address: 00008000 Entry Point: 00008000 Loading Kernel Image ... OK OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 33.51 seconds. # PYBOOT: Result: FAIL omap4-panda: FAIL: last 80 lines of boot log: --------------------------------------------- [ 1.509765] loop: module loaded [ 1.520233] pegasus: v0.9.3 (2013/04/25), Pegasus/Pegasus II USB Ethernet driver [ 1.528045] usbcore: registered new interface driver pegasus [ 1.534027] usbcore: registered new interface driver asix [ 1.539733] usbcore: registered new interface driver ax88179_178a [ 1.546173] usbcore: registered new interface driver cdc_ether [ 1.552307] usbcore: registered new interface driver r815x [ 1.558105] usbcore: registered new interface driver smsc75xx [ 1.564178] usbcore: registered new interface driver smsc95xx [ 1.570220] usbcore: registered new interface driver net1080 [ 1.576202] usbcore: registered new interface driver cdc_subset [ 1.582427] usbcore: registered new interface driver zaurus [ 1.588378] usbcore: registered new interface driver cdc_ncm [ 1.594299] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver [ 1.601135] ehci-pci: EHCI PCI platform driver [ 1.605834] ehci-platform: EHCI generic platform driver [ 1.611511] ehci-omap: OMAP-EHCI Host Controller driver [ 1.637329] ehci-omap 4a064c00.ehci: EHCI Host Controller [ 1.642974] ehci-omap 4a064c00.ehci: new USB bus registered, assigned bus number 1 [ 1.651336] ehci-omap 4a064c00.ehci: irq 109, io mem 0x4a064c00 [ 1.674835] ehci-omap 4a064c00.ehci: USB 2.0 started, EHCI 1.00 [ 1.681915] hub 1-0:1.0: USB hub found [ 1.685913] hub 1-0:1.0: 3 ports detected [ 1.690673] ehci-orion: EHCI orion driver [ 1.695098] SPEAr-ehci: EHCI SPEAr driver [ 1.699462] tegra-ehci: Tegra EHCI driver [ 1.704437] usbcore: registered new interface driver usb-storage [ 1.712799] mousedev: PS/2 mouse device common for all mice [ 1.721099] i2c /dev entries driver [ 1.727874] sdhci: Secure Digital Host Controller Interface driver [ 1.734313] sdhci: Copyright(c) Pierre Ossman [ 1.739837] omap_hsmmc 4809c000.mmc: unable to get vmmc regulator -517 [ 1.746734] platform 4809c000.mmc: Driver omap_hsmmc requests probe deferral [ 1.754425] omap_hsmmc 480d5000.mmc: unable to get vmmc regulator -517 [ 1.761322] platform 480d5000.mmc: Driver omap_hsmmc requests probe deferral [ 1.769226] sdhci-pltfm: SDHCI platform and OF driver helper [ 1.776153] usbcore: registered new interface driver usbhid [ 1.781982] usbhid: USB HID core driver [ 1.790618] TCP: cubic registered [ 1.794067] NET: Registered protocol family 17 [ 1.798980] Key type dns_resolver registered [ 1.804077] Power Management for TI OMAP4+ devices. [ 1.809204] Power Management for TI OMAP4. [ 1.813507] OMAP4 PM: u-boot >= v2012.07 is required for full PM support [ 1.820617] Registering SWP/SWPB emulation handler [ 1.826843] vwl1271: 1800 mV [ 1.834991] Skipping twl internal clock init and using bootloader value (unknown osc rate) [ 1.845092] twl 0-0048: PIH (irq 39) nested IRQs [ 1.851684] twl_rtc rtc.10: Enabling TWL-RTC [ 1.858673] twl_rtc rtc.10: rtc core: registered rtc.10 as rtc0 [ 1.865844] VAUX1_6030: 1000 <--> 3000 mV at 1800 mV [ 1.872039] VAUX2_6030: 1200 <--> 2800 mV at 1800 mV [ 1.878265] VAUX3_6030: 1000 <--> 3000 mV at 1200 mV [ 1.884460] VMMC: 1200 <--> 3000 mV at 3000 mV [ 1.890197] VPP: 1800 <--> 2500 mV at 1900 mV [ 1.895812] VUSIM: 1200 <--> 2900 mV at 1800 mV [ 1.900848] VDAC: 1800 mV [ 1.900848] VANA: 2100 mV [ 1.908416] VCXIO: 1800 mV [ 1.908447] VUSB: 3300 mV [ 1.915618] V1V8: 1800 mV [ 1.919311] V2V1: 2100 mV [ 1.927947] omap_i2c 48070000.i2c: bus 0 rev0.10 at 400 kHz [ 1.935821] omap_i2c 48072000.i2c: bus 1 rev0.10 at 400 kHz [ 1.947082] omap_i2c 48060000.i2c: bus 2 rev0.10 at 100 kHz [ 1.954803] omap_i2c 48350000.i2c: bus 3 rev0.10 at 400 kHz [ 1.963165] omap_hsmmc 4809c000.mmc: pins are not configured from the driver [ 2.005218] usb 1-1: new high-speed USB device number 2 using ehci-omap [ 2.128143] twl_rtc rtc.10: setting system clock to 2014-03-06 10:34:51 UTC (1394102091) [ 2.136657] spear_cpufreq: Invalid cpufreq_tbl [ 2.161193] hub 1-1:1.0: USB hub found [ 2.165710] hub 1-1:1.0: 5 ports detected [ 4.165588] mmc0: host does not support reading read-only switch. assuming write-enable. [ 4.176177] mmc0: new high speed SD card at address aaaa [ 4.182342] mmcblk0: mmc0:aaaa SD02G 1.84 GiB [ 4.188720] mmcblk0: p1 p2 ~$off # PYBOOT: Exception: kernel: ERROR: failed to boot: <class 'pexpect.TIMEOUT'> # PYBOOT: Time: 138.76 seconds. # PYBOOT: Result: FAIL

10 years, 3 months

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel March 2014