Updated patch for kexec on ia64
PATCH 1/1 Updated patch for kexec on ia64
This is an updated version of patch to add kexec support on ia64.
Signed-off-by Khalid Aziz <[email protected]>
Signed-off-by Nanhai Zou <[email protected]>
---
arch/ia64/hp/common/sba_iommu.c +22 -0
@@ -1624,6 +1624,28 @@ ioc_iova_init(struct ioc *ioc)READ_REG (ioc->ioc_hpa +IOC_IBASE ); } +#ifdef CONFIG_KEXEC +void +ioc_iova_disable (void ) +{ +struct ioc *ioc; + + ioc = ioc_list; + +while (ioc !=NULL ) { +/* Disable IOVA translation */ +WRITE_REG (ioc->ibase &0xfffffffffffffffe , ioc->ioc_hpa +IOC_IBASE ); +READ_REG (ioc->ioc_hpa +IOC_IBASE ); + +/* Clear I/O TLB of any possible entries */ +WRITE_REG (ioc->ibase | (get_iovp_order (ioc->iov_size) + iovp_shift), ioc->ioc_hpa +IOC_PCOM ); +READ_REG (ioc->ioc_hpa +IOC_PCOM ); + + ioc = ioc->next; + } +} +#endif +static void __init ioc_resource_init (struct ioc *ioc) {
arch/ia64/Kconfig +17 -0
@@ -376,6 +376,23 @@ config IA64_PALINFO config SGI_SN def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) +config KEXEC + bool "kexec system call (EXPERIMENTAL)" + depends on EXPERIMENTAL + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot + but it is indepedent of the system firmware. And like a reboot + you can start any kernel with it, not just Linux. + + The name comes from the similiarity to the exec system call. + + It is an ongoing process to be certain the hardware in a machine + is properly shutdown, so do not be surprised if this code does not + initially work for you. It may help to enable device hotplugging + support. As of this writing the exact hardware interface is + strongly in flux, so no good recommendation can be made. + source "drivers/firmware/Kconfig" source "fs/Kconfig.binfmt"
arch/ia64/kernel/crash.c +43 -0
43 lines not on this page · raw message
arch/ia64/kernel/entry.S +1 -1
@@ -1590,7 +1590,7 @@ sys_call_table: data8 sys_mq_timedreceive // 1265 data8 sys_mq_notify data8 sys_mq_getsetattr - data8 sys_ni_syscall // reserved for kexec_load + data8 sys_kexec_load data8 sys_ni_syscall // reserved for vserver data8 sys_waitid // 1270 data8 sys_add_key
arch/ia64/kernel/machine_kexec.c +140 -0
140 lines not on this page · raw message
arch/ia64/kernel/Makefile +1 -0
@@ -28,6 +28,7 @@ obj-$(CONFIG_IA64_CYCLONE) += cyclone.o obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o +obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o mca_recovery-y += mca_drv.o mca_drv_asm.o
arch/ia64/kernel/relocate_kernel.S +359 -0
359 lines not on this page · raw message
arch/ia64/kernel/smp.c +29 -0
@@ -30,6 +30,7 @@#include <linux/delay.h> #include <linux/efi.h> #include <linux/bitops.h> +#include <linux/kexec.h> #include <asm/atomic.h> #include <asm/current.h>
@@ -84,6 +85,34 @@ unlock_ipi_calllock(void)spin_unlock_irq (&call_lock); } +#ifdef CONFIG_KEXEC +/* +* Stop the CPU and put it in fake SAL rendezvous. This allows CPU to wake +* up with IPI from boot processor +*/ +void +kexec_stop_this_cpu (void *func) +{ +unsigned long pta, impl_va_bits, pal_base; + +/* +* Remove this CPU by putting it into fake SAL rendezvous +*/ +cpu_clear (smp_processor_id (), cpu_online_map); +max_xtp (); +ia64_eoi (); + +/* Disable VHPT */ + impl_va_bits =ffz (~(local_cpu_data->unimpl_va_mask | (7UL <<61 ))); + pta =POW2 (61 ) -POW2 (vmlpt_bits); +ia64_set_pta (pta | (0 <<8 ) | (vmlpt_bits <<2 ) |0 ); + +local_irq_disable (); + pal_base =__get_cpu_var (ia64_mca_pal_base); +kexec_fake_sal_rendez (func, ap_wakeup_vector, pal_base); +} +#endif +static void stop_this_cpu (void ) {
include/asm-ia64/kexec.h +36 -0
@@ -0,0 +1,36 @@ +#ifndef _ASM_IA64_KEXEC_H +#define _ASM_IA64_KEXEC_H + + +/* Maximum physical address we can use pages from */ +#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL) +/* Maximum address we can reach in physical address mode */ +#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) +/* Maximum address we can use for the control code buffer */ +#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE + +#define KEXEC_CONTROL_CODE_SIZE (8192 + 8192 + 4096) + +/* The native architecture */ +#define KEXEC_ARCH KEXEC_ARCH_IA_64 + +#define MAX_NOTE_BYTES 1024 + +#define pte_bits 3 +#define vmlpt_bits (impl_va_bits - PAGE_SHIFT + pte_bits) +#define POW2 (n) (1ULL << (n)) + +DECLARE_PER_CPU (u64, ia64_mca_pal_base); + +const extern unsigned int relocate_new_kernel_size; +volatile extern long kexec_rendez; +extern void relocate_new_kernel (unsigned long ,unsigned long , +struct ia64_boot_param *,unsigned long ); +extern void kexec_fake_sal_rendez (void *start,unsigned long wake_up, +unsigned long pal_base); + +static inline void +crash_setup_regs (struct pt_regs *newregs,struct pt_regs *oldregs) +{ +} +#endif /* _ASM_IA64_KEXEC_H */
include/asm-ia64/machvec_hpzx1.h +2 -0
@@ -34,4 +34,6 @@ extern ia64_mv_dma_mapping_error sba_dma#define platform_dma_supported sba_dma_supported#define platform_dma_mapping_error sba_dma_mapping_error +extern void ioc_iova_disable (void ); +#endif /* _ASM_IA64_MACHVEC_HPZX1_h */
include/asm-ia64/smp.h +3 -0
@@ -129,6 +129,9 @@ extern void smp_send_reschedule (int cpuextern void lock_ipi_calllock (void );extern void unlock_ipi_calllock (void );extern void identify_siblings (struct cpuinfo_ia64 *); +#ifdef CONFIG_KEXEC +extern void kexec_stop_this_cpu (void *); +#endif #else
---
==================================
Khalid Aziz Open Source and Linux Organization
(970)898-9214 Hewlett-Packard
[email protected] Fort Collins, CO
"The Linux kernel is subject to relentless development"
- Alessandro Rubini