From: Nathan Lynch <nathanl@linux.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: linuxppc-dev@lists.ozlabs.org, Nathan Lynch <nathanl@linux.ibm.com>
Subject: [PATCH 5/7] powerpc/rtas: Move post_mobility_fixup() declaration to pseries
Date: Mon, 06 Nov 2023 07:42:57 -0600 [thread overview]
Message-ID: <20231106-rtas-trivial-v1-5-61847655c51f@linux.ibm.com> (raw)
In-Reply-To: <20231106-rtas-trivial-v1-0-61847655c51f@linux.ibm.com>
This is a pseries-specific function declaration that doesn't belong in
rtas.h. Move it to the pseries platform code and adjust
pseries/suspend.c accordingly.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
---
arch/powerpc/include/asm/rtas.h | 1 -
arch/powerpc/platforms/pseries/pseries.h | 1 +
arch/powerpc/platforms/pseries/suspend.c | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index c6568a647cd0..2365668fc13e 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -444,7 +444,6 @@ extern void pSeries_log_error(char *buf, unsigned int err_type, int fatal);
#ifdef CONFIG_PPC_PSERIES
extern time64_t last_rtas_event;
extern int clobbering_unread_rtas_event(void);
-extern void post_mobility_fixup(void);
int rtas_syscall_dispatch_ibm_suspend_me(u64 handle);
#else
static inline int clobbering_unread_rtas_event(void) { return 0; }
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 8376f03f932a..bba4ad192b0f 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -55,6 +55,7 @@ extern int dlpar_detach_node(struct device_node *);
extern int dlpar_acquire_drc(u32 drc_index);
extern int dlpar_release_drc(u32 drc_index);
extern int dlpar_unisolate_drc(u32 drc_index);
+extern void post_mobility_fixup(void);
void queue_hotplug_event(struct pseries_hp_errorlog *hp_errlog);
int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_errlog);
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index 5c43435472cc..382003dfdb9a 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -13,6 +13,7 @@
#include <asm/mmu.h>
#include <asm/rtas.h>
#include <asm/topology.h>
+#include "pseries.h"
static struct device suspend_dev;
--
2.41.0
WARNING: multiple messages have this Message-ID (diff)
From: Nathan Lynch via B4 Relay <devnull+nathanl.linux.ibm.com@kernel.org>
To: Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Nathan Lynch <nathanl@linux.ibm.com>, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 5/7] powerpc/rtas: Move post_mobility_fixup() declaration to pseries
Date: Mon, 06 Nov 2023 07:42:57 -0600 [thread overview]
Message-ID: <20231106-rtas-trivial-v1-5-61847655c51f@linux.ibm.com> (raw)
In-Reply-To: <20231106-rtas-trivial-v1-0-61847655c51f@linux.ibm.com>
From: Nathan Lynch <nathanl@linux.ibm.com>
This is a pseries-specific function declaration that doesn't belong in
rtas.h. Move it to the pseries platform code and adjust
pseries/suspend.c accordingly.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
---
arch/powerpc/include/asm/rtas.h | 1 -
arch/powerpc/platforms/pseries/pseries.h | 1 +
arch/powerpc/platforms/pseries/suspend.c | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index c6568a647cd0..2365668fc13e 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -444,7 +444,6 @@ extern void pSeries_log_error(char *buf, unsigned int err_type, int fatal);
#ifdef CONFIG_PPC_PSERIES
extern time64_t last_rtas_event;
extern int clobbering_unread_rtas_event(void);
-extern void post_mobility_fixup(void);
int rtas_syscall_dispatch_ibm_suspend_me(u64 handle);
#else
static inline int clobbering_unread_rtas_event(void) { return 0; }
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 8376f03f932a..bba4ad192b0f 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -55,6 +55,7 @@ extern int dlpar_detach_node(struct device_node *);
extern int dlpar_acquire_drc(u32 drc_index);
extern int dlpar_release_drc(u32 drc_index);
extern int dlpar_unisolate_drc(u32 drc_index);
+extern void post_mobility_fixup(void);
void queue_hotplug_event(struct pseries_hp_errorlog *hp_errlog);
int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_errlog);
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index 5c43435472cc..382003dfdb9a 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -13,6 +13,7 @@
#include <asm/mmu.h>
#include <asm/rtas.h>
#include <asm/topology.h>
+#include "pseries.h"
static struct device suspend_dev;
--
2.41.0
next prev parent reply other threads:[~2023-11-06 13:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 13:42 [PATCH 0/7] powerpc/rtas: Trivial, coding style, and kernel-doc fixes Nathan Lynch
2023-11-06 13:42 ` Nathan Lynch via B4 Relay
2023-11-06 13:42 ` [PATCH 1/7] powerpc/pseries/rtas-work-area: Fix rtas_work_area_reserve_arena() kernel-doc Nathan Lynch via B4 Relay
2023-11-06 13:42 ` Nathan Lynch
2023-11-06 13:42 ` [PATCH 2/7] powerpc/rtas: Fix ppc_rtas_rmo_buf_show() kernel-doc Nathan Lynch via B4 Relay
2023-11-06 13:42 ` Nathan Lynch
2023-11-06 13:42 ` [PATCH 3/7] powerpc/rtas: Drop declaration of undefined call_rtas() function Nathan Lynch
2023-11-06 13:42 ` Nathan Lynch via B4 Relay
2023-11-06 13:42 ` [PATCH 4/7] powerpc/rtas: Remove unused rtas_service_present() Nathan Lynch via B4 Relay
2023-11-06 13:42 ` Nathan Lynch
2023-11-06 13:42 ` Nathan Lynch [this message]
2023-11-06 13:42 ` [PATCH 5/7] powerpc/rtas: Move post_mobility_fixup() declaration to pseries Nathan Lynch via B4 Relay
2023-11-06 13:42 ` [PATCH 6/7] powerpc/rtas: Remove trailing space Nathan Lynch via B4 Relay
2023-11-06 13:42 ` Nathan Lynch
2023-11-06 13:42 ` [PATCH 7/7] powerpc/rtas: Remove 'extern' from function declarations in rtas.h Nathan Lynch via B4 Relay
2023-11-06 13:42 ` Nathan Lynch
2023-11-13 2:45 ` (subset) [PATCH 0/7] powerpc/rtas: Trivial, coding style, and kernel-doc fixes Michael Ellerman
2023-12-07 12:38 ` Michael Ellerman
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=20231106-rtas-trivial-v1-5-61847655c51f@linux.ibm.com \
--to=nathanl@linux.ibm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.