lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 430/917] net: intel: igc_ptp: fix build for UML
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit 523994ba3ad1b7b55abe4a72e156897b5e2db825 ]

    On a UML build, the igc_ptp driver uses CONFIG_X86_TSC for timestamp
    conversion. The function that is used is not available on UML builds,
    so have the function use the default system_counterval_t timestamp
    instead for UML builds.

    Prevents this build error on UML:

    ../drivers/net/ethernet/intel/igc/igc_ptp.c: In function ‘igc_device_tstamp_to_system’:
    ../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: implicit declaration of function ‘convert_art_ns_to_tsc’ [-Werror=implicit-function-declaration]
    return convert_art_ns_to_tsc(tstamp);
    ../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: incompatible types when returning type ‘int’ but ‘struct system_counterval_t’ was expected
    return convert_art_ns_to_tsc(tstamp);

    Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Cc: linux-um@lists.infradead.org
    Cc: Jeff Dike <jdike@addtoit.com>
    Cc: Richard Weinberger <richard@nod.at>
    Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
    Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
    Cc: intel-wired-lan@lists.osuosl.org
    Link: https://lore.kernel.org/r/20211014050516.6846-1-rdunlap@infradead.org
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/igc/igc_ptp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
    index 0f021909b430a..30568e3544cda 100644
    --- a/drivers/net/ethernet/intel/igc/igc_ptp.c
    +++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
    @@ -773,7 +773,7 @@ static bool igc_is_crosststamp_supported(struct igc_adapter *adapter)

    static struct system_counterval_t igc_device_tstamp_to_system(u64 tstamp)
    {
    -#if IS_ENABLED(CONFIG_X86_TSC)
    +#if IS_ENABLED(CONFIG_X86_TSC) && !defined(CONFIG_UML)
    return convert_art_ns_to_tsc(tstamp);
    #else
    return (struct system_counterval_t) { };
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:42    [W:3.054 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site