From patchwork Fri Aug 18 01:20:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hilber X-Patchwork-Id: 13357192 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D740C678DC for ; Fri, 18 Aug 2023 01:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VErdqwAcxWzyA5lDgNfWqwHmCVFqlKGtvvqvLBx2KUs=; b=V4nG8wOmg1nUGX AYlKmmskj+h5PA/nLKgSnztI2l8SIR0/QtxuDxJMuA/GG3cBs4mYxKtQk9VitwTIaK8DF2kyJvx7w 1BiNWzB1hwRc3H+SQp1hG2s2TAte2IvqVoJ7NsalRGrutba/XB7mXIw3E322oCcJUyFSFK0MwFxiV MBdLe2W/9yhlNSeSWydHRQvyyqZC6gTGxWEuY/1jkFTHRwAXJQDmiyRG3C+r8yw7hYD+ww9Aj+/P2 hZt+cuRaKyr+NmjUmIdvJbC2ODa6qJezVf0Q4THoFhUvYNsNjl5EyQsa1BFDG6ZxcDwEl/W/PKCqk fgvR8aBYSo663blXx9Vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWoAQ-007STf-33; Fri, 18 Aug 2023 01:20:46 +0000 Received: from repost01.tmes.trendmicro.eu ([18.185.115.119]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qWoAE-007SQH-2R for linux-arm-kernel@lists.infradead.org; Fri, 18 Aug 2023 01:20:39 +0000 Received: from 104.47.7.177_.trendmicro.com (unknown [172.21.183.240]) by repost01.tmes.trendmicro.eu (Postfix) with SMTP id 74D8A1000045E; Fri, 18 Aug 2023 01:20:29 +0000 (UTC) X-TM-MAIL-RECEIVED-TIME: 1692321628.689000 X-TM-MAIL-UUID: 07d632d7-cde6-43d8-9357-0a71ee8f957c Received: from DEU01-BE0-obe.outbound.protection.outlook.com (unknown [104.47.7.177]) by repre01.tmes.trendmicro.eu (Trend Micro Email Security) with ESMTPS id A864910004D9B; Fri, 18 Aug 2023 01:20:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nhnjM0Bd/gRX/BedOVejWXGq4i26nDmwYBKbGJYBehC2J7ImRvn3e76yqJnBHUuvnz2w/Z1OSdP/F6+v5xkeSY0nJmovH4b8WSTQUAY/H0x7vxjRD8C22aPxNyOFJnNb+siryeQnYKBt29SGYJcpa8ABntGLkJFgVsgjtsIBYTrC9WFxsp4P3Jvl7lEP7BktvqGTwBubQne7BjT0EOfjpwDq/C0XkQ4cJ8erGV11a4H1g5JJkOOUTJktXZAp0RrWEeVSNLoS6Uk7QlhFERumZA5Mko2+2Iux01JkTpoz6pyWbN7OYVMZQOzQj6Bpjly8a6qgCgBzMBx1erUXZRyNOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5jhQPEYg1kz6RVlruhL6u/K0RpmZUCn+jdbW6TjVxME=; b=FuDyU7I9mdGvziL2xOCWUd+RxuvzWFXWDrNQk1ihlmabf+GBDtV/VQhq8OCbVkRsBeTKViAEAWy6PyJPj30wvuslm1IbhxQ3zrxv+SQBuKM3LcWCi+KoGhx6QjfUDHwAbMKLPIV9mwOJGLoLpDLEP5XjIvvcg9tCI1mAdGV/nUQ6YkZTs9uHNWLI5mUhrghrwL6rcY3hIcKLrBUiHLy85D2H4V4T2qLynejdQbXPw+ngACuV3+qkc8fluRtdcuJGuB1U8uAhEjz6jAHEMqExc6drjJKDyCvY9fFY3yKSNO2eKMta1/emDUwf2KyawcA5juYb0NQOXYpQubHAU+kFeg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.66.60.4) smtp.rcpttodomain=arm.com smtp.mailfrom=opensynergy.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=opensynergy.com; dkim=none (message not signed); arc=none X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.66.60.4) smtp.mailfrom=opensynergy.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=opensynergy.com; Received-SPF: Pass (protection.outlook.com: domain of opensynergy.com designates 217.66.60.4 as permitted sender) receiver=protection.outlook.com; client-ip=217.66.60.4; helo=SR-MAIL-03.open-synergy.com; pr=C From: Peter Hilber To: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org Cc: Peter Hilber , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Richard Cochran , netdev@vger.kernel.org, Marc Zyngier , Mark Rutland , Daniel Lezcano , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 4/6] virtio_rtc: Add module and driver core Date: Fri, 18 Aug 2023 03:20:10 +0200 Message-Id: <20230818012014.212155-5-peter.hilber@opensynergy.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818012014.212155-1-peter.hilber@opensynergy.com> References: <20230818012014.212155-1-peter.hilber@opensynergy.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1EUR05FT068:EE_|FR2P281MB1718:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ce4a7fc-21fe-4b28-befe-08db9f894dcd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pmloBnDNRR+Y/lLj4VDw86a4bo8TWxrZUU3LO1cBWow7XWsqREy6qocJfV7b8X8KGx+zFQRokoFf13VSpew6BldA1a5EElC2l3CNyMYHF1f3wMmmI1x+EvqaWZOhwBdqRmcu+X+ZsecEW4oqULY+klEg1qxFmG1w0YP5L1p3z+I3BpXtBkmmnu1ohgnmdwC/Au1mEt8nIfVwn/maFMrLATuSslDeq8liFWQFe1rgSqLja4WCObR1+KLsAAVvV5wWk9BnYdx6QUPPNLGdXufs5SiRH3sNejlMv3i+M/DeYIfO//TnaX9P0o0hreJoix4EpW00EvWCLji/SE6KP7nEpouF9reUb1M8KFJ1Tg6LyEHzWwbat/MqIfuqXoKzw2+XZCeIiWTpk7mYwXmxS5T8FINYMRuFv1DckbkA5lZAKyWRkMnbcU8FOldfnY72ZQ6stNMorfdLGr3YbqH4oGUnvpxKQEl12C8lulQAvDXypBUt+clOEn1oSKK97VRjw6RNdC5GZN2JZ6uIGcKio3FA7oOy/7f+T8iDL4ZCEsxUnTu3tKjd0q2GyChjNp8qnhG6Z/k0ikH0B/clonRYWIBr/20d9pk21t26cSUvJeGPML6W9l51yU7cWcXkdtPWAk1cJiRnzvdeMhBWCAckr+SDzA2y35dqaZZk6PjduMQUNqPkgmQ0DgN0z+oA7j7Ymx/LccOe9HwOcC+WleJTc/xSurA/yR4w3xraD4L60Wt73uVztk3GURbyHn/9a7AnE7n7ejjAdsepg5/Kx16gs2NwigXi8b1cWJSu0JxOxHoyBk8TfAc1W96bAw5O64Ha4UMS X-Forefront-Antispam-Report: CIP:217.66.60.4;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SR-MAIL-03.open-synergy.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(136003)(396003)(376002)(346002)(39830400003)(186009)(82310400011)(1800799009)(451199024)(46966006)(36840700001)(66899024)(83380400001)(336012)(81166007)(86362001)(36756003)(47076005)(36860700001)(1076003)(40480700001)(26005)(2616005)(7416002)(8936002)(8676002)(4326008)(30864003)(41300700001)(54906003)(70206006)(70586007)(42186006)(2906002)(316002)(5660300002)(966005)(478600001)(12101799020)(44832011)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: opensynergy.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 01:20:26.6785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ce4a7fc-21fe-4b28-befe-08db9f894dcd X-MS-Exchange-CrossTenant-Id: 800fae25-9b1b-4edc-993d-c939c4e84a64 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=800fae25-9b1b-4edc-993d-c939c4e84a64;Ip=[217.66.60.4];Helo=[SR-MAIL-03.open-synergy.com] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT068.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: FR2P281MB1718 X-TM-AS-ERS: 104.47.7.177-0.0.0.0 X-TMASE-Version: StarCloud-1.3-9.1.1011-27820.003 X-TMASE-Result: 10--9.453500-4.000000 X-TMASE-MatchedRID: fg7dWpSZHJLJ+P2VFrJmrGy53dw2JHQm5f2pKgY/c023UJJ8+n/4RSJS j0953fkRWpS5sR1Imtmbfc6n6VIFW7O1F/ODk5naCqJ0RbJ3bb3t08AkgFFynZASM5lkTKECyom U41gxOyOvmMduBbYSfBOxOZUm/FwcqMfOugFNRj0v/mdfeJBuVwf8yw0JGfKV0SCNQ10PIeZ9OD X3a/d/aTkJ8R13PVYv5RN50ieMXjOJHPiCScEioNwK3aKXLlLAFT2urH0z7F2ocjoCWfKow0zXs GsDTkZg2agkMppXv0m2/m2VjREHcXV2KXA5dledk5TUws0flAgxF6GI4Gs7uFQxWbscxchmxHtx 9qt/1r9FiIQ0fcK1gMaDKYR20wpbGzL7OqSPhBBch/PYekr/BIld6gdpSPED0g+dAcmSn6KEmEj VFBjobGwB+QHjMMuMBPsCWqKv2JA5D7FiRTCtpYruruLIWfnxAJ4bT6ig74eO46CtGFNzgCOOHp I1HwbloJemVG4ZAoyJwQLSKO0PQrxrCWBi8DCI5yGfPzaydsBG93nesqMHbi+IwZW+xLvQpUGBC dNug0+J2kTfSvROnyTFn7BsOu34soVZT6+KANBkj45Xbru8vs1EbCLqdpVOgWl+IkIeOg9TvP6c dvJ8PoiT66ki87L9n3kOOI6Tvb823OtOp2WuSdKVGtUbacqDN9OHqCW0zdFOTTx1QkSESf1uOCM 2va6XQ/14LZTq1Fz+/sB9Ai8pRUPCAFQuRo+g977XxEC4bZPgOJe9wsMrCyLQjDgKVqdp7tihVU vb0P2aLS9iTK8RtOsQNAL2u95wD5teccobfJV8dniJUBtbDHwuCMDi78rnAuA4ZQEtO3paOxpgj iWHdQ9dk+6tnSFLxceaN/0Yt5pdQvLo+GtE13SXnr93fPCMzA2zeol7jys= X-TMASE-XGENCLOUD: e12a6b4c-758f-4a38-90ce-82682faa54c3-0-0-200-0 X-TM-Deliver-Signature: 74E86B8F519311B47EDB0D7DF7B73993 X-TM-Addin-Auth: xP/K8Afi/R+ChjI65nq/n+kyp0htZluDrIhqDGfZiMbaD9KkmOWCGxhIC1j nr9UKt2XAkuDTgr+XHTLCoJ4jwkHMhDxG8G/wVYscK8LmeeiFH792lodqTcLIxvxs8Hpx1qhm1w Lsaqex+vEE4nnon70t2fARL3dsfn30lWHgIulxFTcM31QELwK08qb02dzkg8E+91xxTRUmO6w6R KeHY+FrV70Z0UOLfXIL6yGr5ZtuPTwskBkJytrdk63fNPIQpIpuqyM5VHshikXh4IEFx1scyH4D +Aay1K+XRXY6Z9w=.1yM9zlSD1Rw1dIdcBz1m8AL+qIDwsX/IOQzsDnhFybh5R00IqWt3DZQzlX a7LwSLaDemis8TjFWlTb8jmFAQuX9J5detoZ0y/HMT84AHEhkpMJswCm0CxSbyoBwvQkvgxigBo KPADoVuMLJsNyvZ2kbOY0tv3cnTvU84+Kp6Ff66iGo+fkWgZcn0pTPEuC1ZxTOmzJBhcz623LW2 xfRIUTKuj8FYMFmk21rUjZUaG6q6GM73csdRkdGHfppQXEX6XKYGpm7lbeb1DP4MbpsMnBRWwRT Lxnn8oAEXZo6k1EV+zqt/cYhbUc11/Fp/+knbGqHdau/y/fPyOKk2cCrlvA== X-TM-Addin-ProductCode: EMS DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com; s=TM-DKIM-20210503141657; t=1692321629; bh=AAPoDpFjJAshqu44VeHpHnN8CWDkXcD0i4h1ESjtCbk=; l=28231; h=From:To:Date; b=EVCfDxju678A+v5tUHCUdLP0IX8rQXDUA+O1eCzu67mKcbTTJvNFBhEKJXSuqfHWP lXyiZlzm652hTPVFiXAj+/NHKJpmF1wb6+Hte1/fWnmDx3rJMFAOMIKdU9eHHGcFeI xwRYBoGvjSahDlMwVjKGvVLZes3TPU3GhIWQ27+/rpyGcIuiBYPiQnt0rmwXc5TB5B UZ8WCcWWu+gElMfaxd7NlBM1R5MbnomxlJqTV+SMUIMA8L1lx03hIZ9FEkw4bwxjad AlcZTWYwSlkTf6perrhr/5ZPTI5fSYdWTsBQUsVW1c4gmjIjpkx1lxOLmOj1B1flZn bPAacjBAITF2g== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230817_182035_089239_AE0F347B X-CRM114-Status: GOOD ( 24.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the virtio_rtc module and driver core. The virtio_rtc module implements a driver compatible with the proposed Virtio RTC device specification [1]. The Virtio RTC (Real Time Clock) device provides information about current time. The device can provide different clocks, e.g. for the UTC or TAI time standards, or for physical time elapsed since some past epoch. The driver can read the clocks with simple or more accurate methods. Implement the core, which interacts with the Virtio RTC device. Apart from this, the core does not expose functionality outside of the virtio_rtc module. A follow-up patch will expose PTP clocks. Provide synchronous messaging, which is enough for the expected time synchronization use cases through PTP clocks (similar to ptp_kvm) or RTC Class driver. [1] https://lists.oasis-open.org/archives/virtio-comment/202306/msg00592.html Signed-off-by: Peter Hilber --- MAINTAINERS | 7 + drivers/virtio/Kconfig | 14 + drivers/virtio/Makefile | 2 + drivers/virtio/virtio_rtc_driver.c | 736 +++++++++++++++++++++++++++ drivers/virtio/virtio_rtc_internal.h | 23 + include/uapi/linux/virtio_rtc.h | 159 ++++++ 6 files changed, 941 insertions(+) create mode 100644 drivers/virtio/virtio_rtc_driver.c create mode 100644 drivers/virtio/virtio_rtc_internal.h create mode 100644 include/uapi/linux/virtio_rtc.h diff --git a/MAINTAINERS b/MAINTAINERS index 11b470d38e3f..025c0f8fb7a6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22841,6 +22841,13 @@ S: Maintained F: drivers/nvdimm/nd_virtio.c F: drivers/nvdimm/virtio_pmem.c +VIRTIO RTC DRIVER +M: Peter Hilber +L: virtualization@lists.linux-foundation.org +S: Maintained +F: drivers/virtio/virtio_rtc_* +F: include/uapi/linux/virtio_rtc.h + VIRTIO SOUND DRIVER M: Anton Yakovlev M: "Michael S. Tsirkin" diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 0a53a61231c2..e3dbf16fa977 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -173,4 +173,18 @@ config VIRTIO_DMA_SHARED_BUFFER This option adds a flavor of dma buffers that are backed by virtio resources. +config VIRTIO_RTC + tristate "Virtio RTC driver" + depends on VIRTIO + depends on PTP_1588_CLOCK_OPTIONAL + help + This driver provides current time from a Virtio RTC device. The driver + provides the time through one or more clocks. The driver sub-option + VIRTIO_RTC_PTP must be enabled to expose the clocks to userspace. + + To compile this code as a module, choose M here: the module will be + called virtio_rtc. + + If unsure, say M. + endif # VIRTIO_MENU diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index 8e98d24917cc..f760414ed6ab 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -12,3 +12,5 @@ obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o obj-$(CONFIG_VIRTIO_VDPA) += virtio_vdpa.o obj-$(CONFIG_VIRTIO_MEM) += virtio_mem.o obj-$(CONFIG_VIRTIO_DMA_SHARED_BUFFER) += virtio_dma_buf.o +obj-$(CONFIG_VIRTIO_RTC) += virtio_rtc.o +virtio_rtc-y := virtio_rtc_driver.o diff --git a/drivers/virtio/virtio_rtc_driver.c b/drivers/virtio/virtio_rtc_driver.c new file mode 100644 index 000000000000..424500d2c4f7 --- /dev/null +++ b/drivers/virtio/virtio_rtc_driver.c @@ -0,0 +1,736 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * virtio_rtc driver core + * + * Copyright (C) 2022-2023 OpenSynergy GmbH + */ + +#include +#include +#include +#include +#include + +#include + +#include "virtio_rtc_internal.h" + +/* virtqueue order */ +enum { + VIORTC_READQ, + VIORTC_CONTROLQ, + VIORTC_MAX_NR_QUEUES, +}; + +/** + * struct viortc_vq - virtqueue abstraction + * @vq: virtqueue + * @lock: protects access to vq + */ +struct viortc_vq { + struct virtqueue *vq; + spinlock_t lock; +}; + +/** + * struct viortc_dev - virtio_rtc device data + * @vdev: virtio device + * @vqs: virtqueues + * @num_clocks: # of virtio_rtc clocks + */ +struct viortc_dev { + struct virtio_device *vdev; + struct viortc_vq vqs[VIORTC_MAX_NR_QUEUES]; + u16 num_clocks; +}; + +/** + * struct viortc_msg - Message requested by driver, responded by device. + * @viortc: device data + * @req: request buffer + * @resp: response buffer + * @responded: vqueue callback signals response reception + * @refcnt: Message reference count, message and buffers will be deallocated + * once 0. refcnt is decremented in the vqueue callback and in the + * thread waiting on the responded completion. + * If a message response wait function times out, the message will be + * freed upon late reception (refcnt will reach 0 in the callback), or + * device removal. + * @req_size: size of request in bytes + * @resp_cap: maximum size of response in bytes + * @resp_actual_size: actual size of response + */ +struct viortc_msg { + struct viortc_dev *viortc; + void *req; + void *resp; + struct completion responded; + refcount_t refcnt; + unsigned int req_size; + unsigned int resp_cap; + unsigned int resp_actual_size; +}; + +/** + * viortc_msg_init() - Allocate and initialize message. + * @viortc: device data + * @msg_type: virtio_rtc message type + * @req_size: size of request buffer to be allocated + * @resp_cap: size of response buffer to be allocated + * + * Initializes the message refcnt to 2. The refcnt will be decremented once in + * the virtqueue callback, and once in the thread waiting on the message (on + * completion or timeout). + * + * Context: Process context. + * Return: non-NULL on success. + */ +static struct viortc_msg *viortc_msg_init(struct viortc_dev *viortc, + u16 msg_type, unsigned int req_size, + unsigned int resp_cap) +{ + struct viortc_msg *msg; + struct device *dev = &viortc->vdev->dev; + struct virtio_rtc_req_head *req_head; + + msg = devm_kzalloc(dev, sizeof(*msg), GFP_KERNEL); + if (!msg) + return NULL; + + init_completion(&msg->responded); + + msg->req = devm_kzalloc(dev, req_size, GFP_KERNEL); + if (!msg->req) + goto err_free_msg; + + req_head = msg->req; + + msg->resp = devm_kzalloc(dev, resp_cap, GFP_KERNEL); + if (!msg->resp) + goto err_free_msg_req; + + msg->viortc = viortc; + msg->req_size = req_size; + msg->resp_cap = resp_cap; + + refcount_set(&msg->refcnt, 2); + + req_head->msg_type = virtio_cpu_to_le(msg_type, req_head->msg_type); + + return msg; + +err_free_msg_req: + devm_kfree(dev, msg->req); + +err_free_msg: + devm_kfree(dev, msg); + + return NULL; +} + +/** + * viortc_msg_release() - Decrement message refcnt, potentially free message. + * @msg: message requested by driver + * + * Context: Any context. + */ +static void viortc_msg_release(struct viortc_msg *msg) +{ + if (refcount_dec_and_test(&msg->refcnt)) { + struct device *dev = &msg->viortc->vdev->dev; + + devm_kfree(dev, msg->req); + devm_kfree(dev, msg->resp); + devm_kfree(dev, msg); + } +} + +/** + * viortc_cb() - callback for readq and controlq + * @vq: virtqueue with device response + * + * Signals completion for each received message. + * + * Context: virtqueue callback, typically interrupt. Takes and releases vq lock. + */ +static void viortc_cb(struct virtqueue *vq) +{ + struct viortc_dev *viortc = vq->vdev->priv; + spinlock_t *lock = &viortc->vqs[vq->index].lock; + unsigned long flags; + struct viortc_msg *msg; + unsigned int len; + bool cb_enabled = true; + + for (;;) { + spin_lock_irqsave(lock, flags); + + if (cb_enabled) { + virtqueue_disable_cb(vq); + cb_enabled = false; + } + + msg = virtqueue_get_buf(vq, &len); + if (!msg) { + if (virtqueue_enable_cb(vq)) { + spin_unlock_irqrestore(lock, flags); + return; + } + cb_enabled = true; + } + + spin_unlock_irqrestore(lock, flags); + + if (msg) { + msg->resp_actual_size = len; + + /* + * completion waiter must see our msg metadata, but + * complete() does not guarantee a memory barrier + */ + smp_wmb(); + + complete(&msg->responded); + viortc_msg_release(msg); + } + } +} + +/** + * viortc_get_resp_errno() - converts virtio_rtc errnos to system errnos + * @resp_head: message response header + * + * Return: negative system errno, or 0 + */ +static int viortc_get_resp_errno(struct virtio_rtc_resp_head *resp_head) +{ + switch (virtio_le_to_cpu(resp_head->status)) { + case VIRTIO_RTC_S_OK: + return 0; + case VIRTIO_RTC_S_UNSUPP: + return -EOPNOTSUPP; + case VIRTIO_RTC_S_INVAL: + return -EINVAL; + case VIRTIO_RTC_S_NODEV: + return -ENODEV; + case VIRTIO_RTC_S_DEVERR: + default: + return -EIO; + } +} + +/** + * viortc_msg_xfer() - send message request, wait until message response + * @vq: virtqueue + * @msg: message with driver request + * @timeout_jiffies: message response timeout, 0 for no timeout + * + * Context: Process context. Takes and releases vq.lock. May sleep. + */ +static int viortc_msg_xfer(struct viortc_vq *vq, struct viortc_msg *msg, + unsigned long timeout_jiffies) +{ + int ret; + unsigned long flags; + struct scatterlist out_sg[1]; + struct scatterlist in_sg[1]; + struct scatterlist *sgs[2] = { out_sg, in_sg }; + bool notify; + + sg_init_one(out_sg, msg->req, msg->req_size); + sg_init_one(in_sg, msg->resp, msg->resp_cap); + + spin_lock_irqsave(&vq->lock, flags); + + ret = virtqueue_add_sgs(vq->vq, sgs, 1, 1, msg, GFP_ATOMIC); + if (ret) { + spin_unlock_irqrestore(&vq->lock, flags); + /* + * Release in place of the response callback, which will never + * come. + */ + viortc_msg_release(msg); + return ret; + } + + notify = virtqueue_kick_prepare(vq->vq); + + spin_unlock_irqrestore(&vq->lock, flags); + + if (notify) + virtqueue_notify(vq->vq); + + if (timeout_jiffies) { + long timeout_ret; + + timeout_ret = wait_for_completion_interruptible_timeout( + &msg->responded, timeout_jiffies); + + if (!timeout_ret) + return -ETIMEDOUT; + else if (timeout_ret < 0) + return (int)timeout_ret; + } else { + ret = wait_for_completion_interruptible(&msg->responded); + if (ret) + return ret; + } + + /* + * Ensure we can read message metadata written in the virtqueue + * callback. + */ + smp_rmb(); + + /* + * There is not yet a case where returning a short message would make + * sense, so consider any deviation an error. + */ + if (msg->resp_actual_size != msg->resp_cap) + return -EINVAL; + + return viortc_get_resp_errno(msg->resp); +} + +/* + * common message handle macros for messages of different types + */ + +/** + * VIORTC_DECLARE_MSG_HDL_ONSTACK() - declare message handle on stack + * @hdl: message handle name + * @msg_suf_lowerc: message type suffix in lowercase + * @msg_suf_upperc: message type suffix in uppercase + */ +#define VIORTC_DECLARE_MSG_HDL_ONSTACK(hdl, msg_suf_lowerc, msg_suf_upperc) \ + struct { \ + struct viortc_msg *msg; \ + struct virtio_rtc_req_##msg_suf_lowerc *req; \ + struct virtio_rtc_resp_##msg_suf_lowerc *resp; \ + unsigned int req_size; \ + unsigned int resp_cap; \ + u16 msg_type; \ + } hdl = { \ + NULL, \ + NULL, \ + NULL, \ + sizeof(struct virtio_rtc_req_##msg_suf_lowerc), \ + sizeof(struct virtio_rtc_resp_##msg_suf_lowerc), \ + VIRTIO_RTC_M_##msg_suf_upperc, \ + } + +/** + * VIORTC_MSG() - extract message from message handle + * + * Return: struct viortc_msg + */ +#define VIORTC_MSG(hdl) ((hdl).msg) + +/** + * VIORTC_MSG_INIT() - initialize message handle + * @hdl: message handle + * @viortc: device data (struct viortc_dev *) + * + * Context: Process context. + * Return: 0 on success, -ENOMEM otherwise. + */ +#define VIORTC_MSG_INIT(hdl, viortc) \ + ({ \ + typeof(hdl) *_hdl = &(hdl); \ + \ + _hdl->msg = viortc_msg_init((viortc), _hdl->msg_type, \ + _hdl->req_size, _hdl->resp_cap); \ + if (_hdl->msg) { \ + _hdl->req = _hdl->msg->req; \ + _hdl->resp = _hdl->msg->resp; \ + } \ + _hdl->msg ? 0 : -ENOMEM; \ + }) + +/** + * VIORTC_MSG_WRITE() - write a request message field + * @hdl: message handle + * @dest_member: request message field name + * @src_ptr: pointer to data of compatible type + * + * Writes the field in little-endian format. + */ +#define VIORTC_MSG_WRITE(hdl, dest_member, src_ptr) \ + do { \ + typeof(hdl) _hdl = (hdl); \ + typeof(src_ptr) _src_ptr = (src_ptr); \ + \ + /* Sanity check: must match the member's type */ \ + typecheck(typeof(_hdl.req->dest_member), *_src_ptr); \ + \ + _hdl.req->dest_member = \ + virtio_cpu_to_le(*_src_ptr, _hdl.req->dest_member); \ + } while (0) + +/** + * VIORTC_MSG_READ() - read from a response message field + * @hdl: message handle + * @src_member: response message field name + * @dest_ptr: pointer to data of compatible type + * + * Converts from little-endian format and writes to dest_ptr. + */ +#define VIORTC_MSG_READ(hdl, src_member, dest_ptr) \ + do { \ + typeof(dest_ptr) _dest_ptr = (dest_ptr); \ + \ + /* Sanity check: must match the member's type */ \ + typecheck(typeof((hdl).resp->src_member), *_dest_ptr); \ + \ + *_dest_ptr = virtio_le_to_cpu((hdl).resp->src_member); \ + } while (0) + +/* + * readq messages + */ + +/** timeout for clock readings, where timeouts are considered non-fatal */ +#define VIORTC_MSG_READ_TIMEOUT (msecs_to_jiffies(60 * 1000)) + +/** + * viortc_read() - VIRTIO_RTC_M_READ message wrapper + * @viortc: device data + * @vio_clk_id: virtio_rtc clock id + * @reading: clock reading [ns] + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +int viortc_read(struct viortc_dev *viortc, u64 vio_clk_id, u64 *reading) +{ + int ret; + VIORTC_DECLARE_MSG_HDL_ONSTACK(hdl, read, READ); + + ret = VIORTC_MSG_INIT(hdl, viortc); + if (ret) + return ret; + + VIORTC_MSG_WRITE(hdl, clock_id, &vio_clk_id); + + ret = viortc_msg_xfer(&viortc->vqs[VIORTC_READQ], VIORTC_MSG(hdl), + VIORTC_MSG_READ_TIMEOUT); + if (ret) { + dev_dbg(&viortc->vdev->dev, "%s: xfer returned %d\n", __func__, + ret); + goto out_release; + } + + VIORTC_MSG_READ(hdl, clock_reading, reading); + +out_release: + viortc_msg_release(VIORTC_MSG(hdl)); + + return ret; +} + +/** + * viortc_read_cross() - VIRTIO_RTC_M_READ_CROSS message wrapper + * @viortc: device data + * @vio_clk_id: virtio_rtc clock id + * @hw_counter: virtio_rtc HW counter type + * @reading: clock reading [ns] + * @cycles: HW counter cycles during clock reading + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +int viortc_read_cross(struct viortc_dev *viortc, u64 vio_clk_id, u16 hw_counter, + u64 *reading, u64 *cycles) +{ + int ret; + VIORTC_DECLARE_MSG_HDL_ONSTACK(hdl, read_cross, READ_CROSS); + + ret = VIORTC_MSG_INIT(hdl, viortc); + if (ret) + return ret; + + VIORTC_MSG_WRITE(hdl, clock_id, &vio_clk_id); + VIORTC_MSG_WRITE(hdl, hw_counter, &hw_counter); + + ret = viortc_msg_xfer(&viortc->vqs[VIORTC_READQ], VIORTC_MSG(hdl), + VIORTC_MSG_READ_TIMEOUT); + if (ret) { + dev_dbg(&viortc->vdev->dev, "%s: xfer returned %d\n", __func__, + ret); + goto out_release; + } + + VIORTC_MSG_READ(hdl, clock_reading, reading); + VIORTC_MSG_READ(hdl, counter_cycles, cycles); + +out_release: + viortc_msg_release(VIORTC_MSG(hdl)); + + return ret; +} + +/* + * controlq messages + */ + +/** + * viortc_cfg() - VIRTIO_RTC_M_CFG message wrapper + * @viortc: device data + * @num_clocks: # of virtio_rtc clocks + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_cfg(struct viortc_dev *viortc, u16 *num_clocks) +{ + int ret; + VIORTC_DECLARE_MSG_HDL_ONSTACK(hdl, cfg, CFG); + + ret = VIORTC_MSG_INIT(hdl, viortc); + if (ret) + return ret; + + ret = viortc_msg_xfer(&viortc->vqs[VIORTC_CONTROLQ], VIORTC_MSG(hdl), + 0); + if (ret) { + dev_dbg(&viortc->vdev->dev, "%s: xfer returned %d\n", __func__, + ret); + goto out_release; + } + + VIORTC_MSG_READ(hdl, num_clocks, num_clocks); + +out_release: + viortc_msg_release(VIORTC_MSG(hdl)); + + return ret; +} + +/** + * viortc_clock_cap() - VIRTIO_RTC_M_CLOCK_CAP message wrapper + * @viortc: device data + * @vio_clk_id: virtio_rtc clock id + * @type: virtio_rtc clock type + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_clock_cap(struct viortc_dev *viortc, u64 vio_clk_id, + u16 *type) +{ + int ret; + VIORTC_DECLARE_MSG_HDL_ONSTACK(hdl, clock_cap, CLOCK_CAP); + + ret = VIORTC_MSG_INIT(hdl, viortc); + if (ret) + return ret; + + VIORTC_MSG_WRITE(hdl, clock_id, &vio_clk_id); + + ret = viortc_msg_xfer(&viortc->vqs[VIORTC_CONTROLQ], VIORTC_MSG(hdl), + 0); + if (ret) { + dev_dbg(&viortc->vdev->dev, "%s: xfer returned %d\n", __func__, + ret); + goto out_release; + } + + VIORTC_MSG_READ(hdl, type, type); + +out_release: + viortc_msg_release(VIORTC_MSG(hdl)); + + return ret; +} + +/** + * viortc_cross_cap() - VIRTIO_RTC_M_CROSS_CAP message wrapper + * @viortc: device data + * @vio_clk_id: virtio_rtc clock id + * @hw_counter: virtio_rtc HW counter type + * @supported: xtstamping is supported for the vio_clk_id/hw_counter pair + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +int viortc_cross_cap(struct viortc_dev *viortc, u64 vio_clk_id, u16 hw_counter, + bool *supported) +{ + int ret; + VIORTC_DECLARE_MSG_HDL_ONSTACK(hdl, cross_cap, CROSS_CAP); + u8 flags; + + ret = VIORTC_MSG_INIT(hdl, viortc); + if (ret) + return ret; + + VIORTC_MSG_WRITE(hdl, clock_id, &vio_clk_id); + VIORTC_MSG_WRITE(hdl, hw_counter, &hw_counter); + + ret = viortc_msg_xfer(&viortc->vqs[VIORTC_CONTROLQ], VIORTC_MSG(hdl), + 0); + if (ret) { + dev_dbg(&viortc->vdev->dev, "%s: xfer returned %d\n", __func__, + ret); + goto out_release; + } + + VIORTC_MSG_READ(hdl, flags, &flags); + *supported = !!(flags & BIT(VIRTIO_RTC_FLAG_CROSS_CAP)); + +out_release: + viortc_msg_release(VIORTC_MSG(hdl)); + + return ret; +} + +/* + * init, deinit + */ + +/** + * viortc_clocks_init() - init local representations of virtio_rtc clocks + * @viortc: device data + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_clocks_init(struct viortc_dev *viortc) +{ + int ret; + u16 num_clocks; + + ret = viortc_cfg(viortc, &num_clocks); + if (ret) + return ret; + + if (num_clocks < 1) { + dev_err(&viortc->vdev->dev, "device reported 0 clocks\n"); + return -ENODEV; + } + + viortc->num_clocks = num_clocks; + + /* In the future, PTP clocks will be initialized here. */ + (void)viortc_clock_cap; + + return 0; +} + +/** + * viortc_init_vqs() - init virtqueues + * @viortc: device data + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + * + * Init virtqueues, and their abstractions. + */ +static int viortc_init_vqs(struct viortc_dev *viortc) +{ + int ret; + struct virtio_device *vdev = viortc->vdev; + const char *names[VIORTC_MAX_NR_QUEUES]; + vq_callback_t *callbacks[VIORTC_MAX_NR_QUEUES]; + struct virtqueue *vqs[VIORTC_MAX_NR_QUEUES]; + int nr_queues; + + names[VIORTC_READQ] = "readq"; + callbacks[VIORTC_READQ] = viortc_cb; + + names[VIORTC_CONTROLQ] = "controlq"; + callbacks[VIORTC_CONTROLQ] = viortc_cb; + + nr_queues = 2; + + ret = virtio_find_vqs(vdev, nr_queues, vqs, callbacks, names, NULL); + if (ret) + return ret; + + viortc->vqs[VIORTC_READQ].vq = vqs[VIORTC_READQ]; + spin_lock_init(&viortc->vqs[VIORTC_READQ].lock); + + viortc->vqs[VIORTC_CONTROLQ].vq = vqs[VIORTC_CONTROLQ]; + spin_lock_init(&viortc->vqs[VIORTC_CONTROLQ].lock); + + return 0; +} + +/** + * viortc_probe() - probe a virtio_rtc virtio device + * @vdev: virtio device + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_probe(struct virtio_device *vdev) +{ + struct viortc_dev *viortc; + int ret; + + viortc = devm_kzalloc(&vdev->dev, sizeof(*viortc), GFP_KERNEL); + if (!viortc) + return -ENOMEM; + + vdev->priv = viortc; + viortc->vdev = vdev; + + ret = viortc_init_vqs(viortc); + if (ret) + return ret; + + virtio_device_ready(vdev); + + /* Ready vdev for use by frontend devices initialized next. */ + smp_wmb(); + + ret = viortc_clocks_init(viortc); + if (ret) + goto err_reset_vdev; + + return 0; + +err_reset_vdev: + virtio_reset_device(vdev); + vdev->config->del_vqs(vdev); + + return ret; +} + +/** + * viortc_remove() - remove a virtio_rtc virtio device + * @vdev: virtio device + */ +static void viortc_remove(struct virtio_device *vdev) +{ + /* In the future, PTP clocks will be deinitialized here. */ + + virtio_reset_device(vdev); + vdev->config->del_vqs(vdev); +} + +static unsigned int features[] = { + VIRTIO_RTC_F_READ_CROSS, +}; + +static struct virtio_device_id id_table[] = { + { VIRTIO_ID_CLOCK, VIRTIO_DEV_ANY_ID }, + { 0 }, +}; +MODULE_DEVICE_TABLE(virtio, id_table); + +static struct virtio_driver virtio_rtc_drv = { + .driver.name = KBUILD_MODNAME, + .driver.owner = THIS_MODULE, + .feature_table = features, + .feature_table_size = ARRAY_SIZE(features), + .id_table = id_table, + .probe = viortc_probe, + .remove = viortc_remove, +}; + +module_virtio_driver(virtio_rtc_drv); + +MODULE_DESCRIPTION("Virtio RTC driver"); +MODULE_AUTHOR("OpenSynergy GmbH"); +MODULE_LICENSE("GPL"); diff --git a/drivers/virtio/virtio_rtc_internal.h b/drivers/virtio/virtio_rtc_internal.h new file mode 100644 index 000000000000..c2b5387f506f --- /dev/null +++ b/drivers/virtio/virtio_rtc_internal.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * virtio_rtc internal interfaces + * + * Copyright (C) 2022-2023 OpenSynergy GmbH + */ + +#ifndef _VIRTIO_RTC_INTERNAL_H_ +#define _VIRTIO_RTC_INTERNAL_H_ + +#include + +/* driver core IFs */ + +struct viortc_dev; + +int viortc_read(struct viortc_dev *viortc, u64 vio_clk_id, u64 *reading); +int viortc_read_cross(struct viortc_dev *viortc, u64 vio_clk_id, u16 hw_counter, + u64 *reading, u64 *cycles); +int viortc_cross_cap(struct viortc_dev *viortc, u64 vio_clk_id, u16 hw_counter, + bool *supported); + +#endif /* _VIRTIO_RTC_INTERNAL_H_ */ diff --git a/include/uapi/linux/virtio_rtc.h b/include/uapi/linux/virtio_rtc.h new file mode 100644 index 000000000000..0926b3d58254 --- /dev/null +++ b/include/uapi/linux/virtio_rtc.h @@ -0,0 +1,159 @@ +/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* + * Copyright (C) 2022-2023 OpenSynergy GmbH + */ + +#ifndef _LINUX_VIRTIO_RTC_H +#define _LINUX_VIRTIO_RTC_H + +#include + +/* Device-specific features */ + +#define VIRTIO_RTC_F_READ_CROSS 0 + +/* readq message types */ + +#define VIRTIO_RTC_M_READ 0x0001 +#define VIRTIO_RTC_M_READ_CROSS 0x0002 + +/* controlq message types */ + +#define VIRTIO_RTC_M_CFG 0x1000 +#define VIRTIO_RTC_M_CLOCK_CAP 0x1001 +#define VIRTIO_RTC_M_CROSS_CAP 0x1002 + +/* Message headers */ + +/** common request header */ +struct virtio_rtc_req_head { + __le16 msg_type; + __u8 reserved[2]; +}; + +/** common response header */ +struct virtio_rtc_resp_head { +#define VIRTIO_RTC_S_OK 0 +#define VIRTIO_RTC_S_UNSUPP 1 +#define VIRTIO_RTC_S_NODEV 2 +#define VIRTIO_RTC_S_INVAL 3 +#define VIRTIO_RTC_S_DEVERR 4 + __u8 status; + __u8 reserved[3]; +}; + +/* readq messages */ + +/* VIRTIO_RTC_M_READ message */ + +struct virtio_rtc_req_read { + struct virtio_rtc_req_head head; + __u8 reserved[4]; + __le64 clock_id; +}; + +struct virtio_rtc_resp_read { + struct virtio_rtc_resp_head head; + __u8 reserved[4]; + __le64 clock_reading; +}; + +/* VIRTIO_RTC_M_READ_CROSS message */ + +struct virtio_rtc_req_read_cross { + struct virtio_rtc_req_head head; +/** Arm Generic Timer Virtual Count */ +#define VIRTIO_RTC_COUNTER_ARM_VIRT 0 +/** Arm Generic Timer Physical Count */ +#define VIRTIO_RTC_COUNTER_ARM_PHYS 1 +/** x86 Time Stamp Counter */ +#define VIRTIO_RTC_COUNTER_X86_TSC 2 + __le16 hw_counter; + __u8 reserved[2]; + __le64 clock_id; +}; + +struct virtio_rtc_resp_read_cross { + struct virtio_rtc_resp_head head; + __u8 reserved[4]; + __le64 clock_reading; + __le64 counter_cycles; +}; + +/** Union of request types for readq */ +union virtio_rtc_req_readq { + struct virtio_rtc_req_read read; + struct virtio_rtc_req_read_cross read_cross; +}; + +/** Union of response types for readq */ +union virtio_rtc_resp_readq { + struct virtio_rtc_resp_read read; + struct virtio_rtc_resp_read_cross read_cross; +}; + +/* controlq messages */ + +/* VIRTIO_RTC_M_CFG message */ + +struct virtio_rtc_req_cfg { + struct virtio_rtc_req_head head; + /* no request params */ + __u8 reserved[4]; +}; + +struct virtio_rtc_resp_cfg { + struct virtio_rtc_resp_head head; + /** # of clocks -> clock ids < num_clocks are valid */ + __le16 num_clocks; + __u8 reserved[10]; +}; + +/* VIRTIO_RTC_M_CLOCK_CAP message */ + +struct virtio_rtc_req_clock_cap { + struct virtio_rtc_req_head head; + __u8 reserved[4]; + __le64 clock_id; +}; + +struct virtio_rtc_resp_clock_cap { + struct virtio_rtc_resp_head head; +#define VIRTIO_RTC_CLOCK_UTC 0 +#define VIRTIO_RTC_CLOCK_TAI 1 +#define VIRTIO_RTC_CLOCK_MONO 2 + __le16 type; + __u8 reserved[10]; +}; + +/* VIRTIO_RTC_M_CROSS_CAP message */ + +struct virtio_rtc_req_cross_cap { + struct virtio_rtc_req_head head; + __le16 hw_counter; + __u8 reserved[2]; + __le64 clock_id; +}; + +struct virtio_rtc_resp_cross_cap { + struct virtio_rtc_resp_head head; +#define VIRTIO_RTC_FLAG_CROSS_CAP 0 + __u8 flags; + __u8 reserved[11]; +}; + +/** Union of request types for controlq */ +union virtio_rtc_req_controlq { + struct virtio_rtc_req_cfg cfg; + struct virtio_rtc_req_clock_cap clock_cap; + struct virtio_rtc_req_cross_cap cross_cap; +}; + +/** Union of response types for controlq */ +union virtio_rtc_resp_controlq { + struct virtio_rtc_resp_cfg cfg; + struct virtio_rtc_resp_clock_cap clock_cap; + struct virtio_rtc_resp_cross_cap cross_cap; +}; + +#endif /* _LINUX_VIRTIO_RTC_H */ From patchwork Fri Aug 18 01:20:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hilber X-Patchwork-Id: 13357193 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB3EFC678DF for ; Fri, 18 Aug 2023 01:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HMaeSPOEETUhwNFA4oR+BDRed7EzvC/a/rJqZU6AlUo=; b=00/hjUr2Fh5pWe N99SZb/AZen0QhjQSvf5yUx8iJVGnZ63PCEnDgQNyZyb6oWbrww7eGbmvhjOgS2G5LESBbfl4uT5A DpV1ij4/sM3b9Rv7l1aeF10B0CqiB6TzVIvYezX/zHUJt9G0P4SumlBNISQ2Veo/NVVPhrcXenbCO AV6q8ms//0InsOu8d+yS69ZQ2zhSqNphuiyPsosEvBfWOusm52BVnjEXsmhqo4ilJDjJGh6YSPetF SjPE+BeC+bzWmIrkXK6GqCwt1JKLRGsw7aVIlfI/9qW0f8M4CvOIDYmWjQzUFYUxyuj8XQ4Qki/SS ym0KI7uDpAfFdOpUZuGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWoAS-007SUJ-0D; Fri, 18 Aug 2023 01:20:48 +0000 Received: from repost01.tmes.trendmicro.eu ([18.185.115.110]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qWoAF-007SQN-26 for linux-arm-kernel@lists.infradead.org; Fri, 18 Aug 2023 01:20:40 +0000 Received: from 104.47.7.173_.trendmicro.com (unknown [172.21.201.37]) by repost01.tmes.trendmicro.eu (Postfix) with SMTP id 19B2710000D04; Fri, 18 Aug 2023 01:20:31 +0000 (UTC) X-TM-MAIL-RECEIVED-TIME: 1692321630.480000 X-TM-MAIL-UUID: 21e86b46-3d26-41f1-8615-46636669d81d Received: from DEU01-BE0-obe.outbound.protection.outlook.com (unknown [104.47.7.173]) by repre01.tmes.trendmicro.eu (Trend Micro Email Security) with ESMTPS id 757B11000030B; Fri, 18 Aug 2023 01:20:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gm7JNc0dOUo1FUFqTVJk+tWKRM6O0GO1ROrFj/wOXoN9JyaJ8ql07q4U5cOa8XtVOI3GkWVVxfxdC9YJMtKcwkaf3AOLVR/IMc/LchEIyHtYPtZgzroQdjwJjm3oz+O/YRm89lYGflGQcIYgyxhWEwAaqJ/jcTIB3L3Vu2Olrg+RLQjWXtTddvKAuXPdybHiB7juxOXBGEcesYXTYNvo1WnMDMGwNLhKK0OG1U//Zc6HNwPOSvI9kctpA/7pUIA2CQcBovINWOo/xn81oFysfmiSZLReyt8QB1QklhoPeCIKPPuYuoxjbPA/SnwpSlQHdCTpvAcmNe3Dlf0bvw+Ywg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Fxnj1aoFhV1/cq7zApEAs6WyOZnKJpiRG9kdG5q++lM=; b=BslYsiyDrPu4ve+EbKsAeS+bSLbV1tOmn+7qVbtfEK3OtkJP5t85LrgeKnitfMFudtG+E2TEo9p5Cnuxip/sRoClofWCxCtNf5jWfr8QBadODz58UGwTiJzDQGPC8JEl2l5qe1gOl2/XtBGhEFav5lxUmE8F5oxk/WYDh5rJR9KCiGtkDmVJ2FUaAO1+OXoFrBpECuswYpyKjqDs7sHwRJfM+jU2m4xRRfT+4I6QUQr1jy548hKtr14l0HB7dNwN5VRV2kV1+zf0OOAxsHh1mOMl4R2ghVJ1v9jhKUZvdQpbAWzkKX7baOTGzC7xQ8bA/l+b0b4RKSsj0ea7+K0KfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.66.60.4) smtp.rcpttodomain=arm.com smtp.mailfrom=opensynergy.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=opensynergy.com; dkim=none (message not signed); arc=none X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.66.60.4) smtp.mailfrom=opensynergy.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=opensynergy.com; Received-SPF: Pass (protection.outlook.com: domain of opensynergy.com designates 217.66.60.4 as permitted sender) receiver=protection.outlook.com; client-ip=217.66.60.4; helo=SR-MAIL-03.open-synergy.com; pr=C From: Peter Hilber To: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org Cc: Peter Hilber , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Richard Cochran , netdev@vger.kernel.org, Marc Zyngier , Mark Rutland , Daniel Lezcano , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 5/6] virtio_rtc: Add PTP clocks Date: Fri, 18 Aug 2023 03:20:11 +0200 Message-Id: <20230818012014.212155-6-peter.hilber@opensynergy.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818012014.212155-1-peter.hilber@opensynergy.com> References: <20230818012014.212155-1-peter.hilber@opensynergy.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB8EUR05FT051:EE_|BE1P281MB2918:EE_ X-MS-Office365-Filtering-Correlation-Id: 12ef3246-6da2-48cc-740e-08db9f894e81 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E3W2IYB4VG9H86AGpHdVtKGDk9lLl9AJu6VjGL/gUYH/+qtLcFXVJapuwzlfxuFDqnfvGH3/KCeGLP42hzX54qWRoXEukEJAmpB75TiXfUo/Jo5XK+lVRui8IN7YaM4+LVEeOzbp02N5ccypxqXr+j0rEZ76BsHimuF55K3Qq4+WieddnqcBCMGZ6+/ue68IAYTxxKZWIt3S6N2aVY+6Iw6n9SkB1jVWa/dlcT8NNoS8nWSwYw30+9MoFmadRG4zmJHt5Nt/8A+A1AnyT6whQ8Z6BPrn6jys/bkXssIDdxGkT0S7fypEiVQlGbph7gZl5Vdz0EUxc1L4P1NwtpypOW2WK1VzbYqffhYslWOXMzI5FOvD4yCIwj1D2Hvu6lHPCsY/IXaF16UsNluxtaLZhy8XuyulzRobiVZkBMzevYal8/y2ypTDsScR6C5O72qm6KP/+NY8JdkzURRYxDph2xg+K5veV4zwX3z3LMkJrBk4rd/sSV/dnNB2tPBmYBPC+1TiCi0voFkETqTjMBIUQCBQrPYQPDzt8LsPjtoginpLC1p0eE4ZN3bxruilCwct00zXcjqxwoe6LMsKXciI0SajFR6eOgvvzAAx3HttcXLfuwT7ru24oQy5Pc7Q1cQNETGuxTgTOHAKggMBCNbOSiZXfFPE29LnpHWEiuAwTPVIJ6+u2K5+UzsLsEGCFJXoAhyXKomRaVj/JILASByBE+4c6kSoSLDhJCwDznaU7m1RHj1a+d8xYDzyQL1uYynYrnB7aqIrTB9xyxNn8aVmvFUZSYFkhMJjuh2/ySK/Ml7fDd3/DE51kxa/50zQ4AaA X-Forefront-Antispam-Report: CIP:217.66.60.4;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SR-MAIL-03.open-synergy.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(346002)(376002)(396003)(136003)(39850400004)(451199024)(186009)(82310400011)(1800799009)(36840700001)(46966006)(8676002)(8936002)(4326008)(7416002)(70206006)(70586007)(42186006)(54906003)(30864003)(41300700001)(2616005)(40480700001)(26005)(12101799020)(44832011)(316002)(2906002)(5660300002)(478600001)(36756003)(36860700001)(47076005)(1076003)(83380400001)(82740400003)(81166007)(86362001)(336012)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: opensynergy.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 01:20:27.8406 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12ef3246-6da2-48cc-740e-08db9f894e81 X-MS-Exchange-CrossTenant-Id: 800fae25-9b1b-4edc-993d-c939c4e84a64 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=800fae25-9b1b-4edc-993d-c939c4e84a64;Ip=[217.66.60.4];Helo=[SR-MAIL-03.open-synergy.com] X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT051.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE1P281MB2918 X-TM-AS-ERS: 104.47.7.173-0.0.0.0 X-TMASE-Version: StarCloud-1.3-9.1.1011-27820.003 X-TMASE-Result: 10--20.765500-4.000000 X-TMASE-MatchedRID: 5y2TnboncNEY9bhGrdH9F9wy9mwTudtiRyG5SSR7mMGmopAzNrNOJn+F psIKKIVlk8IAUKtJYbMmnuaVQc5qV4oSaqhQo1toHW+C8sNk3WDFZzmk4ajzuCe5CWghtIzPb1O 21F3h9PlzEFhMBQYFa/6kCjQkL+3Saroq2fxRivXHfwwbjh/dN1pMWq1GqY9jkBIzmWRMoQJIEM g/mVesL4yXmNxvasqVKOq0uwjm7E15BzMVCHZcS/gxOc6+WoXc3O2+pOfl+vcwLJ9PZUBQhdvdj Z1tR/4hQpP6/vBOuJOuxupDoex129/NzBWY5iArO9AbTF0WkMLyQ6dAmPdzEv7u2ibb+jWaW2io yVv78CKxGV70F5p1w1FpbN34u8eDu+0/hUFeJLPFPyeOO7dH/hYcP2hNqlOaYXmNTfcTn35rAiD 6bCwinZOzOj2nffcU8WIpDLwfrXndTd5ynKTK2AGYjCus6WrV4rJ9GpJh5eGf0yAlW3GEerxaMa 1kAGYhDJGx4fIYRwBhJgOUTj6ZojlUWmgsqsw2bUBkpsDXXnKB37bQADgKrw3V01gTbr0scY6fM I/vfQzBw2pT5AT8XU0hqK5zJSrs14hlIu0VY/C69rtClqkCjUIp2pwQ814LDANFWLhvOTlPQFFk 0j5jBsA2iDfbpfy+AVpeDm8nJoLwnQHFZbUP3moEkqixPwVYOfEmq6feyfMlCGssfkpInQ== X-TMASE-XGENCLOUD: 2f01c61e-e23e-48cb-8d53-3568fa149957-0-0-200-0 X-TM-Deliver-Signature: 81196FC6497F7D957558393AAB6EA8FE X-TM-Addin-Auth: sA67C81kzuL0GDDSonBvEt56r+vQvMmnkTM9worFLViqUooYkyPgxEd9F9w xZk+6VpDblwfVkUbaLWOQHGzPW4UoVzfYIvpqY0hr7GxVl71uQSs1W8jusGeRku7hZqZMxZCuWE YV8qaLIpWKuVasCFhDBntSawcbwnZJGs45ZUAevpK/MfmZ1wy3Aa+fhFZnHuct3xyTeFyq3Hwx9 0TpfB2nPga5ixKbnY++alsWSlGkO/pdiMvR3bwcT0FxQ8ZNQQXO8m5RftT2VgBlGDwEjNeABt/z z75dHhES5vK6TRA=.FdLABAJ7DaT3ILuZAnLbrJMBV96vGsfcTFJ8kd4wvpDbBeqouwJkxsdHFG P6LAqyp6DBx4RlArjgvZLHzVQRb5ANxavb6jBYaDRAe2F76sugp33mWVELGv/Wu45D6AjMRBOFl lSnxjKEkeZHEKMbdpgE++XhzCl5he2xce+k4wtr6Cmd2L2HGCsGxPM44dO4AS153QT9GMfQi45P 1nRUdc8CIAGOPh63X82rwx3qAz5ZnGr5Sq0iUEv8AV1GBhqmj0M2hpsL/y19VZTTsdy9/aoQJ3C fybugIMwjq8xKmrAVp1ZPhBeP7MmoluoDRSwa5iwQHHIqcY683ifog+ULJA== X-TM-Addin-ProductCode: EMS DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com; s=TM-DKIM-20210503141657; t=1692321630; bh=KN8wOw4n1b4CHCrTJvmvFzZuXcBNhYPax2ze23jATUA=; l=19435; h=From:To:Date; b=T/sCYKuUiFNPX3DJ4QQcF3cs7tlhncS/RUAa3lJ/zbFvkIqW9DaN+wQ6VPpJyalPx 9jcBg6mmZ5DYbcwFv3FtiApDHG4NNH9+m9Lr8qQxPhMIDVi0iSLjnMdEhZL/LqkITs sXTn8u6wDuK8jycjZxMe7EiB2yYRNv/ToMbli1UL1Ooq04XNzUT3E0qAfubRSDIiSd U5ZDIEX52Z3ohU0j7qkRWGZrHJroGa+9EXeVWUIGIgwWPXirEs2Dec3GsVdDjwA6TU wuIKSzgIlE7SJWbw9FbRyBVFatD0GWxtUHZ4aJIEMMXuw8IfW8Vc/BF0tWHOVsGIwd e2/aIwM02QBbA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230817_182035_996073_F8F9ED67 X-CRM114-Status: GOOD ( 27.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Expose the virtio_rtc clocks as PTP clocks to userspace, similar to ptp_kvm. virtio_rtc can expose multiple clocks, e.g. a UTC clock and a monotonic clock. Userspace should distinguish different clocks through the name assigned by the driver. A udev rule such as the following can be used to get a symlink /dev/ptp_virtio to the UTC clock: SUBSYSTEM=="ptp", ATTR{clock_name}=="Virtio PTP UTC", SYMLINK += "ptp_virtio" The preferred PTP clock reading method is ioctl PTP_SYS_OFFSET_PRECISE2, through the ptp_clock_info.getcrosststamp() op. For now, PTP_SYS_OFFSET_PRECISE2 will return -EOPNOTSUPP through a weak function. PTP_SYS_OFFSET_PRECISE2 requires cross-timestamping support for specific clocksources, which will be added in the following. If the clocksource specific code is enabled, check that the Virtio RTC device supports the respective HW counter before obtaining an actual cross-timestamp from the Virtio device. The Virtio RTC device response time may be higher than the timekeeper seqcount increment interval. Therefore, obtain the cross-timestamp before calling get_device_system_crosststamp(). As a fallback, support the ioctl PTP_SYS_OFFSET_EXTENDED2 for all platforms. Assume that concurrency issues during PTP clock removal are avoided by the posix_clock framework. Kconfig recursive dependencies prevent virtio_rtc from implicitly enabling PTP_1588_CLOCK, therefore just warn the user if PTP_1588_CLOCK is not available. Since virtio_rtc should in the future also expose clocks as RTC class devices, it should make sense to not have VIRTIO_RTC depend on PTP_1588_CLOCK. Signed-off-by: Peter Hilber --- Notes: v2: - Depend on prerequisite patch series "treewide: Use clocksource id for get_device_system_crosststamp()". - Check clocksource id before sending crosststamp message to device. - Do not support multiple hardware counters at runtime any more, since distinction of Arm physical and virtual counter appears unneeded after discussion with Marc Zyngier. drivers/virtio/Kconfig | 16 ++ drivers/virtio/Makefile | 1 + drivers/virtio/virtio_rtc_driver.c | 111 ++++++++- drivers/virtio/virtio_rtc_internal.h | 48 ++++ drivers/virtio/virtio_rtc_ptp.c | 347 +++++++++++++++++++++++++++ 5 files changed, 520 insertions(+), 3 deletions(-) create mode 100644 drivers/virtio/virtio_rtc_ptp.c diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index e3dbf16fa977..7369ecd7dd01 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -187,4 +187,20 @@ config VIRTIO_RTC If unsure, say M. +comment "WARNING: The Virtio RTC driver is useless without VIRTIO_RTC_PTP." + depends on VIRTIO_RTC && !VIRTIO_RTC_PTP + +comment "Enable PTP_1588_CLOCK in order to enable VIRTIO_RTC_PTP." + depends on VIRTIO_RTC && PTP_1588_CLOCK=n + +config VIRTIO_RTC_PTP + bool "Virtio RTC PTP clocks" + default y + depends on VIRTIO_RTC && PTP_1588_CLOCK + help + This exposes any Virtio RTC clocks as PTP Hardware Clocks (PHCs) to + userspace. + + If unsure, say Y. + endif # VIRTIO_MENU diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index f760414ed6ab..4d48cbcae6bb 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_VIRTIO_MEM) += virtio_mem.o obj-$(CONFIG_VIRTIO_DMA_SHARED_BUFFER) += virtio_dma_buf.o obj-$(CONFIG_VIRTIO_RTC) += virtio_rtc.o virtio_rtc-y := virtio_rtc_driver.o +virtio_rtc-$(CONFIG_VIRTIO_RTC_PTP) += virtio_rtc_ptp.o diff --git a/drivers/virtio/virtio_rtc_driver.c b/drivers/virtio/virtio_rtc_driver.c index 424500d2c4f7..3c11fa95b9a7 100644 --- a/drivers/virtio/virtio_rtc_driver.c +++ b/drivers/virtio/virtio_rtc_driver.c @@ -36,11 +36,16 @@ struct viortc_vq { * struct viortc_dev - virtio_rtc device data * @vdev: virtio device * @vqs: virtqueues + * @clocks_to_unregister: Clock references, which are only used during device + * removal. + * For other uses, there would be a race between device + * creation and setting the pointers here. * @num_clocks: # of virtio_rtc clocks */ struct viortc_dev { struct virtio_device *vdev; struct viortc_vq vqs[VIORTC_MAX_NR_QUEUES]; + struct viortc_ptp_clock **clocks_to_unregister; u16 num_clocks; }; @@ -588,6 +593,89 @@ int viortc_cross_cap(struct viortc_dev *viortc, u64 vio_clk_id, u16 hw_counter, * init, deinit */ +/** + * viortc_init_clock() - init local representation of virtio_rtc clock (PHC) + * @viortc: device data + * @vio_clk_id: virtio_rtc clock id + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_init_clock(struct viortc_dev *viortc, u64 vio_clk_id) +{ + int ret; + u16 clock_type; + char ptp_clock_name[PTP_CLOCK_NAME_LEN]; + const char *type_name; + /* fit prefix + u16 in decimal */ + char type_name_buf[5 + 5 + 1]; + bool has_xtstamp_feature; + struct viortc_ptp_clock *vio_ptp; + struct virtio_device *vdev = viortc->vdev; + + ret = viortc_clock_cap(viortc, vio_clk_id, &clock_type); + if (ret) + return ret; + + switch (clock_type) { + case VIRTIO_RTC_CLOCK_UTC: + type_name = "UTC"; + break; + case VIRTIO_RTC_CLOCK_TAI: + type_name = "TAI"; + break; + case VIRTIO_RTC_CLOCK_MONO: + type_name = "monotonic"; + break; + default: + snprintf(type_name_buf, sizeof(type_name_buf), "type %hu", + clock_type); + type_name = type_name_buf; + } + + snprintf(ptp_clock_name, PTP_CLOCK_NAME_LEN, "Virtio PTP %s", + type_name); + + has_xtstamp_feature = virtio_has_feature(vdev, VIRTIO_RTC_F_READ_CROSS); + + vio_ptp = viortc_ptp_register(viortc, &vdev->dev, vio_clk_id, + ptp_clock_name, has_xtstamp_feature); + if (IS_ERR(vio_ptp)) { + dev_err(&vdev->dev, "failed to register PTP clock '%s'\n", + ptp_clock_name); + return PTR_ERR(vio_ptp); + } + + viortc->clocks_to_unregister[vio_clk_id] = vio_ptp; + + if (!vio_ptp) + dev_warn(&vdev->dev, "clock %llu is not exposed to userspace\n", + vio_clk_id); + + return 0; +} + +/** + * viortc_clocks_exit() - unregister PHCs + * @viortc: device data + */ +static void viortc_clocks_exit(struct viortc_dev *viortc) +{ + unsigned int i; + struct viortc_ptp_clock *vio_ptp; + + for (i = 0; i < viortc->num_clocks; i++) { + vio_ptp = viortc->clocks_to_unregister[i]; + + if (!vio_ptp) + continue; + + viortc->clocks_to_unregister[i] = NULL; + + WARN_ON(viortc_ptp_unregister(vio_ptp, &viortc->vdev->dev)); + } +} + /** * viortc_clocks_init() - init local representations of virtio_rtc clocks * @viortc: device data @@ -599,6 +687,7 @@ static int viortc_clocks_init(struct viortc_dev *viortc) { int ret; u16 num_clocks; + unsigned int i; ret = viortc_cfg(viortc, &num_clocks); if (ret) @@ -611,10 +700,24 @@ static int viortc_clocks_init(struct viortc_dev *viortc) viortc->num_clocks = num_clocks; - /* In the future, PTP clocks will be initialized here. */ - (void)viortc_clock_cap; + viortc->clocks_to_unregister = + devm_kcalloc(&viortc->vdev->dev, num_clocks, + sizeof(*viortc->clocks_to_unregister), GFP_KERNEL); + if (!viortc->clocks_to_unregister) + return -ENOMEM; + + for (i = 0; i < num_clocks; i++) { + ret = viortc_init_clock(viortc, i); + if (ret) + goto err_free_clocks; + } return 0; + +err_free_clocks: + viortc_clocks_exit(viortc); + + return ret; } /** @@ -703,7 +806,9 @@ static int viortc_probe(struct virtio_device *vdev) */ static void viortc_remove(struct virtio_device *vdev) { - /* In the future, PTP clocks will be deinitialized here. */ + struct viortc_dev *viortc = vdev->priv; + + viortc_clocks_exit(viortc); virtio_reset_device(vdev); vdev->config->del_vqs(vdev); diff --git a/drivers/virtio/virtio_rtc_internal.h b/drivers/virtio/virtio_rtc_internal.h index c2b5387f506f..ccf621a749da 100644 --- a/drivers/virtio/virtio_rtc_internal.h +++ b/drivers/virtio/virtio_rtc_internal.h @@ -9,6 +9,7 @@ #define _VIRTIO_RTC_INTERNAL_H_ #include +#include /* driver core IFs */ @@ -20,4 +21,51 @@ int viortc_read_cross(struct viortc_dev *viortc, u64 vio_clk_id, u16 hw_counter, int viortc_cross_cap(struct viortc_dev *viortc, u64 vio_clk_id, u16 hw_counter, bool *supported); +/* PTP IFs */ + +struct viortc_ptp_clock; + +#if IS_ENABLED(CONFIG_VIRTIO_RTC_PTP) + +struct viortc_ptp_clock *viortc_ptp_register(struct viortc_dev *viortc, + struct device *parent_dev, + u64 vio_clk_id, + const char *ptp_clock_name, + bool try_enable_xtstamp); +int viortc_ptp_unregister(struct viortc_ptp_clock *vio_ptp, + struct device *parent_dev); + +#else + +static inline struct viortc_ptp_clock * +viortc_ptp_register(struct viortc_dev *viortc, struct device *parent_dev, + u64 vio_clk_id, const char *ptp_clock_name, + bool try_enable_xtstamp) +{ + return NULL; +} + +int viortc_ptp_unregister(struct viortc_ptp_clock *vio_ptp, + struct device *parent_dev) +{ + return -ENODEV; +} + +#endif + +/* HW counter IFs */ + +/** + * viortc_hw_xtstamp_params() - get HW-specific xtstamp params + * @hw_counter: virtio_rtc HW counter type + * @cs_id: clocksource id corresponding to hw_counter + * + * Gets the HW-specific xtstamp params. Returns an error if the driver cannot + * support xtstamp. + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +int viortc_hw_xtstamp_params(u16 *hw_counter, enum clocksource_ids *cs_id); + #endif /* _VIRTIO_RTC_INTERNAL_H_ */ diff --git a/drivers/virtio/virtio_rtc_ptp.c b/drivers/virtio/virtio_rtc_ptp.c new file mode 100644 index 000000000000..c79544d13a64 --- /dev/null +++ b/drivers/virtio/virtio_rtc_ptp.c @@ -0,0 +1,347 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Expose virtio_rtc clocks as PTP clocks. + * + * Copyright (C) 2022-2023 OpenSynergy GmbH + * + * Derived from ptp_kvm_common.c, virtual PTP 1588 clock for use with KVM + * guests. + * + * Copyright (C) 2017 Red Hat Inc. + */ + +#include +#include +#include + +#include + +#include "virtio_rtc_internal.h" + +/** + * struct viortc_ptp_clock - PTP clock abstraction + * @vio_clk_id: virtio_rtc clock id + * @ptp_clock: PTP clock handle + * @viortc: virtio_rtc device data + * @ptp_info: PTP clock description + * @have_cross: device supports crosststamp with available HW counter + */ +struct viortc_ptp_clock { + u64 vio_clk_id; + struct ptp_clock *ptp_clock; + struct viortc_dev *viortc; + struct ptp_clock_info ptp_info; + bool have_cross; +}; + +/** + * struct viortc_ptp_cross_ctx - context for get_device_system_crosststamp() + * @device_time: device clock reading + * @system_counterval: HW counter value at device_time + * + * Provides the already obtained crosststamp to get_device_system_crosststamp(). + */ +struct viortc_ptp_cross_ctx { + ktime_t device_time; + struct system_counterval_t system_counterval; +}; + +/* Weak functions in case get_device_system_crosststamp() is not supported */ + +int __weak viortc_hw_xtstamp_params(u16 *hw_counter, + enum clocksource_ids *cs_id) +{ + return -EOPNOTSUPP; +} + +/** + * viortc_ptp_get_time_fn() - callback for get_device_system_crosststamp() + * @device_time: device clock reading + * @system_counterval: HW counter value at device_time + * @ctx: context with already obtained crosststamp + * + * Return: zero (success). + */ +static int viortc_ptp_get_time_fn(ktime_t *device_time, + struct system_counterval_t *system_counterval, + void *ctx) +{ + struct viortc_ptp_cross_ctx *vio_ctx = ctx; + + *device_time = vio_ctx->device_time; + *system_counterval = vio_ctx->system_counterval; + + return 0; +} + +/** + * viortc_ptp_do_xtstamp() - get crosststamp from device + * @vio_ptp: virtio_rtc PTP clock + * @ctx: context for get_device_system_crosststamp() + * + * Reads HW-specific crosststamp from device. + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_ptp_do_xtstamp(struct viortc_ptp_clock *vio_ptp, + struct viortc_ptp_cross_ctx *ctx, + u16 hw_counter, enum clocksource_ids cs_id) +{ + u64 ns; + u64 max_ns; + int ret; + + ctx->system_counterval.cs_id = cs_id; + + ret = viortc_read_cross(vio_ptp->viortc, vio_ptp->vio_clk_id, + hw_counter, &ns, + &ctx->system_counterval.cycles); + if (ret) + return ret; + + max_ns = (u64)ktime_to_ns(KTIME_MAX); + if (ns > max_ns) + return -EINVAL; + + ctx->device_time = ns_to_ktime(ns); + + return 0; +} + +/* + * PTP clock operations + */ + +/** + * viortc_ptp_getcrosststamp() - PTP clock getcrosststamp op + * @vio_ptp: virtio_rtc PTP clock + * @xtstamp: crosststamp + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_ptp_getcrosststamp(struct ptp_clock_info *ptp, + struct system_device_crosststamp *xtstamp) +{ + struct viortc_ptp_clock *vio_ptp = + container_of(ptp, struct viortc_ptp_clock, ptp_info); + int ret; + struct system_time_snapshot history_begin; + struct viortc_ptp_cross_ctx ctx; + enum clocksource_ids cs_id; + u16 hw_counter; + + if (!vio_ptp->have_cross) + return -EOPNOTSUPP; + + ret = viortc_hw_xtstamp_params(&hw_counter, &cs_id); + if (ret) + return ret; + + ktime_get_snapshot(&history_begin); + if (history_begin.cs_id != cs_id) + return -EOPNOTSUPP; + + /* + * Getting the timestamp can take many milliseconds with a slow Virtio + * device. This is too long for viortc_ptp_get_time_fn() passed to + * get_device_system_crosststamp(), which has to usually return before + * the timekeeper seqcount increases (every tick or so). + * + * So, get the actual cross-timestamp first. + */ + ret = viortc_ptp_do_xtstamp(vio_ptp, &ctx, hw_counter, cs_id); + if (ret) + return ret; + + ret = get_device_system_crosststamp(viortc_ptp_get_time_fn, &ctx, + &history_begin, xtstamp); + if (ret) { + pr_debug("%s: get_device_system_crosststamp() returned %d\n", + __func__, ret); + } + + return ret; +} + +/** viortc_ptp_adjfine() - unsupported PTP clock adjfine op */ +static int viortc_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm) +{ + return -EOPNOTSUPP; +} + +/** viortc_ptp_adjtime() - unsupported PTP clock adjtime op */ +static int viortc_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) +{ + return -EOPNOTSUPP; +} + +/** viortc_ptp_settime64() - unsupported PTP clock settime64 op */ +static int viortc_ptp_settime64(struct ptp_clock_info *ptp, + const struct timespec64 *ts) +{ + return -EOPNOTSUPP; +} + +/** + * viortc_ptp_gettimex64() - PTP clock gettimex64 op + * + * Context: Process context. + */ +static int viortc_ptp_gettimex64(struct ptp_clock_info *ptp, + struct timespec64 *ts, + struct ptp_system_timestamp *sts) +{ + struct viortc_ptp_clock *vio_ptp = + container_of(ptp, struct viortc_ptp_clock, ptp_info); + u64 ns; + int ret; + + ptp_read_system_prets(sts); + ret = viortc_read(vio_ptp->viortc, vio_ptp->vio_clk_id, &ns); + ptp_read_system_postts(sts); + + if (ret) + return ret; + + if (ns > (u64)S64_MAX) + return -EINVAL; + + *ts = ns_to_timespec64((s64)ns); + + return 0; +} + +/** viortc_ptp_enable() - unsupported PTP clock enable op */ +static int viortc_ptp_enable(struct ptp_clock_info *ptp, + struct ptp_clock_request *rq, int on) +{ + return -EOPNOTSUPP; +} + +/** + * viortc_ptp_info_template - ptp_clock_info template + * + * The .name member will be set for individual virtio_rtc PTP clocks. + */ +static const struct ptp_clock_info viortc_ptp_info_template = { + .owner = THIS_MODULE, + /* .name is set according to clock type */ + .adjfine = viortc_ptp_adjfine, + .adjtime = viortc_ptp_adjtime, + .gettimex64 = viortc_ptp_gettimex64, + .settime64 = viortc_ptp_settime64, + .enable = viortc_ptp_enable, + .getcrosststamp = viortc_ptp_getcrosststamp, +}; + +/** + * viortc_ptp_unregister() - PTP clock unregistering wrapper + * @vio_ptp: virtio_rtc PTP clock + * @parent_dev: parent device of PTP clock + * + * Return: Zero on success, negative error code otherwise. + */ +int viortc_ptp_unregister(struct viortc_ptp_clock *vio_ptp, + struct device *parent_dev) +{ + int ret = ptp_clock_unregister(vio_ptp->ptp_clock); + + if (!ret) + devm_kfree(parent_dev, vio_ptp); + + return ret; +} + +/** + * viortc_ptp_get_cross_cap() - get xtstamp support info from device + * @viortc: virtio_rtc device data + * @vio_ptp: virtio_rtc PTP clock abstraction + * + * Context: Process context. + * Return: Zero on success, negative error code otherwise. + */ +static int viortc_ptp_get_cross_cap(struct viortc_dev *viortc, + struct viortc_ptp_clock *vio_ptp) +{ + int ret; + enum clocksource_ids cs_id; + u16 hw_counter; + bool xtstamp_supported; + + ret = viortc_hw_xtstamp_params(&hw_counter, &cs_id); + if (ret) { + vio_ptp->have_cross = false; + return 0; + } + (void)cs_id; + + ret = viortc_cross_cap(viortc, vio_ptp->vio_clk_id, hw_counter, + &xtstamp_supported); + if (ret) + return ret; + + vio_ptp->have_cross = xtstamp_supported; + + return 0; +} + +/** + * viortc_ptp_register() - prepare and register PTP clock + * @viortc: virtio_rtc device data + * @parent_dev: parent device for PTP clock + * @vio_clk_id: id of virtio_rtc clock which backs PTP clock + * @ptp_clock_name: PTP clock name + * @try_enable_xtstamp: enable xtstamp op, if available + * + * Context: Process context. + * Return: Pointer on success, ERR_PTR() otherwise; NULL if PTP clock support + * not available. + */ +struct viortc_ptp_clock *viortc_ptp_register(struct viortc_dev *viortc, + struct device *parent_dev, + u64 vio_clk_id, + const char *ptp_clock_name, + bool try_enable_xtstamp) +{ + struct viortc_ptp_clock *vio_ptp; + struct ptp_clock *ptp_clock; + ssize_t len; + int ret; + + vio_ptp = devm_kzalloc(parent_dev, sizeof(*vio_ptp), GFP_KERNEL); + if (!vio_ptp) + return ERR_PTR(-ENOMEM); + + vio_ptp->viortc = viortc; + vio_ptp->vio_clk_id = vio_clk_id; + vio_ptp->ptp_info = viortc_ptp_info_template; + len = strscpy(vio_ptp->ptp_info.name, ptp_clock_name, + sizeof(vio_ptp->ptp_info.name)); + if (len < 0) { + ret = len; + goto err_free_dev; + } + + if (try_enable_xtstamp) { + ret = viortc_ptp_get_cross_cap(viortc, vio_ptp); + if (ret) + goto err_free_dev; + } + + ptp_clock = ptp_clock_register(&vio_ptp->ptp_info, parent_dev); + if (IS_ERR(ptp_clock)) + goto err_on_register; + + vio_ptp->ptp_clock = ptp_clock; + + return vio_ptp; + +err_on_register: + ret = PTR_ERR(ptp_clock); + +err_free_dev: + devm_kfree(parent_dev, vio_ptp); + return ERR_PTR(ret); +} From patchwork Fri Aug 18 01:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hilber X-Patchwork-Id: 13357191 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5407BC678DC for ; Fri, 18 Aug 2023 01:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sMbuYGqYiKcA/hYWviDP0557ZjXZufjVGNhKAB439T8=; b=JSI/fpiqHLxCX0 K1vrGjXJecVrVxFUk92n+hGnut4i1KBWzIQYfiTkIDUydlyEsocsFXbkqhtD/2C1iwdBtF5Up0A5S QsG+xILaVq+N4MCdFV2lDCkXSPlUCAbwSes/pNIHdLa0uvOBjWmwGxtwvnioESoSo9lEWXsG9sqUL Y6SB/yw6W7dDLFfKeCfuRnOVRxtJv2aqpNjUJ4hpZi0DOSldFjAbWrJ88ADHcUBFAd7np744yBd7V 3Xuz3T4VFBZTV05gY+u6ZrNYedgxmy2s9XnhCVQU3m0YQ7VIXNutFx7EjfEn5pPSV4VPmtpXIY9So oKX5DYTEWnH5jG0uiVZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWoAR-007STz-1b; Fri, 18 Aug 2023 01:20:47 +0000 Received: from repost01.tmes.trendmicro.eu ([18.185.115.112]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qWoAF-007SQP-1i for linux-arm-kernel@lists.infradead.org; Fri, 18 Aug 2023 01:20:39 +0000 Received: from 104.47.11.176_.trendmicro.com (unknown [172.21.184.89]) by repost01.tmes.trendmicro.eu (Postfix) with SMTP id C136E100004F6; Fri, 18 Aug 2023 01:20:30 +0000 (UTC) X-TM-MAIL-RECEIVED-TIME: 1692321630.482000 X-TM-MAIL-UUID: 8ce9f07e-2a60-479d-b66e-f9789796d75d Received: from DEU01-FR2-obe.outbound.protection.outlook.com (unknown [104.47.11.176]) by repre01.tmes.trendmicro.eu (Trend Micro Email Security) with ESMTPS id 75C9810000405; Fri, 18 Aug 2023 01:20:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TaG8Wgfqheufo0+2kOMEKuEJxA7tsbFocsCST/1XUgtvp1EUT2mAbfFFFbhZNBD8tfg/MLFY/AerOcqxjycLR3m0fFkB9ZjgC51V+lRgszLKqFx+dAEivGTRVwIQQH6C0SdWKzrPdjLWsP/uI0VGHM3EhPDGzRx23xYpxeEOsAI16sTsYBjCpr+rNLFJnxblGQADGNIAnwAL467ZDgIEHTFmsbMhzTIBbVjCohj+Mqdf6Gw10aBWFBwZl7hdyycLAWx//Ti4WBkaZ9cE8CBOW3K1lVpvwqvo1ggtczLjjVi00ZMZhWvp4qhyrFlCd8Mh7vTXg2KwGZTm25Gz/tncyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wRne8kbkNKVt6kbFg+jUd0MiRWYGUPi2gLv6PHBaxsY=; b=DkmH8KEeWch8MBm6fl7KR7SFAxpwrUJ5182NpjMcCP2em08JK2qlFfkNhhZ7bj89LU8B/rpWuDMTZGb8yOrqnXKgWYnnvnURUSjYb9nn3tblRmqG3+IRnLXpZg9sX5JlpfkNOA/B2CniCaIRqJfVQHn7L/c8YX70lp6wrVkSEVMaRkm5ZSX1rNL5eO5LZD+Dqpgfr2nA34p3aRW0l4Yfa5/ZUETnCMLu1qjjCSvUuDwYeeSMcQup0eRSlpXEAWsBMisbqBoczlovH89btmzy1czkf01TFiaIyQnhvmbixTmRr5P0zeT3+tKJiHghWYPAzQXDJYwOU9IdjZjUoPkkzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.66.60.4) smtp.rcpttodomain=arm.com smtp.mailfrom=opensynergy.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=opensynergy.com; dkim=none (message not signed); arc=none X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.66.60.4) smtp.mailfrom=opensynergy.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=opensynergy.com; Received-SPF: Pass (protection.outlook.com: domain of opensynergy.com designates 217.66.60.4 as permitted sender) receiver=protection.outlook.com; client-ip=217.66.60.4; helo=SR-MAIL-03.open-synergy.com; pr=C From: Peter Hilber To: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org, linux-arm-kernel@lists.infradead.org Cc: Peter Hilber , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Marc Zyngier , Mark Rutland , Daniel Lezcano , Thomas Gleixner Subject: [RFC PATCH v2 6/6] virtio_rtc: Add Arm Generic Timer cross-timestamping Date: Fri, 18 Aug 2023 03:20:12 +0200 Message-Id: <20230818012014.212155-7-peter.hilber@opensynergy.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818012014.212155-1-peter.hilber@opensynergy.com> References: <20230818012014.212155-1-peter.hilber@opensynergy.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1EUR05FT036:EE_|BE1P281MB1633:EE_ X-MS-Office365-Filtering-Correlation-Id: f657f974-fa40-46fa-d2ae-08db9f894efb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yHPJPMUaG9820kU0+SvG3x5fCuzDVtMDS3pxepBvPBeAlVYydCncuE3/dZgKeCoObKV63mgsiLbfvwlA+9/8SlJcvLTwoeuE7H5DEzapeAIsmgK9aIfyq8Dn57pFWZgCQJGthQazmUbqpwf6fqczqLqwGukNdXaqMwJJsLyI4lKNEb/RaHC6Ns4tBDzMFT6rVJ2gkGm7I4piKPB8U1/GRu8EVYqHMbyDmtf2iSs9PfUTdeswPmgIYlbwlTcCYrm0y17lwqBiWozoVm6y+yaYs8CnjLf1xRe1NsWMCxBNfuiRK11lJ5jw3VnXhwfUpQ9GMxITUc7bSAuK/tXoR7vzY0/8GSoHlFI0L0E2nj/4u1Hkjf4Ogn5Eqfp0jX+34gYDoOE9EQ8gNOnplbCZRxRTULdaemPEhgaKQENVxhUkpaDOuCFXDv6LR6NuYBBwkCAXAIdCAFUVkWLBz8E64tsQY4Hyq7K1B4S2bo9CGvgzRr+TkHjzfoZUFjwgkwYQxlOiui7CMfzzKcZROC/6DEqAzkH2jlE9jv/adLGP6MbC+xS+Qbmg40TldQZn2HbXQ4hkHUgCsdhgOj0LV8Z5fNZNdMm9MVPJAAyCoS8LdxA/Ol6A4NIIRJwQpzTMDlmuD+r2Ih8b/WRgJ8GLWqIuB0YrYDsfMg/C1QeMSsM5bGgLBjK+7T86G+5vllnVHnLX7g1wQEJEIviw8+MaRedwLd3JKwKO/F8IlsbyRGN+RTfx2jEGM/ZueKqvX7z4Ejjq5xSlnbRrF3yGEkJUdtuC0/nYuy+JQsHBvglH7gwXq3+MN8BKzcqR7/pozSFaIpvVM39ZY6ZP+rvgZCmY75n/klBOeQ== X-Forefront-Antispam-Report: CIP:217.66.60.4;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SR-MAIL-03.open-synergy.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(136003)(396003)(376002)(346002)(39850400004)(1800799009)(82310400011)(186009)(451199024)(46966006)(36840700001)(40480700001)(36756003)(86362001)(81166007)(12101799020)(70206006)(42186006)(54906003)(316002)(478600001)(70586007)(41300700001)(82740400003)(26005)(47076005)(1076003)(336012)(2616005)(8676002)(8936002)(5660300002)(4326008)(7416002)(2906002)(44832011)(36860700001)(83380400001)(41533002)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: opensynergy.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 01:20:28.6425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f657f974-fa40-46fa-d2ae-08db9f894efb X-MS-Exchange-CrossTenant-Id: 800fae25-9b1b-4edc-993d-c939c4e84a64 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=800fae25-9b1b-4edc-993d-c939c4e84a64;Ip=[217.66.60.4];Helo=[SR-MAIL-03.open-synergy.com] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT036.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE1P281MB1633 X-TM-AS-ERS: 104.47.11.176-0.0.0.0 X-TMASE-Version: StarCloud-1.3-9.1.1011-27820.003 X-TMASE-Result: 10--18.516800-4.000000 X-TMASE-MatchedRID: ZAkTtSyZ7B7c1YtpVABxhScOunEIf0eXRyG5SSR7mMFHwPpoS7xiTQ3u hqemVNab4tr/y+kNIhx+41laLbgwdzURLmZdK2fK9K6xgLnDQNjrlkvw0pZ13MhGESF2QtYSsgk fnaHAFPzm9Tc/GgfFJwFtWueZlMH0Hw0ziwm/5yd81fikUYgyLUMxQVRV15qN9zxz+98nLbrqqp KNT13hEpMgmvUQU/w2ftTV5S2xLn0yxlgWcGNdNffKbx7F+zg4FkXEytHxBjkweIyZbRlQ2yzec Bj190z12HlzhM3zNtns9WQVYycKfw3lGTiQlxzIv9rSd36EgUI+Mqg+CyrtwA== X-TMASE-XGENCLOUD: 6732af28-3a27-4945-a6cc-85283e71368a-0-0-200-0 X-TM-Deliver-Signature: 73D683A371F90B08169AE946A9213147 X-TM-Addin-Auth: OcQ9Z0y6ljBysb/AZ7MXi5bwj0+XjALf+IL7xbmWb/5E6gEWl6Mu5v/EbRW 6M3hwtnwvq5QPEEMkFq5RAOjPzJuGlXNa+uvPVtiENiK+mIzzjjxI2SnRt4WoIsLcUv+EIFnFvM cPkpT0TK+agSaHVyljgDJDgNfjpMvyikvZdTwjt1KZi/38ND4xKig8Dym3yjf0Uw+4qC9QI5Alu bsPSyebREq6H55xS2wL6W4Iw1rtPr7nfANdKniV2dzoSdtUA58LCke5oz72QFiQM+ITck53A6lV m2U+W0lQ8l+IYRM=.OxyiOyDLdq/fNFKkan2VNxG5E6L8m2MZzckGU6JXS/t4n5M7Wsu+vhKY8B nwonNzBoiB+hcv23U31U/KJiB6DyictX3Q1/DMpCuSnqpun/m0fXVHwlVwpRf/ykIoPaO9PxgGJ v0AXSvXUA4+U3t2MTIMzFWsC4Eshm2TM43use1hZwbrzE/khW1XEJGxEpCvkRg4zcyptHgLFBpl QKC6hCQeG+j2IzTTmNtgsKR9npg0eIfQ8wsss7SL0NWfRrHqzaasBSZckoGnVpjYCSFuFeqyx+m MOIsnJaEJhUI8bwQQ/JsZ2rEpKkUJXX55J6m334Ubx7mrUGZ2iPdrySiW4w== X-TM-Addin-ProductCode: EMS DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com; s=TM-DKIM-20210503141657; t=1692321630; bh=jqtbhrHfjn9VDfVwg/FXcIMDSJtBMetyIWRdox0bdck=; l=2909; h=From:To:Date; b=jIxkWM5PW0jonaCNu0CZkUicYCQPZ/fR4BQ7u6s8hIm1JFPgq8HOmikwAY5eXxB84 jETUWD2iQ5lvlJtEGcD8RD/LLtDnQqJmgcSz4JJ+qOPC1/5UgLaKhbtBFof9/OI8EY YvgDlqCRE/lDDec0b3Zdh1Ami3J4t/gHdqxqE3JKEDSvZ8Y7MF+nK380F6F1Z26U5O en6eAz/QDeHfQbc6vu8jeDlPCYuOqKQ3Sa0UL/UQokO/D5N2oocL8wDn0216ICLqJS y2JvcijQU54o4o93irnZ5yoivqoDk/guZex1FIDtYoPLshIF0yrLNGkILS29EV+1w4 qtSaXfQaWav+Q== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230817_182035_872345_4542B3D9 X-CRM114-Status: GOOD ( 17.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add PTP_SYS_OFFSET_PRECISE2 support on platforms using the Arm Generic Timer. Always report the CP15 virtual counter as the HW counter in use by arm_arch_timer, since the Linux kernel's usage of the Arm Generic Timer should always be compatible with this. Signed-off-by: Peter Hilber --- Notes: v2: - Depend on prerequisite patch series "treewide: Use clocksource id for get_device_system_crosststamp()". - Return clocksource id instead of calling dropped arm_arch_timer helpers. - Always report the CP15 virtual counter to be in use by arm_arch_timer, since distinction of Arm physical and virtual counter appears unneeded after discussion with Marc Zyngier. drivers/virtio/Kconfig | 13 +++++++++++++ drivers/virtio/Makefile | 1 + drivers/virtio/virtio_rtc_arm.c | 22 ++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 drivers/virtio/virtio_rtc_arm.c diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 7369ecd7dd01..ed3f541032a0 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -203,4 +203,17 @@ config VIRTIO_RTC_PTP If unsure, say Y. +config VIRTIO_RTC_ARM + bool "Virtio RTC cross-timestamping using Arm Generic Timer" + default y + depends on VIRTIO_RTC_PTP && ARM_ARCH_TIMER + help + This enables Virtio RTC cross-timestamping using the Arm Generic Timer. + It only has an effect if the Virtio RTC device also supports this. The + cross-timestamp is available through the PTP clock driver precise + cross-timestamp ioctl (PTP_SYS_OFFSET_PRECISE2 or + PTP_SYS_OFFSET_PRECISE). + + If unsure, say Y. + endif # VIRTIO_MENU diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index 4d48cbcae6bb..781dff9f8822 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_VIRTIO_DMA_SHARED_BUFFER) += virtio_dma_buf.o obj-$(CONFIG_VIRTIO_RTC) += virtio_rtc.o virtio_rtc-y := virtio_rtc_driver.o virtio_rtc-$(CONFIG_VIRTIO_RTC_PTP) += virtio_rtc_ptp.o +virtio_rtc-$(CONFIG_VIRTIO_RTC_ARM) += virtio_rtc_arm.o diff --git a/drivers/virtio/virtio_rtc_arm.c b/drivers/virtio/virtio_rtc_arm.c new file mode 100644 index 000000000000..5185b130b3f1 --- /dev/null +++ b/drivers/virtio/virtio_rtc_arm.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Provides cross-timestamp params for Arm. + * + * Copyright (C) 2022-2023 OpenSynergy GmbH + */ + +#include + +#include + +#include "virtio_rtc_internal.h" + +/* see header for doc */ + +int viortc_hw_xtstamp_params(u16 *hw_counter, enum clocksource_ids *cs_id) +{ + *hw_counter = VIRTIO_RTC_COUNTER_ARM_VIRT; + *cs_id = CSID_ARM_ARCH_COUNTER; + + return 0; +}