Commit 6917b51d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cris-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris 

Pull CRIS updates from Jesper Nilsson:
 "Mostly removal of old cruft of which we can use a generic version, or
  fixes for code not commonly run in the cris port, but also additions
  to enable some good debug"

* tag 'cris-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris: (25 commits)
  CRISv10: delete unused lib/dmacopy.c
  CRISv10: delete unused lib/old_checksum.c
  CRIS: fix switch_mm() lockdep splat
  CRISv32: enable LOCKDEP_SUPPORT
  CRIS: add STACKTRACE_SUPPORT
  CRISv32: annotate irq enable in idle loop
  CRISv32: add support for irqflags tracing
  CRIS: UAPI: use generic types.h
  CRIS: UAPI: use generic shmbuf.h
  CRIS: UAPI: use generic msgbuf.h
  CRIS: UAPI: use generic socket.h
  CRIS: UAPI: use generic sembuf.h
  CRIS: UAPI: use generic sockios.h
  CRIS: UAPI: use generic auxvec.h
  CRIS: UAPI: use generic headers via Kbuild
  CRIS: UAPI: fix elf.h export
  CRIS: don't make asm/elf.h depend on asm/user.h
  CRIS: UAPI: fix ptrace.h
  CRISv32: Squash compile warnings for axisflashmap
  CRISv32: Add GPIO driver to the default configs
  ...
parents 10fbd36e 254a0f41

arch/cris/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -36,6 +36,17 @@ config FORCE_MAX_ZONEORDER 
	int

	default 6



config TRACE_IRQFLAGS_SUPPORT

	depends on ETRAX_ARCH_V32

	def_bool y



config STACKTRACE_SUPPORT

	def_bool y



config LOCKDEP_SUPPORT

	depends on ETRAX_ARCH_V32

	def_bool y



config CRIS

	bool

	default y
@@ -58,6 +69,7 @@ config CRIS 
	select CLKSRC_MMIO if ETRAX_ARCH_V32

	select GENERIC_CLOCKEVENTS if ETRAX_ARCH_V32

	select GENERIC_SCHED_CLOCK if ETRAX_ARCH_V32

	select HAVE_DEBUG_BUGVERBOSE if ETRAX_ARCH_V32



config HZ

	int

arch/cris/arch-v10/kernel/entry.S

+8 −0
Original line number Diff line number Diff line
@@ -955,6 +955,14 @@ sys_call_table: 
	.long sys_process_vm_writev

	.long sys_kcmp			/* 350 */

	.long sys_finit_module

	.long sys_sched_setattr

	.long sys_sched_getattr

	.long sys_renameat2

	.long sys_seccomp		/* 355 */

	.long sys_getrandom

	.long sys_memfd_create

	.long sys_bpf

	.long sys_execveat



        /*

         * NOTE!! This doesn't have to be exact - we just have

arch/cris/arch-v10/lib/dmacopy.c

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * memcpy for large blocks, using memory-memory DMA channels 6 and 7 in Etrax

 */



#include <asm/svinto.h>

#include <asm/io.h>



#define D(x)



void *dma_memcpy(void *pdst,

		 const void *psrc,

		 unsigned int pn)

{

	static etrax_dma_descr indma, outdma;



	D(printk(KERN_DEBUG "dma_memcpy %d bytes... ", pn));



#if 0

	*R_GEN_CONFIG = genconfig_shadow =

		(genconfig_shadow & ~0x3c0000) |

		IO_STATE(R_GEN_CONFIG, dma6, intdma7) |

		IO_STATE(R_GEN_CONFIG, dma7, intdma6);

#endif

	indma.sw_len = outdma.sw_len = pn;

	indma.ctrl = d_eol | d_eop;

	outdma.ctrl = d_eol;

	indma.buf = psrc;

	outdma.buf = pdst;



	*R_DMA_CH6_FIRST = &indma;

	*R_DMA_CH7_FIRST = &outdma;

	*R_DMA_CH6_CMD = IO_STATE(R_DMA_CH6_CMD, cmd, start);

	*R_DMA_CH7_CMD = IO_STATE(R_DMA_CH7_CMD, cmd, start);



	while (*R_DMA_CH7_CMD == 1)

		/* wait for completion */;



	D(printk(KERN_DEBUG "done\n"));

}

arch/cris/arch-v10/lib/old_checksum.c

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
/*

 * INET		An implementation of the TCP/IP protocol suite for the LINUX

 *		operating system.  INET is implemented using the  BSD Socket

 *		interface as the means of communication with the user level.

 *

 *		IP/TCP/UDP checksumming routines

 *

 * Authors:	Jorge Cwik, <jorge@laser.satlink.net>

 *		Arnt Gulbrandsen, <agulbra@nvg.unit.no>

 *		Tom May, <ftom@netcom.com>

 *		Lots of code moved from tcp.c and ip.c; see those files

 *		for more names.

 *

 *		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; either version

 *		2 of the License, or (at your option) any later version.

 */



#include <net/checksum.h>

#include <net/module.h>



#undef PROFILE_CHECKSUM



#ifdef PROFILE_CHECKSUM

/* these are just for profiling the checksum code with an oscillioscope.. uh */

#if 0

#define BITOFF *((unsigned char *)0xb0000030) = 0xff

#define BITON *((unsigned char *)0xb0000030) = 0x0

#endif

#include <asm/io.h>

#define CBITON LED_ACTIVE_SET(1)

#define CBITOFF LED_ACTIVE_SET(0)

#define BITOFF

#define BITON

#else

#define BITOFF

#define BITON

#define CBITOFF

#define CBITON

#endif



/*

 * computes a partial checksum, e.g. for TCP/UDP fragments

 */



#include <asm/delay.h>



__wsum csum_partial(const void *p, int len, __wsum __sum)

{

	u32 sum = (__force u32)__sum;

	const u16 *buff = p;

	/*

	* Experiments with ethernet and slip connections show that buff

	* is aligned on either a 2-byte or 4-byte boundary.

	*/

	const void *endMarker = p + len;

	const void *marker = endMarker - (len % 16);

#if 0

	if((int)buff & 0x3)

		printk("unaligned buff %p\n", buff);

	__delay(900); /* extra delay of 90 us to test performance hit */

#endif

	BITON;

	while (buff < marker) {

		sum += *buff++;

		sum += *buff++;

		sum += *buff++;

		sum += *buff++;

		sum += *buff++;

		sum += *buff++;

		sum += *buff++;

		sum += *buff++;

	}

	marker = endMarker - (len % 2);

	while (buff < marker)

		sum += *buff++;



	if (endMarker > buff)

		sum += *(const u8 *)buff;	/* add extra byte separately */



	BITOFF;

	return (__force __wsum)sum;

}



EXPORT_SYMBOL(csum_partial);

arch/cris/arch-v32/drivers/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ config ETRAX_PA_CHANGEABLE_DIR 
	default "0x00" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask (8 bits) with information of what bits in PA that a

	  This is a bitmask with information of what bits in PA that a

	  user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0 here, but it depends on your hardware.
@@ -213,7 +213,7 @@ config ETRAX_PA_CHANGEABLE_BITS 
	default "0x00" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask (8 bits) with information of what bits in PA

	  This is a bitmask with information of what bits in PA

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.
@@ -223,7 +223,7 @@ config ETRAX_PB_CHANGEABLE_DIR 
	default "0x00000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask (18 bits) with information of what bits in PB

	  This is a bitmask with information of what bits in PB

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0 here, but it depends on your hardware.
@@ -234,7 +234,7 @@ config ETRAX_PB_CHANGEABLE_BITS 
	default "0x00000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask (18 bits) with information of what bits in PB

	  This is a bitmask with information of what bits in PB

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.
@@ -244,7 +244,7 @@ config ETRAX_PC_CHANGEABLE_DIR 
	default "0x00000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask (18 bits) with information of what bits in PC

	  This is a bitmask with information of what bits in PC

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0 here, but it depends on your hardware.
@@ -253,9 +253,9 @@ config ETRAX_PC_CHANGEABLE_BITS 
	hex "PC user changeable bits mask"

	depends on ETRAX_GPIO

	default "0x00000" if ETRAXFS

	default "0x00000000" if ETRAXFS

	default "0x00000000" if !ETRAXFS

	help

	  This is a bitmask (18 bits) with information of what bits in PC

	  This is a bitmask with information of what bits in PC

	  that a user can change the value on using ioctl's.

	  Bit set = changeable.
@@ -264,7 +264,7 @@ config ETRAX_PD_CHANGEABLE_DIR 
	depends on ETRAX_GPIO && ETRAXFS

	default "0x00000"

	help

	  This is a bitmask (18 bits) with information of what bits in PD

	  This is a bitmask with information of what bits in PD

	  that a user can change direction on using ioctl's.

	  Bit set = changeable.

	  You probably want 0x00000 here, but it depends on your hardware.

CRA Git | Maintained and supported by SUSTech CRA and CCSE