# git rev-parse -q --verify 22db552b50fa11d8c1d171de908a1f9ef62172b7^{commit} 22db552b50fa11d8c1d171de908a1f9ef62172b7 already have revision, skipping fetch # git checkout -q -f -B kisskb 22db552b50fa11d8c1d171de908a1f9ef62172b7 # git clean -qxdf # < git log -1 # commit 22db552b50fa11d8c1d171de908a1f9ef62172b7 # Author: Arnd Bergmann # Date: Tue Jun 19 16:02:27 2018 +0200 # # powerpc/powermac: Fix rtc read/write functions # # As Mathieu pointed out, my conversion to time64_t was incorrect and # resulted in negative times to be read from the RTC. The problem is # that during the conversion from a byte array to a time64_t, the # 'unsigned char' variable holding the top byte gets turned into a # negative signed 32-bit integer before being assigned to the 64-bit # variable for any times after 1972. # # This changes the logic to cast to an unsigned 32-bit number first for # the Macintosh time and then convert that to the Unix time, which then # gives us a time in the documented 1904..2040 year range. I decided not # to use the longer 1970..2106 range that other drivers use, for # consistency with the literal interpretation of the register, but that # could be easily changed if we decide we want to support any Mac after # 2040. # # Just to be on the safe side, I'm also adding a WARN_ON that will # trigger if either the year 2040 has come and is observed by this # driver, or we run into an RTC that got set back to a pre-1970 date for # some reason (the two are indistinguishable). # # For the RTC write functions, Andreas found another problem: both # pmu_request() and cuda_request() are varargs functions, so changing # the type of the arguments passed into them from 32 bit to 64 bit # breaks the API for the set_rtc_time functions. This changes it back to # 32 bits. # # The same code exists in arch/m68k/ and is patched in an identical way # now in a separate patch. # # Fixes: 5bfd643583b2 ("powerpc: use time64_t in read_persistent_clock") # Reported-by: Mathieu Malaterre # Reported-by: Andreas Schwab # Signed-off-by: Arnd Bergmann # Tested-by: Mathieu Malaterre # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 22db552b50fa11d8c1d171de908a1f9ef62172b7 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_powerpc-allmodconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_powerpc-allmodconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_powerpc-allmodconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/sound/aoa/codecs/onyx.c: In function 'onyx_snd_single_bit_get': /kisskb/src/sound/aoa/codecs/onyx.c:380:37: warning: 'c' may be used uninitialized in this function [-Wmaybe-uninitialized] ucontrol->value.integer.value[0] = !!(c & mask) ^ polarity; ^ In file included from /kisskb/src/include/linux/io.h:25:0, from /kisskb/src/include/linux/of_address.h:7, from /kisskb/src/drivers/ata/ahci_qoriq.c:18: /kisskb/src/drivers/ata/ahci_qoriq.c: In function 'ahci_qoriq_hardreset': /kisskb/src/arch/powerpc/include/asm/io.h:633:3: warning: 'px_is' may be used uninitialized in this function [-Wmaybe-uninitialized] ppc_pci_io.name al; \ ^ /kisskb/src/drivers/ata/ahci_qoriq.c:86:14: note: 'px_is' was declared here u32 px_cmd, px_is, px_val; ^ In file included from /kisskb/src/include/linux/io.h:25:0, from /kisskb/src/include/linux/of_address.h:7, from /kisskb/src/drivers/ata/ahci_qoriq.c:18: /kisskb/src/arch/powerpc/include/asm/io.h:142:2: warning: 'px_cmd' may be used uninitialized in this function [-Wmaybe-uninitialized] __asm__ __volatile__("sync;"#insn" %1,%y0" \ ^ /kisskb/src/drivers/ata/ahci_qoriq.c:86:6: note: 'px_cmd' was declared here u32 px_cmd, px_is, px_val; ^ Completed OK # rm -rf /kisskb/build/powerpc-fixes_powerpc-allmodconfig_powerpc-5.3 # Build took: 0:04:18.853962