| Message ID | 1518474848-3158-1-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 910961754572a2f4c83ad7e610d180e3e6c29bda |
| Headers | show |
| Series | [1/2] powerpc/kdump: Add missing optional dummy functions | expand |
On Tue, Feb 13, 2018 at 9:34 AM, Guenter Roeck <linux@roeck-us.net> wrote: > If KEXEC_CORE is not enabled, PowerNV builds fail as follows. > > arch/powerpc/platforms/powernv/smp.c: In function 'pnv_smp_cpu_kill_self': > arch/powerpc/platforms/powernv/smp.c:236:4: error: > implicit declaration of function 'crash_ipi_callback' > > Add dummy function calls, similar to kdump_in_progress(), to solve the > problem. > > Fixes: 4145f358644b ("powernv/kdump: Fix cases where the kdump kernel ...") > Cc: Balbir Singh <bsingharora@gmail.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Nicholas Piggin <npiggin@gmail.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- Thanks for working on this. You've added two functions, I understand the crash_send_ipi() bits that I broke. Looks like crash_ipi_callback broken without KEXEC_CORE? I am going to test these patches, for now Acked-by: Balbir Singh <bsingharora@gmail.com> Balbir Singh
On Tue, Feb 13, 2018 at 10:01:57AM +1100, Balbir Singh wrote: > On Tue, Feb 13, 2018 at 9:34 AM, Guenter Roeck <linux@roeck-us.net> wrote: > > If KEXEC_CORE is not enabled, PowerNV builds fail as follows. > > > > arch/powerpc/platforms/powernv/smp.c: In function 'pnv_smp_cpu_kill_self': > > arch/powerpc/platforms/powernv/smp.c:236:4: error: > > implicit declaration of function 'crash_ipi_callback' > > > > Add dummy function calls, similar to kdump_in_progress(), to solve the > > problem. > > > > Fixes: 4145f358644b ("powernv/kdump: Fix cases where the kdump kernel ...") > > Cc: Balbir Singh <bsingharora@gmail.com> > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > Cc: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > --- > > Thanks for working on this. > > You've added two functions, I understand the crash_send_ipi() bits > that I broke. Looks like crash_ipi_callback broken without KEXEC_CORE? > If I recall correctly, 4145f358644b introduced the call to crash_ipi_callback(). After I declared the dummy function for that, I got an error about the missing crash_send_ipi(). I didn't spend more time on it but just added another dummy function. It may well be that another problem was introduced in the same time frame. On the other side, maybe I got it all wrong, and my patch is not worth the computer it was written on. Thanks, Guenter
Guenter Roeck <linux@roeck-us.net> writes: > If KEXEC_CORE is not enabled, PowerNV builds fail as follows. > > arch/powerpc/platforms/powernv/smp.c: In function 'pnv_smp_cpu_kill_self': > arch/powerpc/platforms/powernv/smp.c:236:4: error: > implicit declaration of function 'crash_ipi_callback' > > Add dummy function calls, similar to kdump_in_progress(), to solve the > problem. > > Fixes: 4145f358644b ("powernv/kdump: Fix cases where the kdump kernel ...") Personally I prefer these untruncated. > Cc: Balbir Singh <bsingharora@gmail.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Nicholas Piggin <npiggin@gmail.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > arch/powerpc/include/asm/kexec.h | 6 ++++++ > 1 file changed, 6 insertions(+) Thanks. Nathan sent a fix for this a few days ago, but I like this version because it uses the existing #ifdefs. I've taken this version but used the subject from his patch. cheers > diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h > index 9dcbfa6bbb91..d8b1e8e7e035 100644 > --- a/arch/powerpc/include/asm/kexec.h > +++ b/arch/powerpc/include/asm/kexec.h > @@ -140,6 +140,12 @@ static inline bool kdump_in_progress(void) > return false; > } > > +static inline void crash_ipi_callback(struct pt_regs *regs) { } > + > +static inline void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *)) > +{ > +} > + > #endif /* CONFIG_KEXEC_CORE */ > #endif /* ! __ASSEMBLY__ */ > #endif /* __KERNEL__ */ > -- > 2.7.4
On Mon, 12 Feb 2018 15:25:51 -0800 Guenter Roeck <linux@roeck-us.net> wrote: > On Tue, Feb 13, 2018 at 10:01:57AM +1100, Balbir Singh wrote: > > On Tue, Feb 13, 2018 at 9:34 AM, Guenter Roeck <linux@roeck-us.net> wrote: > > > If KEXEC_CORE is not enabled, PowerNV builds fail as follows. > > > > > > arch/powerpc/platforms/powernv/smp.c: In function 'pnv_smp_cpu_kill_self': > > > arch/powerpc/platforms/powernv/smp.c:236:4: error: > > > implicit declaration of function 'crash_ipi_callback' > > > > > > Add dummy function calls, similar to kdump_in_progress(), to solve the > > > problem. > > > > > > Fixes: 4145f358644b ("powernv/kdump: Fix cases where the kdump kernel ...") > > > Cc: Balbir Singh <bsingharora@gmail.com> > > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > > Cc: Nicholas Piggin <npiggin@gmail.com> > > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > > --- > > > > Thanks for working on this. > > > > You've added two functions, I understand the crash_send_ipi() bits > > that I broke. Looks like crash_ipi_callback broken without KEXEC_CORE? > > > > If I recall correctly, 4145f358644b introduced the call to crash_ipi_callback(). > After I declared the dummy function for that, I got an error about the missing > crash_send_ipi(). I didn't spend more time on it but just added another dummy > function. It may well be that another problem was introduced in the same time > frame. On the other side, maybe I got it all wrong, and my patch is not worth > the computer it was written on. > The patches worked for me with CONFIG_KEXEC=n and CONFIG_KEXEC_CORE=n Tested-by: Balbir Singh <bsingharora@gmail.com> Balbir Singh
On Mon, 2018-02-12 at 22:34:07 UTC, Guenter Roeck wrote: > If KEXEC_CORE is not enabled, PowerNV builds fail as follows. > > arch/powerpc/platforms/powernv/smp.c: In function 'pnv_smp_cpu_kill_self': > arch/powerpc/platforms/powernv/smp.c:236:4: error: > implicit declaration of function 'crash_ipi_callback' > > Add dummy function calls, similar to kdump_in_progress(), to solve the > problem. > > Fixes: 4145f358644b ("powernv/kdump: Fix cases where the kdump kernel ...") > Cc: Balbir Singh <bsingharora@gmail.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Nicholas Piggin <npiggin@gmail.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > Acked-by: Balbir Singh <bsingharora@gmail.com> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/910961754572a2f4c83ad7e610d180 cheers
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 9dcbfa6bbb91..d8b1e8e7e035 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -140,6 +140,12 @@ static inline bool kdump_in_progress(void) return false; } +static inline void crash_ipi_callback(struct pt_regs *regs) { } + +static inline void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *)) +{ +} + #endif /* CONFIG_KEXEC_CORE */ #endif /* ! __ASSEMBLY__ */ #endif /* __KERNEL__ */
If KEXEC_CORE is not enabled, PowerNV builds fail as follows. arch/powerpc/platforms/powernv/smp.c: In function 'pnv_smp_cpu_kill_self': arch/powerpc/platforms/powernv/smp.c:236:4: error: implicit declaration of function 'crash_ipi_callback' Add dummy function calls, similar to kdump_in_progress(), to solve the problem. Fixes: 4145f358644b ("powernv/kdump: Fix cases where the kdump kernel ...") Cc: Balbir Singh <bsingharora@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- arch/powerpc/include/asm/kexec.h | 6 ++++++ 1 file changed, 6 insertions(+)