[PATCH 2/3] arm64/crashdump: unify routine to get page_offset

[Pingfan Liu]

On Wed, Dec 15, 2021 at 9:35 PM Philipp Rudo <prudo at redhat.com> wrote:
>
> Hi Pinfang,
>
> On Fri, 10 Dec 2021 11:07:34 +0800
> Pingfan Liu <piliu at redhat.com> wrote:
>
> > There are two funcs to get page_offset:
> >   get_kernel_page_offset()
> >   get_page_offset()
> >
> > Since get_kernel_page_offset() does not observe the kernel formula, and
> > remove it. Unify them in order to introduce 52-bits VA kernel more
> > easily in the coming patch.
> >
> > Signed-off-by: Pingfan Liu <piliu at redhat.com>
> > ---
> >  kexec/arch/arm64/crashdump-arm64.c | 23 +----------------------
> >  kexec/arch/arm64/kexec-arm64.c     |  4 ++--
> >  kexec/arch/arm64/kexec-arm64.h     |  1 +
> >  3 files changed, 4 insertions(+), 24 deletions(-)
> >
> > diff --git a/kexec/arch/arm64/crashdump-arm64.c b/kexec/arch/arm64/crashdump-arm64.c
> > index a02019a..0a8d44c 100644
> > --- a/kexec/arch/arm64/crashdump-arm64.c
> > +++ b/kexec/arch/arm64/crashdump-arm64.c
>
> [...]
>
> > diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
> > index 7373fa3..bd650e6 100644
> > --- a/kexec/arch/arm64/kexec-arm64.c
> > +++ b/kexec/arch/arm64/kexec-arm64.c
> > @@ -909,7 +909,7 @@ static int get_va_bits(void)
> >   * get_page_offset - Helper for getting PAGE_OFFSET
> >   */
> >
> > -static int get_page_offset(void)
> > +int get_page_offset(unsigned long *page_offset)
> >  {
> >       int ret;
> >
>
> The new page_offset is never used in this patch. There's still the line
> left with the global page_offset but that will cause a type miss-match
> (unsigend long vs unsigned log *). In the next patch you do the update
> (page_offset -> *page_offset) but in the meantime the code is broken.
>
I will fix it in V2.

Thanks,

Pingfan