Patch "x86/rtc: Remove __init for runtime functions" has been added to the 5.15-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    x86/rtc: Remove __init for runtime functions

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-rtc-remove-__init-for-runtime-functions.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 33bd270820f25d50a7394fafd56ffea8bfd150af
Author: Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@xxxxxxxxx>
Date:   Thu Apr 6 08:26:52 2023 +0200

    x86/rtc: Remove __init for runtime functions
    
    [ Upstream commit 775d3c514c5b2763a50ab7839026d7561795924d ]
    
    set_rtc_noop(), get_rtc_noop() are after booting, therefore their __init
    annotation is wrong.
    
    A crash was observed on an x86 platform where CMOS RTC is unused and
    disabled via device tree. set_rtc_noop() was invoked from ntp:
    sync_hw_clock(), although CONFIG_RTC_SYSTOHC=n, however sync_cmos_clock()
    doesn't honour that.
    
      Workqueue: events_power_efficient sync_hw_clock
      RIP: 0010:set_rtc_noop
      Call Trace:
       update_persistent_clock64
       sync_hw_clock
    
    Fix this by dropping the __init annotation from set/get_rtc_noop().
    
    Fixes: c311ed6183f4 ("x86/init: Allow DT configured systems to disable RTC at boot time")
    Signed-off-by: Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@xxxxxxxxx>
    Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/59f7ceb1-446b-1d3d-0bc8-1f0ee94b1e18@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 8b395821cb8d0..d3e3b16ea9cf3 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -32,8 +32,8 @@ static int __init iommu_init_noop(void) { return 0; }
 static void iommu_shutdown_noop(void) { }
 bool __init bool_x86_init_noop(void) { return false; }
 void x86_op_int_noop(int cpu) { }
-static __init int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; }
-static __init void get_rtc_noop(struct timespec64 *now) { }
+static int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; }
+static void get_rtc_noop(struct timespec64 *now) { }
 
 static __initconst const struct of_device_id of_cmos_match[] = {
 	{ .compatible = "motorola,mc146818" },



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux