From patchwork Fri Sep 22 08:12:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 143257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5406973vqi; Fri, 22 Sep 2023 01:29:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH2Ybk3gEKasyAiosDsOlVumpk2bTdJlxl6drt9WNot7DkdaaGzjzDSZWm08hkP7bvdakED X-Received: by 2002:a05:6a21:66c5:b0:15d:c86d:27a6 with SMTP id ze5-20020a056a2166c500b0015dc86d27a6mr758241pzb.55.1695371372769; Fri, 22 Sep 2023 01:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695371372; cv=none; d=google.com; s=arc-20160816; b=jIfvG6CbKaPr/x9xKnt5beafN43zK4ELCtpQISaiZknMczrwBeVOurz+pXOoOWmvZO Vz2bEijlHhBjGHTfSragxHezk/ryJHmCavmeZ9JNET1yHea/fM1lHUTiizr1r3XSoW24 IJwQYRCPtTaResgvHYsPMrCr75rW6zQ7NdHO8kkL+QqcoCKwEYv/L0iztqoxkEdkNT2s Oe61+ocOGphJhsdAw6G2C/YdDMXKTwX0o/XSqLBCsG2NYAwdmNfJxPfT3FJFFZ46/4zG Ijb/J0WjxLi3UZN06DlFDOmIC0n0mvzgrl1p/Cp2ZD+jzxDevzA9Dn6csESJGbMmSlBC AF3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=vZ64YJm43gWKwa3DdIPzDDw2I5V/5+OxYRh9aamQVSA=; fh=1+tag1NjUikqdfNf7snx3DmIrkAlUm/lust9+NwQ9wc=; b=R8eC7uz3Jr90YhhWaOH3dARvKb4XgrtvJjiu7n04iQdGGx3jyF7g2oAvz6bxb3etoZ f30qSuaru0b0WxPLqfT3tG7QTRHpbVFyPDUVz0LP48XEKMkn/xrgS4jkbCd2qaRs0GaY CEhG2Uz7ITnSaBQLLs+vIvVdzaW3eqkK/TjGXt8T3iB0M4DjcmBsdgPxzu9ncPeXVGeh bBZJjEGjcg4cJVLDLfIFj4nipb8TQEVxioLq3+OLo3ytONqbHuR0KyA6JyBuaLOv/FUW fEaWR/Ci2avwaPzeYB85WKqBQsqvUds8pLNQsp+Tq6l+dXSclCrSbfmoYRlwV752UCEQ Lh4g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id np12-20020a17090b4c4c00b00276f10d241fsi3536242pjb.37.2023.09.22.01.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 01:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 08DAF834F775; Fri, 22 Sep 2023 01:13:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232701AbjIVINT (ORCPT + 30 others); Fri, 22 Sep 2023 04:13:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232548AbjIVIMv (ORCPT ); Fri, 22 Sep 2023 04:12:51 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3995A1F04; Fri, 22 Sep 2023 01:12:16 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,167,1694703600"; d="scan'208";a="176896542" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 22 Sep 2023 17:12:15 +0900 Received: from localhost.localdomain (unknown [10.226.92.204]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id E56BC400F937; Fri, 22 Sep 2023 17:12:11 +0900 (JST) From: Biju Das To: Thomas Gleixner , Alessandro Zummo , Alexandre Belloni Cc: Biju Das , John Stultz , Stephen Boyd , Douglas Anderson , Geert Uytterhoeven , Biju Das , linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v2] alarmtimer: Fix rebind failure Date: Fri, 22 Sep 2023 09:12:08 +0100 Message-Id: <20230922081208.26334-1-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 22 Sep 2023 01:13:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777725732823838230 X-GMAIL-MSGID: 1777725732823838230 The resources allocated in alarmtimer_rtc_add_device() are not freed leading to re-bind failure for the endpoint driver. Fix this issue by adding alarmtimer_rtc_remove_device(). Fixes: c79108bd19a8 ("alarmtimer: Make alarmtimer platform device child of RTC device") Fixes: 7c94caca877b ("alarmtimer: Use wakeup source from alarmtimer platform device") Signed-off-by: Biju Das --- v1->v2: * Add fixes tag. * Replaced the variable rtc_pdev->alarmtimer_pdev * Added the check rtcdev == rtc before unregistering the real alarmtimer. Note: This issue is found while adding irq support for built in RTC found on Renesas PMIC RAA215300 device. This issue should present on all RTC drivers which calls device_init_wakeup() in probe(). --- kernel/time/alarmtimer.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 8d9f13d847f0..04d67de8b1fe 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -61,6 +61,7 @@ static DEFINE_SPINLOCK(freezer_delta_lock); /* rtc timer and device for setting alarm wakeups at suspend */ static struct rtc_timer rtctimer; static struct rtc_device *rtcdev; +static struct platform_device *alarmtimer_pdev; static DEFINE_SPINLOCK(rtcdev_lock); /** @@ -109,6 +110,7 @@ static int alarmtimer_rtc_add_device(struct device *dev) } rtcdev = rtc; + alarmtimer_pdev = pdev; /* hold a reference so it doesn't go away */ get_device(dev); pdev = NULL; @@ -123,6 +125,22 @@ static int alarmtimer_rtc_add_device(struct device *dev) return ret; } +static void alarmtimer_rtc_remove_device(struct device *dev) +{ + struct rtc_device *rtc = to_rtc_device(dev); + + if (rtcdev == rtc) { + module_put(rtc->owner); + if (device_may_wakeup(rtc->dev.parent)) + device_init_wakeup(&alarmtimer_pdev->dev, false); + + platform_device_unregister(alarmtimer_pdev); + put_device(dev); + alarmtimer_pdev = NULL; + rtcdev = NULL; + } +} + static inline void alarmtimer_rtc_timer_init(void) { rtc_timer_init(&rtctimer, NULL, NULL); @@ -130,6 +148,7 @@ static inline void alarmtimer_rtc_timer_init(void) static struct class_interface alarmtimer_rtc_interface = { .add_dev = &alarmtimer_rtc_add_device, + .remove_dev = &alarmtimer_rtc_remove_device, }; static int alarmtimer_rtc_interface_setup(void)