direct-io.hg

changeset 10384:64b118cddb9a

[IA64] clean out xen/drivers/patches in the sparse tree

This is all old, unused code.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author awilliam@xenbuild.aw
date Thu Jun 08 10:15:09 2006 -0600 (2006-06-08)
parents 4e78528e3480
children d8d2b5c08245
files linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/blkback.c.patch linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Tue Jun 06 09:11:25 2006 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Thu Jun 08 10:15:09 2006 -0600
     1.3 @@ -15,12 +15,3 @@ ln -sf ../../../../xen/include/asm-ia64/
     1.4  #(warning: there be dragons here if these files diverge)
     1.5  ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile
     1.6  ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile
     1.7 -
     1.8 -#still a few x86-ism's in various drivers/xen files, patch them
     1.9 -#cd drivers/xen
    1.10 -#if [ ! -e ia64.patch.semaphore ]
    1.11 -#then
    1.12 -#	cat ../../arch/ia64/xen/drivers/patches/* | patch -p1 -b
    1.13 -#fi
    1.14 -#touch ia64.patch.semaphore
    1.15 -#cd ../..
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/blkback.c.patch	Tue Jun 06 09:11:25 2006 -0600
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,57 +0,0 @@
     2.4 -diff -Naur xen/blkback/blkback.c xen.patched/blkback/blkback.c
     2.5 ---- xen/blkback/blkback.c	2005-09-23 10:54:50.000000000 -0600
     2.6 -+++ xen.patched/blkback/blkback.c	2005-09-23 10:57:51.000000000 -0600
     2.7 -@@ -30,10 +30,16 @@
     2.8 - static unsigned long mmap_vstart;
     2.9 - #define MMAP_PAGES						\
    2.10 - 	(MAX_PENDING_REQS * BLKIF_MAX_SEGMENTS_PER_REQUEST)
    2.11 -+#ifdef __ia64__
    2.12 -+static void *pending_vaddrs[MMAP_PAGES];
    2.13 -+#define MMAP_VADDR(_idx, _i) \
    2.14 -+	(unsigned long)(pending_vaddrs[((_idx) * BLKIF_MAX_SEGMENTS_PER_REQUEST) + (_i)])
    2.15 -+#else
    2.16 - #define MMAP_VADDR(_req,_seg)						\
    2.17 - 	(mmap_vstart +							\
    2.18 - 	 ((_req) * BLKIF_MAX_SEGMENTS_PER_REQUEST * PAGE_SIZE) +	\
    2.19 - 	 ((_seg) * PAGE_SIZE))
    2.20 -+#endif
    2.21 - 
    2.22 - /*
    2.23 -  * Each outstanding request that we've passed to the lower device layers has a 
    2.24 -@@ -377,9 +383,13 @@
    2.25 - 			goto bad_descriptor;
    2.26 - 		}
    2.27 - 
    2.28 -+#ifdef __ia64__
    2.29 -+		MMAP_VADDR(pending_idx,i) = gnttab_map_vaddr(map[i]);
    2.30 -+#else
    2.31 - 		phys_to_machine_mapping[__pa(MMAP_VADDR(
    2.32 - 			pending_idx, i)) >> PAGE_SHIFT] =
    2.33 - 			FOREIGN_FRAME(map[i].dev_bus_addr >> PAGE_SHIFT);
    2.34 -+#endif
    2.35 - 
    2.36 - 		pending_handle(pending_idx, i) = map[i].handle;
    2.37 - 	}
    2.38 -@@ -500,9 +510,22 @@
    2.39 - 
    2.40 - 	blkif_interface_init();
    2.41 - 
    2.42 -+#ifdef __ia64__
    2.43 -+    {
    2.44 -+	extern unsigned long alloc_empty_foreign_map_page_range(unsigned long pages);
    2.45 -+	int i;
    2.46 -+
    2.47 -+	mmap_vstart =  alloc_empty_foreign_map_page_range(MMAP_PAGES);
    2.48 -+	printk("Allocated mmap_vstart: 0x%lx\n", mmap_vstart);
    2.49 -+	for(i = 0; i < MMAP_PAGES; i++)
    2.50 -+	    pending_vaddrs[i] = mmap_vstart + (i << PAGE_SHIFT);
    2.51 -+	BUG_ON(mmap_vstart == NULL);
    2.52 -+    }
    2.53 -+#else
    2.54 - 	page = balloon_alloc_empty_page_range(MMAP_PAGES);
    2.55 - 	BUG_ON(page == NULL);
    2.56 - 	mmap_vstart = (unsigned long)pfn_to_kaddr(page_to_pfn(page));
    2.57 -+#endif
    2.58 - 
    2.59 - 	pending_cons = 0;
    2.60 - 	pending_prod = MAX_PENDING_REQS;
     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch	Tue Jun 06 09:11:25 2006 -0600
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,18 +0,0 @@
     3.4 ---- xen/console/console.c	2005-11-02 14:13:07.000000000 +0100
     3.5 -+++ xen.patched/console/console.c	2005-11-02 14:21:20.000000000 +0100
     3.6 -@@ -768,9 +771,15 @@
     3.7 - #endif
     3.8 - 
     3.9 - 	if (xen_start_info->flags & SIF_INITDOMAIN) {
    3.10 -+#ifdef __ia64__
    3.11 -+		xencons_priv_irq = bind_virq_to_evtchn(VIRQ_CONSOLE);
    3.12 -+		bind_evtchn_to_irqhandler(xencons_priv_irq,
    3.13 -+				xencons_priv_interrupt, 0, "console", NULL);
    3.14 -+#else
    3.15 - 		xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);
    3.16 - 		(void)request_irq(xencons_priv_irq,
    3.17 - 				  xencons_priv_interrupt, 0, "console", NULL);
    3.18 -+#endif
    3.19 - 	} else {
    3.20 - 		xencons_ring_register_receiver(xencons_rx);
    3.21 - 	}
     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch	Tue Jun 06 09:11:25 2006 -0600
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,3 +0,0 @@
     4.4 -diff -Naur xen/core/devmem.c xen.patched/core/devmem.c
     4.5 ---- xen/core/devmem.c	2005-09-23 10:54:50.000000000 -0600
     4.6 -+++ xen.patched/core/devmem.c	2005-09-23 10:57:51.000000000 -0600
     5.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch	Tue Jun 06 09:11:25 2006 -0600
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,46 +0,0 @@
     5.4 -diff -Naur xen/core/gnttab.c xen.patched/core/gnttab.c
     5.5 ---- xen/core/gnttab.c	2005-09-23 10:54:50.000000000 -0600
     5.6 -+++ xen.patched/core/gnttab.c	2005-09-23 10:57:51.000000000 -0600
     5.7 -@@ -346,6 +350,10 @@
     5.8 - 	if ( hypercall.op != __HYPERVISOR_grant_table_op )
     5.9 - 		return -ENOSYS;
    5.10 - 
    5.11 -+
    5.12 -+#ifdef __ia64__
    5.13 -+	ret = HYPERVISOR_grant_table_op(hypercall.arg[0], (void *)hypercall.arg[1], hypercall.arg[2]);
    5.14 -+#else
    5.15 - 	/* hypercall-invoking asm taken from privcmd.c */
    5.16 - 	__asm__ __volatile__ (
    5.17 - 		"pushl %%ebx; pushl %%ecx; pushl %%edx; "
    5.18 -@@ -359,6 +367,7 @@
    5.19 - 		TRAP_INSTR "; "
    5.20 - 		"popl %%edi; popl %%esi; popl %%edx; popl %%ecx; popl %%ebx"
    5.21 - 		: "=a" (ret) : "0" (&hypercall) : "memory" );
    5.22 -+#endif
    5.23 - 
    5.24 - 	return ret;
    5.25 - }
    5.26 -@@ -423,8 +432,13 @@
    5.27 - 	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1));
    5.28 - 	BUG_ON(setup.status != 0);
    5.29 - 
    5.30 -+#ifdef __ia64__
    5.31 -+	shared = __va(frames[0] << PAGE_SHIFT);
    5.32 -+	printk("grant table at %p\n", shared);
    5.33 -+#else
    5.34 - 	for (i = 0; i < NR_GRANT_FRAMES; i++)
    5.35 - 		set_fixmap(FIX_GNTTAB_END - i, frames[i] << PAGE_SHIFT);
    5.36 -+#endif
    5.37 - 
    5.38 - 	return 0;
    5.39 - }
    5.40 -@@ -450,7 +466,9 @@
    5.41 - 
    5.42 - 	BUG_ON(gnttab_resume());
    5.43 - 
    5.44 -+#ifndef __ia64__
    5.45 - 	shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
    5.46 -+#endif
    5.47 - 
    5.48 - 	for (i = NR_RESERVED_ENTRIES; i < NR_GRANT_ENTRIES; i++)
    5.49 - 		gnttab_list[i] = i + 1;
     6.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch	Tue Jun 06 09:11:25 2006 -0600
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,43 +0,0 @@
     6.4 -diff -Naur xen/privcmd/privcmd.c xen.patched/privcmd/privcmd.c
     6.5 ---- xen/privcmd/privcmd.c	2005-09-23 10:54:50.000000000 -0600
     6.6 -+++ xen.patched/privcmd/privcmd.c	2005-09-23 10:57:51.000000000 -0600
     6.7 -@@ -180,6 +183,15 @@
     6.8 - 		for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) {
     6.9 - 			if (get_user(mfn, p))
    6.10 - 				return -EFAULT;
    6.11 -+#ifdef __ia64__
    6.12 -+			ret = remap_pfn_range(vma,
    6.13 -+					      addr&PAGE_MASK,
    6.14 -+					      mfn,
    6.15 -+					      1<<PAGE_SHIFT,
    6.16 -+					      vma->vm_page_prot);
    6.17 -+			if (ret < 0)
    6.18 -+			    goto batch_err;
    6.19 -+#else
    6.20 - 
    6.21 - 			ret = create_lookup_pte_addr(vma->vm_mm, addr, &ptep);
    6.22 - 			if (ret)
    6.23 -@@ -190,6 +202,7 @@
    6.24 - 
    6.25 - 			if (HYPERVISOR_mmu_update(&u, 1, NULL, m.dom) < 0)
    6.26 - 				put_user(0xF0000000 | mfn, p);
    6.27 -+#endif
    6.28 - 		}
    6.29 - 
    6.30 - 		ret = 0;
    6.31 -@@ -205,6 +218,7 @@
    6.32 - 	break;
    6.33 - #endif
    6.34 - 
    6.35 -+#ifndef __ia64__
    6.36 - 	case IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN: {
    6.37 - 		unsigned long m2pv = (unsigned long)machine_to_phys_mapping;
    6.38 - 		pgd_t *pgd = pgd_offset_k(m2pv);
    6.39 -@@ -216,6 +230,7 @@
    6.40 - 			-EFAULT: 0;
    6.41 - 	}
    6.42 - 	break;
    6.43 -+#endif
    6.44 - 
    6.45 - 	default:
    6.46 - 		ret = -EINVAL;