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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B5D08C33CAA for ; Tue, 21 Jan 2020 19:48:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CAFD21835 for ; Tue, 21 Jan 2020 19:48:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UpO9XYMQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729158AbgAUTsO (ORCPT ); Tue, 21 Jan 2020 14:48:14 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:43101 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728596AbgAUTsN (ORCPT ); Tue, 21 Jan 2020 14:48:13 -0500 Received: by mail-pg1-f196.google.com with SMTP id k197so2050083pga.10 for ; Tue, 21 Jan 2020 11:48:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rMMAFQfcSz2Ny4QcMJ2+IjNjBaQLZnItVjFQDEF8YTc=; b=UpO9XYMQtahmwQ1m6pd4F9SG5x52rmQ4bs41zUHh04id2ISgpOG0pHptiObAwGUopl edQWATgRMjzkQ1O/Q6tKE0sw4836emXMUufwfvbkuwMBneHZV+mlpgdOoX0sTBXtpbc5 b0phRnp5v/A5IsXKdQG9bVulKFh11hbxL4C5Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rMMAFQfcSz2Ny4QcMJ2+IjNjBaQLZnItVjFQDEF8YTc=; b=amMbcMr/mjI4xAOEfXIxaabWJh/zAdgisaNiXAaJHaBsWJdnyzno+F9iRQGEQhPBSx fKekMr+zAv4OUfuUXNA0PeW3QalVH85kSfIN7tiZBpZBRGQMeGPZR4ELLNd7FLveccX1 3fgAv30VbN/kPvzyqgWpbOqe0V6+oQer/zzW3VYQ+dS491bmNXlV00lj/DYRc8eMWslD wzWOKR5OjKY72atRytcKqroJL3JidRTDSqWXvEST3wNxO5+rq4bbyy91DxEs7fqaWh0z aC6TfrXojFMdWHH+u0l9NffdJtKKBASj5jSO0UTaaHq5CtTcYgAfMQmJzRJKRB8mlm9B MivA== X-Gm-Message-State: APjAAAX0X9YP2n5k8DpGtUVjBI5DDq2hH5kuGBx+67C6RbhZMrtZIu5P MXWNUkhgMPEWpADzUwkAN28NxUVM//uczQ== X-Google-Smtp-Source: APXvYqzgfKm+Zgb6jveGV5EhvCDFXpIOakl6kyuAASuoZqjpzIkqq0TRhMGCvUxnVOhlyBa5Ep1YmA== X-Received: by 2002:aa7:8b17:: with SMTP id f23mr6101870pfd.197.1579636093306; Tue, 21 Jan 2020 11:48:13 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:1:fa53:7765:582b:82b9]) by smtp.gmail.com with ESMTPSA id u7sm44004674pfh.128.2020.01.21.11.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 11:48:12 -0800 (PST) From: Stephen Boyd To: John Stultz , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, Stephen Boyd , Douglas Anderson Subject: [PATCH v2 1/3] alarmtimer: Make alarmtimer platform device child of RTC device Date: Tue, 21 Jan 2020 11:48:09 -0800 Message-Id: <20200121194811.145644-2-swboyd@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200121194811.145644-1-swboyd@chromium.org> References: <20200121194811.145644-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The alarmtimer_suspend() function will fail if an RTC device is on a bus such as SPI or i2c and that RTC device registers and probes after alarmtimer_init() registers and probes the 'alarmtimer' platform device. This is because system wide suspend suspends devices in the reverse order of their probe. When alarmtimer_suspend() attempts to program the RTC for a wakeup it will try to program an RTC device on a bus that has already been suspended. Let's move the alarmtimer device registration to be when the RTC we use for wakeup is registered. Register the 'alarmtimer' platform device as a child of the RTC device too, so that we can be guaranteed that the RTC device won't be suspended when alarmtimer_suspend() is called. Reported-by: Douglas Anderson Signed-off-by: Stephen Boyd --- kernel/time/alarmtimer.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 9dc7a0913190..e1a863b5c0bf 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -91,6 +91,7 @@ static int alarmtimer_rtc_add_device(struct device *dev, unsigned long flags; struct rtc_device *rtc = to_rtc_device(dev); struct wakeup_source *__ws; + struct platform_device *pdev; int ret = 0; if (rtcdev) @@ -102,9 +103,11 @@ static int alarmtimer_rtc_add_device(struct device *dev, return -1; __ws = wakeup_source_register(dev, "alarmtimer"); + pdev = platform_device_register_data(dev, "alarmtimer", + PLATFORM_DEVID_AUTO, NULL, 0); spin_lock_irqsave(&rtcdev_lock, flags); - if (!rtcdev) { + if (__ws && !IS_ERR(pdev) && !rtcdev) { if (!try_module_get(rtc->owner)) { ret = -1; goto unlock; @@ -115,10 +118,14 @@ static int alarmtimer_rtc_add_device(struct device *dev, get_device(dev); ws = __ws; __ws = NULL; + pdev = NULL; + } else { + ret = - 1; } unlock: spin_unlock_irqrestore(&rtcdev_lock, flags); + platform_device_unregister(pdev); wakeup_source_unregister(__ws); return ret; @@ -905,8 +912,7 @@ static void get_boottime_timespec(struct timespec64 *tp) */ static int __init alarmtimer_init(void) { - struct platform_device *pdev; - int error = 0; + int error; int i; alarmtimer_rtc_timer_init(); @@ -931,15 +937,7 @@ static int __init alarmtimer_init(void) if (error) goto out_if; - pdev = platform_device_register_simple("alarmtimer", -1, NULL, 0); - if (IS_ERR(pdev)) { - error = PTR_ERR(pdev); - goto out_drv; - } return 0; - -out_drv: - platform_driver_unregister(&alarmtimer_driver); out_if: alarmtimer_rtc_interface_remove(); return error; -- Sent by a computer, using git, on the internet