[S390] vmur: fix diag14 exceptions with addresses > 2GB. (0a87c5cf) · Commits · 戴 / test

arch/s390/kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ EXTRA_AFLAGS := -traditional

		obj-y := bitmap.o traps.o time.o process.o base.o early.o \
		setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
		semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o
		semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o diag.o

		obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o)
		obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)

arch/s390/kernel/diag.c

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		/*
		* Implementation of s390 diagnose codes
		*
		* Copyright IBM Corp. 2007
		* Author(s): Michael Holzheu <holzheu@de.ibm.com>
		*/

		#include <linux/module.h>
		#include <asm/diag.h>

		/*
		* Diagnose 10: Release pages
		*/
		void diag10(unsigned long addr)
		{
		if (addr >= 0x7ff00000)
		return;
		asm volatile(
		#ifdef CONFIG_64BIT
		" sam31\n"
		" diag %0,%0,0x10\n"
		"0: sam64\n"
		#else
		" diag %0,%0,0x10\n"
		"0:\n"
		#endif
		EX_TABLE(0b, 0b)
		: : "a" (addr));
		}
		EXPORT_SYMBOL(diag10);

		/*
		* Diagnose 14: Input spool file manipulation
		*/
		int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode)
		{
		register unsigned long _ry1 asm("2") = ry1;
		register unsigned long _ry2 asm("3") = subcode;
		int rc = 0;

		asm volatile(
		#ifdef CONFIG_64BIT
		" sam31\n"
		" diag %2,2,0x14\n"
		" sam64\n"
		#else
		" diag %2,2,0x14\n"
		#endif
		" ipm %0\n"
		" srl %0,28\n"
		: "=d" (rc), "+d" (_ry2)
		: "d" (rx), "d" (_ry1)
		: "cc");

		return rc;
		}
		EXPORT_SYMBOL(diag14);

		/*
		* Diagnose 210: Get information about a virtual device
		*/
		int diag210(struct diag210 *addr)
		{
		/*
		* diag 210 needs its data below the 2GB border, so we
		* use a static data area to be sure
		*/
		static struct diag210 diag210_tmp;
		static DEFINE_SPINLOCK(diag210_lock);
		unsigned long flags;
		int ccode;

		spin_lock_irqsave(&diag210_lock, flags);
		diag210_tmp = *addr;

		#ifdef CONFIG_64BIT
		asm volatile(
		" lhi %0,-1\n"
		" sam31\n"
		" diag %1,0,0x210\n"
		"0: ipm %0\n"
		" srl %0,28\n"
		"1: sam64\n"
		EX_TABLE(0b, 1b)
		: "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
		#else
		asm volatile(
		" lhi %0,-1\n"
		" diag %1,0,0x210\n"
		"0: ipm %0\n"
		" srl %0,28\n"
		"1:\n"
		EX_TABLE(0b, 1b)
		: "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
		#endif

		*addr = diag210_tmp;
		spin_unlock_irqrestore(&diag210_lock, flags);

		return ccode;
		}
		EXPORT_SYMBOL(diag210);

arch/s390/kernel/s390_ksyms.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ EXPORT_SYMBOL(_oi_bitmap);
		EXPORT_SYMBOL(_ni_bitmap);
		EXPORT_SYMBOL(_zb_findmap);
		EXPORT_SYMBOL(_sb_findmap);
		EXPORT_SYMBOL(diag10);

		/*
		* semaphore ops

arch/s390/mm/cmm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@

		#include <asm/pgalloc.h>
		#include <asm/uaccess.h>
		#include <asm/diag.h>

		static char *sender = "VMRMSVM";
		module_param(sender, charp, 0400);

arch/s390/mm/init.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -42,23 +42,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
		pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));
		char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));

		void diag10(unsigned long addr)
		{
		if (addr >= 0x7ff00000)
		return;
		asm volatile(
		#ifdef CONFIG_64BIT
		" sam31\n"
		" diag %0,%0,0x10\n"
		"0: sam64\n"
		#else
		" diag %0,%0,0x10\n"
		"0:\n"
		#endif
		EX_TABLE(0b,0b)
		: : "a" (addr));
		}

		void show_mem(void)
		{
		int i, total = 0, reserved = 0;

Admin message