linux-toradex.git/arch/m68k/include, branch v4.19

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2018-08-19T23:23:03+00:00

Pull m68knommu updates from Greg Ungerer:
 "Only two changes.

  One cleans up warnings in the ColdFire DMA code, the other stubs out
  (with warnings) ColdFire clock api functions not normally used"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: Fix typos in Coldfire 5272 DMA debug code
  m68k: coldfire: Normalize clk API

Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2018-08-13T19:23:39+00:00

Pull locking/atomics update from Thomas Gleixner:
 "The locking, atomics and memory model brains delivered:

   - A larger update to the atomics code which reworks the ordering
     barriers, consolidates the atomic primitives, provides the new
     atomic64_fetch_add_unless() primitive and cleans up the include
     hell.

   - Simplify cmpxchg() instrumentation and add instrumentation for
     xchg() and cmpxchg_double().

   - Updates to the memory model and documentation"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (48 commits)
  locking/atomics: Rework ordering barriers
  locking/atomics: Instrument cmpxchg_double*()
  locking/atomics: Instrument xchg()
  locking/atomics: Simplify cmpxchg() instrumentation
  locking/atomics/x86: Reduce arch_cmpxchg64*() instrumentation
  tools/memory-model: Rename litmus tests to comply to norm7
  tools/memory-model/Documentation: Fix typo, smb->smp
  sched/Documentation: Update wake_up() & co. memory-barrier guarantees
  locking/spinlock, sched/core: Clarify requirements for smp_mb__after_spinlock()
  sched/core: Use smp_mb() in wake_woken_function()
  tools/memory-model: Add informal LKMM documentation to MAINTAINERS
  locking/atomics/Documentation: Describe atomic_set() as a write operation
  tools/memory-model: Make scripts executable
  tools/memory-model: Remove ACCESS_ONCE() from model
  tools/memory-model: Remove ACCESS_ONCE() from recipes
  locking/memory-barriers.txt/kokr: Update Korean translation to fix broken DMA vs. MMIO ordering example
  MAINTAINERS: Add Daniel Lustig as an LKMM reviewer
  tools/memory-model: Fix ISA2+pooncelock+pooncelock+pombonce name
  tools/memory-model: Add litmus test for full multicopy atomicity
  locking/refcount: Always allow checked forms
  ...

m68knommu: Fix typos in Coldfire 5272 DMA debug code

2018-07-29T23:15:01+00:00

If DEBUG_DMA is defined:

    include/asm/dma.h: In function ‘set_dma_mode’:
    include/asm/dma.h:393: error: ‘dmabp’ undeclared (first use in this function)
    include/asm/dma.h:393: error: (Each undeclared identifier is reported only once
    include/asm/dma.h:393: error: for each function it appears in.)
    include/asm/dma.h: In function ‘set_dma_addr’:
    include/asm/dma.h:424: error: ‘dmawp’ undeclared (first use in this function)

Reported-by: kbuild test robot 
Signed-off-by: Geert Uytterhoeven 
Signed-off-by: Greg Ungerer

m68k/page_no.h: force __va argument to be unsigned long

2018-07-29T08:48:18+00:00

Add explicit casting to unsigned long to the __va() parameter

Signed-off-by: Mike Rapoport 
Acked-by: Greg Ungerer 
Signed-off-by: Geert Uytterhoeven

m68k/bitops: convert __ffs to match generic declaration

2018-07-29T08:48:18+00:00

The generic bitops declare __ffs as

	static inline unsigned long __ffs(unsigned long word);

Convert the m68k version to match the generic declaration.

Signed-off-by: Mike Rapoport 
Acked-by: Greg Ungerer 
Signed-off-by: Geert Uytterhoeven

m68k/io: Switch mmu variant to

2018-07-29T08:48:18+00:00

The dummy functions defined in  can be provided by
.

As nommu already uses , move its inclusion to
, and add/adjust include guards where appropriate.

This gets rid of lots of "statement with no effect" and "unused
variable" warnings when compile-testing.

Signed-off-by: Geert Uytterhoeven 
Acked-by: Greg Ungerer

m68k/io: Move mem*io define guards to

2018-07-29T08:48:18+00:00

The mem*io define guards are applicable to all users of .
Hence move them, and drop the #ifdef.

Signed-off-by: Geert Uytterhoeven 
Acked-by: Greg Ungerer

m68k/io: Add missing ioremap define guards, fix typo

2018-07-29T08:48:18+00:00

  - Add missing define guard for ioremap_wt(),
  - Move ARCH_HAS_IOREMAP_WT from  to , as it
    is applicable to Coldfire with MMU, too,
  - Fix typo s/ioremap_fillcache/ioremap_fullcache/,
  - Add define guard for iounmap() for consistency with other
    architectures.

Fixes: 9746882f547d2f00 ("m68k: group io mapping definitions and functions")
Signed-off-by: Geert Uytterhoeven 
Acked-by: Greg Ungerer

m68k: Remove unused set_clock_mmss() helpers

2018-07-29T08:48:18+00:00

Commit 397ac99c6cef ("m68k: remove dead timer code") removed set_rtc_mmss()
because it was unused in 2012. However, this was itself the only user of the
mach_set_clock_mmss() callback and the many implementations of that callback,
which are equally unused.

This removes all of those as well.

Signed-off-by: Arnd Bergmann 
Acked-by: Greg Ungerer 
Signed-off-by: Geert Uytterhoeven

m68k: Use generic dma_noncoherent_ops

2018-07-23T13:07:12+00:00

Switch to the generic noncoherent direct mapping implementation.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Greg Ungerer 
Tested-by: Greg Ungerer 
Signed-off-by: Geert Uytterhoeven