lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH AUTOSEL 5.4 076/350] staging/octeon: Use stubs for MIPS && !CAVIUM_OCTEON_SOC
    On Tue, Dec 10, 2019 at 04:03:01PM -0500, Sasha Levin wrote:
    > From: Paul Burton <paul.burton@mips.com>
    >
    > [ Upstream commit 17a29fea086ba18b000d28439bd5cb4f2b0a527b ]
    >
    > When building for a non-Cavium MIPS system with COMPILE_TEST=y, the
    > Octeon ethernet driver hits a number of issues due to use of macros
    > provided only for CONFIG_CAVIUM_OCTEON_SOC=y configurations. For
    > example:
    >
    > drivers/staging/octeon/ethernet-rx.c:190:6: error:
    > 'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared (first use in this function)
    > drivers/staging/octeon/ethernet-rx.c:472:25: error:
    > 'OCTEON_IRQ_WORKQ0' undeclared (first use in this function)
    >
    > These come from various asm/ headers that a non-Octeon build will be
    > using a non-Octeon version of.
    >
    > Fix this by using the octeon-stubs.h header for non-Cavium MIPS builds,
    > and only using the real asm/octeon/ headers when building a Cavium
    > Octeon kernel configuration.
    >
    > This requires that octeon-stubs.h doesn't redefine XKPHYS_TO_PHYS, which
    > is defined for MIPS by asm/addrspace.h which is pulled in by many other
    > common asm/ headers.
    >
    > Signed-off-by: Paul Burton <paul.burton@mips.com>
    > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
    > URL: https://lore.kernel.org/linux-mips/CAMuHMdXvu+BppwzsU9imNWVKea_hoLcRt9N+a29Q-QsjW=ip2g@mail.gmail.com/
    > Fixes: 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS")
    > Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
    > Cc: David S. Miller <davem@davemloft.net>
    >
    > Link: https://lore.kernel.org/r/20191007231741.2012860-1-paul.burton@mips.com
    > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    > Signed-off-by: Sasha Levin <sashal@kernel.org>
    > ---
    > drivers/staging/octeon/octeon-ethernet.h | 2 +-
    > drivers/staging/octeon/octeon-stubs.h | 5 ++++-
    > 2 files changed, 5 insertions(+), 2 deletions(-)

    I think this broke the build for 5.5-rc1, so no, please do not include
    this. This driver is about to be deleted (see the discussion on the
    staging mailing list for details), so this patch can be dropped.

    thanks,

    greg k-h

    \
     
     \ /
      Last update: 2019-12-11 08:52    [W:2.182 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site