Eric Lee / smarc-fsl-linux-kernel

01 Oct, 2011

1 commit

  • f72a209a3   Merge branches 'irq-urgent-for-linus', 'x86-urgent-for-linus' and 'sched-urgent-… ... Browse Code »

    …for-linus' of git://tesla.tglx.de/git/linux-2.6-tip

    * 'irq-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
    irq: Fix check for already initialized irq_domain in irq_domain_add
    irq: Add declaration of irq_domain_simple_ops to irqdomain.h

    * 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
    x86/rtc: Don't recursively acquire rtc_lock

    * 'sched-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
    posix-cpu-timers: Cure SMP wobbles
    sched: Fix up wchan borkage
    sched/rt: Migrate equal priority tasks to available CPUs

    Linus Torvalds
     

30 Sep, 2011

4 commits

  • 0ecdb12a7   Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 ... Browse Code »

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
    [S390] cio: fix cio_tpi ignoring adapter interrupts
    [S390] gmap: always up mmap_sem properly
    [S390] Do not clobber personality flags on exec

    Linus Torvalds
     
  • 5fe858b5b   Merge git://github.com/davem330/sparc ... Browse Code »

    * git://github.com/davem330/sparc:
    sparc64: Force the execute bit in OpenFirmware's translation entries.
    sparc: Make '-p' boot option meaningful again.
    sparc, exec: remove redundant addr_limit assignment
    sparc64: Future proof Niagara cpu detection.

    Linus Torvalds
     
  • 16fa42aff   powerpc: Fix device-tree matching for Apple U4 bridge ... Browse Code »

    Apple Quad G5 has some oddity in it's device-tree which causes the new
    generic matching code to fail to relate nodes for PCI-E devices below U4
    with their respective struct pci_dev. This breaks graphics on those
    machines among others.

    This fixes it using a quirk which copies the node pointer from the host
    bridge for the root complex, which makes the generic code work for the
    children afterward.

    Signed-off-by: Benjamin Herrenschmidt
    Signed-off-by: Linus Torvalds

    Benjamin Herrenschmidt
     
  • f4142cba4   sparc64: Force the execute bit in OpenFirmware's translation entries. ... Browse Code »

    In the OF 'translations' property, the template TTEs in the mappings
    never specify the executable bit. This is the case even though some
    of these mappings are for OF's code segment.

    Therefore, we need to force the execute bit on in every mapping.

    This problem can only really trigger on Niagara/sun4v machines and the
    history behind this is a little complicated.

    Previous to sun4v, the sun4u TTE entries lacked a hardware execute
    permission bit. So OF didn't have to ever worry about setting
    anything to handle executable pages. Any valid TTE loaded into the
    I-TLB would be respected by the chip.

    But sun4v Niagara chips have a real hardware enforced executable bit
    in their TTEs. So it has to be set or else the I-TLB throws an
    instruction access exception with type code 6 (protection violation).

    We've been extremely fortunate to not get bitten by this in the past.

    The best I can tell is that the OF's mappings for it's executable code
    were mapped using permanent locked mappings on sun4v in the past.
    Therefore, the fact that we didn't have the exec bit set in the OF
    translations we would use did not matter in practice.

    Thanks to Greg Onufer for helping me track this down.

    Signed-off-by: David S. Miller

    David S. Miller
     

27 Sep, 2011

5 commits

26 Sep, 2011

8 commits

23 Sep, 2011

1 commit

22 Sep, 2011

1 commit

  • 11032c17b   sparc: Make '-p' boot option meaningful again. ... Browse Code »

    If "-p" is given on the command line, clear the CON_BOOT
    flag for the initial early boot PROM console.

    This is necessary to try and see crash messages that occur
    between the registry of the VT console and the probing of
    the first framebuffer or serial console. During this time
    no console messages are emitted because the VT console
    registry (even if no backend is registered to it) removes
    the early console if CON_BOOT is set.

    Signed-off-by: David S. Miller

    David S. Miller
     

21 Sep, 2011

6 commits

  • 47997d756   x86/rtc: Don't recursively acquire rtc_lock ... Browse Code »

    A deadlock was introduced on x86 in commit ef68c8f87ed1 ("x86:
    Serialize EFI time accesses on rtc_lock") because efi_get_time()
    and friends can be called with rtc_lock already held by
    read_persistent_time(), e.g.:

    timekeeping_init()
    read_persistent_clock()

    To fix this let's push the locking down into the get_wallclock()
    and set_wallclock() implementations. Only the clock
    implementations that access the x86 RTC directly need to acquire
    rtc_lock, so it makes sense to push the locking down into the
    rtc, vrtc and efi code.

    The virtualization implementations don't require rtc_lock to be
    held because they provide their own serialization.

    Signed-off-by: Matt Fleming
    Acked-by: Jan Beulich
    Acked-by: Avi Kivity [for the virtualization aspect]
    Cc: "H. Peter Anvin"
    Cc: Zhang Rui
    Cc: Josh Boyer
    Signed-off-by: Andrew Morton
    Signed-off-by: Thomas Gleixner
    Signed-off-by: Ingo Molnar

    Matt Fleming
     
  • ddd53bf11   sparc, exec: remove redundant addr_limit assignment ... Browse Code »

    The address limit is already set in flush_old_exec() so this assignment of
    USER_DS is redundant.

    Signed-off-by: Mathias Krause
    Cc: David Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    Mathias Krause
     
  • 6760b1096   ARM: fix vmlinux.lds.S discarding sections ... Browse Code »

    We are seeing linker errors caused by sections being discarded, despite
    the linker script trying to keep them. The result is (eg):

    `.exit.text' referenced in section `.alt.smp.init' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o
    `.exit.text' referenced in section `.alt.smp.init' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o

    This is the relevent part of the linker script (reformatted to make it
    clearer):
    | SECTIONS
    | {
    | /*
    | * unwind exit sections must be discarded before the rest of the
    | * unwind sections get included.
    | */
    | /DISCARD/ : {
    | *(.ARM.exidx.exit.text)
    | *(.ARM.extab.exit.text)
    | }
    | ...
    | .exit.text : {
    | *(.exit.text)
    | *(.memexit.text)
    | }
    | ...
    | /DISCARD/ : {
    | *(.exit.text)
    | *(.memexit.text)
    | *(.exit.data)
    | *(.memexit.data)
    | *(.memexit.rodata)
    | *(.exitcall.exit)
    | *(.discard)
    | *(.discard.*)
    | }
    | }

    Now, this is what the linker manual says about discarded output sections:

    | The special output section name `/DISCARD/' may be used to discard
    | input sections. Any input sections which are assigned to an output
    | section named `/DISCARD/' are not included in the output file.

    No questions, no exceptions. It doesn't say "unless they are listed
    before the /DISCARD/ section." Now, this is what asn-generic/vmlinux.lds.S
    says:
    | /*
    | * Default discarded sections.
    | *
    | * Some archs want to discard exit text/data at runtime rather than
    | * link time due to cross-section references such as alt instructions,
    | * bug table, eh_frame, etc. DISCARDS must be the last of output
    | * section definitions so that such archs put those in earlier section
    | * definitions.
    | */

    And guess what - the list _always_ includes .exit.text etc.

    Now, what's actually happening is that the linker is reading the script,
    and it finds the first /DISCARD/ output section at the beginning of the
    script. It continues reading the script, and finds the 'DISCARD' macro
    at the end, which having been postprocessed results in another
    /DISCARD/ output section. As the linker already contains the earlier
    /DISCARD/ output section, it adds it to that existing section, so it
    effectively is placed at the start. This can be seen by using the -M
    option to ld:

    | Linker script and memory map
    |
    | 0xc037c080 jiffies = jiffies_64
    |
    | /DISCARD/
    | *(.ARM.exidx.exit.text)
    | *(.ARM.extab.exit.text)
    | *(.exit.text)
    | *(.memexit.text)
    | *(.exit.data)
    | *(.memexit.data)
    | *(.memexit.rodata)
    | *(.exitcall.exit)
    | *(.discard)
    | *(.discard.*)
    |
    | 0xc0008000 . = 0xc0008000
    |
    | .head.text 0xc0008000 0x1d0
    | 0xc0008000 _text = .
    | *(.head.text)
    | .head.text 0xc0008000 0x1d0 arch/arm/kernel/head.o
    | 0xc0008000 stext
    |
    | .text 0xc0008200 0x2d78d0
    | 0xc0008200 _stext = .
    | 0xc0008200 __exception_text_start = .
    | *(.exception.text)
    | .exception.text
    | ...

    As you can see, all the discarded sections are grouped together - and
    as a result of it being the first output section, they all appear before
    any other section.

    The result is that not only is the unwind information discarded (as
    intended), but also the .exit.text, despite us wanting to have the
    .exit.text preserved.

    We can't move the unwind information elsewhere, because it'll then be
    included even when we do actually discard the .exit.text (and similar)
    sections.

    So, work around this by avoiding the generic DISCARDS macro, and instead
    conditionalize the sections to be discarded ourselves. This avoids the
    ambiguity in how the linker assigns input sections to output sections,
    making our script less dependent on undocumented linker behaviour.

    Reported-by: Rob Herring
    Tested-by: Mark Brown
    Signed-off-by: Russell King

    Russell King
     
  • 38867a28a   Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
    mach-integrator: fix VGA base regression
    arm/dt: Tegra: Update SDHCI nodes to match bindings
    ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines
    ARM: SAMSUNG: fix to prevent declaring duplicated
    ARM: SAMSUNG: fix watchdog reset issue with clk_get()
    ARM: S3C64XX: Remove un-used code backlight code on SMDK6410
    ARM: EXYNOS4: restart clocksource while system resumes
    ARM: EXYNOS4: Fix routing timer interrupt to offline CPU
    ARM: EXYNOS4: Fix return type of local_timer_setup()
    ARM: EXYNOS4: Fix wrong pll type for vpll
    ARM: Dove: fix second SPI initialization call

    Linus Torvalds
     
  • b71d8429e   mach-integrator: fix VGA base regression ... Browse Code »

    The changes introduced in commit
    cc22b4c18540e5e8bf55c7d124044f9317527d3c
    "ARM: set vga memory base at run-time"

    Makes the Integrator/AP freeze completely. I appears that
    this is due to the VGA base address being assigned at PCI
    init time, while this base is needed earlier than that.
    Moving the initialization of the base address to the
    .map_io function solves this problem.

    Cc: Rob Herring
    Cc: Nicolas Pitre
    Cc: Arnd Bergmann
    Signed-off-by: Linus Walleij
    Acked-by: Rob Herring
    Signed-off-by: Arnd Bergmann

    Linus Walleij
     
  • a0638eb6a   arm/dt: Tegra: Update SDHCI nodes to match bindings ... Browse Code »

    The bindings were recently updated to have separate properties for each
    type of GPIO. Update the Device Tree source to match that.

    Signed-off-by: Stephen Warren
    Acked-by: Olof Johansson
    Signed-off-by: Arnd Bergmann

    Stephen Warren
     

20 Sep, 2011

2 commits

  • b6cf8788a   [S390] kvm: extension capability for new address space layout ... Browse Code »

    598841ca9919d008b520114d8a4378c4ce4e40a1 ([S390] use gmap address
    spaces for kvm guest images) changed kvm on s390 to use a separate
    address space for kvm guests. We can now put KVM guests anywhere
    in the user address mode with a size up to 8PB - as long as the
    memory is 1MB-aligned. This change was done without KVM extension
    capability bit.
    The change was added after 3.0, but we still have a chance to add
    a feature bit before 3.1 (keeping the releases in a sane state).
    We use number 71 to avoid collisions with other pending kvm patches
    as requested by Alexander Graf.

    Signed-off-by: Christian Borntraeger
    Acked-by: Avi Kivity
    Cc: Alexander Graf
    Signed-off-by: Heiko Carstens

    Christian Borntraeger
     
  • 480e5926c   [S390] kvm: fix address mode switching ... Browse Code »

    598841ca9919d008b520114d8a4378c4ce4e40a1 ([S390] use gmap address
    spaces for kvm guest images) changed kvm to use a separate address
    space for kvm guests. This address space was switched in __vcpu_run
    In some cases (preemption, page fault) there is the possibility that
    this address space switch is lost.
    The typical symptom was a huge amount of validity intercepts or
    random guest addressing exceptions.
    Fix this by doing the switch in sie_loop and sie_exit and saving the
    address space in the gmap structure itself. Also use the preempt
    notifier.

    Signed-off-by: Christian Borntraeger
    Acked-by: Avi Kivity
    Signed-off-by: Heiko Carstens

    Christian Borntraeger
     

17 Sep, 2011

4 commits

  • 4dfa33868   ARM: nommu: fix warning with checksyscalls.sh ... Browse Code »

    CALL scripts/checksyscalls.sh
    :46:1: warning: "__IGNORE_migrate_pages" redefined
    In file included from :2:
    arch/arm/include/asm/unistd.h:482:1: warning: this is the location of the previous definition

    This is caused because we define __IGNORE_migrate_pages to be 1, but
    in the case of nommu, it's defined to be empty. Fix this by just
    defining the __IGNORE_ symbols to be empty.

    Signed-off-by: Russell King

    Russell King
     
  • f630c1bdf   ARM: 7091/1: errata: D-cache line maintenance operation by MVA may not succeed ... Browse Code »
    1

    This patch implements a workaround for erratum 764369 affecting
    Cortex-A9 MPCore with two or more processors (all current revisions).
    Under certain timing circumstances, a data cache line maintenance
    operation by MVA targeting an Inner Shareable memory region may fail to
    proceed up to either the Point of Coherency or to the Point of
    Unification of the system. This workaround adds a DSB instruction before
    the relevant cache maintenance functions and sets a specific bit in the
    diagnostic control register of the SCU.

    Cc:
    Signed-off-by: Will Deacon
    Signed-off-by: Catalin Marinas
    Tested-by: Mark Rutland
    Signed-off-by: Russell King

    Will Deacon
     
  • 08cefa9fa   sparc64: Future proof Niagara cpu detection. ... Browse Code »

    Recognize T4 and T5 chips. Treating them both as "T2 plus other
    stuff" should be extremely safe and make sure distributions will work
    when those chips actually ship to customers.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • abbe0d3c2   Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen ... Browse Code »

    * 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen:
    xen/i386: follow-up to "replace order-based range checking of M2P table by linear one"
    xen/irq: Alter the locking to use a mutex instead of a spinlock.
    xen/e820: if there is no dom0_mem=, don't tweak extra_pages.
    xen: disable PV spinlocks on HVM

    Linus Torvalds
     

16 Sep, 2011

1 commit

  • a7f934d4f   asm alternatives: remove incorrect alignment notes ... Browse Code »

    On x86-64, they were just wasteful: with the explicitly added (now
    unnecessary) padding, the size of the alternatives structure was 16
    bytes, and an alignment of 8 bytes didn't hurt much.

    However, it was still silly, since the natural size and alignment for
    the structure is actually just 12 bytes, 4-byte aligned since commit
    59e97e4d6fbc ("x86: Make alternative instruction pointers relative").
    So removing the padding, and removing the extra alignment is just a good
    idea.

    On x86-32, the alignment of 4 bytes was correct, but was incorrectly
    hardcoded as 8 bytes in . That header file had
    used to be an x86-64 only header file, but various unification efforts
    have made it be used for x86-32 too (ie the unification of rwlock and
    rwsem).

    That in turn caused x86-32 boot failures, because the extra alignment
    would result in random zero-filled words in the altinstructions section,
    causing oopses early at boot when doing alternative instruction
    replacement.

    So just remove all the alignment noise entirely. It's wrong, and it's
    unnecessary. The section itself is already properly aligned by the
    linker scripts, and all additions to the section had better be of the
    proper 12-byte format, keeping it aligned. So if the align directive
    were to ever make a difference, that would be an indication of a serious
    bug to begin with.

    Reported-by: Werner Landgraf
    Acked-by: Andrew Lutomirski
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

15 Sep, 2011

7 commits