Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (0806ca2a) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/ia64/aliasing-test.c

+19 −7

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <sys/mman.h>
		#include <sys/stat.h>
		#include <unistd.h>
		#include <linux/pci.h>

		int sum;

		@@ -34,13 +35,19 @@ int map_mem(char *path, off_t offset, size_t length, int touch)
		return -1;
		}

		if (fnmatch("/proc/bus/pci/*", path, 0) == 0) {
		rc = ioctl(fd, PCIIOC_MMAP_IS_MEM);
		if (rc == -1)
		perror("PCIIOC_MMAP_IS_MEM ioctl");
		}

		addr = mmap(NULL, length, PROT_READ\|PROT_WRITE, MAP_SHARED, fd, offset);
		if (addr == MAP_FAILED)
		return 1;

		if (touch) {
		c = (int *) addr;
		while (c < (int *) (offset + length))
		while (c < (int *) (addr + length))
		sum += *c++;
		}

		@@ -54,7 +61,7 @@ int map_mem(char *path, off_t offset, size_t length, int touch)
		return 0;
		}

		int scan_sysfs(char path, char file, off_t offset, size_t length, int touch)
		int scan_tree(char path, char file, off_t offset, size_t length, int touch)
		{
		struct dirent **namelist;
		char name, path2;
		@@ -93,7 +100,7 @@ int scan_sysfs(char path, char file, off_t offset, size_t length, int touch)
		} else {
		r = lstat(path2, &buf);
		if (r == 0 && S_ISDIR(buf.st_mode)) {
		rc = scan_sysfs(path2, file, offset, length, touch);
		rc = scan_tree(path2, file, offset, length, touch);
		if (rc < 0)
		return rc;
		}
		@@ -238,10 +245,15 @@ int main()
		else
		fprintf(stderr, "FAIL: /dev/mem 0x0-0x100000 not accessible\n");

		scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0, 0xA0000, 1);
		scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0xA0000, 0x20000, 0);
		scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0xC0000, 0x40000, 1);
		scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0, 1024*1024, 0);
		scan_tree("/sys/class/pci_bus", "legacy_mem", 0, 0xA0000, 1);
		scan_tree("/sys/class/pci_bus", "legacy_mem", 0xA0000, 0x20000, 0);
		scan_tree("/sys/class/pci_bus", "legacy_mem", 0xC0000, 0x40000, 1);
		scan_tree("/sys/class/pci_bus", "legacy_mem", 0, 1024*1024, 0);

		scan_rom("/sys/devices", "rom");

		scan_tree("/proc/bus/pci", "??.?", 0, 0xA0000, 1);
		scan_tree("/proc/bus/pci", "??.?", 0xA0000, 0x20000, 0);
		scan_tree("/proc/bus/pci", "??.?", 0xC0000, 0x40000, 1);
		scan_tree("/proc/bus/pci", "??.?", 0, 1024*1024, 0);
		}

Documentation/ia64/aliasing.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,18 @@ POTENTIAL ATTRIBUTE ALIASING CASES

		The /dev/mem mmap constraints apply.

		mmap of /proc/bus/pci/.../??.?

		This is an MMIO mmap of PCI functions, which additionally may or
		may not be requested as using the WC attribute.

		If WC is requested, and the region in kern_memmap is either WC
		or UC, and the EFI memory map designates the region as WC, then
		the WC mapping is allowed.

		Otherwise, the user mapping must use the same attribute as the
		kernel mapping.

		read/write of /dev/mem

		This uses copy_from_user(), which implicitly uses a kernel

arch/ia64/kernel/gate.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		.previous
		#define BRL_COND_FSYS_BUBBLE_DOWN(pr) \
		[1:](pr)brl.cond.sptk 0; \
		;; \
		.xdata4 ".data.patch.brl_fsys_bubble_down", 1b-.

		GLOBAL_ENTRY(__kernel_syscall_via_break)

arch/ia64/kernel/mca.c

+53 −7

Original line number	Diff line number	Diff line
		@@ -57,6 +57,9 @@
		*
		* 2006-09-15 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
		* Add printing support for MCA/INIT.
		*
		* 2007-04-27 Russ Anderson <rja@sgi.com>
		* Support multiple cpus going through OS_MCA in the same event.
		*/
		#include <linux/types.h>
		#include <linux/init.h>
		@@ -96,7 +99,6 @@
		#endif

		/* Used by mca_asm.S */
		u32 ia64_mca_serialize;
		DEFINE_PER_CPU(u64, ia64_mca_data); /* == __per_cpu_mca[smp_processor_id()] */
		DEFINE_PER_CPU(u64, ia64_mca_per_cpu_pte); /* PTE to map per-CPU area */
		DEFINE_PER_CPU(u64, ia64_mca_pal_pte); /* PTE to map PAL code */
		@@ -963,11 +965,12 @@ ia64_mca_modify_original_stack(struct pt_regs *regs,
		goto no_mod;
		}

		if (!mca_recover_range(ms->pmsa_iip)) {
		if (r13 != sos->prev_IA64_KR_CURRENT) {
		msg = "inconsistent previous current and r13";
		goto no_mod;
		}

		if (!mca_recover_range(ms->pmsa_iip)) {
		if ((r12 - r13) >= KERNEL_STACK_SIZE) {
		msg = "inconsistent r12 and r13";
		goto no_mod;
		@@ -1187,6 +1190,13 @@ ia64_wait_for_slaves(int monarch, const char *type)
		* further MCA logging is enabled by clearing logs.
		* Monarch also has the duty of sending wakeup-IPIs to pull the
		* slave processors out of rendezvous spinloop.
		*
		* If multiple processors call into OS_MCA, the first will become
		* the monarch. Subsequent cpus will be recorded in the mca_cpu
		* bitmask. After the first monarch has processed its MCA, it
		* will wake up the next cpu in the mca_cpu bitmask and then go
		* into the rendezvous loop. When all processors have serviced
		* their MCA, the last monarch frees up the rest of the processors.
		*/
		void
		ia64_mca_handler(struct pt_regs regs, struct switch_stack sw,
		@@ -1196,16 +1206,32 @@ ia64_mca_handler(struct pt_regs regs, struct switch_stack sw,
		struct task_struct *previous_current;
		struct ia64_mca_notify_die nd =
		{ .sos = sos, .monarch_cpu = &monarch_cpu };
		static atomic_t mca_count;
		static cpumask_t mca_cpu;

		if (atomic_add_return(1, &mca_count) == 1) {
		monarch_cpu = cpu;
		sos->monarch = 1;
		} else {
		cpu_set(cpu, mca_cpu);
		sos->monarch = 0;
		}
		mprintk(KERN_INFO "Entered OS MCA handler. PSP=%lx cpu=%d "
		"monarch=%ld\n", sos->proc_state_param, cpu, sos->monarch);

		previous_current = ia64_mca_modify_original_stack(regs, sw, sos, "MCA");
		monarch_cpu = cpu;

		if (notify_die(DIE_MCA_MONARCH_ENTER, "MCA", regs, (long)&nd, 0, 0)
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);
		if (sos->monarch) {
		ia64_wait_for_slaves(cpu, "MCA");
		} else {
		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
		while (cpu_isset(cpu, mca_cpu))
		cpu_relax(); /* spin until monarch wakes us */
		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
		}

		/* Wakeup all the processors which are spinning in the rendezvous loop.
		* They will leave SAL, then spin in the OS with interrupts disabled
		@@ -1244,6 +1270,26 @@ ia64_mca_handler(struct pt_regs regs, struct switch_stack sw,
		== NOTIFY_STOP)
		ia64_mca_spin(__FUNCTION__);


		if (atomic_dec_return(&mca_count) > 0) {
		int i;

		/* wake up the next monarch cpu,
		* and put this cpu in the rendez loop.
		*/
		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
		for_each_online_cpu(i) {
		if (cpu_isset(i, mca_cpu)) {
		monarch_cpu = i;
		cpu_clear(i, mca_cpu); /* wake next cpu */
		while (monarch_cpu != -1)
		cpu_relax(); /* spin until last cpu leaves */
		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
		set_curr_task(cpu, previous_current);
		return;
		}
		}
		}
		set_curr_task(cpu, previous_current);
		monarch_cpu = -1;
		}

arch/ia64/kernel/mca_asm.S

+0 −12

Original line number	Diff line number	Diff line
		@@ -133,14 +133,6 @@ ia64_do_tlb_purge:
		//StartMain////////////////////////////////////////////////////////////////////

		ia64_os_mca_dispatch:
		// Serialize all MCA processing
		mov r3=1;;
		LOAD_PHYSICAL(p0,r2,ia64_mca_serialize);;
		ia64_os_mca_spin:
		xchg4 r4=[r2],r3;;
		cmp.ne p6,p0=r4,r0
		(p6) br ia64_os_mca_spin

		mov r3=IA64_MCA_CPU_MCA_STACK_OFFSET // use the MCA stack
		LOAD_PHYSICAL(p0,r2,1f) // return address
		mov r19=1 // All MCA events are treated as monarch (for now)
		@@ -291,10 +283,6 @@ END(ia64_os_mca_virtual_begin)

		mov b0=r12 // SAL_CHECK return address

		// release lock
		LOAD_PHYSICAL(p0,r3,ia64_mca_serialize);;
		st4.rel [r3]=r0

		br b0

		//EndMain//////////////////////////////////////////////////////////////////////