|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH 02/11] unmodified_drivers: remove ia64 parts of the code
>>> On 06.03.14 at 17:13, Olaf Hering <olaf@xxxxxxxxx> wrote:
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
> ---
> .../linux-2.6/compat-include/xen/platform-compat.h | 4 ---
> unmodified_drivers/linux-2.6/mkbuildtree | 16 +---------
> unmodified_drivers/linux-2.6/overrides.mk | 3 --
> unmodified_drivers/linux-2.6/platform-pci/Kbuild | 4 ---
> .../linux-2.6/platform-pci/panic-handler.c | 14 ---------
> .../linux-2.6/platform-pci/platform-pci.c | 23 --------------
> .../linux-2.6/platform-pci/xen_support.c | 36
> ----------------------
> 7 files changed, 1 insertion(+), 99 deletions(-)
Why? In fact I think it was a mistake too to remove the ia64 bits
from the public headers - there's nothing wrong with someone
still wanting to build ia64 PV drivers against an old Linux tree (e.g.
linux-2.6.18-xen.hg itself, where I intentionally avoided mirroring
that public header cleanup), and the implementation going away
is unrelated to the interface definitions remaining the same.
Jan
> --- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
> +++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
> @@ -42,10 +42,6 @@
> #define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L)
> #endif
>
> -#if defined(_ASM_IA64_PGTABLE_H) && !defined(_PGTABLE_NOPUD_H)
> -#include <asm-generic/pgtable-nopud.h>
> -#endif
> -
> /* Some kernels have this typedef backported so we cannot reliably
> * detect based on version number, hence we forcibly #define it.
> */
> diff --git a/unmodified_drivers/linux-2.6/mkbuildtree
> b/unmodified_drivers/linux-2.6/mkbuildtree
> index 3aca16d..379b39b 100755
> --- a/unmodified_drivers/linux-2.6/mkbuildtree
> +++ b/unmodified_drivers/linux-2.6/mkbuildtree
> @@ -5,7 +5,7 @@ if [ $1 ]; then
> else
> uname=`uname -m`
> echo "Defaulting to this machine's architecture, $uname, for linking."
> - echo "This may be overridden on the command line (i386,x86_64,ia64)."
> + echo "This may be overridden on the command line (i386,x86_64)."
> fi
>
> C=$(cd $(dirname $0) && pwd)
> @@ -79,20 +79,6 @@ i[34567]86|x86_64)
> ln -sf ${XL}/include/asm-$uname/mach-xen/asm/gnttab_dma.h include/asm
> fi
> ;;
> -"ia64")
> - ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm
> - ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
> - ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
> - ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
> - ln -sf ${XL}/include/asm-ia64/gnttab_dma.h include/asm
> - mkdir -p include/asm/xen
> - ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
> - ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
> - ln -sf ${XL}/arch/ia64/xen/xcom_hcall.c platform-pci/
> - ln -sf ${XL}/arch/ia64/xen/xcom_asm.S platform-pci/
> - ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci/xencomm_arch.c
> - ln -sf ${XL}/drivers/xen/core/xencomm.c platform-pci
> - ;;
> *)
> echo unknown architecture $uname
> exit 1
> diff --git a/unmodified_drivers/linux-2.6/overrides.mk
> b/unmodified_drivers/linux-2.6/overrides.mk
> index 803eccd..6c278ad 100644
> --- a/unmodified_drivers/linux-2.6/overrides.mk
> +++ b/unmodified_drivers/linux-2.6/overrides.mk
> @@ -7,9 +7,6 @@
> _XEN_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030205
> _XEN_CPPFLAGS += -DCONFIG_XEN_COMPAT=0xffffff
> _XEN_CPPFLAGS += -I$(M)/include -I$(M)/compat-include
> -DHAVE_XEN_PLATFORM_COMPAT_H
> -ifeq ($(ARCH),ia64)
> - _XEN_CPPFLAGS += -DCONFIG_VMX_GUEST
> -endif
>
> _XEN_CPPFLAGS += -include $(wildcard $(objtree)/include/*/autoconf.h)
>
> diff --git a/unmodified_drivers/linux-2.6/platform-pci/Kbuild
> b/unmodified_drivers/linux-2.6/platform-pci/Kbuild
> index 7b332ee..4701aa6 100644
> --- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild
> +++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild
> @@ -16,7 +16,3 @@ xen-platform-pci-objs += ../xenbus/xenbus_dev.o
> xen-platform-pci-objs += ../xenbus/xenbus_client.o
> xen-platform-pci-objs += ../xenbus/xen_proc.o
>
> -# Can we do better ?
> -ifeq ($(ARCH),ia64)
> - xen-platform-pci-objs += xencomm.o xencomm_arch.o xcom_hcall.o xcom_asm.o
> -endif
> diff --git a/unmodified_drivers/linux-2.6/platform-pci/panic-handler.c
> b/unmodified_drivers/linux-2.6/platform-pci/panic-handler.c
> index 7564d0c..2b1895f 100644
> --- a/unmodified_drivers/linux-2.6/platform-pci/panic-handler.c
> +++ b/unmodified_drivers/linux-2.6/platform-pci/panic-handler.c
> @@ -9,24 +9,10 @@
>
> MODULE_LICENSE("GPL");
>
> -#ifdef __ia64__
> -static void
> -xen_panic_hypercall(struct unw_frame_info *info, void *arg)
> -{
> - current->thread.ksp = (__u64)info->sw - 16;
> - HYPERVISOR_shutdown(SHUTDOWN_crash);
> - /* we're never actually going to get here... */
> -}
> -#endif
> -
> static int
> xen_panic_event(struct notifier_block *this, unsigned long event, void
> *ptr)
> {
> -#ifdef __ia64__
> - unw_init_running(xen_panic_hypercall, NULL);
> -#else /* !__ia64__ */
> HYPERVISOR_shutdown(SHUTDOWN_crash);
> -#endif
> /* we're never actually going to get here... */
> return NOTIFY_DONE;
> }
> diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
> b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
> index 163b168..895e19d 100644
> --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
> +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
> @@ -39,9 +39,6 @@
> #include <xen/interface/hvm/params.h>
> #include <xen/features.h>
> #include <xen/evtchn.h>
> -#ifdef __ia64__
> -#include <asm/xen/xencomm.h>
> -#endif
>
> #include "platform-pci.h"
>
> @@ -78,10 +75,6 @@ static int __devinit init_xen_info(void)
> struct xen_add_to_physmap xatp;
> extern void *shared_info_area;
>
> -#ifdef __ia64__
> - xencomm_initialize();
> -#endif
> -
> setup_xen_features();
>
> shared_info_frame = alloc_xen_mmio(PAGE_SIZE) >> PAGE_SHIFT;
> @@ -115,8 +108,6 @@ unsigned long alloc_xen_mmio(unsigned long len)
> return addr;
> }
>
> -#ifndef __ia64__
> -
> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
> static uint32_t xen_cpuid_base(void)
> {
> @@ -212,28 +203,14 @@ static void resume_hypercall_stubs(void)
> nr_hypercall_stub_pages = pages;
> }
>
> -#else /* __ia64__ */
> -
> -#define init_hypercall_stubs() (0)
> -#define resume_hypercall_stubs() ((void)0)
> -
> -#endif
> -
> static uint64_t get_callback_via(struct pci_dev *pdev)
> {
> u8 pin;
> int irq;
>
> -#ifdef __ia64__
> - for (irq = 0; irq < 16; irq++) {
> - if (isa_irq_to_vector(irq) == pdev->irq)
> - return irq; /* ISA IRQ */
> - }
> -#else /* !__ia64__ */
> irq = pdev->irq;
> if (irq < 16)
> return irq; /* ISA IRQ */
> -#endif
>
> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
> pin = pdev->pin;
> diff --git a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
> b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
> index 510a2b7..c8aadc0 100644
> --- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
> +++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
> @@ -30,42 +30,6 @@
> #include <xen/platform-compat.h>
> #endif
>
> -#if defined (__ia64__)
> -unsigned long __hypercall(unsigned long a1, unsigned long a2,
> - unsigned long a3, unsigned long a4,
> - unsigned long a5, unsigned long cmd)
> -{
> - unsigned long __res;
> - __asm__ __volatile__ (";;\n"
> - "mov r2=%1\n"
> - "break 0x1000 ;;\n"
> - "mov %0=r8 ;;\n"
> - : "=r"(__res) : "r"(cmd) : "r2", "r8", "memory");
> -
> - return __res;
> -}
> -EXPORT_SYMBOL(__hypercall);
> -
> -int HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int
> count)
> -{
> - return xencomm_hypercall_grant_table_op(cmd, uop, count);
> -}
> -EXPORT_SYMBOL(HYPERVISOR_grant_table_op);
> -
> -/* without using balloon driver on PV-on-HVM for ia64 */
> -void balloon_update_driver_allowance(long delta)
> -{
> - /* nothing */
> -}
> -EXPORT_SYMBOL_GPL(balloon_update_driver_allowance);
> -
> -void balloon_release_driver_page(struct page *page)
> -{
> - /* nothing */
> -}
> -EXPORT_SYMBOL_GPL(balloon_release_driver_page);
> -#endif /* __ia64__ */
> -
> void xen_machphys_update(unsigned long mfn, unsigned long pfn)
> {
> BUG();
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |