diff options
author | Haiying Wang <Haiying.Wang@freescale.com> | 2013-04-11 13:15:24 (GMT) |
---|---|---|
committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-04-11 16:05:22 (GMT) |
commit | c66b8677ef99cc1dc9b20f93b3a9e368c86dc54e (patch) | |
tree | 256187ca2728cb3de7b902f0d82b1fb23a49ad6a /arch | |
parent | 98b27f32258d5578702d1c9895f4b2222da86e4b (diff) | |
download | linux-fsl-qoriq-c66b8677ef99cc1dc9b20f93b3a9e368c86dc54e.tar.xz |
usdpaa: fix p2041rdb and p3041ds usdpaa device tree
Update the buffer size to 1728, and remove q/bman portals because we use
dynamic portal allocation, and remove pool-channel for ethernet nodes.
Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com>
Signed-off-by: Yashpal Dutta <yashpal.dutta@freescale.com>
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Change-Id: I9b98706b89f79069a285c33989e7409f277dcd57
Reviewed-on: http://git.am.freescale.net:8181/1244
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/boot/dts/p2041rdb-usdpaa.dts | 176 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/p3041ds-usdpaa.dts | 192 |
2 files changed, 65 insertions, 303 deletions
diff --git a/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts b/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts index bd0fbf5..2557614 100644 --- a/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts +++ b/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts @@ -1,7 +1,7 @@ /* * P2041RDB Device Tree Source * - * Copyright 2011 Freescale Semiconductor Inc. + * Copyright 2011-2012 Freescale Semiconductor Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -35,193 +35,67 @@ /include/ "p2041rdb.dts" / { - bman-portals@ff4000000 { - bman-portal@0 { - cpu-handle = <&cpu0>; - }; - bman-portal@4000 { - cpu-handle = <&cpu1>; - }; - bman-portal@8000 { - cpu-handle = <&cpu2>; - }; - bman-portal@c000 { - cpu-handle = <&cpu3>; - }; - bman-portal@10000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu0>; - }; - bman-portal@14000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu1>; - }; - bman-portal@18000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu2>; - }; - bman-portal@1c000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu3>; - }; - bman-portal@20000 { - }; - bman-portal@24000 { - }; - /* The buffer pool is used for dynamic FQID allocation */ - buffer-pool@0 { - compatible = "fsl,p2041-bpool", "fsl,bpool"; - fsl,bpid = <0>; - fsl,bpool-cfg = <0 0x100 0 1 0 0x100>; - }; - /* NB: the bpool-ethernet-seeds is not set to avoid buffer seeding, - * because apps seed these pools buffers which are determined only - * at run-time. - * HOWEVER, the kernel driver requires the buffer-size and also - * mis-interprets things if the base-address is zero (hence the - * bogus values). - */ - bp7: buffer-pool@7 { - compatible = "fsl,p2041-bpool", "fsl,bpool"; - fsl,bpid = <7>; - fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>; - fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>; - }; - bp8: buffer-pool@8 { - compatible = "fsl,p2041-bpool", "fsl,bpool"; - fsl,bpid = <8>; - fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp9: buffer-pool@9 { - compatible = "fsl,p2041-bpool", "fsl,bpool"; - fsl,bpid = <9>; - fsl,bpool-ethernet-cfg = <0 0 0 1600 0 0xfeedabba>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp10: buffer-pool@10 { - compatible = "fsl,p2041-bpool", "fsl,bpool"; - fsl,bpid = <10>; - fsl,bpool-thresholds = <0x10 0x30 0x0 0x0>; - }; - bp11: buffer-pool@11 { - compatible = "fsl,p2041-bpool", "fsl,bpool"; - fsl,bpid = <11>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp12: buffer-pool@12 { - compatible = "fsl,p2041-bpool", "fsl,bpool"; - fsl,bpid = <12>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; + /* NB: "bpool-ethernet-seeds" is not set to avoid buffer seeding, + * because apps seed these pools with buffers allocated at + * run-time. + * HOWEVER, the kernel driver requires the buffer-size so + * "fsl,bpool-ethernet-cfg" is set. It also mis-interprets + * things if the base-address is zero (hence the 0xdeadbeef + * values). + */ + bp7: buffer-pool@7 { + compatible = "fsl,p2041-bpool", "fsl,bpool"; + fsl,bpid = <7>; + fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>; + fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>; }; - - qman-portals@ff4200000 { - qportal0: qman-portal@0 { - cpu-handle = <&cpu0>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal1: qman-portal@4000 { - cpu-handle = <&cpu1>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal2: qman-portal@8000 { - cpu-handle = <&cpu2>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal3: qman-portal@c000 { - cpu-handle = <&cpu3>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal4: qman-portal@10000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu0>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal5: qman-portal@14000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu1>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal6: qman-portal@18000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu2>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal7: qman-portal@1c000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu3>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal8: qman-portal@20000 { - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal9: qman-portal@24000 { - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; + bp8: buffer-pool@8 { + compatible = "fsl,p2041-bpool", "fsl,bpool"; + fsl,bpid = <8>; + fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>; + fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; + }; + bp9: buffer-pool@9 { + compatible = "fsl,p2041-bpool", "fsl,bpool"; + fsl,bpid = <9>; + fsl,bpool-ethernet-cfg = <0 0 0 1728 0 0xfeedabba>; + fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; }; fsl,dpaa { ethernet@0 { compatible = "fsl,p2041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x50 1 0x51 1>; fsl,qman-frame-queues-tx = <0x70 1 0x71 1>; }; ethernet@1 { compatible = "fsl,p2041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x52 1 0x53 1>; fsl,qman-frame-queues-tx = <0x72 1 0x73 1>; }; ethernet@2 { compatible = "fsl,p2041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x54 1 0x55 1>; fsl,qman-frame-queues-tx = <0x74 1 0x75 1>; }; ethernet@3 { compatible = "fsl,p2041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x56 1 0x57 1>; fsl,qman-frame-queues-tx = <0x76 1 0x77 1>; }; ethernet@4 { compatible = "fsl,p2041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x58 1 0x59 1>; fsl,qman-frame-queues-tx = <0x78 1 0x79 1>; }; ethernet@5 { compatible = "fsl,p2041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x5a 1 0x5b 1>; fsl,qman-frame-queues-tx = <0x7a 1 0x7b 1>; }; diff --git a/arch/powerpc/boot/dts/p3041ds-usdpaa.dts b/arch/powerpc/boot/dts/p3041ds-usdpaa.dts index 59dfbae..a3cb1d3 100644 --- a/arch/powerpc/boot/dts/p3041ds-usdpaa.dts +++ b/arch/powerpc/boot/dts/p3041ds-usdpaa.dts @@ -1,7 +1,7 @@ /* * P3041DS Device Tree Source * - * Copyright 2010-2011 Freescale Semiconductor Inc. + * Copyright 2010-2012 Freescale Semiconductor Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -35,194 +35,82 @@ /include/ "p3041ds.dts" / { - bman-portals@ff4000000 { - bman-portal@0 { - cpu-handle = <&cpu0>; - }; - bman-portal@4000 { - cpu-handle = <&cpu1>; - }; - bman-portal@8000 { - cpu-handle = <&cpu2>; - }; - bman-portal@c000 { - cpu-handle = <&cpu3>; - }; - bman-portal@10000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu0>; - }; - bman-portal@14000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu1>; - }; - bman-portal@18000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu2>; - }; - bman-portal@1c000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu3>; - }; - bman-portal@20000 { - }; - bman-portal@24000 { - }; - - /* The BPID0 is used a dynamic FQID allocator */ - buffer-pool@0 { - compatible = "fsl,p3041-bpool", "fsl,bpool"; - fsl,bpid = <0>; - fsl,bpool-cfg = <0 0x100 0 1 0 0x100>; - }; - /* NB: the bpool-ethernet-seeds is not set to avoid buffer seeding, - * because apps seed these pools buffers which are determined only - * at run-time. - * HOWEVER, the kernel driver requires the buffer-size and also - * mis-interprets things if the base-address is zero (hence the - * bogus values). - */ - bp7: buffer-pool@7 { - compatible = "fsl,p3041-bpool", "fsl,bpool"; - fsl,bpid = <7>; - fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>; - fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>; - }; - bp8: buffer-pool@8 { - compatible = "fsl,p3041-bpool", "fsl,bpool"; - fsl,bpid = <8>; - fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp9: buffer-pool@9 { - compatible = "fsl,p3041-bpool", "fsl,bpool"; - fsl,bpid = <9>; - fsl,bpool-ethernet-cfg = <0 0 0 1600 0 0xfeedabba>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp10: buffer-pool@10 { - compatible = "fsl,p3041-bpool", "fsl,bpool"; - fsl,bpid = <10>; - fsl,bpool-thresholds = <0x10 0x30 0x0 0x0>; - }; - bp11: buffer-pool@11 { - compatible = "fsl,p3041-bpool", "fsl,bpool"; - fsl,bpid = <11>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; - bp12: buffer-pool@12 { - compatible = "fsl,p3041-bpool", "fsl,bpool"; - fsl,bpid = <12>; - fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; - }; + /* NB: "bpool-ethernet-seeds" is not set to avoid buffer seeding, + * because apps seed these pools with buffers allocated at + * run-time. + * HOWEVER, the kernel driver requires the buffer-size so + * "fsl,bpool-ethernet-cfg" is set. It also mis-interprets + * things if the base-address is zero (hence the 0xdeadbeef + * values). + */ + bp7: buffer-pool@7 { + compatible = "fsl,p3041-bpool", "fsl,bpool"; + fsl,bpid = <7>; + fsl,bpool-ethernet-cfg = <0 0 0 192 0 0xdeadbeef>; + fsl,bpool-thresholds = <0x400 0xc00 0x0 0x0>; }; - - qman-portals@ff4200000 { - qportal0: qman-portal@0 { - cpu-handle = <&cpu0>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal1: qman-portal@4000 { - cpu-handle = <&cpu1>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal2: qman-portal@8000 { - cpu-handle = <&cpu2>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal3: qman-portal@c000 { - cpu-handle = <&cpu3>; - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal4: qman-portal@10000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu0>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal5: qman-portal@14000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu1>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal6: qman-portal@18000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu2>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal7: qman-portal@1c000 { - fsl,usdpaa-portal; - cpu-handle = <&cpu3>; - fsl,qman-pool-channels = <&qpool4 &qpool5 &qpool6 - &qpool7 &qpool8 &qpool9 - &qpool10 &qpool11 &qpool12 - &qpool13 &qpool14 &qpool15>; - }; - - qportal8: qman-portal@20000 { - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; - - qportal9: qman-portal@24000 { - fsl,qman-pool-channels = <&qpool1 &qpool2 &qpool3>; - }; + bp8: buffer-pool@8 { + compatible = "fsl,p3041-bpool", "fsl,bpool"; + fsl,bpid = <8>; + fsl,bpool-ethernet-cfg = <0 0 0 576 0 0xabbaf00d>; + fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; + }; + bp9: buffer-pool@9 { + compatible = "fsl,p3041-bpool", "fsl,bpool"; + fsl,bpid = <9>; + fsl,bpool-ethernet-cfg = <0 0 0 1728 0 0xfeedabba>; + fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; + }; + bp10: buffer-pool@10 { + compatible = "fsl,p3041-bpool", "fsl,bpool"; + fsl,bpid = <10>; + fsl,bpool-thresholds = <0x10 0x30 0x0 0x0>; + }; + bp11: buffer-pool@11 { + compatible = "fsl,p3041-bpool", "fsl,bpool"; + fsl,bpid = <11>; + fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; + }; + bp12: buffer-pool@12 { + compatible = "fsl,p3041-bpool", "fsl,bpool"; + fsl,bpid = <12>; + fsl,bpool-thresholds = <0x100 0x300 0x0 0x0>; }; fsl,dpaa { ethernet@0 { compatible = "fsl,p3041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x50 1 0x51 1>; fsl,qman-frame-queues-tx = <0x70 1 0x71 1>; }; ethernet@1 { compatible = "fsl,p3041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x52 1 0x53 1>; fsl,qman-frame-queues-tx = <0x72 1 0x73 1>; }; ethernet@2 { compatible = "fsl,p3041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x54 1 0x55 1>; fsl,qman-frame-queues-tx = <0x74 1 0x75 1>; }; ethernet@3 { compatible = "fsl,p3041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x56 1 0x57 1>; fsl,qman-frame-queues-tx = <0x76 1 0x77 1>; }; ethernet@4 { compatible = "fsl,p3041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x58 1 0x59 1>; fsl,qman-frame-queues-tx = <0x78 1 0x79 1>; }; ethernet@5 { compatible = "fsl,p3041-dpa-ethernet-init", "fsl,dpa-ethernet-init"; fsl,bman-buffer-pools = <&bp7 &bp8 &bp9>; - fsl,qman-channel = <&qpool4>; fsl,qman-frame-queues-rx = <0x5a 1 0x5b 1>; fsl,qman-frame-queues-tx = <0x7a 1 0x7b 1>; }; |