From 3498859bd499c93ed52e7cc123053a635f60f718 Mon Sep 17 00:00:00 2001 From: Harry Liebel Date: Mon, 11 Nov 2013 13:24:47 +0000 Subject: [PATCH] Add GICv3 ITS to FDTs - The interrupt addresses need to be updated to work. Change-Id: Icdd00177095ae9e4eb7b13718762f92e29b1465c --- fdts/fvp-base-gicv3-psci.dtb | Bin 9033 -> 9528 bytes fdts/fvp-base-gicv3-psci.dts | 99 +++++++++++++++------------- fdts/fvp-foundation-gicv3-psci.dtb | Bin 6770 -> 7265 bytes fdts/fvp-foundation-gicv3-psci.dts | 101 ++++++++++++++++------------- 4 files changed, 109 insertions(+), 91 deletions(-) diff --git a/fdts/fvp-base-gicv3-psci.dtb b/fdts/fvp-base-gicv3-psci.dtb index 678b45bb7588d63e37cf8e8e2a44265f28a21b21..5198cc7ea75ff7b6c0bf78a95f8311da3d247d22 100644 GIT binary patch delta 2134 zcmah~Uuc_E6u&oX(q!wOWbJHY(xzE0Mrbfgs!lUm)v^`4X&$5$`>=&?NgJC#Gl}yL z!%i47RM2{T7&xJfqQi%7V;k;4p^QCrqevg-5aL6pB7%RIb%GB?JiqgOH%YbA3-@>L zIp=rIJ@?%E-S66-%TI@voB#Snh`yadh+!eN578K+?xF6cPR({lh~V1!&}q9Z9Z^g6 zM`k|pZ`)+r#5|39en~kU6Y{z`?C6;OiuBU5HPBeGWSJ?K2BYanG(wGZXz*{P?noAM z{Sz4@d?Xeo8cfyL-&u3y^fn9++JMx|5r{6!nOv$U)TfRID3cqGxLj54M#H{p|KpaJ zneBa4CyT^ox|qzR2BXQHwRB*ogryD-xrsUjYdk<92b|M#UR`u5FH+WRH%*A?Ag0`| z4!V4*v2!!51B?mAEaM5rImQLXZy5h%Y~KQ}2;)A+Nyg)h zvy7iJe$9A?(cJ{Ee#T+OLyX55PcdF*yuo;zv8fqeA;uxbgN#QRPcmL)TxR^4(b;mp zjHpP<6jka}OG!SZ+^uJ+b_=cX;4@aqtU8NTnSU56$jwx}apiaWJh(o%HkwsY!|wS0 zfBA~mCkHJSorWAg63snUOr?$N)Q;TbYhh{P z6`%R)z3#r4K7Jpr_bjS@K z6&g6W=KN3;N(LSZtw(IEr4Q9y>%OktGNBH2jS!w=TXo$zbVAy$Lsj-()?td{2|ThF{tv-(43wO$a_$H+a=4W7ra99q@{y> ziRRdlw%?>V8e|G&tEjm^ue_xe0|EJi`Y{lbKPi7tOx{+Bo-6iZGCz@0?qH-lSIUHq gLcUxqWV7^}HL?X`Dx5B+UVJH)H(tFk8vI@U4Wqg%8~^|S delta 1914 zcmah~TWC~C5WRhqI7v**OfnjEZZa7sYDA;a1Qo|6>-vZq#UBxIg%GZj1jl6D#0TyQ zaovC)iYr?m>R&!&S6J~u1jPr65mXcv4fwGEALySi$cOkqJ?GxrnTf`=;oPpOK2=>^ zUDI=R`Hdx&ck@5KFpTIj!!VW_M%f0;6+i&+0~qEr*ey!CPvFSifmnnGc9n#j&f}hJs??rygAL<;`+~*QV(hhBP6nd^ zo>6yLm6O5KV9cq9Z%Cx7(LYCeVHugSDn`~-L+2vmvC(!XS?uFnkBKH!`yo5+j+uiw z(0&jz?aY9Kc0^R&#+gvMejLgOZ#^69dS|`+DA;zl;vS4f**~UnB6DE#Gv07~v^ug4 z7AG7g`rtdvBOX&%cet4N%_C;bSU2YXW$QApdQ4sCZ^v9c&W#DiH}iC3KJ}O&4q>uO zbgf+Gmhs7%tdj1ZpjTC9!@-%iqPU8cCW7fKE7_{%ZG#zHMFtujfhOBRone>TOTCXNaOKGf;Ij|}OVh6^pu2lJ59Kw|F+LUxds9>Gf-nIjAF$c}uz?QFTv_M#AcWT#r=qPYmD3QZ?a; + #address-cells = <2>; + #size-cells = <2>; + ranges; interrupt-controller; reg = <0x0 0x2f000000 0 0x10000>, // GICD <0x0 0x2f100000 0 0x200000>, // GICR <0x0 0x2c000000 0 0x2000>, // GICC <0x0 0x2c010000 0 0x2000>, // GICH - <0x0 0x2c02F000 0 0x2000>; // GICV + <0x0 0x2c02f000 0 0x2000>; // GICV interrupts = <1 9 4>; + + its: its@2f020000 { + compatible = "arm,gic-v3-its"; + msi-controller; + reg = <0x0 0x2f020000 0x0 0x20000>; // GITS + }; }; timer { @@ -178,49 +187,49 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; - interrupt-map = <0 0 0 &gic 0 0 4>, - <0 0 1 &gic 0 1 4>, - <0 0 2 &gic 0 2 4>, - <0 0 3 &gic 0 3 4>, - <0 0 4 &gic 0 4 4>, - <0 0 5 &gic 0 5 4>, - <0 0 6 &gic 0 6 4>, - <0 0 7 &gic 0 7 4>, - <0 0 8 &gic 0 8 4>, - <0 0 9 &gic 0 9 4>, - <0 0 10 &gic 0 10 4>, - <0 0 11 &gic 0 11 4>, - <0 0 12 &gic 0 12 4>, - <0 0 13 &gic 0 13 4>, - <0 0 14 &gic 0 14 4>, - <0 0 15 &gic 0 15 4>, - <0 0 16 &gic 0 16 4>, - <0 0 17 &gic 0 17 4>, - <0 0 18 &gic 0 18 4>, - <0 0 19 &gic 0 19 4>, - <0 0 20 &gic 0 20 4>, - <0 0 21 &gic 0 21 4>, - <0 0 22 &gic 0 22 4>, - <0 0 23 &gic 0 23 4>, - <0 0 24 &gic 0 24 4>, - <0 0 25 &gic 0 25 4>, - <0 0 26 &gic 0 26 4>, - <0 0 27 &gic 0 27 4>, - <0 0 28 &gic 0 28 4>, - <0 0 29 &gic 0 29 4>, - <0 0 30 &gic 0 30 4>, - <0 0 31 &gic 0 31 4>, - <0 0 32 &gic 0 32 4>, - <0 0 33 &gic 0 33 4>, - <0 0 34 &gic 0 34 4>, - <0 0 35 &gic 0 35 4>, - <0 0 36 &gic 0 36 4>, - <0 0 37 &gic 0 37 4>, - <0 0 38 &gic 0 38 4>, - <0 0 39 &gic 0 39 4>, - <0 0 40 &gic 0 40 4>, - <0 0 41 &gic 0 41 4>, - <0 0 42 &gic 0 42 4>; + interrupt-map = <0 0 0 &gic 0 0 0 0 4>, + <0 0 1 &gic 0 0 0 1 4>, + <0 0 2 &gic 0 0 0 2 4>, + <0 0 3 &gic 0 0 0 3 4>, + <0 0 4 &gic 0 0 0 4 4>, + <0 0 5 &gic 0 0 0 5 4>, + <0 0 6 &gic 0 0 0 6 4>, + <0 0 7 &gic 0 0 0 7 4>, + <0 0 8 &gic 0 0 0 8 4>, + <0 0 9 &gic 0 0 0 9 4>, + <0 0 10 &gic 0 0 0 10 4>, + <0 0 11 &gic 0 0 0 11 4>, + <0 0 12 &gic 0 0 0 12 4>, + <0 0 13 &gic 0 0 0 13 4>, + <0 0 14 &gic 0 0 0 14 4>, + <0 0 15 &gic 0 0 0 15 4>, + <0 0 16 &gic 0 0 0 16 4>, + <0 0 17 &gic 0 0 0 17 4>, + <0 0 18 &gic 0 0 0 18 4>, + <0 0 19 &gic 0 0 0 19 4>, + <0 0 20 &gic 0 0 0 20 4>, + <0 0 21 &gic 0 0 0 21 4>, + <0 0 22 &gic 0 0 0 22 4>, + <0 0 23 &gic 0 0 0 23 4>, + <0 0 24 &gic 0 0 0 24 4>, + <0 0 25 &gic 0 0 0 25 4>, + <0 0 26 &gic 0 0 0 26 4>, + <0 0 27 &gic 0 0 0 27 4>, + <0 0 28 &gic 0 0 0 28 4>, + <0 0 29 &gic 0 0 0 29 4>, + <0 0 30 &gic 0 0 0 30 4>, + <0 0 31 &gic 0 0 0 31 4>, + <0 0 32 &gic 0 0 0 32 4>, + <0 0 33 &gic 0 0 0 33 4>, + <0 0 34 &gic 0 0 0 34 4>, + <0 0 35 &gic 0 0 0 35 4>, + <0 0 36 &gic 0 0 0 36 4>, + <0 0 37 &gic 0 0 0 37 4>, + <0 0 38 &gic 0 0 0 38 4>, + <0 0 39 &gic 0 0 0 39 4>, + <0 0 40 &gic 0 0 0 40 4>, + <0 0 41 &gic 0 0 0 41 4>, + <0 0 42 &gic 0 0 0 42 4>; /include/ "rtsm_ve-motherboard.dtsi" }; diff --git a/fdts/fvp-foundation-gicv3-psci.dtb b/fdts/fvp-foundation-gicv3-psci.dtb index 29a7c742975feb9f239e87529fec1e4824f4eaea..c6472e000fd0bdb6c7e39c3038e875ab8d037c2f 100644 GIT binary patch delta 1437 zcmZ{kUr5tY6vywK`)yjA+j4U*S7{b4a5Oh5a}SM_8fD-^6j)&6=QhXw)lV~uU_M9$ z`J&ecA9`36)RPby81&$S53z?RFbLLz5>40g63B%w4JA3I18V!knxNbZ(_uT7hPDa6Omvd5DdTo8x9P&!8FB`Y&FkfCck^;hi~ zOL~Nk69yyA!=An^wAK5@}o16s4R4znuH zokSDvt~UX zh}mix7n=W54P(+DAQw zzf_pj4exp&7VKS)0oduE415|;!8?1H`XTMg_J2V2yfAl#+IKJBh^y(Qm+C(=9U)J}va#DObzMvpo` zr|WR}M5V(V;NzwDJL(qT@*PTvu>4C6rw+f|AlxW2z!xi>GRH?h&$Z!o~u?!JJ_xVkL6&*5%M-9_8pOG+%4j0>kH la4|5M;O|P#ZbN delta 1217 zcmZ{jO=uHQ5XbkW+a#?`H=BMWZCBe6#dwI?4~#U2`T@4J^(G2d2(nF6NSbJ@R=rfn z!GnU*>A_=fih?2yc+f+!-judr(1QW>9uckJ!T9l?&8|(4X#fz~qmYj}W+8d$ zpj~`weFIoPDd&*4$#R-j&@E?xo;Wpn2Wsjx+6hKL8W4C4-hy8sP_NM-NPwGQ5xfE4 zLFX2Y4ud$j4jzJ6;2Y>@&}abY;2O9OR>3;(x-^P_D9D04;05>uni@3wZdsi;Jb{SzxGhYmo=u?ojt z?3wD%#3uA)qI+uc3cTer&cqp6XWg5pY4?As!GnOvP~oYdnl*R18e3It$(=@5NmUOW z-|&lZtSfbVr+wpG%2P>=ww?V;#T9vR*9=X20xI`tJ+8e*1$R9WV;=l6H>&^Y8QZZ8 zkL7hj%bB@XhLw2moV6)oD6L91SIW(0rNfNhTsdzlp)hXRT)DlaoD;$-CC{n4&Rk2n zn>(^5*lc!W{3GFK%agI9wsLoK-XN{DI4IjXs&X*5%^1P-zO|DjGk!j@;$Z(wilz8_ zV@kKZI$mhWJJOx)J<$udk%qN%QqQS{iv7KcJ>23MUGfcz*RyH!u7^+aeQ6FYYymeMavnKP+)?EK; }; - gic: interrupt-controller@2cf00000 { + gic: interrupt-controller@2f000000 { compatible = "arm,gic-v3"; #interrupt-cells = <3>; + #address-cells = <2>; + #size-cells = <2>; + ranges; interrupt-controller; reg = <0x0 0x2f000000 0 0x10000>, // GICD <0x0 0x2f100000 0 0x200000>, // GICR <0x0 0x2c000000 0 0x2000>, // GICC <0x0 0x2c010000 0 0x2000>, // GICH - <0x0 0x2c02F000 0 0x2000>; // GICV + <0x0 0x2c02f000 0 0x2000>; // GICV interrupts = <1 9 4>; + + its: its@2f020000 { + compatible = "arm,gic-v3-its"; + msi-controller; + reg = <0x0 0x2f020000 0x0 0x20000>; // GITS + }; }; timer { @@ -152,49 +161,49 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; - interrupt-map = <0 0 0 &gic 0 0 4>, - <0 0 1 &gic 0 1 4>, - <0 0 2 &gic 0 2 4>, - <0 0 3 &gic 0 3 4>, - <0 0 4 &gic 0 4 4>, - <0 0 5 &gic 0 5 4>, - <0 0 6 &gic 0 6 4>, - <0 0 7 &gic 0 7 4>, - <0 0 8 &gic 0 8 4>, - <0 0 9 &gic 0 9 4>, - <0 0 10 &gic 0 10 4>, - <0 0 11 &gic 0 11 4>, - <0 0 12 &gic 0 12 4>, - <0 0 13 &gic 0 13 4>, - <0 0 14 &gic 0 14 4>, - <0 0 15 &gic 0 15 4>, - <0 0 16 &gic 0 16 4>, - <0 0 17 &gic 0 17 4>, - <0 0 18 &gic 0 18 4>, - <0 0 19 &gic 0 19 4>, - <0 0 20 &gic 0 20 4>, - <0 0 21 &gic 0 21 4>, - <0 0 22 &gic 0 22 4>, - <0 0 23 &gic 0 23 4>, - <0 0 24 &gic 0 24 4>, - <0 0 25 &gic 0 25 4>, - <0 0 26 &gic 0 26 4>, - <0 0 27 &gic 0 27 4>, - <0 0 28 &gic 0 28 4>, - <0 0 29 &gic 0 29 4>, - <0 0 30 &gic 0 30 4>, - <0 0 31 &gic 0 31 4>, - <0 0 32 &gic 0 32 4>, - <0 0 33 &gic 0 33 4>, - <0 0 34 &gic 0 34 4>, - <0 0 35 &gic 0 35 4>, - <0 0 36 &gic 0 36 4>, - <0 0 37 &gic 0 37 4>, - <0 0 38 &gic 0 38 4>, - <0 0 39 &gic 0 39 4>, - <0 0 40 &gic 0 40 4>, - <0 0 41 &gic 0 41 4>, - <0 0 42 &gic 0 42 4>; + interrupt-map = <0 0 0 &gic 0 0 0 0 4>, + <0 0 1 &gic 0 0 0 1 4>, + <0 0 2 &gic 0 0 0 2 4>, + <0 0 3 &gic 0 0 0 3 4>, + <0 0 4 &gic 0 0 0 4 4>, + <0 0 5 &gic 0 0 0 5 4>, + <0 0 6 &gic 0 0 0 6 4>, + <0 0 7 &gic 0 0 0 7 4>, + <0 0 8 &gic 0 0 0 8 4>, + <0 0 9 &gic 0 0 0 9 4>, + <0 0 10 &gic 0 0 0 10 4>, + <0 0 11 &gic 0 0 0 11 4>, + <0 0 12 &gic 0 0 0 12 4>, + <0 0 13 &gic 0 0 0 13 4>, + <0 0 14 &gic 0 0 0 14 4>, + <0 0 15 &gic 0 0 0 15 4>, + <0 0 16 &gic 0 0 0 16 4>, + <0 0 17 &gic 0 0 0 17 4>, + <0 0 18 &gic 0 0 0 18 4>, + <0 0 19 &gic 0 0 0 19 4>, + <0 0 20 &gic 0 0 0 20 4>, + <0 0 21 &gic 0 0 0 21 4>, + <0 0 22 &gic 0 0 0 22 4>, + <0 0 23 &gic 0 0 0 23 4>, + <0 0 24 &gic 0 0 0 24 4>, + <0 0 25 &gic 0 0 0 25 4>, + <0 0 26 &gic 0 0 0 26 4>, + <0 0 27 &gic 0 0 0 27 4>, + <0 0 28 &gic 0 0 0 28 4>, + <0 0 29 &gic 0 0 0 29 4>, + <0 0 30 &gic 0 0 0 30 4>, + <0 0 31 &gic 0 0 0 31 4>, + <0 0 32 &gic 0 0 0 32 4>, + <0 0 33 &gic 0 0 0 33 4>, + <0 0 34 &gic 0 0 0 34 4>, + <0 0 35 &gic 0 0 0 35 4>, + <0 0 36 &gic 0 0 0 36 4>, + <0 0 37 &gic 0 0 0 37 4>, + <0 0 38 &gic 0 0 0 38 4>, + <0 0 39 &gic 0 0 0 39 4>, + <0 0 40 &gic 0 0 0 40 4>, + <0 0 41 &gic 0 0 0 41 4>, + <0 0 42 &gic 0 0 0 42 4>; /include/ "fvp-foundation-motherboard.dtsi" };