Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2331038a96ecdad76c50ab223fd48d656d8a1184

Authored by Richard Cochran
Committed by David S. Miller
1 parent f1dc045e68
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

dp83640: fix phy status frame event parsing 

If two eternal time stamp events occur at nearly the same time, the
phyter will add an extra word into the status frame. This commit fixes
the parsing code to recognize and skip over the extra word.

Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>

Showing 1 changed file with 15 additions and 5 deletions Side-by-side Diff

drivers/net/phy/dp83640.c
Diff comments   View file @ 2331038
... ... @@ -543,12 +543,21 @@
543 543  
544 544 /* time stamping methods */
545 545  
546   -static void decode_evnt(struct dp83640_private *dp83640,
547   - struct phy_txts *phy_txts, u16 ests)
  546 +static int decode_evnt(struct dp83640_private *dp83640,
  547 + void *data, u16 ests)
548 548 {
  549 + struct phy_txts *phy_txts;
549 550 struct ptp_clock_event event;
550 551 int words = (ests >> EVNT_TS_LEN_SHIFT) & EVNT_TS_LEN_MASK;
  552 + u16 ext_status = 0;
551 553  
  554 + if (ests & MULT_EVNT) {
  555 + ext_status = *(u16 *) data;
  556 + data += sizeof(ext_status);
  557 + }
  558 +
  559 + phy_txts = data;
  560 +
552 561 switch (words) { /* fall through in every case */
553 562 case 3:
554 563 dp83640->edata.sec_hi = phy_txts->sec_hi;
... ... @@ -565,6 +574,9 @@
565 574 event.timestamp = phy2txts(&dp83640->edata);
566 575  
567 576 ptp_clock_event(dp83640->clock->ptp_clock, &event);
  577 +
  578 + words = ext_status ? words + 2 : words + 1;
  579 + return words * sizeof(u16);
568 580 }
569 581  
570 582 static void decode_rxts(struct dp83640_private *dp83640,
... ... @@ -643,9 +655,7 @@
643 655  
644 656 } else if (PSF_EVNT == type && len >= sizeof(*phy_txts)) {
645 657  
646   - phy_txts = (struct phy_txts *) ptr;
647   - decode_evnt(dp83640, phy_txts, ests);
648   - size = sizeof(*phy_txts);
  658 + size = decode_evnt(dp83640, ptr, ests);
649 659  
650 660 } else {
651 661 size = 0;