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 32EFD431A5C; Sat, 12 Sep 2026 15:46:51 +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=1789228013; cv=none; b=RxbiTYqt9iokauK8nWyCh6UfuzD4NO12DPR0wD+ief0o7+cukhcB7iFNulkjJ5HSOK8ucdVHd6BfbnmgF7O0o5+mFyx9UNXP5y135E8f3lODMayBlqa4NxngVk734piPV2mVRdPVbGn+Hd1mAxX5wMYCJu/NSqbIlqtMQfxpD0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789228013; c=relaxed/simple; bh=YTtOR+sEYggmJGmgQnsFxuBJ5Cjnp//y4LxEWoovxpM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jAnoCjiXPDXspgiQTUPsZ3hS4CF1JzsP53pTy00SS2mOVfmChR0YmpzZGrvEZ+r6Plg6+NNG6lO39hSQpEDiFNOh5QKhs/3OAEHyQuvsRVtpDUaZOLIVYWncV2cc9u5M64IY18yPHi+Ez4B5kNzeHhQxZ7xkN42g8Ha1mNoj1+k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vG8X5mAQ; 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="vG8X5mAQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD8B61F00899; Sat, 12 Sep 2026 15:46:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789228009; bh=KbUA9DtkLGt4YdsQxEnbo94HeI6hlZmcl7vQcdSMca4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vG8X5mAQ4uPu4h8E1570BdhXafQDLOcvH+6En1vLBImIOFjyIhAruqqb6lG1Euxuk Baq9NgC2XMk3N/fiHULNak6Xm+5VM0OMgKbQ8m61dFAfPQFO5WVnlIefX1OQgY4nNM j7x27GEb3eGvu3HK2sThMfv+ngdGLLNjQhIc1dmg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lad Prabhakar , Wolfram Sang , Alexandre Belloni Subject: [PATCH 6.1 0299/1191] rtc: rzn1: Fix weekday underflow when alarm crosses month boundary Date: Sat, 12 Sep 2026 08:50:27 +0200 Message-ID: <20260912065554.947445092@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@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: Lad Prabhakar commit 022a2839a52006531804a8db55d3228084400b48 upstream. rzn1_rtc_set_alarm() calculates the alarm weekday from the difference between the alarm day and the current day of the month. When the alarm crosses a month boundary, this difference can become negative. Since days_ahead is unsigned, it underflows and results in an incorrect weekday being programmed into RZN1_RTC_ALW. The RTC core already provides a fully populated struct rtc_time for the alarm, including the correct tm_wday. Use tm->tm_wday directly instead of recalculating the weekday from the day-of-month. This avoids the underflow and ensures alarms scheduled across a month boundary use the correct weekday. Fixes: b5ad1bf00d2c4 ("rtc: rzn1: Add alarm support") Cc: stable@vger.kernel.org Signed-off-by: Lad Prabhakar Suggested-by: Wolfram Sang Reviewed-by: Wolfram Sang Tested-by: Wolfram Sang Link: https://patch.msgid.link/20260821211032.13554-4-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Alexandre Belloni Signed-off-by: Greg Kroah-Hartman --- drivers/rtc/rtc-rzn1.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) --- a/drivers/rtc/rtc-rzn1.c +++ b/drivers/rtc/rtc-rzn1.c @@ -219,7 +219,6 @@ static int rzn1_rtc_set_alarm(struct dev struct rzn1_rtc *rtc = dev_get_drvdata(dev); struct rtc_time *tm = &alrm->time, tm_now; unsigned long alarm, farest; - unsigned int days_ahead, wday; int ret; ret = rzn1_rtc_read_time(dev, &tm_now); @@ -232,13 +231,9 @@ static int rzn1_rtc_set_alarm(struct dev if (time_after(alarm, farest)) return -ERANGE; - /* Convert alarm day into week day */ - days_ahead = tm->tm_mday - tm_now.tm_mday; - wday = (tm_now.tm_wday + days_ahead) % 7; - writel(bin2bcd(tm->tm_min), rtc->base + RZN1_RTC_ALM); writel(bin2bcd(tm->tm_hour), rtc->base + RZN1_RTC_ALH); - writel(BIT(wday), rtc->base + RZN1_RTC_ALW); + writel(BIT(tm->tm_wday), rtc->base + RZN1_RTC_ALW); rzn1_rtc_alarm_irq_enable(dev, alrm->enabled);