Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d05d82f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull arch/tile updates from Chris Metcalf:
 "This is a grab bag of changes that includes some NOHZ and
  context-tracking related changes, some debugging improvements,
  JUMP_LABEL support, and some fixes for tilepro allmodconfig support.

  We also remove the now-unused node_has_online_mem() definitions both
  for tile's asm/topology.h as well as in linux/topology.h itself"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  numa: remove stale node_has_online_mem() define
  arch/tile: move user_exit() to early kernel entry sequence
  tile: fix bug in setting PT_FLAGS_DISABLE_IRQ on kernel entry
  tile: fix tilepro casts for readl, writel, etc
  tile: fix a -Wframe-larger-than warning
  tile: include the syscall number in the backtrace
  MAINTAINERS: add git URL for tile
  arch/tile: adopt prepare_exit_to_usermode() model from x86
  tile/jump_label: add jump label support for TILE-Gx
  tile: define a macro ktext_writable_addr to get writable kernel text address
parents d90f351a 00d27c63

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10811,6 +10811,7 @@ F: net/tipc/ 
TILE ARCHITECTURE

M:	Chris Metcalf <cmetcalf@ezchip.com>

W:	http://www.ezchip.com/scm/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git

S:	Supported

F:	arch/tile/

F:	drivers/char/tile-srom.c

arch/tile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ config TILEGX 
	select HAVE_KRETPROBES

	select HAVE_ARCH_KGDB

	select ARCH_SUPPORTS_ATOMIC_RMW

	select HAVE_ARCH_JUMP_LABEL



config TILEPRO

	def_bool !TILEGX

arch/tile/include/asm/insn.h

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Tilera Corporation. All Rights Reserved.

 *

 *   This program is free software; you can redistribute it and/or

 *   modify it under the terms of the GNU General Public License

 *   as published by the Free Software Foundation, version 2.

 *

 *   This program is distributed in the hope that it will be useful, but

 *   WITHOUT ANY WARRANTY; without even the implied warranty of

 *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or

 *   NON INFRINGEMENT.  See the GNU General Public License for

 *   more details.

 */

#ifndef __ASM_TILE_INSN_H

#define __ASM_TILE_INSN_H



#include <arch/opcode.h>



static inline tilegx_bundle_bits NOP(void)

{

	return create_UnaryOpcodeExtension_X0(FNOP_UNARY_OPCODE_X0) |

		create_RRROpcodeExtension_X0(UNARY_RRR_0_OPCODE_X0) |

		create_Opcode_X0(RRR_0_OPCODE_X0) |

		create_UnaryOpcodeExtension_X1(NOP_UNARY_OPCODE_X1) |

		create_RRROpcodeExtension_X1(UNARY_RRR_0_OPCODE_X1) |

		create_Opcode_X1(RRR_0_OPCODE_X1);

}



static inline tilegx_bundle_bits tilegx_gen_branch(unsigned long pc,

					    unsigned long addr,

					    bool link)

{

	tilegx_bundle_bits opcode_x0, opcode_x1;

	long pcrel_by_instr = (addr - pc) >> TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES;



	if (link) {

		/* opcode: jal addr */

		opcode_x1 =

			create_Opcode_X1(JUMP_OPCODE_X1) |

			create_JumpOpcodeExtension_X1(JAL_JUMP_OPCODE_X1) |

			create_JumpOff_X1(pcrel_by_instr);

	} else {

		/* opcode: j addr */

		opcode_x1 =

			create_Opcode_X1(JUMP_OPCODE_X1) |

			create_JumpOpcodeExtension_X1(J_JUMP_OPCODE_X1) |

			create_JumpOff_X1(pcrel_by_instr);

	}



	/* opcode: fnop */

	opcode_x0 =

		create_UnaryOpcodeExtension_X0(FNOP_UNARY_OPCODE_X0) |

		create_RRROpcodeExtension_X0(UNARY_RRR_0_OPCODE_X0) |

		create_Opcode_X0(RRR_0_OPCODE_X0);



	return opcode_x1 | opcode_x0;

}



#endif /* __ASM_TILE_INSN_H */

arch/tile/include/asm/io.h

+8 −8
Original line number Diff line number Diff line
@@ -161,14 +161,14 @@ extern void _tile_writew(u16 val, unsigned long addr); 
extern void _tile_writel(u32 val, unsigned long addr);

extern void _tile_writeq(u64 val, unsigned long addr);



#define __raw_readb(addr) _tile_readb((unsigned long)addr)

#define __raw_readw(addr) _tile_readw((unsigned long)addr)

#define __raw_readl(addr) _tile_readl((unsigned long)addr)

#define __raw_readq(addr) _tile_readq((unsigned long)addr)

#define __raw_writeb(val, addr) _tile_writeb(val, (unsigned long)addr)

#define __raw_writew(val, addr) _tile_writew(val, (unsigned long)addr)

#define __raw_writel(val, addr) _tile_writel(val, (unsigned long)addr)

#define __raw_writeq(val, addr) _tile_writeq(val, (unsigned long)addr)

#define __raw_readb(addr) _tile_readb((unsigned long)(addr))

#define __raw_readw(addr) _tile_readw((unsigned long)(addr))

#define __raw_readl(addr) _tile_readl((unsigned long)(addr))

#define __raw_readq(addr) _tile_readq((unsigned long)(addr))

#define __raw_writeb(val, addr) _tile_writeb(val, (unsigned long)(addr))

#define __raw_writew(val, addr) _tile_writew(val, (unsigned long)(addr))

#define __raw_writel(val, addr) _tile_writel(val, (unsigned long)(addr))

#define __raw_writeq(val, addr) _tile_writeq(val, (unsigned long)(addr))



#else /* CONFIG_PCI */

arch/tile/include/asm/jump_label.h

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Tilera Corporation. All Rights Reserved.

 *

 *   This program is free software; you can redistribute it and/or

 *   modify it under the terms of the GNU General Public License

 *   as published by the Free Software Foundation, version 2.

 *

 *   This program is distributed in the hope that it will be useful, but

 *   WITHOUT ANY WARRANTY; without even the implied warranty of

 *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or

 *   NON INFRINGEMENT.  See the GNU General Public License for

 *   more details.

 */



#ifndef _ASM_TILE_JUMP_LABEL_H

#define _ASM_TILE_JUMP_LABEL_H



#include <arch/opcode.h>



#define JUMP_LABEL_NOP_SIZE	TILE_BUNDLE_SIZE_IN_BYTES



static __always_inline bool arch_static_branch(struct static_key *key,

					       bool branch)

{

	asm_volatile_goto("1:\n\t"

		"nop" "\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		".quad 1b, %l[l_yes], %0 + %1 \n\t"

		".popsection\n\t"

		: :  "i" (key), "i" (branch) : : l_yes);

	return false;

l_yes:

	return true;

}



static __always_inline bool arch_static_branch_jump(struct static_key *key,

						    bool branch)

{

	asm_volatile_goto("1:\n\t"

		"j %l[l_yes]" "\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		".quad 1b, %l[l_yes], %0 + %1 \n\t"

		".popsection\n\t"

		: :  "i" (key), "i" (branch) : : l_yes);

	return false;

l_yes:

	return true;

}



typedef u64 jump_label_t;



struct jump_entry {

	jump_label_t code;

	jump_label_t target;

	jump_label_t key;

};



#endif /* _ASM_TILE_JUMP_LABEL_H */