summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-20ovl: rename filesystem type to "overlay"Miklos Szeredi
Some distributions carry an "old" format of overlayfs while mainline has a "new" format. The distros will possibly want to keep the old overlayfs alongside the new for compatibility reasons. To make it possible to differentiate the two versions change the name of the new one from "overlayfs" to "overlay". Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Reported-by: Serge Hallyn <serge.hallyn@ubuntu.com> Cc: Andy Whitcroft <apw@canonical.com>
2014-11-20of/selftest: Fix testing when /aliases is missingGrant Likely
The /aliases node isn't always present in the device tree, but the unittest code assumes that /aliases is there. Add a check when inserting the testcase data to see if of_aliases needs to be updated, and undo the settings when the nodes are removed. Signed-off-by: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Gaurav Minocha <gaurav.minocha.os@gmail.com> Cc: <stable@vger.kernel.org>
2014-11-20Merge branch 'at91/cleanup' into next/driversArnd Bergmann
This resolves some of the obvious conflicts between the at91 cleanup and drivers branches. Conflicts: arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c drivers/rtc/Kconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20ARM: multi_v7_defconfig: Enable cgroupsSoren Brinkmann
This allows booting the kernel with systemd-based root file systems. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20MAINTAINERS: add entry for the GISB arbiter driverFlorian Fainelli
The GISB bus arbiter driver is relevant for BCM7xxx (brcmstb) platforms, add an entry to cover this file. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20MAINTAINERS: update brcmstb entriesFlorian Fainelli
Add Gregory Fong and myself as maintainers for the brcmstb platform along with Brian Norris and Marc Carino. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'arm-perf-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/drivers Pull "ARM: perf: updates for 3.19" from Will Deacon: This patch series takes us slightly further on the road to big.LITTLE support in perf. The main change enabling this is moving the CCI PMU driver away from the arm-pmu abstraction, allowing the arch code to focus specifically on support for CPU PMUs. * tag 'arm-perf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: arm: perf: fold hotplug notifier into arm_pmu arm: perf: dynamically allocate cpu hardware data arm: perf: fold percpu_pmu into pmu_hw_events arm: perf: kill get_hw_events() arm: perf: limit size of accounting data arm: perf: use IDR types for CPU PMUs arm: perf: make PMU probing data-driven arm: perf: add missing pr_info newlines arm: perf: factor out callchain code ARM: perf: use pr_* instead of printk ARM: perf: remove useless return and check of idx in counter handling bus: cci: move away from arm_pmu framework Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'v3.19-next-soc' of https://github.com/mbgg/linux-mediatek into ↵Arnd Bergmann
next/soc Pull "Add earlyprintk to mt8127 and mt8135 and update Kconfig entry for Mediatek SoCs" from Matthias Brugger: Here comes the pull request which add earlyprintk support for mt8127 and mt8135. Apart from that the Kconfig entry for the Mediatek architecture was fixed. * tag 'v3.19-next-soc' of https://github.com/mbgg/linux-mediatek: ARM: mediatek: Fix description for mediatek SoCs ARM: mediatek: Add earlyprintk support for mt8127 & mt8135 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'v3.19-next-dts' of https://github.com/mbgg/linux-mediatek into ↵Arnd Bergmann
next/dt Pull "Add support for mt6592, mt8127 and mt8135 Socs from Mediatek" from Matthias Brugger: Here comes the pull request which introduces basic support for Mediatek SoCs mt6592, mt8127 and mt8135. The patches for the mt81xx got merged in the late tree for v3.18 but were not be merged at the end. They got a small fix regarding the compatible and model string in the dts files. * tag 'v3.19-next-dts' of https://github.com/mbgg/linux-mediatek: dt-bindings: add documentation for Mediatek SoC ARM: mediatek: add dts for mt6592-evb ARM: mediatek: Add basic support for mt6592 dt-bindings: add more chips in documentation for Mediatek SoC ARM: dts: Build dtb for mt8127 & mt8135 ARM: mediatek: add dts for MT8135 evaluation board. ARM: mediatek: Add basic support for mt8135 ARM: mediatek: add dts for 8127 Moose board ARM: mediatek: Add basic support for mt8127 Signed-off-by; Arnd Bergmann <arnd@arndb.de>
2014-11-20MAINTAINERS: update email address and cleanup for exynos entryKukjin Kim
Use kernel.org account instead of samsung.com and cleanup for Samsung s3c, s5p and exynos SoCs. Signed-off-by: Kukjin Kim <kgene@kernel.org> Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'at91-drivers' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers Pull "First batch of drivers for 3.19" from Nicolas Ferre: It is only about a not so recent driver for old platforms: RTT as RTC driver: - RTT as RTC driver enhancements and machine specific include files removal - RTT as RTC driver conversion to device tree * tag 'at91-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: rtc: at91sam9: add DT bindings documentation rtc: at91sam9: use clk API instead of relying on AT91_SLOW_CLOCK ARM: at91: add clk_lookup entry for RTT devices rtc: at91sam9: rework the Kconfig description rtc: at91sam9: make use of syscon/regmap to access GPBR registers rtc: at91sam9: add DT support rtc: at91sam9: replace devm_ioremap by devm_ioremap_resource rtc: at91sam9: use standard readl/writel functions instead of raw versions rtc: at91sam9: remove references to mach specific headers Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'at91-cleanup2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup Pull "Second batch of cleanup/SoC for 3.19" from Nicolas Ferre: - fixes following legacy board removal - removal of an unused config option CONFIG_MACH_SAMA5_DT - move of some header files out of include/mach directory * tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91: move sdramc/ddrsdr header to include/soc/at91 ARM: at91: remove CONFIG_MACH_SAMA5_DT ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option ARM: at91: remove useless init_time for DT-only SoCs ARM: at91: fix build breakage due to legacy board removals Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'keystone-dts' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt Pull "Keystone dts updates for 3.19" from Santosh Shilimkar: - PCIE controller related updates - 1GBe phy related upates * tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: keystone-k2e: add DT bindings for PCI controller for port 1 ARM: dts: keystone: add DT bindings for PCI controller for port 0 ARM: dts: k2l-evm: add 1g ethernet phys nodes ARM: dts: k2e-evm: add 1g ethernet phys nodes Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'keystone-driver-soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers Pull "Keystone SOC Navigator driver non critical fixes frm Alex for 3.19" from Santosh Shilimkar: - Use list_for_each_entry_safe to prevent use after free - Return proper error if devm_kzalloc fails - Use list_first_entry_or_null() at appropriate places * tag 'keystone-driver-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: soc: ti: knav_qmss_queue: Use list_for_each_entry_safe to prevent use after free soc: ti: knav_qmss_queue: Return proper error if devm_kzalloc fails soc: ti: knav_qmss_queue: Fix unbalanced locking ins knav_pool_create() soc: ti: Use list_first_entry_or_null() at appropriate places Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'keystone-soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig Pull "Keystone config updates for 3.19" from Santosh Shilimkar: - Enable PCIE controller and related options - Enable MDIO and ethernet phy options - Enable DSP IRQCHIP option * tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: keystone: defconfig: add options to enable PCI controller ARM: keystone: add pcie related options ARM: keystone_defconfig: enable mdio and marvell eth phys ARM: keystone_defconfig: enable dsp irq and gpio support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'arm-soc/for-3.19/cygnus-defconfig-v2' of ↵Arnd Bergmann
http://github.com/brcm/linux into next/soc Pull "Broadcom Cygnus SoC defconfig" from Florian Fainelli: This pull requests removes one level in menuconfig for the BCM SoCs for the bcm_defconfig file. * tag 'arm-soc/for-3.19/cygnus-defconfig-v2' of http://github.com/brcm/linux: ARM: bcm_defconfig: remove one level of menu from Kconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'arm-soc/for-3.19/cygnus-platform-v2' of ↵Arnd Bergmann
http://github.com/brcm/linux into next/soc Pull "Broadcom Cygnus SoC platform support" from Florian Fainelli: This pull request contains the platform code to support the Broadcom Cygnus SoC using the iProc architecture: - add support for the Broadcom Cygnus SoC - consolidate the BCM5301X Kconfig options under the iProc menuconfig entry - remove one level of menu in menuconfig * tag 'arm-soc/for-3.19/cygnus-platform-v2' of http://github.com/brcm/linux: ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig ARM: mach-bcm: Consolidate currently supported IPROC SoCs ARM: cygnus: Initial support for Broadcom Cygnus SoC Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20arm64: percpu: Implement this_cpu operationsSteve Capper
The generic this_cpu operations disable interrupts to ensure that the requested operation is protected from pre-emption. For arm64, this is overkill and can hurt throughput and latency. This patch provides arm64 specific implementations for the this_cpu operations. Rather than disable interrupts, we use the exclusive monitor or atomic operations as appropriate. The following operations are implemented: add, add_return, and, or, read, write, xchg. We also wire up a cmpxchg implementation from cmpxchg.h. Testing was performed using the percpu_test module and hackbench on a Juno board running 3.18-rc4. Signed-off-by: Steve Capper <steve.capper@linaro.org> Reviewed-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2014-11-20arm64: pgalloc: consistently use PGALLOC_GFPMark Rutland
We currently allocate different levels of page tables with a variety of differing flags, and the PGALLOC_GFP flags, intended for use when allocating any level of page table, are only used for ptes in pte_alloc_one. On x86, PGALLOC_GFP is used for all page table allocations. Currently the major differences are: * __GFP_NOTRACK -- Needed to ensure page tables are always accessible in the presence of kmemcheck to prevent recursive faults. Currently kmemcheck cannot be selected for arm64. * __GFP_REPEAT -- Causes the allocator to try to reclaim pages and retry upon a failure to allocate. * __GFP_ZERO -- Sometimes passed explicitly, sometimes zalloc variants are used. While we've no encountered issues so far, it would be preferable to be consistent. This patch ensures all levels of table are allocated in the same manner, with PGALLOC_GFP. Cc: Steve Capper <steve.capper@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2014-11-20Merge tag 'arm-soc/for-3.19/cygnus-maintainers-v2' of ↵Arnd Bergmann
http://github.com/brcm/linux into next/fixes-non-critical Pull "Broadcom Cygnus SoC MAINTAINERS updates" from Florian Fainelli: This pull request contains the MAINTAINERS update to add the Broadcom Cygnus SoC platform files, Device Tree sources and clock drivers. * tag 'arm-soc/for-3.19/cygnus-maintainers-v2' of http://github.com/brcm/linux: MAINTAINERS: Entry for Cygnus/iproc arm architecture Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'arm-soc/for-3.19/cygnus-dts-v2' of http://github.com/brcm/linux ↵Arnd Bergmann
into next/dt Pull "Broadcom Cygnus SoC Device Tree changes" from Florian Fainelli: This pull request contains the Broadcom Cygnus Device Tree changes: - binding documentation for the SoC and clock - cygnus SoC and clock dtsi files - DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K * tag 'arm-soc/for-3.19/cygnus-dts-v2' of http://github.com/brcm/linux: ARM: dts: Enable Broadcom Cygnus SoC dt-bindings: Document Broadcom Cygnus SoC and clocks [arnd: something went wrong here, we already had pulled an earlier version of the same patches, which had the wrong license statement. I've pulled this one over the old pull request and fixed up the conflicts now] Conflicts: arch/arm/boot/dts/bcm-cygnus-clock.dtsi arch/arm/boot/dts/bcm-cygnus.dtsi arch/arm/boot/dts/bcm911360_entphn.dts arch/arm/boot/dts/bcm911360k.dts arch/arm/boot/dts/bcm958300k.dts Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20ARM: multi_v7_defconfig: Enable Broadcom CygnusRay Jui
Enable Broadcom Cygnus platform support in multi_v7_defconfig Signed-off-by: Ray Jui <rjui@broadcom.com> Signed-off-by: Scott Branden <sbranden@broadcom.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20ARM: multi_v7_defconfig: remove one level of menu from KconfigScott Branden
remove menu "Broadcom Mobile SoC Selection" This requires: - selecting ARCH_BCM_MOBILE based on SoC selections - fixup multi_v7_defconfig to work with new menu levels of mach-bcm. Signed-off-by: Scott Branden <sbranden@broadcom.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20ARM: debug: move StrongARM debug include to arch/arm/include/debugDmitry Eremin-Solenikov
StrongARM debug-macro.S is quite standalone thing, depending only on register mappings. Move it to proper place and add Kconfig entry. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20arch: arm: boot: dts: Correct vendor-prefix for iio device isl29028 in ↵Darshana Padmadas
compatible property This patch corrects the vendor-prefix for isl29028 in the compatible property from "isil,isl29028" to "isl,isl29028" according to listed vendor-prefixes in Documentation/devicetree/bindings/vendor-prefixes.txt. Incorrect vendor-prefix "isl" was reported by checkpatch.pl warning for drivers/staging/iio/light/isl29028.c. Thus incorrect vendor-prefix "isil" was corrected for every mention of device isl29028. Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Staging: iio: light: Added correct vendor-prefix for device isl29028Darshana Padmadas
This patch adds the correct vendor-prefix for device isl29028 and maintains deprecated vendor-prefix found by checkpatch warning for older kernel releases. Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20dt-bindings: Document deprecated device vendor name to fix related warningDarshana Padmadas
This patch documents deprecated vendor name "isil" to fix warning of undocumented string for device isl29028 as reported while running checkpatch.pl on drivers/staging/iio/light/isl29028.c. This is done to maintain compatibility with older kernels. Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20dt-bindings: Document correct and deprecated vendor-prefix with device isl29028Darshana Padmadas
This patch documents the device isl29028 with its vendor-prefix. Undocumented deprecated vendor-prefix found by checkpatch also documented for compatibility reasons. Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20ARM: bcm2835: Add device tree for Raspberry Pi model B+Matthias Klein
The model B and B+ differ in the GPIO lines for ACT and PWR leds, and the I2S interface. Signed-off-by: Matthias Klein <matthias.klein@linux.com> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Lee Jones <lee@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'omap-for-v3.19/prcm-cleanup' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "omap prcm clean-up for v3.19" from Tony Lindgren: Clean-up series for omap PRCM (Power Reset Clock Module) from Tero Kristo to move things a bit closer to becoming a proper device driver. * tag 'omap-for-v3.19/prcm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits) ARM: OMAP2+: PRM: provide generic API for system reset ARM: OMAP3+: PRM: add generic API for reconfiguring I/O chain ARM: OMAP4: PRM: make PRCM interrupt handler related functions static ARM: OMAP3: PRM: make PRCM interrupt handler related functions static ARM: OMAP4: PRM: make omap4_prm_read/write_inst_reg calls static ARM: AM33xx: PRM: make direct register access functions static ARM: AM33xx: PRM: move global warm reset implementation to driver ARM: OMAP4+: CM: remove omap4_cm1/cm2_* functions ARM: OMAP4: CM: make cminst direct register access functions static ARM: OMAP4: CM: move public definitions from cminst44xx.h to cm44xx.h ARM: OMAP2+: PRM: add generic API for checking hardreset status ARM: OMAP2+: PRM: add generic API for deasserting hardware reset ARM: OMAP2+: PRM: add generic API for asserting hardware reset ARM: AM33xx: PRM: add support for prm_init ARM: AM43xx: hwmod: use OMAP4 hardreset ops instead of the AM33xx version ARM: AM33xx: hwmod: remove am33xx specific module SoC opts ARM: OMAP2/3: CM: make cm_split_idlest_reg SoC calls static ARM: OMAP2+: CM: add common APIs for cm_module_enable/disable ARM: OMAP2+: CM: make clkdm_hwsup operations static ARM: OMAP4+/AM33xx: CM: add common API for cm_wait_module_idle ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'omap-for-v3.19/w1-and-l3-noc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers Pull "omap driver changes for v3.19" from Tony Lindgren: Few omap driver changes to add minimal device tree support for the omap 1w driver, and to fix resume and interrupt issues on the l3-noc driver. * tag 'omap-for-v3.19/w1-and-l3-noc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler bus: omap_l3_noc: Add resume hook to restore context w1: omap-hdq: support device probing with device-tree Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'omap-for-v3.19/dt-part1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "Device tree related changes for omaps" from Tony Lindgren: - Fix currently harmless but wrong sizes for various GPMC connected devices - Set up timings for several GPMC connected devices to get rid of bootloader dependencies in later patches - Enable various drivers for dra7xx - Prepare Igep boards to support new variants - Add intial support for BeagleBoard-X15 * tag 'omap-for-v3.19/dt-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (37 commits) ARM: dts: DRA7: Add aliases for all serial ports ARM: dts: Add am57xx-beagle-x15 ARM: OMAP2+: igep00x0: Add pdata-quirks for the btwilink device. ARM: dts: omap3-igep00x0: Remove i2c2 node. ARM: dts: omap3-igep0020-rev-f: Support IGEPv2 Rev. F ARM: dts: omap3-igep0020-common: Introduce igep0020 common dtsi file. ARM: dts: omap3-igep0030-rev-g: Support IGEP COM MODULE Rev. G ARM: dts: omap3-igep0030-common: Introduce igep0030 common dtsi file. ARM: dts: omap3-igep00x0: Move outside common file the on board Wifi module. ARM: dts: omap3-igep0020: Specify IGEPv2 revision in device tree. ARM: dts: omap3-igep0030: Specify IGEP COM revision in device tree. ARM: dts: omap3-igep00x0: Move NAND configuration to a common place. ARM: dts: omap3-igep00x0: Fix UART2 pins that aren't common. ARM: dts: dra7: add labels to DWC3 nodes ARM: dts: dra72x-evm: Enable CPSW and MDIO ARM: dts: dra7-evm: Keep all VDD rails always-on ARM: dts: dra72-evm: Add MMC nodes ARM: dts: dra72-evm: Add power button node ARM: dts: dra72-evm: Provide explicit pinmux for TPS PMIC ARM: dts: dra72-evm: Add regulator information to USB2 PHYs ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'omap-for-v3.19/clocks-and-pm' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "omap soc changes for v3.19" from Tony Lindgren: SoC related changes for omaps. Mostly to make PM easier to use for omap4 and later, and to fix clock DPLL fixes by adding determine_rate and set_rate_and_parent. * tag 'omap-for-v3.19/clocks-and-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: hwmod: drop unnecessary list initialization ARM: OMAP3+: DPLL: use determine_rate() and set_rate_and_parent() ARM: OMAP3: clock: add support for dpll4_set_rate_and_parent ARM: OMAP4: clock: add support for determine_rate for omap4 regm4xen DPLL ARM: OMAP3: clock: add new rate changing logic support for noncore DPLLs ARM: OMAP3: clock: use clk_features flags for omap3 DPLL4 checks ARM: OMAP4+: PM: Program CPU logic power state ARM: OMAP4+: PM: Centralize static dependency mapping table ARM: OMAP4: PM: Only do static dependency configuration in omap4_init_static_deps Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'omap-for-v3.19/fixes-not-urgent-part1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical Pull "omap non-urgent fixes for v3.19" from Tony Lindgren: Fixes for omap3 that are not urgent. Mostly to remove unnecessary noise during the boot with pointless errors and warnings. * tag 'omap-for-v3.19/fixes-not-urgent-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: serial: remove last vestige of DTR_gpio support. ARM: OMAP2+: gpmc: Get rid of "ti,elm-id not found" warning ARM: OMAP2: Remove unnecessary KERN_* in omap_phy_internal.c ARM: OMAP4+: Remove unused omap_l3_noc platform init ARM: dts: Add twl keypad map for omap3 EVM ARM: dts: Add twl keypad map for LDP ARM: dts: Fix NAND last partition size on LDP ARM: OMAP3: Fix errors for omap_l3_smx when booted with device tree Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge tag 'pxa-for-3.19' of https://github.com/rjarzmik/linux into next/socArnd Bergmann
Pull "arm: pxa: pxa for v3.19" from Robert Jarzmik: This is a very quiet release, featuring a small cleanup, a tosa change on its charger driver, and support for pxa device-tree based pxa27x boards. The device-tree part will only be fully activated once clocks support is fully operation in the common clock framework. * tag 'pxa-for-3.19' of https://github.com/rjarzmik/linux: arm: pxa: add pxa27x device-tree support arm: pxa: remove unnecessary includes from pxa-dt arm: pxa: move init functions into generic.h arm: pxa: add device-tree irq init for pxa27x ARM: pxa: tosa: switch to gpio-charger arm: mach-pxa: Convert pr_warning to pr_warn Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20Merge branch 'dra7xx-uart-hwmod-v3.19' into omap-b-for-v3.19Paul Walmsley
2014-11-20zfcp: auto port scan resiliencyMartin Peschke
This patch improves the Fibre Channel port scan behaviour of the zfcp lldd. Without it the zfcp device driver may churn up the storage area network by excessive scanning and scan bursts, particularly in big virtual server environments, potentially resulting in interference of virtual servers and reduced availability of storage connectivity. The two main issues as to the zfcp device drivers automatic port scan in virtual server environments are frequency and simultaneity. On the one hand, there is no point in allowing lots of ports scans in a row. It makes sense, though, to make sure that a scan is conducted eventually if there has been any indication for potential SAN changes. On the other hand, lots of virtual servers receiving the same indication for a SAN change had better not attempt to conduct a scan instantly, that is, at the same time. Hence this patch has a two-fold approach for better port scanning: the introduction of a rate limit to amend frequency issues, and the introduction of a short random backoff to amend simultaneity issues. Both approaches boil down to deferred port scans, with delays comprising parts for both approaches. The new port scan behaviour is summarised best by: NEW: NEW: no_auto_port_rescan random rate flush backoff limit =wait adapter resume/thaw yes yes no yes* adapter online (user) no yes no yes* port rescan (user) no no no yes adapter recovery (user) yes yes yes no adapter recovery (other) yes yes yes no incoming ELS yes yes yes no incoming ELS lost yes yes yes no Implementation is straight-forward by converting an existing worker to a delayed worker. But care is needed whenever that worker is going to be flushed (in order to make sure work has been completed), since a flush operation cancels the timer set up for deferred execution (see * above). There is a small race window whenever a port scan work starts running up to the point in time of storing the time stamp for that port scan. The impact is negligible. Closing that gap isn't trivial, though, and would the destroy the beauty of a simple work-to-delayed-work conversion. Signed-off-by: Martin Peschke <mpeschke@linux.vnet.ibm.com> Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20zfcp: bring back unit sysfs attributes for automatic LUN scanSteffen Maier
Through sysfs attributes, zfcp unit objects provide a trigger for manual LUN recovery and export information for problem determination. With commit f8210e34887e1feb977a9b6b8caa086855af40c9 "[SCSI] zfcp: Allow midlayer to scan for LUNs when running in NPIV mode" and when attaching SCSI devices through this new optional method, no more zfcp unit objects are allocated for such SCSI devices. Hence, the above-mentioned trigger and information were missing. The information and context is located in SCSI transport device data since b62a8d9b45b971a67a0f8413338c230e3117dff5 "[SCSI] zfcp: Use SCSI device data zfcp_scsi_dev instead of zfcp_unit" 57c237731b92fadc7d44824276313ec330b1989b "[SCSI] zfcp: Add zfcp private struct as SCSI device driver data" Hence, introduce the trigger and the information unconditionally for all SCSI devices attached through zfcp. We prefix the attribute names with 'zfcp_' to prevent collisions and to avoid mix-ups such as with the common 'state' attribute. Since some of the new attribute views do not need zfcp_port in the ZFCP_DEFINE_SCSI_ATTR helper macro, remove zfcp_port to avoid compiler warnings on unused variable. It's easy to open code the conversion from zfcp_scsi_dev to zfcp_port for the two already existing attributes hba_id and wwpn. Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com> Reviewed-by: Martin Peschke <mpeschke@linux.vnet.ibm.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20bfa: replace 2 kzalloc/copy_from_user by memdup_userFabian Frederick
This patch also removes unnecessary printk(KERN_INFO Signed-off-by: Fabian Frederick <fabf@skynet.be> Acked-by: Anil Gurumurthy <anil.gurumurthy@qlogic.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20zfcp: remove access control tables interface (port leftovers)Martin Peschke
This patch removes some leftovers for commit 663e0890e31cb85f0cca5ac1faaee0d2d52880b5 "[SCSI] zfcp: remove access control tables interface". The "access denied" case for ports is gone, as well. The corresponding flag was cleared, but never set. So clean it up. Sysfs flag is kept, though, for backward-compatibility. Now it returns always 0. Signed-off-by: Martin Peschke <mpeschke@linux.vnet.ibm.com> Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20virtio_scsi: support multi hw queue of blk-mqMing Lei
Since virtio_scsi has supported multi virtqueue already, it is natural to map the virtque to hw-queue of blk-mq. Signed-off-by: Ming Lei <ming.lei@canonical.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: remove spin lock around command allocationStephen M. Cameron
It is already using atomic test_and_set_bit to do the allocation. There is some microscopic chance of starvation, but it is so microscopic that it should never happen in reality. Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Webb Scales <webbnh@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: always call pci_set_master after pci_enable_deviceRobert Elliott
If the kernel is booted with the reset_device parameter, which is done for kdump, then the driver needs to call pci_set_master after pci_enable_device to reenable bus mastering (since the preceding pci_disable_device call disables bus mastering). Also, place that after pci_request_regions both in the kdump code and the normal pci_init code. Remove the comment summarizing what pci_set_master does, with the incomplete commentary on the impact of pci_disable_device. Signed-off-by: Robert Elliott <elliott@hp.com> Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Don Brace <don.brace@pmcs.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: Convert SCSI LLD ->queuecommand() for host_lock less operationNicholas Bellinger
There isn't anything in hpsa that requires the host lock to be held during queuecommand. Signed-off-by: Don Brace <don.brace@pmcs.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Reviewed-by: Stephen M. Cameron <stephenmcameron@gmail.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: do not be so noisy about check conditionsStephen M. Cameron
We were printing a lot of useless information before ultimately just passing things up to the SCSI mid layer. Just let the midlayer handle it without LLD chatter. Signed-off-by: Don Brace <don.brace@pmcs.com> Signed-off-by: Stephen M. Cameron <stephenmcameron@gmail.com> Reviewed-by: Joe Handzik <joseph.t.handzik@hp.com> Reviewed-by: Scott Teel <scott.teel@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: use atomics for commands_outstandingStephen M. Cameron
Use atomics for commands_outstanding instead of protecting with spin locks. Signed-off-by: Don Brace <don.brace@pmcs.com> Signed-off-by: Stephen M. Cameron <stephenmcameron@gmail.com> Reviewed-by: Joe Handzik <joseph.t.handzik@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: get rid of type/attribute/direction bit field where possibleStephen M. Cameron
Using bit fields for hardware command fields isn't portable and relies on assumptions about how the compiler lays out the bits. We can fix this in the driver's internal command structure, but the ioctl interface we can't change because it is part of the userland ABI. Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Webb Scales <webb.scales@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: fix endianness issue with scatter gather elementsStephen M. Cameron
The hardware needs little endian scatter gather addresses and lengths but we were not bothering to convert from cpu byte order as we should have been. On Intel, this is all just a bunch of no-ops macros, but it makes the code endian-clean(er). Signed-off-by: Don Brace <don.brace@pmcs.com> Signed-off-by: Robert Elliott <elliott@hp.com> Reviewed-by: Webb Scales <webbnh@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: fix allocation sizes for CISS_REPORT_LUNs commandsStephen M. Cameron
We were allocating roughly double the amount of memory we should be due to ReportLUNdata and ExtendedReportLUNdata containing a non-zero sized array but adding extra memory to allocate as if the array were zero sized. Track the logical and physical sizes separately. Allocate the memory based on the specific data structure sizes. Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Webb Scales <webb.scales@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
2014-11-20hpsa: remove 'action required' phrasingStephen M. Cameron
In the case of LUN data changing, the driver will auto rescan and so it's not even true that "action" is "required". Remove "action required" phrases from warning messages and replace with description phrases. Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Stephen M. Cameron <stephenmcameron@gmail.com> Reviewed-by: Joe Handzik <joseph.t.handzik@hp.com> Reviewed-by: Webb Scales <webb.scales@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>