lkml.org 
[lkml]   [2005]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: spin_lock error in arch/i386/kernel/time.c on APM resume
    On Sat, Mar 12, 2005 at 09:46:54AM -0700, Zwane Mwaikambo wrote:
    > On Sat, 12 Mar 2005, Venkatesh Pallipadi wrote:
    >
    > > On Sat, Mar 12, 2005 at 09:25:13AM -0700, Zwane Mwaikambo wrote:
    > >
    > > How about this patch? Also fixes one other use of rtc_lock in acpi/sleep/proc.c
    > >
    > > rtc_lock is held during timer interrupts. So, we should block interrupts
    > > while holding it.
    >
    > It's certainly a lot safer with saving/restoring eflags and the
    > drivers/acpi/sleep/proc.c change is a good catch, but i think the
    > get_cmos_time() callers should take care of the interrupt disabling. btw,
    > s/spin_unlock_restore/spin_unlock_irqrestore/. Please submit the proc.c
    > change.
    >

    So, I will assume get_cmos_time issue will be fixed in some other way.
    Sending the proper proc.c change this time.
    Andrew: Please apply.

    Thanks,
    Venki

    rtc_lock is held during timer interrupts. So, we should block interrupts
    while holding it.

    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

    --- linux-2.6.10/drivers/acpi/sleep/proc.c.org 2005-03-12 10:50:40.000000000 -0800
    +++ linux-2.6.10/drivers/acpi/sleep/proc.c 2005-03-12 10:53:08.000000000 -0800
    @@ -84,10 +84,11 @@ static int acpi_system_alarm_seq_show(st
    u32 sec, min, hr;
    u32 day, mo, yr;
    unsigned char rtc_control = 0;
    + unsigned long flags;

    ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");

    - spin_lock(&rtc_lock);
    + spin_lock_irqsave(&rtc_lock, flags);

    sec = CMOS_READ(RTC_SECONDS_ALARM);
    min = CMOS_READ(RTC_MINUTES_ALARM);
    @@ -109,7 +110,7 @@ static int acpi_system_alarm_seq_show(st
    else
    yr = CMOS_READ(RTC_YEAR);

    - spin_unlock(&rtc_lock);
    + spin_unlock_irqrestore(&rtc_lock, flags);

    if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
    BCD_TO_BIN(sec);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:11    [W:0.023 / U:0.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site