From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Date: Mon, 15 Nov 2021 17:58:45 +0100 Subject: [Intel-wired-lan] [PATCH 5.15 430/917] net: intel: igc_ptp: fix build for UML In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> Message-ID: <20211115165443.371123535@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: From: Randy Dunlap [ 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 Cc: linux-um at lists.infradead.org Cc: Jeff Dike Cc: Richard Weinberger Cc: Anton Ivanov Cc: Jesse Brandeburg Cc: Tony Nguyen Cc: intel-wired-lan at lists.osuosl.org Link: https://lore.kernel.org/r/20211014050516.6846-1-rdunlap at infradead.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmh1I-00Gltx-HI for linux-um@lists.infradead.org; Mon, 15 Nov 2021 18:47:57 +0000 From: Greg Kroah-Hartman Subject: [PATCH 5.15 430/917] net: intel: igc_ptp: fix build for UML Date: Mon, 15 Nov 2021 17:58:45 +0100 Message-Id: <20211115165443.371123535@linuxfoundation.org> In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , linux-um@lists.infradead.org, Jeff Dike , Richard Weinberger , Anton Ivanov , Jesse Brandeburg , Tony Nguyen , intel-wired-lan@lists.osuosl.org, Jakub Kicinski , Sasha Levin RnJvbTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CgpbIFVwc3RyZWFtIGNv bW1pdCA1MjM5OTRiYTNhZDFiN2I1NWFiZTRhNzJlMTU2ODk3YjVlMmRiODI1IF0KCk9uIGEgVU1M IGJ1aWxkLCB0aGUgaWdjX3B0cCBkcml2ZXIgdXNlcyBDT05GSUdfWDg2X1RTQyBmb3IgdGltZXN0 YW1wCmNvbnZlcnNpb24uIFRoZSBmdW5jdGlvbiB0aGF0IGlzIHVzZWQgaXMgbm90IGF2YWlsYWJs ZSBvbiBVTUwgYnVpbGRzLApzbyBoYXZlIHRoZSBmdW5jdGlvbiB1c2UgdGhlIGRlZmF1bHQgc3lz dGVtX2NvdW50ZXJ2YWxfdCB0aW1lc3RhbXAKaW5zdGVhZCBmb3IgVU1MIGJ1aWxkcy4KClByZXZl bnRzIHRoaXMgYnVpbGQgZXJyb3Igb24gVU1MOgoKLi4vZHJpdmVycy9uZXQvZXRoZXJuZXQvaW50 ZWwvaWdjL2lnY19wdHAuYzogSW4gZnVuY3Rpb24g4oCYaWdjX2RldmljZV90c3RhbXBfdG9fc3lz dGVt4oCZOgouLi9kcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRlbC9pZ2MvaWdjX3B0cC5jOjc3Nzo5 OiBlcnJvcjogaW1wbGljaXQgZGVjbGFyYXRpb24gb2YgZnVuY3Rpb24g4oCYY29udmVydF9hcnRf bnNfdG9fdHNj4oCZIFstV2Vycm9yPWltcGxpY2l0LWZ1bmN0aW9uLWRlY2xhcmF0aW9uXQogIHJl dHVybiBjb252ZXJ0X2FydF9uc190b190c2ModHN0YW1wKTsKLi4vZHJpdmVycy9uZXQvZXRoZXJu ZXQvaW50ZWwvaWdjL2lnY19wdHAuYzo3Nzc6OTogZXJyb3I6IGluY29tcGF0aWJsZSB0eXBlcyB3 aGVuIHJldHVybmluZyB0eXBlIOKAmGludOKAmSBidXQg4oCYc3RydWN0IHN5c3RlbV9jb3VudGVy dmFsX3TigJkgd2FzIGV4cGVjdGVkCiAgcmV0dXJuIGNvbnZlcnRfYXJ0X25zX3RvX3RzYyh0c3Rh bXApOwoKRml4ZXM6IDY4ZjVkM2YzYjY1NCAoInVtOiBhZGQgUENJIG92ZXIgdmlydGlvIGVtdWxh dGlvbiBkcml2ZXIiKQpTaWduZWQtb2ZmLWJ5OiBSYW5keSBEdW5sYXAgPHJkdW5sYXBAaW5mcmFk ZWFkLm9yZz4KQ2M6IGxpbnV4LXVtQGxpc3RzLmluZnJhZGVhZC5vcmcKQ2M6IEplZmYgRGlrZSA8 amRpa2VAYWRkdG9pdC5jb20+CkNjOiBSaWNoYXJkIFdlaW5iZXJnZXIgPHJpY2hhcmRAbm9kLmF0 PgpDYzogQW50b24gSXZhbm92IDxhbnRvbi5pdmFub3ZAY2FtYnJpZGdlZ3JleXMuY29tPgpDYzog SmVzc2UgQnJhbmRlYnVyZyA8amVzc2UuYnJhbmRlYnVyZ0BpbnRlbC5jb20+CkNjOiBUb255IE5n dXllbiA8YW50aG9ueS5sLm5ndXllbkBpbnRlbC5jb20+CkNjOiBpbnRlbC13aXJlZC1sYW5AbGlz dHMub3N1b3NsLm9yZwpMaW5rOiBodHRwczovL2xvcmUua2VybmVsLm9yZy9yLzIwMjExMDE0MDUw NTE2LjY4NDYtMS1yZHVubGFwQGluZnJhZGVhZC5vcmcKU2lnbmVkLW9mZi1ieTogSmFrdWIgS2lj aW5za2kgPGt1YmFAa2VybmVsLm9yZz4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hh bEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvbmV0L2V0aGVybmV0L2ludGVsL2lnYy9pZ2NfcHRw LmMgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRlbC9pZ2MvaWdjX3B0cC5jIGIv ZHJpdmVycy9uZXQvZXRoZXJuZXQvaW50ZWwvaWdjL2lnY19wdHAuYwppbmRleCAwZjAyMTkwOWI0 MzBhLi4zMDU2OGUzNTQ0Y2RhIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRl bC9pZ2MvaWdjX3B0cC5jCisrKyBiL2RyaXZlcnMvbmV0L2V0aGVybmV0L2ludGVsL2lnYy9pZ2Nf cHRwLmMKQEAgLTc3Myw3ICs3NzMsNyBAQCBzdGF0aWMgYm9vbCBpZ2NfaXNfY3Jvc3N0c3RhbXBf c3VwcG9ydGVkKHN0cnVjdCBpZ2NfYWRhcHRlciAqYWRhcHRlcikKIAogc3RhdGljIHN0cnVjdCBz eXN0ZW1fY291bnRlcnZhbF90IGlnY19kZXZpY2VfdHN0YW1wX3RvX3N5c3RlbSh1NjQgdHN0YW1w KQogewotI2lmIElTX0VOQUJMRUQoQ09ORklHX1g4Nl9UU0MpCisjaWYgSVNfRU5BQkxFRChDT05G SUdfWDg2X1RTQykgJiYgIWRlZmluZWQoQ09ORklHX1VNTCkKIAlyZXR1cm4gY29udmVydF9hcnRf bnNfdG9fdHNjKHRzdGFtcCk7CiAjZWxzZQogCXJldHVybiAoc3RydWN0IHN5c3RlbV9jb3VudGVy dmFsX3QpIHsgfTsKLS0gCjIuMzMuMAoKCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KbGludXgtdW0gbWFpbGluZyBsaXN0CmxpbnV4LXVtQGxpc3RzLmlu ZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9s aW51eC11bQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09142C433F5 for ; Tue, 16 Nov 2021 00:41:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5F5D61205 for ; Tue, 16 Nov 2021 00:41:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345634AbhKPAoo (ORCPT ); Mon, 15 Nov 2021 19:44:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:45220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343871AbhKOTWQ (ORCPT ); Mon, 15 Nov 2021 14:22:16 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 71BA86339E; Mon, 15 Nov 2021 18:47:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637002076; bh=odq/y+JYCzdPMIOo+K8Xx9cwJ4a9FATDI5/rCaDVnKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bd1C7KumCfm7KQvBvD1FXmkKvtczzIfTzTJQ/MDPBnNpL0gTa3A13m4A5q+K6Je07 TKySTwkYdI2HmCwrxRVy8yqerqxlYFs5qo7Uma8qrSJtu6K6j9G+7TgXEiZtk2BAe9 LAAllcDngpCELJM6Qva9N3GC0t8kLCL27BdAp8Kg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , linux-um@lists.infradead.org, Jeff Dike , Richard Weinberger , Anton Ivanov , Jesse Brandeburg , Tony Nguyen , intel-wired-lan@lists.osuosl.org, Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 430/917] net: intel: igc_ptp: fix build for UML Date: Mon, 15 Nov 2021 17:58:45 +0100 Message-Id: <20211115165443.371123535@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ 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 Cc: linux-um@lists.infradead.org Cc: Jeff Dike Cc: Richard Weinberger Cc: Anton Ivanov Cc: Jesse Brandeburg Cc: Tony Nguyen Cc: intel-wired-lan@lists.osuosl.org Link: https://lore.kernel.org/r/20211014050516.6846-1-rdunlap@infradead.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- 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