13 Aug, 2014

1 commit

  • We should prefer `struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to
    meet kernel coding style guidelines. This issue was reported by checkpatch.

    A simplified version of the semantic patch that makes this change is as
    follows (http://coccinelle.lip6.fr/):

    //

    @@
    identifier i;
    declarer name DEFINE_PCI_DEVICE_TABLE;
    initializer z;
    @@

    - DEFINE_PCI_DEVICE_TABLE(i)
    + const struct pci_device_id i[]
    = z;

    //

    [bhelgaas: add semantic patch]
    Signed-off-by: Benoit Taine
    Signed-off-by: Bjorn Helgaas

    Benoit Taine
     

11 Aug, 2014

1 commit

  • Pull module updates from Rusty Russell:
    "This finally applies the stricter sysfs perms checking we pulled out
    before last merge window. A few stragglers are fixed (thanks
    linux-next!)"

    * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
    arch/powerpc/platforms/powernv/opal-dump.c: fix world-writable sysfs files
    arch/powerpc/platforms/powernv/opal-elog.c: fix world-writable sysfs files
    drivers/video/fbdev/s3c2410fb.c: don't make debug world-writable.
    ARM: avoid ARM binutils leaking ELF local symbols
    scripts: modpost: Remove numeric suffix pattern matching
    scripts: modpost: fix compilation warning
    sysfs: disallow world-writable files.
    module: return bool from within_module*()
    module: add within_module() function
    modules: Fix build error in moduleloader.h

    Linus Torvalds
     

09 Aug, 2014

3 commits

  • Pull fbdev updates from Tomi Valkeinen:
    - much better HDMI infoframe support for OMAP
    - Cirrus Logic CLPS711X framebuffer driver
    - DT support for PL11x CLCD driver
    - various small fixes

    * tag 'fbdev-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (35 commits)
    OMAPDSS: DSI: fix depopulating dsi peripherals
    video: hyperv: hyperv_fb: refresh the VM screen by force on VM panic
    video: ARM CLCD: Fix DT-related build problems
    drivers: video: fbdev: atmel_lcdfb.c: Add ability to inverted backlight PWM.
    video: ARM CLCD: Add DT support
    drm/omap: Add infoframe & dvi/hdmi mode support
    OMAPDSS: HDMI: remove the unused code
    OMAPDSS: HDMI5: add support to set infoframe & HDMI mode
    OMAPDSS: HDMI4: add support to set infoframe & HDMI mode
    OMAPDSS: HDMI: add infoframe and hdmi_dvi_mode fields
    OMAPDSS: add hdmi ops to hdmi-connector and tpd12s015
    OMAPDSS: add hdmi ops to hdmi_ops and omap_dss_driver
    OMAPDSS: HDMI: remove custom avi infoframe
    OMAPDSS: HDMI5: use common AVI infoframe support
    OMAPDSS: HDMI4: use common AVI infoframe support
    OMAPDSS: Kconfig: select HDMI
    OMAPDSS: HDMI: fix name conflict
    OMAPDSS: DISPC: clean up dispc_mgr_timings_ok
    OMAPDSS: DISPC: reject interlace for lcd out
    OMAPDSS: DISPC: fix debugfs reg dump
    ...

    Linus Torvalds
     
  • Pull ARM SoC driver changes from Olof Johansson:
    "A handful of driver-related changes. We've had a bunch of them going
    in through other branches as well, so it's only a part of what we
    really have this release.

    Larger pieces are:

    - Removal of a now unused PWM driver for atmel
    [ This includes AVR32 changes that have been appropriately acked ]
    - Performance counter support for the arm CCN interconnect
    - OMAP mailbox driver cleanups and consolidation
    - PCI and SATA PHY drivers for SPEAr 13xx platforms
    - Redefinition (with backwards compatibility!) of PCI DT bindings for
    Tegra to better model regulators/power"

    Note: this merge also fixes up the semantic conflict with the new
    calling convention for devm_phy_create(), see commit f0ed817638b5 ("phy:
    core: Let node ptr of PHY point to PHY and not of PHY provider") that
    came in through Greg's USB tree.

    Semantic merge patch by Stephen Rothwell through
    the next tree.

    * tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
    bus: arm-ccn: Fix error handling at event allocation
    mailbox/omap: add a parent structure for every IP instance
    mailbox/omap: remove the private mailbox structure
    mailbox/omap: consolidate OMAP mailbox driver
    mailbox/omap: simplify the fifo assignment by using macros
    mailbox/omap: remove omap_mbox_type_t from mailbox ops
    mailbox/omap: remove OMAP1 mailbox driver
    mailbox/omap: use devm_* interfaces
    bus: ARM CCN: add PERF_EVENTS dependency
    bus: ARM CCN PMU driver
    PCI: spear: Remove spear13xx_pcie_remove()
    PCI: spear: Fix Section mismatch compilation warning for probe()
    ARM: tegra: Remove legacy PCIe power supply properties
    PCI: tegra: Remove deprecated power supply properties
    PCI: tegra: Implement accurate power supply scheme
    ARM: SPEAr13xx: Update defconfigs
    ARM: SPEAr13xx: Add pcie and miphy DT nodes
    ARM: SPEAr13xx: Add bindings and dt node for misc block
    ARM: SPEAr13xx: Fix static mapping table
    phy: Add drivers for PCIe and SATA phy on SPEAr13xx
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups from Olof Johansson:
    "This merge window brings a good size of cleanups on various platforms.
    Among the bigger ones:

    - Removal of Samsung s5pc100 and s5p64xx platforms. Both of these
    have lacked active support for quite a while, and after asking
    around nobody showed interest in keeping them around. If needed,
    they could be resurrected in the future but it's more likely that
    we would prefer reintroduction of them as DT and
    multiplatform-enabled platforms instead.

    - OMAP4 controller code register define diet. They defined a lot of
    registers that were never actually used, etc.

    - Move of some of the Tegra platform code (PMC, APBIO, fuse,
    powergate) to drivers/soc so it can be shared with 64-bit code.
    This also converts them over to traditional driver models where
    possible.

    - Removal of legacy gpio-samsung driver, since the last users have
    been removed (moved to pinctrl)

    Plus a bunch of smaller changes for various platforms that sort of
    dissapear in the diffstat for the above. clps711x cleanups, shmobile
    header file refactoring/moves for multiplatform friendliness, some
    misc cleanups, etc"

    * tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (117 commits)
    drivers: CCI: Correct use of ! and &
    video: clcd-versatile: Depend on ARM
    video: fix up versatile CLCD helper move
    MAINTAINERS: Add sdhci-st file to ARCH/STI architecture
    ARM: EXYNOS: Fix build breakge with PM_SLEEP=n
    MAINTAINERS: Remove Kirkwood
    ARM: tegra: Convert PMC to a driver
    soc/tegra: fuse: Set up in early initcall
    ARM: tegra: Always lock the CPU reset vector
    ARM: tegra: Setup CPU hotplug in a pure initcall
    soc/tegra: Implement runtime check for Tegra SoCs
    soc/tegra: fuse: fix dummy functions
    soc/tegra: fuse: move APB DMA into Tegra20 fuse driver
    soc/tegra: Add efuse and apbmisc bindings
    soc/tegra: Add efuse driver for Tegra
    ARM: tegra: move fuse exports to soc/tegra/fuse.h
    ARM: tegra: export apb dma readl/writel
    ARM: tegra: Use a function to get the chip ID
    ARM: tegra: Sort includes alphabetically
    ARM: tegra: Move includes to include/soc/tegra
    ...

    Linus Torvalds
     

08 Aug, 2014

2 commits

  • After v3.16-rc1, devices populated with of_platform_populate() should be
    depopulated using of_platform_depopulate(). Failure to do so prevents
    the devices from being populated again (e.g. when loading a module).

    This patch fixes the problem for the OMAP DSI driver.

    Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     
  • Pull backlight changes from Lee Jones:
    Changes to existing drivers:
    - remove get brightness implementations in via-pmu-backlight
    samsung-q10 aat2870_bl ams369fg06 bd6107 gpio_backlight ld9040
    lp855x_bl lp8788_bl lv5207lp pandora_bl pwm_bl s6e63m0 tps65217_bl
    aty128fb atyfb_base radeon_backlight s6e8ax0 nv_backlight
    riva/fbdev
    - improve error handling in jornada720_lcd
    - make use of new 'get optional' GPIO command in pwm_bl
    - fix sparse warning in ipaq_micro_bl

    New drivers/supported devices:
    - new driver for iPAQ"

    * tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
    backlight: ipaq_micro: Fix sparse non static symbol warning
    backlight: Add driver for iPAQ micro backlight
    backlight: pwm-backlight: Use devm_gpiod_get_optional()
    backlight: jornada720: Minimise code duplication and handle errors better
    backlight: Show brightness even if get_brightness is not implemented
    backlight: Remove trivial get_brightness implementations

    Linus Torvalds
     

07 Aug, 2014

1 commit

  • Pull MIPS updates from Ralf Baechle:
    "This is the main pull request for 3.17. It contains:

    - misc Cavium Octeon, BCM47xx, BCM63xx and Alchemy updates
    - MIPS ptrace updates and cleanups
    - various fixes that will also go to -stable
    - a number of cleanups and small non-critical fixes.
    - NUMA support for the Loongson 3.
    - more support for MSA
    - support for MAAR
    - various FP enhancements and fixes"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (139 commits)
    MIPS: jz4740: remove unnecessary null test before debugfs_remove
    MIPS: Octeon: remove unnecessary null test before debugfs_remove_recursive
    MIPS: ZBOOT: implement stack protector in compressed boot phase
    MIPS: mipsreg: remove duplicate MIPS_CONF4_FTLBSETS_SHIFT
    MIPS: Bonito64: remove a duplicate define
    MIPS: Malta: initialise MAARs
    MIPS: Initialise MAARs
    MIPS: detect presence of MAARs
    MIPS: define MAAR register accessors & bits
    MIPS: mark MSA experimental
    MIPS: Don't build MSA support unless it can be used
    MIPS: consistently clear MSA flags when starting & copying threads
    MIPS: 16 byte align MSA vector context
    MIPS: disable preemption whilst initialising MSA
    MIPS: ensure MSA gets disabled during boot
    MIPS: fix read_msa_* & write_msa_* functions on non-MSA toolchains
    MIPS: fix MSA context for tasks which don't use FP first
    MIPS: init upper 64b of vector registers when MSA is first used
    MIPS: save/disable MSA in lose_fpu
    MIPS: preserve scalar FP CSR when switching vector context
    ...

    Linus Torvalds
     

06 Aug, 2014

1 commit


05 Aug, 2014

1 commit

  • Pull PCI updates from Bjorn Helgaas:
    "I'll be on vacation until Aug 11, and I suspect the merge window will
    open before then, so I'm sending this to you early. There are more
    things I'd like to get into v3.17, so I hope to send another pull
    request soon after I return.

    The most notable pieces here are:

    - Support BARs up to 128GB (up from 8GB)
    - Fix SR-IOV resource assignment when we fail to expand a resource
    - Rework pciehp to handle a common hardware erratum
    - Cleanup MSI
    - Fix NIC renaming issue
    - Fix VGA default device issue on EFI systems
    - Fix ASPM configuration (previously we didn't enable it as expected)

    Alex Williamson has graciously agreed to take care of any major issues
    with this if you take it before I return.

    Details:

    Resource management
    - Support BAR sizes up to 128GB (Yinghai Lu)
    - Keep original resource if we fail to expand it (Guo Chao)
    - Return conventional error values from pci_revert_fw_address() (Bjorn Helgaas)
    - Tidy resource assignment messages (Bjorn Helgaas)
    - Don't exclude low BIOS area for non-PCI cards (Christoph Schulz)

    PCI device hotplug
    - Prevent NULL dereference during pciehp probe (Andreas Noever)
    - Make pciehp pcie_wait_cmd() self-contained (Bjorn Helgaas)
    - Wait for pciehp hotplug command completion lazily (Bjorn Helgaas)
    - Compute pciehp timeout from hotplug command start time (Bjorn Helgaas)
    - Remove pciehp assumptions about which commands cause completion events (Bjorn Helgaas)
    - Clear pciehp Data Link Layer State Changed during init (Myron Stowe)
    - Remove pciehp struct controller.no_cmd_complete (Rajat Jain)
    - Remove cpqphp unnecessary null test (Fabian Frederick)
    - Remove "invalid IRQ" warning for hot-added PCIe ports (Jiang Liu)

    IOMMU
    - Add DMA alias quirk for Intel 82801 bridge (Alex Williamson)

    MSI
    - Add internal msix_clear_and_set_ctrl() (Yijing Wang)
    - Remove unused msi_enabled_mask() (Yijing Wang)
    - Cache Multiple Message Capable in struct msi_desc (Yijing Wang)
    - Add msi_setup_entry() to clean up initialization (Yijing Wang)
    - Remove unused msi_remove_pci_irq_vectors() (Yijing Wang)
    - Retrieve first MSI IRQ from msi_desc rather than pci_dev (Yijing Wang)
    - Remove unused list access in __pci_restore_msix_state() (Yijing Wang)
    - Use irq_get_msi_desc() to simplify code (Yijing Wang)

    Generic host bridge driver
    - Fix GPL v2 license string typo (Bjorn Helgaas)

    Marvell MVEBU
    - Fix GPL v2 license string typo (Thierry Reding)

    NVIDIA Tegra
    - Use correct initial HW settings (Phil Edworthy)
    - Remove rcar_pcie_setup_window() resource argument (Phil Edworthy)
    - Fix GPL v2 license string typo (Thierry Reding)

    Renesas R-Car
    - Remove redundant config accessor register checks (Sergei Shtylyov)
    - Fix GPL v2 license string typo (Bjorn Helgaas)

    Virtualization
    - Factor secondary bus reset logic (Gavin Shan)
    - Remove duplicate powerpc reset logic (Gavin Shan)

    Miscellaneous
    - Rework default VGA detection for EFI (Bruno Prémont)
    - Fix sysfs "acpi_index" and "label" errors for NIC renaming (Simone Gotti)
    - Configure ASPM at pci_enable_device()-time (Vidya Sagar)
    - Add include/linux/pci_ids.h include guard (Rasmus Villemoes)"

    * tag 'pci-v3.17-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (38 commits)
    PCI/MSI: Use irq_get_msi_desc() to simplify code
    PCI/MSI: Remove unused list access in __pci_restore_msix_state()
    PCI/MSI: Retrieve first MSI IRQ from msi_desc rather than pci_dev
    PCI/MSI: Remove unused function msi_remove_pci_irq_vectors()
    PCI/MSI: Add msi_setup_entry() to clean up MSI initialization
    PCI: Configure ASPM when enabling device
    x86: don't exclude low BIOS area when allocating address space for non-PCI cards
    PCI: generic: Fix GPL v2 license string typo
    PCI: rcar: Fix GPL v2 license string typo
    PCI: tegra: Fix GPL v2 license string typo
    PCI: mvebu: Fix GPL v2 license string typo
    PCI: Add include guard to include/linux/pci_ids.h
    x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup()
    PCI: Tidy resource assignment messages
    PCI: Return conventional error values from pci_revert_fw_address()
    PCI: Cleanup control flow
    PCI: Support BAR sizes up to 128GB
    PCI: cpqphp: Remove unnecessary null test before debugfs_remove()
    PCI: pciehp: Clear Data Link Layer State Changed during init
    PCI: Add bridge DMA alias quirk for Intel 82801 bridge
    ...

    Linus Torvalds
     

04 Aug, 2014

3 commits

  • Tomi Valkeinen
     
  • Currently the VSC has no chance to notify the VSP of the dirty rectangle on VM
    panic because the notification work is done in a workqueue, and in panic() the
    kernel typically ends up in an infinite loop, and a typical kernel config has
    CONFIG_PREEMPT_VOLUNTARY=y and CONFIG_PREEMPT is not set, so a context switch
    can't happen in panic() and the workqueue won't have a chance to run. As a
    result, the VM Connection window can't refresh until it's closed and we
    re-connect to the VM.

    We can register a handler on panic_notifier_list: the handler can notify
    the VSC and switch the framebuffer driver to a "synchronous mode", meaning
    the VSC flushes any future framebuffer change to the VSP immediately.

    v2: removed the MS-TFS line in the commit message
    v3: remove some 'unlikely' markings
    v4: avoid global variables as Tomi Valkeinen suggested

    Cc: Haiyang Zhang
    Signed-off-by: Dexuan Cui
    Signed-off-by: Tomi Valkeinen

    Dexuan Cui
     
  • This patch fixes the following error when !CONFIG_OF:

    drivers/video/fbdev/amba-clcd.c:800:54: warning: ‘struct amba_dev’ declared inside parameter list [enabled by default]
    static struct clcd_board *clcdfb_of_get_board(struct amba_dev *dev)
    ^
    and adds a missing Kconfig select causing this
    when CONFIG_OF && !CONFIG_FB_MODE_HELPERS:

    drivers/video/fbdev/amba-clcd.c:567: undefined reference to `fb_videomode_from_videomode'

    Reported-by: Fengguang Wu
    Signed-off-by: Pawel Moll
    Signed-off-by: Tomi Valkeinen

    Pawel Moll
     

31 Jul, 2014

1 commit


30 Jul, 2014

5 commits


29 Jul, 2014

1 commit


28 Jul, 2014

1 commit

  • The Versatile CLCD helpers call dma_alloc_writecombine() which is only
    available on ARM and AVR32, meaning they won't build on other platforms
    including arm64. Unfortunately the current Kconfig enables the symbol
    by default if ARCH_VEXPRESS is defined which means that it is enabled on
    arm64 when building for the ARM reference platforms and models for ARMv8
    since they have many hardware similarities with their pre-ARMv8 systems.

    Since all the systems that need the helpers are ARM systems fix this by
    adding a dependency on ARM.

    Signed-off-by: Mark Brown
    Signed-off-by: Arnd Bergmann

    Mark Brown
     

25 Jul, 2014

1 commit


23 Jul, 2014

1 commit

  • commit 11c32d7b6274cb0f ("video: move Versatile CLCD helpers")
    moved files out of the plat-versatile directory but in the process
    got a few of the dependencies wrong:

    - If CONFIG_FB is not set, the file no longer gets built, resulting
    in a link error
    - If CONFIG_FB or CONFIG_FB_ARMCLCD are disabled, we also get a
    Kconfig warning for incorrect dependencies due to the symbol
    being 'select'ed from the platform Kconfig.
    - When the file is not built, we also get a link error for missing
    symbols.

    This patch should fix all three, by removing the 'select' statements,
    changing the Kconfig description of the symbol to be enabled in
    exactly the right configurations, and adding inline stub functions
    for the case when the framebuffer driver is disabled.

    Signed-off-by: Arnd Bergmann
    Reviewed-by: Linus Walleij

    Arnd Bergmann
     

18 Jul, 2014

2 commits


13 Jul, 2014

4 commits

  • …git/linusw/linux-stericsson into next/cleanup

    Merge "Ux500 core changes for v3.17 take 1" from Linus Walleij:

    Some minor cleanups to the Ux500 core. DT-only probe path and
    some constification from static code analysis.

    * tag 'ux500-core-for-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
    ARM: ux500: remove pointless cache setup complexity
    ARM: ux500: storage class should be before const qualifier
    ARM: ux500: Staticize ab8505_regulators
    ARM: ux500: Staticize local symbols in cpu-db8500.c
    ARM: ux500: Staticise ux500_soc_attr
    + Linux 3.16-rc4

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …e/linux-samsung into next/cleanup

    Merge "Samsung cleanup 2nd version for S5P SoCs for 3.17" from Kukjin Kim:

    Cleanup S5P SoCs for 3.17
    - removing s5p64x0 SoCs and s5pc100 SoC in mainline because
    no more user and if it is required next time, it will be
    supported with DT.

    * tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes
    mtd: onenand: remove s5pc100 related onenand codes
    spi: s3c64xx: remove s5pc100 related spi codes
    gpio: samsung: remov s5pc100 related gpio codes
    ARM: S5PC100: no more support S5PC100 SoC
    video: fbdev: s3c-fb: remove s5p64x0 related fimd codes
    spi: s3c64xx: remove s5p64x0 related spi codes
    gpio: samsung: remove s5p64x0 related gpio codes
    ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • This patch removes fimd and fb codes for s5pc100 SoC.

    Acked-by: Jingoo Han
    Cc: Tomi Valkeinen
    Signed-off-by: Kukjin Kim

    Kukjin Kim
     
  • This patch removes fimd codes for s5p6440 and s5p6450 SoCs.

    Acked-by: Jingoo Han
    Acked-by: Tomi Valkeinen
    Signed-off-by: Kukjin Kim

    Kukjin Kim
     

11 Jul, 2014

1 commit

  • Commit b4aa0163056b ("efifb: Implement vga_default_device() (v2)") added
    efifb vga_default_device() so EFI systems that do not load shadow VBIOS or
    setup VGA get proper value for boot_vga PCI sysfs attribute on the
    corresponding PCI device.

    Xorg doesn't detect devices when boot_vga=0, e.g., on some EFI systems such
    as MacBookAir2,1. Xorg detects the GPU and finds the DRI device but then
    bails out with "no devices detected".

    Note: When vga_default_device() is set boot_vga PCI sysfs attribute
    reflects its state. When unset this attribute is 1 whenever
    IORESOURCE_ROM_SHADOW flag is set.

    With introduction of sysfb/simplefb/simpledrm efifb is getting obsolete
    while having native drivers for the GPU also makes selecting sysfb/efifb
    optional.

    Remove the efifb implementation of vga_default_device() and initialize
    vgaarb's vga_default_device() with the PCI GPU that matches boot
    screen_info in pci_fixup_video().

    [bhelgaas: remove unused "dev" in efifb_setup()]
    Fixes: b4aa0163056b ("efifb: Implement vga_default_device() (v2)")
    Tested-by: Anibal Francisco Martinez Cortina
    Signed-off-by: Bruno Prémont
    Signed-off-by: Bjorn Helgaas
    Acked-by: Matthew Garrett
    CC: stable@vger.kernel.org # v3.5+

    Bruno Prémont
     

09 Jul, 2014

1 commit

  • The atmel-pwm-bl driver is now obsolete. It is not used by any mainlined boards
    and is replaced by the generic pwm_bl with the pawm-atmel driver using the
    generic PWM framework.

    Signed-off-by: Alexandre Belloni
    Acked-by: Hans-Christian Egtvedt
    Acked-by: Jingoo Han
    Signed-off-by: Nicolas Ferre

    Alexandre Belloni
     

04 Jul, 2014

9 commits