From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rykl1312wzDrKB for ; Tue, 26 Jul 2016 00:53:01 +1000 (AEST) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u6PEnFgq030839 for ; Mon, 25 Jul 2016 10:52:59 -0400 Received: from e23smtp06.au.ibm.com (e23smtp06.au.ibm.com [202.81.31.148]) by mx0a-001b2d01.pphosted.com with ESMTP id 24c3vk8569-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 25 Jul 2016 10:52:59 -0400 Received: from localhost by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Jul 2016 00:52:57 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 8D3163578052 for ; Tue, 26 Jul 2016 00:52:55 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u6PEqtIk25100372 for ; Tue, 26 Jul 2016 00:52:55 +1000 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u6PEqsfs012470 for ; Tue, 26 Jul 2016 00:52:55 +1000 From: Madhavan Srinivasan To: benh@kernel.crashing.org, mpe@ellerman.id.au, anton@samba.org, paulus@samba.org Cc: linuxppc-dev@lists.ozlabs.org, Madhavan Srinivasan Subject: [RFC PATCH 4/9] powerpc: Use set_soft_enabled api to update paca->soft_enabled Date: Mon, 25 Jul 2016 20:22:17 +0530 In-Reply-To: <1469458342-26233-1-git-send-email-maddy@linux.vnet.ibm.com> References: <1469458342-26233-1-git-send-email-maddy@linux.vnet.ibm.com> Message-Id: <1469458342-26233-5-git-send-email-maddy@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Madhavan Srinivasan --- arch/powerpc/include/asm/kvm_ppc.h | 2 +- arch/powerpc/kernel/irq.c | 4 ++-- arch/powerpc/kernel/setup_64.c | 3 ++- arch/powerpc/kernel/time.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index e790b8a6bf0b..68c2275c3674 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -707,7 +707,7 @@ static inline void kvmppc_fix_ee_before_entry(void) /* Only need to enable IRQs by hard enabling them after this */ local_paca->irq_happened = 0; - local_paca->soft_enabled = LAZY_INTERRUPT_ENABLED; + set_soft_enabled(LAZY_INTERRUPT_ENABLED); #endif } diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 88e541daf7b0..9b9b6df8d83d 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -202,7 +202,7 @@ notrace void arch_local_irq_restore(unsigned long en) /* Write the new soft-enabled value */ set_soft_enabled(en); - if (en == LAZY_INTERRUPT_DIABLED) + if (en == LAZY_INTERRUPT_DISABLED) return; /* * From this point onward, we can take interrupts, preempt, @@ -331,7 +331,7 @@ bool prep_irq_for_idle(void) * of entering the low power state. */ local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS; - local_paca->soft_enabled = LAZY_INTERRUPT_ENABLED; + set_soft_enabled(LAZY_INTERRUPT_ENABLED); /* Tell the caller to enter the low power state */ return true; diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 0ca504839550..2c7f4b23359a 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -206,7 +206,7 @@ static void fixup_boot_paca(void) /* Allow percpu accesses to work until we setup percpu data */ get_paca()->data_offset = 0; /* Mark interrupts disabled in PACA */ - get_paca()->soft_enabled = LAZY_INTERRUPT_DISABLED; + set_soft_enabled(LAZY_INTERRUPT_DISABLED); } static void cpu_ready_for_interrupts(void) @@ -326,6 +326,7 @@ void early_setup_secondary(void) { /* Mark interrupts enabled in PACA */ get_paca()->soft_enabled = 0; + set_soft_enabled(LAZY_INTERRUPT_DISABLED); /* Initialize the hash table or TLB handling */ early_init_mmu_secondary(); diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index e46f7ab6cbde..0a1669708a0d 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -258,7 +258,7 @@ void accumulate_stolen_time(void) * needs to reflect that so various debug stuff doesn't * complain */ - local_paca->soft_enabled = LAZY_INTERRUPT_DISABLED; + set_soft_enabled(LAZY_INTERRUPT_DISABLED); sst = scan_dispatch_log(local_paca->starttime_user); ust = scan_dispatch_log(local_paca->starttime); @@ -266,7 +266,7 @@ void accumulate_stolen_time(void) local_paca->user_time -= ust; local_paca->stolen_time += ust + sst; - local_paca->soft_enabled = save_soft_enabled; + set_soft_enabled(save_soft_enabled); } static inline u64 calculate_stolen_time(u64 stop_tb) -- 2.7.4