Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtc: pcf2127: handle timestamp interrupts

commit 03623b4b041c ("rtc: pcf2127: add tamper detection support")
added support for timestamp interrupts. However they are not being
handled in the irq handler. If a timestamp interrupt occurs it
results in kernel disabling the interrupt and displaying the call
trace:

[ 121.145580] irq 78: nobody cared (try booting with the "irqpoll" option)
...
[ 121.238087] [<00000000c4d69393>] irq_default_primary_handler threaded [<000000000a90d25b>] pcf2127_rtc_irq [rtc_pcf2127]
[ 121.248971] Disabling IRQ #78

Handle timestamp interrupts in pcf2127_rtc_irq(). Save time stamp
before clearing TSF1 and TSF2 flags so that it can't be overwritten.
Set a flag to mark if the timestamp is valid and only report to sysfs
if the flag is set. To mimic the hardware behavior, don’t save
another timestamp until the first one has been read by the userspace.

However, if the alarm irq is not configured, keep the old way of
handling timestamp interrupt in the timestamp0 sysfs calls.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Reviewed-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Tested-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20210629150643.31551-1-ykaukab@suse.de

authored by

Mian Yousaf Kaukab and committed by
Alexandre Belloni
2f861984 37aadf9b

+135 -61
+135 -61
drivers/rtc/rtc-pcf2127.c
··· 94 94 #define PCF2127_WD_VAL_MAX 255 95 95 #define PCF2127_WD_VAL_DEFAULT 60 96 96 97 + /* Mask for currently enabled interrupts */ 98 + #define PCF2127_CTRL1_IRQ_MASK (PCF2127_BIT_CTRL1_TSF1) 99 + #define PCF2127_CTRL2_IRQ_MASK ( \ 100 + PCF2127_BIT_CTRL2_AF | \ 101 + PCF2127_BIT_CTRL2_WDTF | \ 102 + PCF2127_BIT_CTRL2_TSF2) 103 + 97 104 struct pcf2127 { 98 105 struct rtc_device *rtc; 99 106 struct watchdog_device wdd; 100 107 struct regmap *regmap; 108 + time64_t ts; 109 + bool ts_valid; 110 + bool irq_enabled; 101 111 }; 102 112 103 113 /* ··· 444 434 return pcf2127_rtc_alarm_irq_enable(dev, alrm->enabled); 445 435 } 446 436 437 + /* 438 + * This function reads ctrl2 register, caller is responsible for calling 439 + * pcf2127_wdt_active_ping() 440 + */ 441 + static int pcf2127_rtc_ts_read(struct device *dev, time64_t *ts) 442 + { 443 + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); 444 + struct rtc_time tm; 445 + int ret; 446 + unsigned char data[25]; 447 + 448 + ret = regmap_bulk_read(pcf2127->regmap, PCF2127_REG_CTRL1, data, 449 + sizeof(data)); 450 + if (ret) { 451 + dev_err(dev, "%s: read error ret=%d\n", __func__, ret); 452 + return ret; 453 + } 454 + 455 + dev_dbg(dev, 456 + "%s: raw data is cr1=%02x, cr2=%02x, cr3=%02x, ts_sc=%02x, ts_mn=%02x, ts_hr=%02x, ts_dm=%02x, ts_mo=%02x, ts_yr=%02x\n", 457 + __func__, data[PCF2127_REG_CTRL1], data[PCF2127_REG_CTRL2], 458 + data[PCF2127_REG_CTRL3], data[PCF2127_REG_TS_SC], 459 + data[PCF2127_REG_TS_MN], data[PCF2127_REG_TS_HR], 460 + data[PCF2127_REG_TS_DM], data[PCF2127_REG_TS_MO], 461 + data[PCF2127_REG_TS_YR]); 462 + 463 + tm.tm_sec = bcd2bin(data[PCF2127_REG_TS_SC] & 0x7F); 464 + tm.tm_min = bcd2bin(data[PCF2127_REG_TS_MN] & 0x7F); 465 + tm.tm_hour = bcd2bin(data[PCF2127_REG_TS_HR] & 0x3F); 466 + tm.tm_mday = bcd2bin(data[PCF2127_REG_TS_DM] & 0x3F); 467 + /* TS_MO register (month) value range: 1-12 */ 468 + tm.tm_mon = bcd2bin(data[PCF2127_REG_TS_MO] & 0x1F) - 1; 469 + tm.tm_year = bcd2bin(data[PCF2127_REG_TS_YR]); 470 + if (tm.tm_year < 70) 471 + tm.tm_year += 100; /* assume we are in 1970...2069 */ 472 + 473 + ret = rtc_valid_tm(&tm); 474 + if (ret) { 475 + dev_err(dev, "Invalid timestamp. ret=%d\n", ret); 476 + return ret; 477 + } 478 + 479 + *ts = rtc_tm_to_time64(&tm); 480 + return 0; 481 + }; 482 + 483 + static void pcf2127_rtc_ts_snapshot(struct device *dev) 484 + { 485 + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); 486 + int ret; 487 + 488 + /* Let userspace read the first timestamp */ 489 + if (pcf2127->ts_valid) 490 + return; 491 + 492 + ret = pcf2127_rtc_ts_read(dev, &pcf2127->ts); 493 + if (!ret) 494 + pcf2127->ts_valid = true; 495 + } 496 + 447 497 static irqreturn_t pcf2127_rtc_irq(int irq, void *dev) 448 498 { 449 499 struct pcf2127 *pcf2127 = dev_get_drvdata(dev); 450 - unsigned int ctrl2 = 0; 500 + unsigned int ctrl1, ctrl2; 451 501 int ret = 0; 502 + 503 + ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL1, &ctrl1); 504 + if (ret) 505 + return IRQ_NONE; 452 506 453 507 ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2); 454 508 if (ret) 455 509 return IRQ_NONE; 456 510 457 - if (!(ctrl2 & PCF2127_BIT_CTRL2_AF)) 511 + if (!(ctrl1 & PCF2127_CTRL1_IRQ_MASK || ctrl2 & PCF2127_CTRL2_IRQ_MASK)) 458 512 return IRQ_NONE; 459 513 460 - regmap_write(pcf2127->regmap, PCF2127_REG_CTRL2, 461 - ctrl2 & ~(PCF2127_BIT_CTRL2_AF | PCF2127_BIT_CTRL2_WDTF)); 514 + if (ctrl1 & PCF2127_BIT_CTRL1_TSF1 || ctrl2 & PCF2127_BIT_CTRL2_TSF2) 515 + pcf2127_rtc_ts_snapshot(dev); 462 516 463 - rtc_update_irq(pcf2127->rtc, 1, RTC_IRQF | RTC_AF); 517 + if (ctrl1 & PCF2127_CTRL1_IRQ_MASK) 518 + regmap_write(pcf2127->regmap, PCF2127_REG_CTRL1, 519 + ctrl1 & ~PCF2127_CTRL1_IRQ_MASK); 520 + 521 + if (ctrl2 & PCF2127_CTRL2_IRQ_MASK) 522 + regmap_write(pcf2127->regmap, PCF2127_REG_CTRL2, 523 + ctrl2 & ~PCF2127_CTRL2_IRQ_MASK); 524 + 525 + if (ctrl2 & PCF2127_BIT_CTRL2_AF) 526 + rtc_update_irq(pcf2127->rtc, 1, RTC_IRQF | RTC_AF); 464 527 465 528 pcf2127_wdt_active_ping(&pcf2127->wdd); 466 529 ··· 558 475 struct pcf2127 *pcf2127 = dev_get_drvdata(dev->parent); 559 476 int ret; 560 477 561 - ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL1, 562 - PCF2127_BIT_CTRL1_TSF1, 0); 563 - if (ret) { 564 - dev_err(dev, "%s: update ctrl1 ret=%d\n", __func__, ret); 565 - return ret; 566 - } 478 + if (pcf2127->irq_enabled) { 479 + pcf2127->ts_valid = false; 480 + } else { 481 + ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL1, 482 + PCF2127_BIT_CTRL1_TSF1, 0); 483 + if (ret) { 484 + dev_err(dev, "%s: update ctrl1 ret=%d\n", __func__, ret); 485 + return ret; 486 + } 567 487 568 - ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2, 569 - PCF2127_BIT_CTRL2_TSF2, 0); 570 - if (ret) { 571 - dev_err(dev, "%s: update ctrl2 ret=%d\n", __func__, ret); 572 - return ret; 573 - } 488 + ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2, 489 + PCF2127_BIT_CTRL2_TSF2, 0); 490 + if (ret) { 491 + dev_err(dev, "%s: update ctrl2 ret=%d\n", __func__, ret); 492 + return ret; 493 + } 574 494 575 - ret = pcf2127_wdt_active_ping(&pcf2127->wdd); 576 - if (ret) 577 - return ret; 495 + ret = pcf2127_wdt_active_ping(&pcf2127->wdd); 496 + if (ret) 497 + return ret; 498 + } 578 499 579 500 return count; 580 501 }; ··· 587 500 struct device_attribute *attr, char *buf) 588 501 { 589 502 struct pcf2127 *pcf2127 = dev_get_drvdata(dev->parent); 590 - struct rtc_time tm; 503 + unsigned int ctrl1, ctrl2; 591 504 int ret; 592 - unsigned char data[25]; 505 + time64_t ts; 593 506 594 - ret = regmap_bulk_read(pcf2127->regmap, PCF2127_REG_CTRL1, data, 595 - sizeof(data)); 596 - if (ret) { 597 - dev_err(dev, "%s: read error ret=%d\n", __func__, ret); 598 - return ret; 507 + if (pcf2127->irq_enabled) { 508 + if (!pcf2127->ts_valid) 509 + return 0; 510 + ts = pcf2127->ts; 511 + } else { 512 + ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL1, &ctrl1); 513 + if (ret) 514 + return 0; 515 + 516 + ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2); 517 + if (ret) 518 + return 0; 519 + 520 + if (!(ctrl1 & PCF2127_BIT_CTRL1_TSF1) && 521 + !(ctrl2 & PCF2127_BIT_CTRL2_TSF2)) 522 + return 0; 523 + 524 + ret = pcf2127_rtc_ts_read(dev->parent, &ts); 525 + if (ret) 526 + return 0; 527 + 528 + ret = pcf2127_wdt_active_ping(&pcf2127->wdd); 529 + if (ret) 530 + return ret; 599 531 } 600 - 601 - dev_dbg(dev, 602 - "%s: raw data is cr1=%02x, cr2=%02x, cr3=%02x, ts_sc=%02x, " 603 - "ts_mn=%02x, ts_hr=%02x, ts_dm=%02x, ts_mo=%02x, ts_yr=%02x\n", 604 - __func__, data[PCF2127_REG_CTRL1], data[PCF2127_REG_CTRL2], 605 - data[PCF2127_REG_CTRL3], data[PCF2127_REG_TS_SC], 606 - data[PCF2127_REG_TS_MN], data[PCF2127_REG_TS_HR], 607 - data[PCF2127_REG_TS_DM], data[PCF2127_REG_TS_MO], 608 - data[PCF2127_REG_TS_YR]); 609 - 610 - ret = pcf2127_wdt_active_ping(&pcf2127->wdd); 611 - if (ret) 612 - return ret; 613 - 614 - if (!(data[PCF2127_REG_CTRL1] & PCF2127_BIT_CTRL1_TSF1) && 615 - !(data[PCF2127_REG_CTRL2] & PCF2127_BIT_CTRL2_TSF2)) 616 - return 0; 617 - 618 - tm.tm_sec = bcd2bin(data[PCF2127_REG_TS_SC] & 0x7F); 619 - tm.tm_min = bcd2bin(data[PCF2127_REG_TS_MN] & 0x7F); 620 - tm.tm_hour = bcd2bin(data[PCF2127_REG_TS_HR] & 0x3F); 621 - tm.tm_mday = bcd2bin(data[PCF2127_REG_TS_DM] & 0x3F); 622 - /* TS_MO register (month) value range: 1-12 */ 623 - tm.tm_mon = bcd2bin(data[PCF2127_REG_TS_MO] & 0x1F) - 1; 624 - tm.tm_year = bcd2bin(data[PCF2127_REG_TS_YR]); 625 - if (tm.tm_year < 70) 626 - tm.tm_year += 100; /* assume we are in 1970...2069 */ 627 - 628 - ret = rtc_valid_tm(&tm); 629 - if (ret) 630 - return ret; 631 - 632 - return sprintf(buf, "%llu\n", 633 - (unsigned long long)rtc_tm_to_time64(&tm)); 532 + return sprintf(buf, "%llu\n", (unsigned long long)ts); 634 533 }; 635 534 636 535 static DEVICE_ATTR_RW(timestamp0); ··· 667 594 dev_err(dev, "failed to request alarm irq\n"); 668 595 return ret; 669 596 } 597 + pcf2127->irq_enabled = true; 670 598 } 671 599 672 600 if (alarm_irq > 0 || device_property_read_bool(dev, "wakeup-source")) {