powerpc/4xx: Complete removal of MSI support

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

kernel os linux

Finish the work by removing all references to the PPC4xx_MSI config
and the associated device nodes in the DTs.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/e92f2bb3-b5e1-c870-8151-3917a789a640@kaod.org

authored by

Cédric Le Goater and committed by

Thomas Gleixner 4 years ago eca21315 4f1d038b

-113

7 changed files

expand all

arch

powerpc

boot

dts

bluestone.dts

canyonlands.dts

katmai.dts

kilauea.dts

redwood.dts

platforms

40x

Kconfig

44x

Kconfig

-25

arch/powerpc/boot/dts/bluestone.dts

··· 366 366 0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */ 367 367 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; 368 368 }; 369 - 370 - MSI: ppc4xx-msi@C10000000 { 371 - compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; 372 - reg = < 0xC 0x10000000 0x100 373 - 0xC 0x10000000 0x100>; 374 - sdr-base = <0x36C>; 375 - msi-data = <0x00004440>; 376 - msi-mask = <0x0000ffe0>; 377 - interrupts =<0 1 2 3 4 5 6 7>; 378 - interrupt-parent = <&MSI>; 379 - #interrupt-cells = <1>; 380 - #address-cells = <0>; 381 - #size-cells = <0>; 382 - msi-available-ranges = <0x0 0x100>; 383 - interrupt-map = < 384 - 0 &UIC3 0x18 1 385 - 1 &UIC3 0x19 1 386 - 2 &UIC3 0x1A 1 387 - 3 &UIC3 0x1B 1 388 - 4 &UIC3 0x1C 1 389 - 5 &UIC3 0x1D 1 390 - 6 &UIC3 0x1E 1 391 - 7 &UIC3 0x1F 1 392 - >; 393 - }; 394 369 }; 395 370 };

-18

arch/powerpc/boot/dts/canyonlands.dts

··· 544 544 0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */ 545 545 0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>; 546 546 }; 547 - 548 - MSI: ppc4xx-msi@C10000000 { 549 - compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; 550 - reg = < 0xC 0x10000000 0x100>; 551 - sdr-base = <0x36C>; 552 - msi-data = <0x00000000>; 553 - msi-mask = <0x44440000>; 554 - interrupt-count = <3>; 555 - interrupts = <0 1 2 3>; 556 - interrupt-parent = <&UIC3>; 557 - #interrupt-cells = <1>; 558 - #address-cells = <0>; 559 - #size-cells = <0>; 560 - interrupt-map = <0 &UIC3 0x18 1 561 - 1 &UIC3 0x19 1 562 - 2 &UIC3 0x1A 1 563 - 3 &UIC3 0x1B 1>; 564 - }; 565 547 }; 566 548 };

-18

arch/powerpc/boot/dts/katmai.dts

··· 442 442 0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>; 443 443 }; 444 444 445 - MSI: ppc4xx-msi@400300000 { 446 - compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; 447 - reg = < 0x4 0x00300000 0x100>; 448 - sdr-base = <0x3B0>; 449 - msi-data = <0x00000000>; 450 - msi-mask = <0x44440000>; 451 - interrupt-count = <3>; 452 - interrupts =<0 1 2 3>; 453 - interrupt-parent = <&UIC0>; 454 - #interrupt-cells = <1>; 455 - #address-cells = <0>; 456 - #size-cells = <0>; 457 - interrupt-map = <0 &UIC0 0xC 1 458 - 1 &UIC0 0x0D 1 459 - 2 &UIC0 0x0E 1 460 - 3 &UIC0 0x0F 1>; 461 - }; 462 - 463 445 I2O: i2o@400100000 { 464 446 compatible = "ibm,i2o-440spe"; 465 447 reg = <0x00000004 0x00100000 0x100>;

-28

arch/powerpc/boot/dts/kilauea.dts

··· 403 403 0x0 0x0 0x0 0x3 &UIC2 0xd 0x4 /* swizzled int C */ 404 404 0x0 0x0 0x0 0x4 &UIC2 0xe 0x4 /* swizzled int D */>; 405 405 }; 406 - 407 - MSI: ppc4xx-msi@C10000000 { 408 - compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; 409 - reg = <0xEF620000 0x100>; 410 - sdr-base = <0x4B0>; 411 - msi-data = <0x00000000>; 412 - msi-mask = <0x44440000>; 413 - interrupt-count = <12>; 414 - interrupts = <0 1 2 3 4 5 6 7 8 9 0xA 0xB 0xC 0xD>; 415 - interrupt-parent = <&UIC2>; 416 - #interrupt-cells = <1>; 417 - #address-cells = <0>; 418 - #size-cells = <0>; 419 - interrupt-map = <0 &UIC2 0x10 1 420 - 1 &UIC2 0x11 1 421 - 2 &UIC2 0x12 1 422 - 2 &UIC2 0x13 1 423 - 2 &UIC2 0x14 1 424 - 2 &UIC2 0x15 1 425 - 2 &UIC2 0x16 1 426 - 2 &UIC2 0x17 1 427 - 2 &UIC2 0x18 1 428 - 2 &UIC2 0x19 1 429 - 2 &UIC2 0x1A 1 430 - 2 &UIC2 0x1B 1 431 - 2 &UIC2 0x1C 1 432 - 3 &UIC2 0x1D 1>; 433 - }; 434 406 }; 435 407 };

-19

arch/powerpc/boot/dts/redwood.dts

··· 358 358 0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>; 359 359 }; 360 360 361 - MSI: ppc4xx-msi@400300000 { 362 - compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; 363 - reg = < 0x4 0x00300000 0x100 364 - 0x4 0x00300000 0x100>; 365 - sdr-base = <0x3B0>; 366 - msi-data = <0x00000000>; 367 - msi-mask = <0x44440000>; 368 - interrupt-count = <3>; 369 - interrupts =<0 1 2 3>; 370 - interrupt-parent = <&UIC0>; 371 - #interrupt-cells = <1>; 372 - #address-cells = <0>; 373 - #size-cells = <0>; 374 - interrupt-map = <0 &UIC0 0xC 1 375 - 1 &UIC0 0x0D 1 376 - 2 &UIC0 0x0E 1 377 - 3 &UIC0 0x0F 1>; 378 - }; 379 - 380 361 }; 381 362 382 363

-1

arch/powerpc/platforms/40x/Kconfig

··· 23 23 select PPC4xx_PCI_EXPRESS 24 24 select FORCE_PCI 25 25 select PCI_MSI 26 - select PPC4xx_MSI 27 26 help 28 27 This option enables support for the AMCC PPC405EX evaluation board. 29 28

-4

arch/powerpc/platforms/44x/Kconfig

··· 23 23 select APM821xx 24 24 select FORCE_PCI 25 25 select PCI_MSI 26 - select PPC4xx_MSI 27 26 select PPC4xx_PCI_EXPRESS 28 27 select IBM_EMAC_RGMII if IBM_EMAC 29 28 help ··· 72 73 select FORCE_PCI 73 74 select PPC4xx_PCI_EXPRESS 74 75 select PCI_MSI 75 - select PPC4xx_MSI 76 76 help 77 77 This option enables support for the AMCC PPC440SPe evaluation board. 78 78 ··· 113 115 select FORCE_PCI 114 116 select PPC4xx_PCI_EXPRESS 115 117 select PCI_MSI 116 - select PPC4xx_MSI 117 118 select IBM_EMAC_RGMII if IBM_EMAC 118 119 select IBM_EMAC_ZMII if IBM_EMAC 119 120 help ··· 138 141 select FORCE_PCI 139 142 select PPC4xx_PCI_EXPRESS 140 143 select PCI_MSI 141 - select PPC4xx_MSI 142 144 help 143 145 This option enables support for the AMCC PPC460SX Redwood board. 144 146