Commit 14c79092 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "The most important change is that we reduce L1_CACHE_BYTES to 16
  bytes, for which a trivial patch for XPS in the network layer was
  needed.  Then we wire up the sys_membarrier and userfaultfd syscalls
  and added two other small cleanups"

* 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Change L1_CACHE_BYTES to 16
  net/xps: Fix calculation of initial number of xps queues
  parisc: reduce syslog debug output
  parisc: serial/mux: Convert to uart_console_device instead of open-coded
  parisc: Wire up userfaultfd syscall
  parisc: allocate sys_membarrier system call number
parents 1b1050cd a01fece2

arch/parisc/include/asm/cache.h

+5 −13
Original line number Diff line number Diff line
@@ -7,20 +7,12 @@ 




/*

 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have

 * 32-byte cachelines.  The default configuration is not for SMP anyway,

 * so if you're building for SMP, you should select the appropriate

 * processor type.  There is a potential livelock danger when running

 * a machine with this value set too small, but it's more probable you'll

 * just ruin performance.

 * PA 2.0 processors have 64 and 128-byte L2 cachelines; PA 1.1 processors

 * have 32-byte cachelines.  The L1 length appears to be 16 bytes but this

 * is not clearly documented.

 */

#ifdef CONFIG_PA20

#define L1_CACHE_BYTES 64

#define L1_CACHE_SHIFT 6

#else

#define L1_CACHE_BYTES 32

#define L1_CACHE_SHIFT 5

#endif

#define L1_CACHE_BYTES 16

#define L1_CACHE_SHIFT 4



#ifndef __ASSEMBLY__

arch/parisc/include/uapi/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -358,8 +358,10 @@ 
#define __NR_memfd_create	(__NR_Linux + 340)

#define __NR_bpf		(__NR_Linux + 341)

#define __NR_execveat		(__NR_Linux + 342)

#define __NR_membarrier		(__NR_Linux + 343)

#define __NR_userfaultfd	(__NR_Linux + 344)



#define __NR_Linux_syscalls	(__NR_execveat + 1)

#define __NR_Linux_syscalls	(__NR_userfaultfd + 1)





#define __IGNORE_select		/* newselect */

arch/parisc/kernel/syscall_table.S

+2 −0
Original line number Diff line number Diff line
@@ -438,6 +438,8 @@ 
	ENTRY_SAME(memfd_create)	/* 340 */

	ENTRY_SAME(bpf)

	ENTRY_COMP(execveat)

	ENTRY_SAME(membarrier)

	ENTRY_SAME(userfaultfd)





.ifne (. - 90b) - (__NR_Linux_syscalls * (91b - 90b))

drivers/parisc/lba_pci.c

+6 −6
Original line number Diff line number Diff line
@@ -624,6 +624,10 @@ extend_lmmio_len(unsigned long start, unsigned long end, unsigned long lba_len) 
{

	struct resource *tmp;



	/* exit if not a C8000 */

	if (boot_cpu_data.cpu_type < mako)

		return end;



	pr_debug("LMMIO mismatch: PAT length = 0x%lx, MASK register = 0x%lx\n",

		end - start, lba_len);
@@ -631,10 +635,6 @@ extend_lmmio_len(unsigned long start, unsigned long end, unsigned long lba_len) 


	pr_debug("LBA: lmmio_space [0x%lx-0x%lx] - original\n", start, end);



	if (boot_cpu_data.cpu_type < mako) {

		pr_info("LBA: Not a C8000 system - not extending LMMIO range.\n");

		return end;

	}



	end += lba_len;

	if (end < start) /* fix overflow */
@@ -1557,9 +1557,9 @@ lba_driver_probe(struct parisc_device *dev) 
		pci_add_resource_offset(&resources, &lba_dev->hba.lmmio_space,

					lba_dev->hba.lmmio_space_offset);

	if (lba_dev->hba.gmmio_space.flags) {

		/* Not registering GMMIO space - according to docs it's not

		 * even used on HP-UX. */

		/* pci_add_resource(&resources, &lba_dev->hba.gmmio_space); */

		pr_warn("LBA: Not registering GMMIO space %pR\n",

			&lba_dev->hba.gmmio_space);

	}



	pci_add_resource(&resources, &lba_dev->hba.bus_num);

drivers/tty/serial/mux.c

+2 −7
Original line number Diff line number Diff line
@@ -412,19 +412,14 @@ static int mux_console_setup(struct console *co, char *options) 
        return 0;

}



struct tty_driver *mux_console_device(struct console *co, int *index)

{

        *index = co->index;

	return mux_driver.tty_driver;

}



static struct console mux_console = {

	.name =		"ttyB",

	.write =	mux_console_write,

	.device =	mux_console_device,

	.device =	uart_console_device,

	.setup =	mux_console_setup,

	.flags =	CON_ENABLED | CON_PRINTBUFFER,

	.index =	0,

	.data =		&mux_driver,

};



#define MUX_CONSOLE	&mux_console

CRA Git | Maintained and supported by SUSTech CRA and CCSE