linux-stable.git/drivers/rtc/rtc-cmos.c, branch linux-3.19.y

rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP

2014-10-14T00:18:19+00:00

Commit b5ada4600dfd ("drivers/rtc/rtc-cmos.c: fix compilation warning
when !CONFIG_PM_SLEEP") broke wakeup from S5 by making cmos_poweroff a
nop unless CONFIG_PM_SLEEP was defined.

Fix this by restricting the #ifdef to cmos_resume and restoring the old
dependency on CONFIG_PM for cmos_suspend and cmos_poweroff.

Signed-off-by: Daniel Glöckner 
Cc: Mika Westerberg 
Cc: Alessandro Zummo 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-cmos.c: drivers/char/rtc.c features for DECstation support

2014-06-06T23:08:07+00:00

This brings in drivers/char/rtc.c functionality required for DECstation
and, should the maintainers decide to switch, Alpha systems to use
rtc-cmos.

Specifically these features are made available:

* RTC iomem rather than x86/PCI port I/O mapping, controlled with the
  RTC_IOMAPPED macro as with the original driver.  The DS1287A chip in all
  DECstation systems is mapped in the host bus address space as a
  contiguous block of 64 32-bit words of which the least significant byte
  accesses the RTC chip for both reads and writes.  All the address and
  data window register accesses are made transparently by the chipset glue
  logic so that the device appears directly mapped on the host bus.

* A way to set the size of the address space explicitly with the
  newly-added `address_space' member of the platform part of the RTC
  device structure.  This avoids the unreliable heuristics that does not
  work in a setup where the RTC is not explicitly accessed with the usual
  address and data window register pair.

* The ability to use the RTC periodic interrupt as a system clock
  device, which is implemented by arch/mips/kernel/cevt-ds1287.c for
  DECstation systems and takes the RTC interrupt away from the RTC driver.
   Eventually hooking back to the clock device's interrupt handler should
  be possible for the purpose of the alarm clock and possibly also
  update-in-progress interrupt, but this is not done by this change.

  o To avoid interfering with the clock interrupt all the places where
    the RTC interrupt mask is fiddled with are only executed if and IRQ
    has been assigned to the RTC driver.

  o To avoid changing the clock setup Register A is not fiddled with
    if CMOS_RTC_FLAGS_NOFREQ is set in the newly-added `flags' member of
    the platform part of the RTC device structure.  Originally, in
    drivers/char/rtc.c, this was keyed with the absence of the RTC
    interrupt, just like the interrupt mask, but there only the periodic
    interrupt frequency is set, whereas rtc-cmos also sets the divider
    bits.  Therefore a new flag is introduced so that systems where the
    RTC interrupt is not usable rather than used as a system clock device
    can fully initialise the RTC.

* A small clean-up is made to the IRQ assignment code that makes the IRQ
  number hardcoded to -1 rather than arbitrary -ENXIO (or whatever error
  happens to be returned by platform_get_irq) where no IRQ has been
  assigned to the RTC driver (NO_IRQ might be another candidate, but it
  looks like this macro has inconsistent or missing definitions and
  limited use and might therefore be unsafe).

Verified to work correctly with a DECstation 5000/240 system.

[akpm@linux-foundation.org: fix weird code layout]
Signed-off-by: Maciej W. Rozycki 
Cc: Alessandro Zummo 
Cc: Ralf Baechle 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-cmos.c: fix compilation warning when !CONFIG_PM_SLEEP

2014-04-03T23:21:21+00:00

CONFIG_PM will be set also if only CONFIG_PM_RUNTIME is set which causes
the compiler to emit following warning:

  drivers/rtc/rtc-cmos.c:845:12: warning: =E2=80=98cmos_resume=E2=80=99 defined but not used [-Wunused-function]

Fix this by using CONFIG_PM_SLEEP instead of CONFIG_PM and removing it
from the driver pm ops as this has been taken care by
SIMPLE_DEV_PM_OPS() already.

Signed-off-by: Mika Westerberg 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-cmos.c: propagate hpet_register_irq_handler() failure

2014-01-24T00:37:00+00:00

If hpet_register_irq_handler() fails, cmos_do_probe() will incorrectly
return 0.

Reported-by: Julia Lawall 
Cc: John Stultz 
Cc: Grant Likely 
Cc: Rob Herring 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-cmos.c: remove superfluous name cast

2014-01-24T00:36:59+00:00

device_driver.name is "const char *"

Signed-off-by: Geert Uytterhoeven 
Cc: Alessandro Zummo 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

rtc-cmos: Add an alarm disable quirk

2013-12-23T20:52:20+00:00

41c7f7424259f ("rtc: Disable the alarm in the hardware (v2)") added the
functionality to disable the RTC wake alarm when shutting down the box.

However, there are at least two b0rked BIOSes we know about:

https://bugzilla.novell.com/show_bug.cgi?id=812592
https://bugzilla.novell.com/show_bug.cgi?id=805740

where, when wakeup alarm is enabled in the BIOS, the machine reboots
automatically right after shutdown, regardless of what wakeup time is
programmed.

Bisecting the issue lead to this patch so disable its functionality with
a DMI quirk only for those boxes.

Cc: Brecht Machiels 
Cc: Thomas Gleixner 
Cc: John Stultz 
Cc: Rabin Vincent 
Cc: stable 
Signed-off-by: Borislav Petkov 
[jstultz: Changed variable name for clarity, added extra dmi entry]
Tested-by: Brecht Machiels 
Tested-by: Borislav Petkov 
Signed-off-by: John Stultz

drivers/rtc/rtc-cmos.c: use dev_get_platdata()

2013-11-13T03:09:28+00:00

Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.  This is a cosmetic change to make
the code simpler and enhance the readability.

Signed-off-by: Jingoo Han 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-cmos.c: remove redundant dev_set_drvdata

2013-11-13T03:09:27+00:00

Driver core sets the driver data to NULL upon device_release or on probe
failure.

Signed-off-by: Sachin Kamat 
Cc: Jingoo Han 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

rtc: convert rtc-cmos to dev_pm_ops from legacy pm_ops

2013-09-11T22:58:15+00:00

Convert drivers/rtc/rtc-cmos to use dev_pm_ops instead of legacy pm_ops.
This patch depends on pnp driver bus ops change to invoke pnp_driver
dev_pm_ops.

Signed-off-by: Shuah Khan 
Cc: Matthew Garrett 
Cc: Leonidas Da Silva Barbosa 
Cc: Ashley Lai 
Cc: Rajiv Andrade 
Cc: Marcel Selhorst 
Cc: Sirrix AG 
Cc: Alessandro Zummo 
Cc: "Rafael J. Wysocki" 
Cc: Bjorn Helgaas 
Cc: Grant Likely 
Cc: Rob Herring 
Cc: Peter Hüwe 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-cmos.c: work around bios clearing rtc control

2013-07-03T23:08:00+00:00

The bios may clear the rtc control register when resuming the system. Since the
cmos interrupt handler may now be run before the rtc_cmos is resumed, this can
cause the interrupt handler to ignore an alarm since the alarm bit is not set in
the rtc control register. To work around this, check if the rtc_cmos is
suspended and use the stored value for the rtc control register.

Signed-off-by: Derek Basehore 
Reviewed-by: Sameer Nanda 
Cc: Alessandro Zummo 
Cc: Jingoo Han 
Cc: Steven Rostedt 
Cc: John Stultz 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds