From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 76DAF35C69A; Tue, 21 Jul 2026 21:34:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784669672; cv=none; b=MeQlFDMvd/7NV6+yP0nmCpepUpFMpU6KorfunskANjJWUqLJRc1XRtwT1Tdkj6dvMg0GlgSmYdypW1PgZmlt4b1DfahvK8h591Q/23o6mMh5SgLEWrFFpLn+z+wQvdEv8ZAc++7jrZqJZyV1lcLE0DUK0UZSZCqD5IHDi2xqBgs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784669672; c=relaxed/simple; bh=u5FrFZxuSAYoyhAeSFGCjZC+l1ZsAkU79jEjgPgzck0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ActYQtNzmKKTcL1yULczon+HZeB3wmBDZqoYbTrjv5hGWTX/sAtbNcuxxhsW/qjZhRXWlw3YFZ6Ej/VAS8W86R49GZwa6hFoPnGhYbYAXcLUUFzrusXJB24hJfId7L7ff41TbhyuIbEQ7PCX7JGnt+X7Waa0OraDndHcfzNwNX4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=q2mrcVWz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="q2mrcVWz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 558FF1F00A3E; Tue, 21 Jul 2026 21:34:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784669668; bh=xPWoXZmZTiN+PkrZfPBYZQDV0vEgMKUdzmSOC9dn9iY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=q2mrcVWz907guyNwtT2xvg4h/OBEVzGqF8UY6o/591b7ZSzY+m7t8FqieZM92tA2g vfBZnA5KnAUf43tx4PF+CJ55zicwdtQU2kH6RNwddTYaEUGqvEXcoVN3wb/4Pdcqa7 +8sMEmCbIo8FUuOsyvywA94r6a7k0RFvcGzS/MeY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nobuhiro Iwamatsu , Fredrik M Olsson , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.1 0641/1067] rtc: ds1307: Fix off-by-one issue with wday for rx8130 Date: Tue, 21 Jul 2026 17:20:42 +0200 Message-ID: <20260721152438.930772766@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 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-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fredrik M Olsson [ Upstream commit 6882aab3c66112b33b251be95c09c8ead3e8d580 ] The RTC represent each weekday with a individual bit set in the WDAY register, where the 0th bit represent the first day of the week and the 6th bit represents the last day of the week. For each passed day the chip performs a rotary-left-shift by one to advance the weekday by one. The tm_wday field represent weekdays by a value in the range of 0-6. The fls() function return the bit index of the last bit set. To handle when there are no bits set it will return 0, and if the 0th bit is set it will return 1, and if the 1st bit is set it will return 2, and so on. In order to make the result of the fls() function fall into the expected range of 0-6 (instead of 1-7) this patch subtracts one from the result (which matches how the value is written in ds1307_set_time()). Fixes: 204756f016726 ("rtc: ds1307: Fix wday settings for rx8130") Reviewed-by: Nobuhiro Iwamatsu Signed-off-by: Fredrik M Olsson Link: https://patch.msgid.link/20260520-ds1307-rx8901-add-v2-2-e069ea32e1db@axis.com Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/rtc-ds1307.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index e5140e7477a419..00a83d543cab22 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -305,7 +305,7 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t) t->tm_hour = bcd2bin(tmp); /* rx8130 is bit position, not BCD */ if (ds1307->type == rx_8130) - t->tm_wday = fls(regs[DS1307_REG_WDAY] & 0x7f); + t->tm_wday = fls(regs[DS1307_REG_WDAY] & 0x7f) - 1; else t->tm_wday = bcd2bin(regs[DS1307_REG_WDAY] & 0x07) - 1; t->tm_mday = bcd2bin(regs[DS1307_REG_MDAY] & 0x3f); -- 2.53.0