From patchwork Wed Jul 19 11:39:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 790954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="qMEE05A+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xCFSj448Kz9s4q for ; Wed, 19 Jul 2017 21:40:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753583AbdGSLkF (ORCPT ); Wed, 19 Jul 2017 07:40:05 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35003 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753413AbdGSLkD (ORCPT ); Wed, 19 Jul 2017 07:40:03 -0400 Received: by mail-wm0-f68.google.com with SMTP id n64so2162729wmg.2 for ; Wed, 19 Jul 2017 04:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=rLem+KiQJhwr2QjU//cKj/e3rRNc0bXlRa5qSmgDu0E=; b=qMEE05A+P96afO2x8+ChzxI/925a0YbhZQha4BUQndWH/bpoaq0TWVuP7M6KSQL3W6 ZL6LomW5FUQYios0RoTKzkkyQ8Ny1dAf6kVIrjnRbDqejLPOxrQ0u8PZiP9ga0U2Fm6Q FFdMdg9MGvle6gmmhy9/1AgRR75QPqS0m8WoTJOpFSpeFGINgts1bvkWDmf0MwdWHwvz Fnd4+KKOhDRXGNXvtpJUQEDdKXliSHJkVTEvcqFq3O3hEsc4yWI4aS7m+1ddZrEEjKJt wZBt0UgzVnBi47lavdjcv/If3nlfV0YsKwwyrp6XLuUwJdbkzkY0UgQKa/s7fgDik04w vdXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=rLem+KiQJhwr2QjU//cKj/e3rRNc0bXlRa5qSmgDu0E=; b=Fy7uyBlvxJoLpxt/8DgEBbGng4eg9GuLdqIAGXQNMCLV78JKg/DgT+jGBlvOtjpODH MOPheCxtSuKaI2/8ia3h4/qsyHSnHcaVpLfoQ66p6PAaSZaAGARjLPTigHIrls4HBnWz KV3lLYxC1Vg7f260uqZnFn/M9hMYRHfVaOeU69nYD2tNSPRbW1hEhvwI09Od82gzxN2j mUldopQiCas0b5GAFM9HLo/cqerFeWNihNfyVb6uKeOUO3nkPie+itD7HM9PsIEU/RQD yECrp7CFVg5nmN8v03WlBdKqXByf0msLCo//qgE2CoppNBLofO/y3gmYgwr2tQqomOLQ LioQ== X-Gm-Message-State: AIVw1130Z3VMG9CUOpRjqqiZ5wlQEvueYZF55cDVomTHD7Djd92VsvqT Z2Wh1hny25hfMCTG X-Received: by 10.28.232.29 with SMTP id f29mr5196667wmh.55.1500464402343; Wed, 19 Jul 2017 04:40:02 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id t12sm158098wmd.32.2017.07.19.04.40.01 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 19 Jul 2017 04:40:01 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Cc: =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-rtc@vger.kernel.org, Alessandro Zummo , Alexandre Belloni , linux-arm-kernel@lists.infradead.org Subject: [PATCH] rtc: zynqmp: Disable the build as a module Date: Wed, 19 Jul 2017 13:39:57 +0200 Message-Id: <9881f4ae2afb2cd671715bcd1fcb9035688c40c9.1500464394.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org The patch: "timers: Introduce in-kernel alarm-timer interface" (sha1: ff3ead96d17f47ee70c294a5cc2cce9b61e82f0f) introduced new requirement that RTC drivers with alarm functionality can't be used as a module. When module is unloaded there is still a reference that's why rtc_device_release() is not called and ida is not freed. That's why when module is loaded again it can't use the same RTC number based on aliases. Log: sh-4.3# modprobe rtc-zynqmp [ 42.468565] rtc_zynqmp ffa60000.rtc: rtc core: registered ffa60000.rtc as rtc5 sh-4.3# rmmod rtc-zynqmp sh-4.3# modprobe rtc-zynqmp [ 48.648222] rtc_zynqmp ffa60000.rtc: /aliases ID 5 not available [ 48.654280] rtc_zynqmp ffa60000.rtc: rtc core: registered ffa60000.rtc as rtc0 This patch is removing module support which is just a workaround till alarm-timer interface is fixed to support device releasing when alarm timer is not used. Signed-off-by: Michal Simek --- Based on discussion: https://www.mail-archive.com/rtc-linux@googlegroups.com/msg00908.html --- drivers/rtc/Kconfig | 2 +- drivers/rtc/rtc-zynqmp.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 72419ac2c52a..a2bbe7c2cf92 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -1225,7 +1225,7 @@ config RTC_DRV_OPAL will be called rtc-opal. config RTC_DRV_ZYNQMP - tristate "Xilinx Zynq Ultrascale+ MPSoC RTC" + bool "Xilinx Zynq Ultrascale+ MPSoC RTC" depends on OF help If you say yes here you get support for the RTC controller found on diff --git a/drivers/rtc/rtc-zynqmp.c b/drivers/rtc/rtc-zynqmp.c index da18a8ae3c1d..5fc50145dbd2 100644 --- a/drivers/rtc/rtc-zynqmp.c +++ b/drivers/rtc/rtc-zynqmp.c @@ -268,14 +268,6 @@ static int xlnx_rtc_probe(struct platform_device *pdev) return PTR_ERR_OR_ZERO(xrtcdev->rtc); } -static int xlnx_rtc_remove(struct platform_device *pdev) -{ - xlnx_rtc_alarm_irq_enable(&pdev->dev, 0); - device_init_wakeup(&pdev->dev, 0); - - return 0; -} - static int __maybe_unused xlnx_rtc_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -312,7 +304,6 @@ static int __maybe_unused xlnx_rtc_resume(struct device *dev) static struct platform_driver xlnx_rtc_driver = { .probe = xlnx_rtc_probe, - .remove = xlnx_rtc_remove, .driver = { .name = KBUILD_MODNAME, .pm = &xlnx_rtc_pm_ops, @@ -320,8 +311,4 @@ static int __maybe_unused xlnx_rtc_resume(struct device *dev) }, }; -module_platform_driver(xlnx_rtc_driver); - -MODULE_DESCRIPTION("Xilinx Zynq MPSoC RTC driver"); -MODULE_AUTHOR("Xilinx Inc."); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(xlnx_rtc_driver);