target/linux/layerscape/patches-5.4/302-dts-0049-sdk-dts-ls104x-move-dma-coherent-from-soc-to-its-chi.patch

   1 From 6795bab4281aa9ed8e0ba3fbba06de8dd369b17c Mon Sep 17 00:00:00 2001
   2 From: Ran Wang <ran.wang_1@nxp.com>
   3 Date: Thu, 21 Feb 2019 13:32:59 +0800
   4 Subject: [PATCH] sdk: dts: ls104x move dma-coherent from soc to its child
   5  nodes
   6
   7 Since SMMU is not supported for SDK version, USB function will down if
   8 still apply property 'dma-coherent' in scope of soc (USB driver is not
   9 ready to support it alone) in SDK device trees, decide to remove it.
  10 And add dma-coherent on other non-USB child nodes under soc.
  11
  12 dma-coherent feature in dts node will cause issue that
  13 QE-HDLC received too little, when a lot of data is transmitted while
  14 just little data received, the Tx buffer will run out.
  15
  16 Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
  17 Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  18 ---
  19  .../boot/dts/freescale/fsl-ls1043a-qds-sdk.dts     | 184 ++++++++++++++++++++-
  20  .../boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts     | 177 ++++++++++++++++++++
  21  .../boot/dts/freescale/fsl-ls1043a-rdb-usdpaa.dts  |   4 +
  22  .../boot/dts/freescale/fsl-ls1046a-qds-sdk.dts     | 175 ++++++++++++++++++++
  23  .../boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts     | 178 ++++++++++++++++++++
  24  .../boot/dts/freescale/fsl-ls1046a-rdb-usdpaa.dts  |   4 +
  25  6 files changed, 719 insertions(+), 3 deletions(-)
  26
  27 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds-sdk.dts
  28 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds-sdk.dts
  29 @@ -62,19 +62,24 @@
  30  };
  31
  32  &soc {
  33 +/delete-property/ dma-coherent;
  34 +
  35  #include "qoriq-dpaa-eth.dtsi"
  36  #include "qoriq-fman3-0-6oh.dtsi"
  37
  38  pcie@3400000 {
  39 -       /delete-property/ iommu-map;
  40 +       /delete-property/ iommu-map;
  41 +       dma-coherent;
  42  };
  43
  44  pcie@3500000 {
  45 -       /delete-property/ iommu-map;
  46 +       /delete-property/ iommu-map;
  47 +       dma-coherent;
  48  };
  49
  50  pcie@3600000 {
  51 -       /delete-property/ iommu-map;
  52 +       /delete-property/ iommu-map;
  53 +       dma-coherent;
  54  };
  55
  56  /delete-node/ iommu@9000000;
  57 @@ -82,4 +87,177 @@ pcie@3600000 {
  58
  59  &fman0 {
  60         compatible = "fsl,fman", "simple-bus";
  61 +       dma-coherent;
  62 +};
  63 +
  64 +&clockgen {
  65 +       dma-coherent;
  66 +};
  67 +
  68 +&scfg {
  69 +       dma-coherent;
  70 +};
  71 +
  72 +&crypto {
  73 +       dma-coherent;
  74 +};
  75 +
  76 +&dcfg {
  77 +       dma-coherent;
  78 +};
  79 +
  80 +&ifc {
  81 +       dma-coherent;
  82 +};
  83 +
  84 +&qspi {
  85 +       dma-coherent;
  86 +};
  87 +
  88 +&esdhc {
  89 +       dma-coherent;
  90 +};
  91 +
  92 +&ddr {
  93 +       dma-coherent;
  94 +};
  95 +
  96 +&tmu {
  97 +       dma-coherent;
  98 +};
  99 +
 100 +&qman {
 101 +       dma-coherent;
 102 +};
 103 +
 104 +&bman {
 105 +       dma-coherent;
 106 +};
 107 +
 108 +&bportals {
 109 +       dma-coherent;
 110 +};
 111 +
 112 +&qportals {
 113 +       dma-coherent;
 114 +};
 115 +
 116 +&dspi0 {
 117 +       dma-coherent;
 118 +};
 119 +
 120 +&dspi1 {
 121 +       dma-coherent;
 122 +};
 123 +
 124 +&i2c0 {
 125 +       dma-coherent;
 126 +};
 127 +
 128 +&i2c1 {
 129 +       dma-coherent;
 130 +};
 131 +
 132 +&i2c2 {
 133 +       dma-coherent;
 134 +};
 135 +
 136 +&i2c3 {
 137 +       dma-coherent;
 138 +};
 139 +
 140 +&duart0 {
 141 +       dma-coherent;
 142 +};
 143 +
 144 +&duart1 {
 145 +       dma-coherent;
 146 +};
 147 +
 148 +&duart2 {
 149 +       dma-coherent;
 150 +};
 151 +
 152 +&duart3 {
 153 +       dma-coherent;
 154 +};
 155 +
 156 +&gpio1 {
 157 +       dma-coherent;
 158 +};
 159 +
 160 +&gpio2 {
 161 +       dma-coherent;
 162 +};
 163 +
 164 +&gpio3 {
 165 +       dma-coherent;
 166 +};
 167 +
 168 +&gpio4 {
 169 +       dma-coherent;
 170 +};
 171 +
 172 +&uqe {
 173 +       dma-coherent;
 174 +};
 175 +
 176 +&lpuart0 {
 177 +       dma-coherent;
 178 +};
 179 +
 180 +&lpuart1 {
 181 +       dma-coherent;
 182 +};
 183 +
 184 +&lpuart2 {
 185 +       dma-coherent;
 186 +};
 187 +
 188 +&lpuart3 {
 189 +       dma-coherent;
 190 +};
 191 +
 192 +&lpuart4 {
 193 +       dma-coherent;
 194 +};
 195 +
 196 +&lpuart5 {
 197 +       dma-coherent;
 198 +};
 199 +
 200 +&ftm0 {
 201 +       dma-coherent;
 202 +};
 203 +
 204 +&wdog0 {
 205 +       dma-coherent;
 206 +};
 207 +
 208 +&edma0 {
 209 +       dma-coherent;
 210 +};
 211 +
 212 +&qdma {
 213 +       dma-coherent;
 214 +};
 215 +
 216 +&msi1 {
 217 +       dma-coherent;
 218 +};
 219 +
 220 +&msi2 {
 221 +       dma-coherent;
 222 +};
 223 +
 224 +&msi3 {
 225 +       dma-coherent;
 226 +};
 227 +
 228 +&ptp_timer0 {
 229 +       dma-coherent;
 230 +};
 231 +
 232 +&fsldpaa {
 233 +       dma-coherent;
 234  };
 235 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts
 236 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk.dts
 237 @@ -62,19 +62,24 @@
 238  };
 239
 240  &soc {
 241 +/delete-property/ dma-coherent;
 242 +
 243  #include "qoriq-dpaa-eth.dtsi"
 244  #include "qoriq-fman3-0-6oh.dtsi"
 245
 246  pcie@3400000 {
 247         /delete-property/ iommu-map;
 248 +       dma-coherent;
 249  };
 250
 251  pcie@3500000 {
 252         /delete-property/ iommu-map;
 253 +       dma-coherent;
 254  };
 255
 256  pcie@3600000 {
 257         /delete-property/ iommu-map;
 258 +       dma-coherent;
 259  };
 260
 261  /delete-node/ iommu@9000000;
 262 @@ -83,3 +88,175 @@ pcie@3600000 {
 263  &fman0 {
 264         compatible = "fsl,fman", "simple-bus";
 265  };
 266 +
 267 +&clockgen {
 268 +       dma-coherent;
 269 +};
 270 +
 271 +&scfg {
 272 +       dma-coherent;
 273 +};
 274 +
 275 +&crypto {
 276 +       dma-coherent;
 277 +};
 278 +
 279 +&dcfg {
 280 +       dma-coherent;
 281 +};
 282 +
 283 +&ifc {
 284 +       dma-coherent;
 285 +};
 286 +
 287 +&qspi {
 288 +       dma-coherent;
 289 +};
 290 +
 291 +&esdhc {
 292 +       dma-coherent;
 293 +};
 294 +
 295 +&ddr {
 296 +       dma-coherent;
 297 +};
 298 +
 299 +&tmu {
 300 +       dma-coherent;
 301 +};
 302 +
 303 +&qman {
 304 +       dma-coherent;
 305 +};
 306 +
 307 +&bman {
 308 +       dma-coherent;
 309 +};
 310 +
 311 +&bportals {
 312 +       dma-coherent;
 313 +};
 314 +
 315 +&qportals {
 316 +       dma-coherent;
 317 +};
 318 +
 319 +&dspi0 {
 320 +       dma-coherent;
 321 +};
 322 +
 323 +&dspi1 {
 324 +       dma-coherent;
 325 +};
 326 +
 327 +&i2c0 {
 328 +       dma-coherent;
 329 +};
 330 +
 331 +&i2c1 {
 332 +       dma-coherent;
 333 +};
 334 +
 335 +&i2c2 {
 336 +       dma-coherent;
 337 +};
 338 +
 339 +&i2c3 {
 340 +       dma-coherent;
 341 +};
 342 +
 343 +&duart0 {
 344 +       dma-coherent;
 345 +};
 346 +
 347 +&duart1 {
 348 +       dma-coherent;
 349 +};
 350 +
 351 +&duart2 {
 352 +       dma-coherent;
 353 +};
 354 +
 355 +&duart3 {
 356 +       dma-coherent;
 357 +};
 358 +
 359 +&gpio1 {
 360 +       dma-coherent;
 361 +};
 362 +
 363 +&gpio2 {
 364 +       dma-coherent;
 365 +};
 366 +
 367 +&gpio3 {
 368 +       dma-coherent;
 369 +};
 370 +
 371 +&gpio4 {
 372 +       dma-coherent;
 373 +};
 374 +
 375 +&lpuart0 {
 376 +       dma-coherent;
 377 +};
 378 +
 379 +&lpuart1 {
 380 +       dma-coherent;
 381 +};
 382 +
 383 +&lpuart2 {
 384 +       dma-coherent;
 385 +};
 386 +
 387 +&lpuart3 {
 388 +       dma-coherent;
 389 +};
 390 +
 391 +&lpuart4 {
 392 +       dma-coherent;
 393 +};
 394 +
 395 +&lpuart5 {
 396 +       dma-coherent;
 397 +};
 398 +
 399 +&ftm0 {
 400 +       dma-coherent;
 401 +};
 402 +
 403 +&wdog0 {
 404 +       dma-coherent;
 405 +};
 406 +
 407 +&edma0 {
 408 +       dma-coherent;
 409 +};
 410 +
 411 +&qdma {
 412 +       dma-coherent;
 413 +};
 414 +
 415 +&msi1 {
 416 +       dma-coherent;
 417 +};
 418 +
 419 +&msi2 {
 420 +       dma-coherent;
 421 +};
 422 +
 423 +&msi3 {
 424 +       dma-coherent;
 425 +};
 426 +
 427 +&fman0 {
 428 +       dma-coherent;
 429 +};
 430 +
 431 +&ptp_timer0 {
 432 +       dma-coherent;
 433 +};
 434 +
 435 +&fsldpaa {
 436 +       dma-coherent;
 437 +};
 438 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-usdpaa.dts
 439 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb-usdpaa.dts
 440 @@ -16,6 +16,7 @@
 441                 fsl,bpid = <7>;
 442                 fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>;
 443                 fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>;
 444 +               dma-coherent;
 445         };
 446
 447         bp8: buffer-pool@8 {
 448 @@ -23,6 +24,7 @@
 449                 fsl,bpid = <8>;
 450                 fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>;
 451                 fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>;
 452 +               dma-coherent;
 453         };
 454
 455         bp9: buffer-pool@9 {
 456 @@ -30,10 +32,12 @@
 457                 fsl,bpid = <9>;
 458                 fsl,bpool-ethernet-cfg = <0 0 0 2048 0 0xfeedabba>;
 459                 fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>;
 460 +               dma-coherent;
 461         };
 462
 463         fsl,dpaa {
 464                 compatible = "fsl,ls1043a", "fsl,dpaa", "simple-bus";
 465 +               dma-coherent;
 466
 467                 ethernet@0 {
 468                         compatible = "fsl,dpa-ethernet-init";
 469 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts
 470 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts
 471 @@ -62,6 +62,8 @@
 472  };
 473
 474  &soc {
 475 +/delete-property/ dma-coherent;
 476 +
 477  #include "qoriq-dpaa-eth.dtsi"
 478  #include "qoriq-fman3-0-6oh.dtsi"
 479
 480 @@ -90,4 +92,177 @@ pcie@3600000 {
 481
 482  &fman0 {
 483         compatible = "fsl,fman", "simple-bus";
 484 +       dma-coherent;
 485 +};
 486 +
 487 +&clockgen {
 488 +       dma-coherent;
 489 +};
 490 +
 491 +&scfg {
 492 +       dma-coherent;
 493 +};
 494 +
 495 +&crypto {
 496 +       dma-coherent;
 497 +};
 498 +
 499 +&dcfg {
 500 +       dma-coherent;
 501 +};
 502 +
 503 +&ifc {
 504 +       dma-coherent;
 505 +};
 506 +
 507 +&qspi {
 508 +       dma-coherent;
 509 +};
 510 +
 511 +&esdhc {
 512 +       dma-coherent;
 513 +};
 514 +
 515 +&ddr {
 516 +       dma-coherent;
 517 +};
 518 +
 519 +&tmu {
 520 +       dma-coherent;
 521 +};
 522 +
 523 +&qman {
 524 +       dma-coherent;
 525 +};
 526 +
 527 +&bman {
 528 +       dma-coherent;
 529 +};
 530 +
 531 +&bportals {
 532 +       dma-coherent;
 533 +};
 534 +
 535 +&qportals {
 536 +       dma-coherent;
 537 +};
 538 +
 539 +&dspi {
 540 +       dma-coherent;
 541 +};
 542 +
 543 +&i2c0 {
 544 +       dma-coherent;
 545 +};
 546 +
 547 +&i2c1 {
 548 +       dma-coherent;
 549 +};
 550 +
 551 +&i2c2 {
 552 +       dma-coherent;
 553 +};
 554 +
 555 +&i2c3 {
 556 +       dma-coherent;
 557 +};
 558 +
 559 +&duart0 {
 560 +       dma-coherent;
 561 +};
 562 +
 563 +&duart1 {
 564 +       dma-coherent;
 565 +};
 566 +
 567 +&duart2 {
 568 +       dma-coherent;
 569 +};
 570 +
 571 +&duart3 {
 572 +       dma-coherent;
 573 +};
 574 +
 575 +&gpio0 {
 576 +       dma-coherent;
 577 +};
 578 +
 579 +&gpio1 {
 580 +       dma-coherent;
 581 +};
 582 +
 583 +&gpio2 {
 584 +       dma-coherent;
 585 +};
 586 +
 587 +&gpio3 {
 588 +       dma-coherent;
 589 +};
 590 +
 591 +&lpuart0 {
 592 +       dma-coherent;
 593 +};
 594 +
 595 +&lpuart1 {
 596 +       dma-coherent;
 597 +};
 598 +
 599 +&lpuart2 {
 600 +       dma-coherent;
 601 +};
 602 +
 603 +&lpuart3 {
 604 +       dma-coherent;
 605 +};
 606 +
 607 +&lpuart4 {
 608 +       dma-coherent;
 609 +};
 610 +
 611 +&lpuart5 {
 612 +       dma-coherent;
 613 +};
 614 +
 615 +&ftm0 {
 616 +       dma-coherent;
 617 +};
 618 +
 619 +&wdog0 {
 620 +       dma-coherent;
 621 +};
 622 +
 623 +&edma0 {
 624 +       dma-coherent;
 625 +};
 626 +
 627 +&sata {
 628 +       dma-coherent;
 629 +};
 630 +
 631 +&qdma {
 632 +       dma-coherent;
 633 +};
 634 +
 635 +&msi1 {
 636 +       dma-coherent;
 637 +};
 638 +
 639 +&msi2 {
 640 +       dma-coherent;
 641 +};
 642 +
 643 +&msi3 {
 644 +       dma-coherent;
 645 +};
 646 +
 647 +&ptp_timer0 {
 648 +       dma-coherent;
 649 +};
 650 +
 651 +&serdes1 {
 652 +       dma-coherent;
 653 +};
 654 +
 655 +&fsldpaa {
 656 +       dma-coherent;
 657  };
 658 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts
 659 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts
 660 @@ -62,6 +62,8 @@
 661  };
 662
 663  &soc {
 664 +/delete-property/ dma-coherent;
 665 +
 666  #include "qoriq-dpaa-eth.dtsi"
 667  #include "qoriq-fman3-0-6oh.dtsi"
 668
 669 @@ -127,3 +129,179 @@ pcie@3600000 {
 670   *     phy-handle = <&pcsphy7>;
 671   *};
 672  */
 673 +
 674 +&clockgen {
 675 +       dma-coherent;
 676 +};
 677 +
 678 +&scfg {
 679 +       dma-coherent;
 680 +};
 681 +
 682 +&crypto {
 683 +       dma-coherent;
 684 +};
 685 +
 686 +&dcfg {
 687 +       dma-coherent;
 688 +};
 689 +
 690 +&ifc {
 691 +       dma-coherent;
 692 +};
 693 +
 694 +&qspi {
 695 +       dma-coherent;
 696 +};
 697 +
 698 +&esdhc {
 699 +       dma-coherent;
 700 +};
 701 +
 702 +&ddr {
 703 +       dma-coherent;
 704 +};
 705 +
 706 +&tmu {
 707 +       dma-coherent;
 708 +};
 709 +
 710 +&qman {
 711 +       dma-coherent;
 712 +};
 713 +
 714 +&bman {
 715 +       dma-coherent;
 716 +};
 717 +
 718 +&bportals {
 719 +       dma-coherent;
 720 +};
 721 +
 722 +&qportals {
 723 +       dma-coherent;
 724 +};
 725 +
 726 +&dspi {
 727 +       dma-coherent;
 728 +};
 729 +
 730 +&i2c0 {
 731 +       dma-coherent;
 732 +};
 733 +
 734 +&i2c1 {
 735 +       dma-coherent;
 736 +};
 737 +
 738 +&i2c2 {
 739 +       dma-coherent;
 740 +};
 741 +
 742 +&i2c3 {
 743 +       dma-coherent;
 744 +};
 745 +
 746 +&duart0 {
 747 +       dma-coherent;
 748 +};
 749 +
 750 +&duart1 {
 751 +       dma-coherent;
 752 +};
 753 +
 754 +&duart2 {
 755 +       dma-coherent;
 756 +};
 757 +
 758 +&duart3 {
 759 +       dma-coherent;
 760 +};
 761 +
 762 +&gpio0 {
 763 +       dma-coherent;
 764 +};
 765 +
 766 +&gpio1 {
 767 +       dma-coherent;
 768 +};
 769 +
 770 +&gpio2 {
 771 +       dma-coherent;
 772 +};
 773 +
 774 +&gpio3 {
 775 +       dma-coherent;
 776 +};
 777 +
 778 +&lpuart0 {
 779 +       dma-coherent;
 780 +};
 781 +
 782 +&lpuart1 {
 783 +       dma-coherent;
 784 +};
 785 +
 786 +&lpuart2 {
 787 +       dma-coherent;
 788 +};
 789 +
 790 +&lpuart3 {
 791 +       dma-coherent;
 792 +};
 793 +
 794 +&lpuart4 {
 795 +       dma-coherent;
 796 +};
 797 +
 798 +&lpuart5 {
 799 +       dma-coherent;
 800 +};
 801 +
 802 +&ftm0 {
 803 +       dma-coherent;
 804 +};
 805 +
 806 +&wdog0 {
 807 +       dma-coherent;
 808 +};
 809 +
 810 +&edma0 {
 811 +       dma-coherent;
 812 +};
 813 +
 814 +&sata {
 815 +       dma-coherent;
 816 +};
 817 +
 818 +&qdma {
 819 +       dma-coherent;
 820 +};
 821 +
 822 +&msi1 {
 823 +       dma-coherent;
 824 +};
 825 +
 826 +&msi2 {
 827 +       dma-coherent;
 828 +};
 829 +
 830 +&msi3 {
 831 +       dma-coherent;
 832 +};
 833 +
 834 +&fman0 {
 835 +       dma-coherent;
 836 +};
 837 +
 838 +&ptp_timer0 {
 839 +       dma-coherent;
 840 +};
 841 +
 842 +&serdes1 {
 843 +       dma-coherent;
 844 +};
 845 +
 846 +&fsldpaa {
 847 +       dma-coherent;
 848 +};
 849 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-usdpaa.dts
 850 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-usdpaa.dts
 851 @@ -16,6 +16,7 @@
 852                 fsl,bpid = <7>;
 853                 fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>;
 854                 fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>;
 855 +               dma-coherent;
 856         };
 857
 858         bp8: buffer-pool@8 {
 859 @@ -23,6 +24,7 @@
 860                 fsl,bpid = <8>;
 861                 fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>;
 862                 fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>;
 863 +               dma-coherent;
 864         };
 865
 866         bp9: buffer-pool@9 {
 867 @@ -30,10 +32,12 @@
 868                 fsl,bpid = <9>;
 869                 fsl,bpool-ethernet-cfg = <0 0 0 2048 0 0xfeedabba>;
 870                 fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>;
 871 +               dma-coherent;
 872         };
 873
 874         fsl,dpaa {
 875                 compatible = "fsl,ls1046a", "fsl,dpaa", "simple-bus";
 876 +               dma-coherent;
 877
 878                 ethernet@2 {
 879                         compatible = "fsl,dpa-ethernet-init";