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 X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D960BC5ACC4 for ; Wed, 19 Feb 2020 22:11:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9E42206EF for ; Wed, 19 Feb 2020 22:11:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727469AbgBSWLk (ORCPT ); Wed, 19 Feb 2020 17:11:40 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:41915 "EHLO relay7-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727232AbgBSWLk (ORCPT ); Wed, 19 Feb 2020 17:11:40 -0500 X-Originating-IP: 86.202.105.35 Received: from localhost (lfbn-lyo-1-9-35.w86-202.abo.wanadoo.fr [86.202.105.35]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id E5C402000B; Wed, 19 Feb 2020 22:11:37 +0000 (UTC) Date: Wed, 19 Feb 2020 23:11:37 +0100 From: Alexandre Belloni To: Ard Biesheuvel Cc: linux-efi@vger.kernel.org, Leif Lindholm , Peter Jones , Heinrich Schuchardt , Jeff Brasen , Atish Patra , x86@kernel.org, Alessandro Zummo , linux-rtc@vger.kernel.org Subject: Re: [PATCH 4/9] efi: register EFI rtc platform device only when available Message-ID: <20200219221016.GL3390@piout.net> References: <20200219171907.11894-1-ardb@kernel.org> <20200219171907.11894-5-ardb@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200219171907.11894-5-ardb@kernel.org> Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org On 19/02/2020 18:19:02+0100, Ard Biesheuvel wrote: > Drop the separate driver that registers the EFI rtc on all EFI > systems that have runtime services available, and instead, move > the registration into the core EFI code, and make it conditional > on whether the actual time related services are available. > > Cc: Alessandro Zummo > Cc: Alexandre Belloni > Cc: linux-rtc@vger.kernel.org > Signed-off-by: Ard Biesheuvel Acked-by: Alexandre Belloni > --- > drivers/firmware/efi/efi.c | 3 ++ > drivers/rtc/Makefile | 4 --- > drivers/rtc/rtc-efi-platform.c | 35 -------------------- > 3 files changed, 3 insertions(+), 39 deletions(-) > > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c > index abf4c02e0201..69a585106d30 100644 > --- a/drivers/firmware/efi/efi.c > +++ b/drivers/firmware/efi/efi.c > @@ -321,6 +321,9 @@ static int __init efisubsys_init(void) > } > } > > + if (efi_rt_services_supported(EFI_RT_SUPPORTED_TIME_SERVICES)) > + platform_device_register_simple("rtc-efi", 0, NULL, 0); > + > /* We register the efi directory at /sys/firmware/efi */ > efi_kobj = kobject_create_and_add("efi", firmware_kobj); > if (!efi_kobj) { > diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile > index 4ac8f19fb631..24c7dfa1bd7d 100644 > --- a/drivers/rtc/Makefile > +++ b/drivers/rtc/Makefile > @@ -12,10 +12,6 @@ obj-$(CONFIG_RTC_CLASS) += rtc-core.o > obj-$(CONFIG_RTC_MC146818_LIB) += rtc-mc146818-lib.o > rtc-core-y := class.o interface.o > > -ifdef CONFIG_RTC_DRV_EFI > -rtc-core-y += rtc-efi-platform.o > -endif > - > rtc-core-$(CONFIG_RTC_NVMEM) += nvmem.o > rtc-core-$(CONFIG_RTC_INTF_DEV) += dev.o > rtc-core-$(CONFIG_RTC_INTF_PROC) += proc.o > diff --git a/drivers/rtc/rtc-efi-platform.c b/drivers/rtc/rtc-efi-platform.c > deleted file mode 100644 > index 6c037dc4e3dc..000000000000 > --- a/drivers/rtc/rtc-efi-platform.c > +++ /dev/null > @@ -1,35 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * Moved from arch/ia64/kernel/time.c > - * > - * Copyright (C) 1998-2003 Hewlett-Packard Co > - * Stephane Eranian > - * David Mosberger > - * Copyright (C) 1999 Don Dugger > - * Copyright (C) 1999-2000 VA Linux Systems > - * Copyright (C) 1999-2000 Walt Drummond > - */ > - > -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > - > -#include > -#include > -#include > -#include > -#include > - > -static struct platform_device rtc_efi_dev = { > - .name = "rtc-efi", > - .id = -1, > -}; > - > -static int __init rtc_init(void) > -{ > - if (efi_enabled(EFI_RUNTIME_SERVICES)) > - if (platform_device_register(&rtc_efi_dev) < 0) > - pr_err("unable to register rtc device...\n"); > - > - /* not necessarily an error */ > - return 0; > -} > -module_init(rtc_init); > -- > 2.17.1 > -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com