Commit 79caa6c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull asm-generic updates from Arnd Bergmann:
 "These are a number of unrelated cleanups, generally simplifying the
  architecture specific header files:

   - A series from Al Viro simplifies asm/vga.h, after it turns out that
     most of it can be generalized.

   - A series from Julian Vetter adds a common version of
     memcpy_{to,from}io() and memset_io() and changes most architectures
     to use that instead of their own implementation

   - A series from Niklas Schnelle concludes his work to make PC style
     inb()/outb() optional

   - Nicolas Pitre contributes improvements for the generic do_div()
     helper

   - Christoph Hellwig adds a generic version of page_to_phys() and
     phys_to_page(), replacing the slightly different architecture
     specific definitions.

   - Uwe Kleine-Koenig has a minor cleanup for ioctl definitions"

* tag 'asm-generic-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (24 commits)
  empty include/asm-generic/vga.h
  sparc: get rid of asm/vga.h
  asm/vga.h: don't bother with scr_mem{cpy,move}v() unless we need to
  vt_buffer.h: get rid of dead code in default scr_...() instances
  tty: serial: export serial_8250_warn_need_ioport
  lib/iomem_copy: fix kerneldoc format style
  hexagon: simplify asm/io.h for !HAS_IOPORT
  loongarch: Use new fallback IO memcpy/memset
  csky: Use new fallback IO memcpy/memset
  arm64: Use new fallback IO memcpy/memset
  New implementation for IO memcpy and IO memset
  watchdog: Add HAS_IOPORT dependency for SBC8360 and SBC7240
  __arch_xprod64(): make __always_inline when optimizing for performance
  ARM: div64: improve __arch_xprod_64()
  asm-generic/div64: optimize/simplify __div64_const32()
  lib/math/test_div64: add some edge cases relevant to __div64_const32()
  asm-generic: add an optional pfn_valid check to page_to_phys
  asm-generic: provide generic page_to_phys and phys_to_page implementations
  asm-generic/io.h: Remove I/O port accessors for HAS_IOPORT=n
  tty: serial: handle HAS_IOPORT dependencies
  ...
parents c66fbc6c 0af8e323

arch/alpha/include/asm/io.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static inline void * phys_to_virt(unsigned long address) 


#define virt_to_phys		virt_to_phys

#define phys_to_virt		phys_to_virt

#define page_to_phys(page)	page_to_pa(page)



/* Maximum PIO space address supported?  */

#define IO_SPACE_LIMIT 0xffff

arch/arc/include/asm/io.h

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ static inline void ioport_unmap(void __iomem *addr) 
#define iowrite16be(v,p)	({ __iowmb(); __raw_writew((__force u16)cpu_to_be16(v), p); })

#define iowrite32be(v,p)	({ __iowmb(); __raw_writel((__force u32)cpu_to_be32(v), p); })



/* Change struct page to physical address */

#define page_to_phys(page)		(page_to_pfn(page) << PAGE_SHIFT)



#define __raw_readb __raw_readb

static inline u8 __raw_readb(const volatile void __iomem *addr)

{

arch/arm/include/asm/div64.h

+10 −3
Original line number Diff line number Diff line
@@ -52,10 +52,17 @@ static inline uint32_t __div64_32(uint64_t *n, uint32_t base) 


#else



static inline uint64_t __arch_xprod_64(uint64_t m, uint64_t n, bool bias)

#ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE

static __always_inline

#else

static inline

#endif

uint64_t __arch_xprod_64(uint64_t m, uint64_t n, bool bias)

{

	unsigned long long res;

	register unsigned int tmp asm("ip") = 0;

	bool no_ovf = __builtin_constant_p(m) &&

		      ((m >> 32) + (m & 0xffffffff) < 0x100000000);



	if (!bias) {

		asm (	"umull	%Q0, %R0, %Q1, %Q2\n\t"
@@ -63,7 +70,7 @@ static inline uint64_t __arch_xprod_64(uint64_t m, uint64_t n, bool bias) 
			: "=&r" (res)

			: "r" (m), "r" (n)

			: "cc");

	} else if (!(m & ((1ULL << 63) | (1ULL << 31)))) {

	} else if (no_ovf) {

		res = m;

		asm (	"umlal	%Q0, %R0, %Q1, %Q2\n\t"

			"mov	%Q0, #0"
@@ -80,7 +87,7 @@ static inline uint64_t __arch_xprod_64(uint64_t m, uint64_t n, bool bias) 
			: "cc");

	}



	if (!(m & ((1ULL << 63) | (1ULL << 31)))) {

	if (no_ovf) {

		asm (	"umlal	%R0, %Q0, %R1, %Q2\n\t"

			"umlal	%R0, %Q0, %Q1, %R2\n\t"

			"mov	%R0, #0\n\t"

arch/arm/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -147,12 +147,6 @@ extern unsigned long vectors_base; 
#define DTCM_OFFSET	UL(0xfffe8000)

#endif



/*

 * Convert a page to/from a physical address

 */

#define page_to_phys(page)	(__pfn_to_phys(page_to_pfn(page)))

#define phys_to_page(phys)	(pfn_to_page(__phys_to_pfn(phys)))



/*

 * PLAT_PHYS_OFFSET is the offset (from zero) of the start of physical

 * memory.  This is used for XIP and NoMMU kernels, and on platforms that don't

arch/arm64/include/asm/io.h

+0 −11
Original line number Diff line number Diff line
@@ -129,17 +129,6 @@ static __always_inline u64 __raw_readq(const volatile void __iomem *addr) 
#define IO_SPACE_LIMIT		(PCI_IO_SIZE - 1)

#define PCI_IOBASE		((void __iomem *)PCI_IO_START)



/*

 * String version of I/O memory access operations.

 */

extern void __memcpy_fromio(void *, const volatile void __iomem *, size_t);

extern void __memcpy_toio(volatile void __iomem *, const void *, size_t);

extern void __memset_io(volatile void __iomem *, int, size_t);



#define memset_io(c,v,l)	__memset_io((c),(v),(l))

#define memcpy_fromio(a,c,l)	__memcpy_fromio((a),(c),(l))

#define memcpy_toio(c,a,l)	__memcpy_toio((c),(a),(l))



/*

 * The ARM64 iowrite implementation is intended to support drivers that want to

 * use write combining. For instance PCI drivers using write combining with a 64