]> git.sur5r.net Git - u-boot/commitdiff
x86: ivybridge: Check the RTC return value
authorSimon Glass <sjg@chromium.org>
Sun, 18 Oct 2015 21:55:33 +0000 (15:55 -0600)
committerSimon Glass <sjg@chromium.org>
Wed, 21 Oct 2015 13:46:50 +0000 (07:46 -0600)
The RTC can fail, so check the return value for reads.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
arch/x86/cpu/ivybridge/sdram.c

index 26e2e5b6f2d144c7d7a4f932f4e640faf9bff6b6..e63790963c9c73d3aa4f60fb60de865c9f2fe6a4 100644 (file)
@@ -107,11 +107,18 @@ static int read_seed_from_cmos(struct pei_data *pei_data)
         * the flash too much. So we store these in CMOS and the large MRC
         * data in SPI flash.
         */
-       rtc_read32(dev, CMOS_OFFSET_MRC_SEED, &pei_data->scrambler_seed);
+       ret = rtc_read32(dev, CMOS_OFFSET_MRC_SEED, &pei_data->scrambler_seed);
+       if (!ret) {
+               ret = rtc_read32(dev, CMOS_OFFSET_MRC_SEED_S3,
+                                &pei_data->scrambler_seed_s3);
+       }
+       if (ret) {
+               debug("Failed to read from RTC %s\n", dev->name);
+               return ret;
+       }
+
        debug("Read scrambler seed    0x%08x from CMOS 0x%02x\n",
              pei_data->scrambler_seed, CMOS_OFFSET_MRC_SEED);
-
-       rtc_read32(dev, CMOS_OFFSET_MRC_SEED_S3, &pei_data->scrambler_seed_s3);
        debug("Read S3 scrambler seed 0x%08x from CMOS 0x%02x\n",
              pei_data->scrambler_seed_s3, CMOS_OFFSET_MRC_SEED_S3);