linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Michael Ellerman <mpe@ellerman.id.au>
To: linuxppc-dev@ozlabs.org
Cc: npiggin@gmail.com
Subject: [PATCH v16 21/21] powerpc: clean stack pointers naming
Date: Tue,  5 Feb 2019 22:32:19 +1100	[thread overview]
Message-ID: <20190205113219.17903-22-mpe@ellerman.id.au> (raw)
In-Reply-To: <20190205113219.17903-1-mpe@ellerman.id.au>

From: Christophe Leroy <christophe.leroy@c-s.fr>

Some stack pointers used to also be thread_info pointers
and were called tp. Now that they are only stack pointers,
rename them sp.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/kernel/irq.c      | 17 +++++++----------
 arch/powerpc/kernel/setup_64.c | 11 +++--------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 938944c6e2ee..8a936723c791 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -659,21 +659,21 @@ void __do_irq(struct pt_regs *regs)
 void do_IRQ(struct pt_regs *regs)
 {
 	struct pt_regs *old_regs = set_irq_regs(regs);
-	void *curtp, *irqtp, *sirqtp;
+	void *cursp, *irqsp, *sirqsp;
 
 	/* Switch to the irq stack to handle this */
-	curtp = (void *)(current_stack_pointer() & ~(THREAD_SIZE - 1));
-	irqtp = hardirq_ctx[raw_smp_processor_id()];
-	sirqtp = softirq_ctx[raw_smp_processor_id()];
+	cursp = (void *)(current_stack_pointer() & ~(THREAD_SIZE - 1));
+	irqsp = hardirq_ctx[raw_smp_processor_id()];
+	sirqsp = softirq_ctx[raw_smp_processor_id()];
 
 	/* Already there ? */
-	if (unlikely(curtp == irqtp || curtp == sirqtp)) {
+	if (unlikely(cursp == irqsp || cursp == sirqsp)) {
 		__do_irq(regs);
 		set_irq_regs(old_regs);
 		return;
 	}
 	/* Switch stack and call */
-	call_do_irq(regs, irqtp);
+	call_do_irq(regs, irqsp);
 
 	set_irq_regs(old_regs);
 }
@@ -695,10 +695,7 @@ void *hardirq_ctx[NR_CPUS] __read_mostly;
 
 void do_softirq_own_stack(void)
 {
-	void *irqtp;
-
-	irqtp = softirq_ctx[smp_processor_id()];
-	call_do_softirq(irqtp);
+	call_do_softirq(softirq_ctx[smp_processor_id()]);
 }
 
 irq_hw_number_t virq_to_hw(unsigned int virq)
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 2db1c5f7d141..daa361fc6a24 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -716,19 +716,14 @@ void __init emergency_stack_init(void)
 	limit = min(ppc64_bolted_size(), ppc64_rma_size);
 
 	for_each_possible_cpu(i) {
-		void *ti;
-
-		ti = alloc_stack(limit, i);
-		paca_ptrs[i]->emergency_sp = ti + THREAD_SIZE;
+		paca_ptrs[i]->emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;
 
 #ifdef CONFIG_PPC_BOOK3S_64
 		/* emergency stack for NMI exception handling. */
-		ti = alloc_stack(limit, i);
-		paca_ptrs[i]->nmi_emergency_sp = ti + THREAD_SIZE;
+		paca_ptrs[i]->nmi_emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;
 
 		/* emergency stack for machine check exception handling. */
-		ti = alloc_stack(limit, i);
-		paca_ptrs[i]->mc_emergency_sp = ti + THREAD_SIZE;
+		paca_ptrs[i]->mc_emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;
 #endif
 	}
 }
-- 
2.20.1


      parent reply	other threads:[~2019-02-05 12:17 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-05 11:31 [PATCH v16 00/21] powerpc: Switch to CONFIG_THREAD_INFO_IN_TASK Michael Ellerman
2019-02-05 11:31 ` [PATCH v16 01/21] powerpc/irq: use memblock functions returning virtual address Michael Ellerman
2019-02-07  3:54   ` Nicholas Piggin
2019-02-26  3:27   ` [v16, " Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 02/21] powerpc/32: Fix CONFIG_VIRT_CPU_ACCOUNTING_NATIVE for 40x/booke Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 03/21] powerpc: Avoid circular header inclusion in mmu-hash.h Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 04/21] powerpc: Only use task_struct 'cpu' field on SMP Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 05/21] powerpc: prep stack walkers for THREAD_INFO_IN_TASK Michael Ellerman
2019-02-07  4:05   ` Nicholas Piggin
2019-02-23 11:31   ` Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 06/21] powerpc: Rename THREAD_INFO to TASK_STACK Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 07/21] powerpc: call_do_[soft]irq() takes a pointer to the stack Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 08/21] powerpc: Don't use CURRENT_THREAD_INFO to find " Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 09/21] powerpc: Replace current_thread_info()->task with current Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 10/21] powerpc: Update comments in preparation for THREAD_INFO_IN_TASK Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 11/21] powerpc/64: Use task_stack_page() to initialise paca->kstack Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 12/21] powerpc: Use sizeof(struct thread_info) in INIT_SP_LIMIT Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 13/21] powerpc: Use linux/thread_info.h in processor.h Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 14/21] powerpc: Use task_stack_page() in current_pt_regs() Michael Ellerman
2019-02-07  4:13   ` Nicholas Piggin
2019-02-05 11:32 ` [PATCH v16 15/21] powerpc/idle/6xx: Use r1 with CURRENT_THREAD_INFO() Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 16/21] powerpc: Activate CONFIG_THREAD_INFO_IN_TASK Michael Ellerman
2019-02-07  4:44   ` Nicholas Piggin
2019-02-07  4:53   ` Nicholas Piggin
2019-02-07  6:07     ` Christophe Leroy
2019-02-05 11:32 ` [PATCH v16 17/21] powerpc: regain entire stack space Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 18/21] powerpc: 'current_set' is now a table of task_struct pointers Michael Ellerman
2019-02-05 11:32 ` [PATCH v16 19/21] powerpc/32: Remove CURRENT_THREAD_INFO and rename TI_CPU Michael Ellerman
2019-02-07  0:10   ` Michael Ellerman
2019-02-07  4:27   ` Nicholas Piggin
2019-02-07  4:41     ` Nicholas Piggin
2019-02-05 11:32 ` [PATCH v16 20/21] powerpc/64: Replace CURRENT_THREAD_INFO with PACA_CURRENT_TI Michael Ellerman
2019-02-07  4:24   ` Nicholas Piggin
2019-02-05 11:32 ` Michael Ellerman [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190205113219.17903-22-mpe@ellerman.id.au \
    --to=mpe@ellerman.id.au \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=npiggin@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).