From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 079961A6195; Tue, 30 Jul 2024 16:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722357331; cv=none; b=tBdt9vgAY6LO/RivxAA9ju6osyKD7UFKDUURTzSQ9NWMXSpm8nCqf5AusBRpkqPUUptZDhExtArmHX7vNba6vVK2tBYGIWNW94HDDjRWFruM18RavBCBzH6HsCmJa1koPzSD2dK1Op7Q0FL1/Z/eGpxkfOduRg6paQQPCJMB0CE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722357331; c=relaxed/simple; bh=xaI7na7rCDNi3cCWxgaH5YahjeKZHl0X+RAG1wsklY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dYpq7Gj6pWuXyqmjblcDZqHKbM0GEy84onczhqZeHD6aJO8R3q1z/xrg4C2IDv6pwbiNRzg1ZDdg95apaS6EqNpWpLqXVDv09jvWls6xuHg62lasvmi/tcMKfSU39Qi6s4CHnApKQF4hESIDI45KB8avQ/tGaZKKd1jN8cE84ik= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JGKzG2nD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JGKzG2nD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FB9BC32782; Tue, 30 Jul 2024 16:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722357330; bh=xaI7na7rCDNi3cCWxgaH5YahjeKZHl0X+RAG1wsklY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JGKzG2nDN9bDQZU+k2pfv6i0xlbbZfXU0Jf+8/vi0WnWi0AllgQyNwGTb7M5Zr7Ji I9J+GS8OvKGdO0H4t6zpYDfVzsD4Yb03mSl0B6o7/CvVgvN6U/nCNcPilzPjMNgs+j +5xJEce4HavMPb2RVJ1BlkgZGXqZrbuhYCCyx6z8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Cs=C3=B3k=C3=A1s, =20Bence?= , Alexandre Belloni , Sasha Levin , Csókás Subject: [PATCH 6.1 262/440] rtc: interface: Add RTC offset to alarm after fix-up Date: Tue, 30 Jul 2024 17:48:15 +0200 Message-ID: <20240730151626.074465147@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Csókás, Bence [ Upstream commit 463927a8902a9f22c3633960119410f57d4c8920 ] `rtc_add_offset()` is called by `__rtc_read_time()` and `__rtc_read_alarm()` to add the RTC's offset to the raw read-outs from the device drivers. However, in the latter case, a fix-up algorithm is run if the RTC device does not report a full `struct rtc_time` alarm value. In that case, the offset was forgot to be added. Fixes: fd6792bb022e ("rtc: fix alarm read and set offset") Signed-off-by: Csókás, Bence Link: https://lore.kernel.org/r/20240619140451.2800578-1-csokas.bence@prolan.hu Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/interface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 3d0fbc644f578..c928037bf6f3a 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -274,10 +274,9 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) return err; /* full-function RTCs won't have such missing fields */ - if (rtc_valid_tm(&alarm->time) == 0) { - rtc_add_offset(rtc, &alarm->time); - return 0; - } + err = rtc_valid_tm(&alarm->time); + if (!err) + goto done; /* get the "after" timestamp, to detect wrapped fields */ err = rtc_read_time(rtc, &now); @@ -379,6 +378,8 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) if (err) dev_warn(&rtc->dev, "invalid alarm value: %ptR\n", &alarm->time); + else + rtc_add_offset(rtc, &alarm->time); return err; } -- 2.43.0