[platforms: PATCH 0/4] Armada 7k/8k - misc improvements pt.3

[platforms: PATCH 0/4] Armada 7k/8k - misc improvements pt.3

[Marcin Wojtas]

Hi,

This patchset contains small fixes and improvements in the Armada
platform support (re-enable tftp command, fix watchdog base,
clean-up MvPhyDxe header and firmware update command's usage
information). Right after these patches get merged, the file
structure of the support will be reworked.

The patches are available in the github:
https://github.com/MarvellEmbeddedProcessors/edk2-open-platform/commits/misc-upstream-r20171201

I'm looking forward to your comments or remarks.

Best regards,
Marcin


Marcin Wojtas (4):
  Marvell/Armada: Switch to dynamic tftp command
  Marvell/Armada: Fix watchdog control base
  Marvell/Applications: FirmwareUpdate: Fix usage information
  Marvell/Drivers: MvPhyDxe: Cleanup the header

 Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni | Bin 5146 -> 2300 bytes
 Platform/Marvell/Armada/Armada.dsc.inc                   |   3 +-
 Platform/Marvell/Armada/Armada70x0.fdf                   |   1 +
 Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c     |   2 +-
 Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h     | 152 ++++----------------
 5 files changed, 34 insertions(+), 124 deletions(-)

-- 
2.7.4

[platforms: PATCH 1/4] Marvell/Armada: Switch to dynamic tftp command

[Marcin Wojtas]

After removal of the tftp library in EDK2, the tftp was
disabled on Armada platform. Re-enable this functionality
as a dynamic command.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Armada/Armada.dsc.inc | 1 +
 Platform/Marvell/Armada/Armada70x0.fdf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
index 2a8a226..1b68ef3 100644
--- a/Platform/Marvell/Armada/Armada.dsc.inc
+++ b/Platform/Marvell/Armada/Armada.dsc.inc
@@ -524,6 +524,7 @@
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
       gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
   }
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
 [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf
index ca92c60..65c6474 100644
--- a/Platform/Marvell/Armada/Armada70x0.fdf
+++ b/Platform/Marvell/Armada/Armada70x0.fdf
@@ -176,6 +176,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
 
   # UEFI application (Shell Embedded Boot Loader)
   INF ShellPkg/Application/Shell/Shell.inf
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
   # Bds
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-- 
2.7.4

[platforms: PATCH 2/4] Marvell/Armada: Fix watchdog control base

[Marcin Wojtas]

Proper watchdog control base is 0xf0610000, so fix the
incorrect value.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Armada/Armada.dsc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
index 1b68ef3..cf81615 100644
--- a/Platform/Marvell/Armada/Armada.dsc.inc
+++ b/Platform/Marvell/Armada/Armada.dsc.inc
@@ -269,7 +269,7 @@
   gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000
 
   # ARM SBSA Watchdog
-  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0620000
+  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0610000
   gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0xF0600000
   gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|34
 
-- 
2.7.4

[platforms: PATCH 3/4] Marvell/Applications: FirmwareUpdate: Fix usage information

[Marcin Wojtas]

fupdate command's usage information referred to a deprecated
flag in 'examples' section. Fix this and replace damaged
FUpdate.uni file with its proper text version.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni | Bin 5146 -> 2300 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni b/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni
index 9d52e590c6d239621d226a240a3f9755210f52fe..293ae6650b92d04bcc977193ea4390e3d938a15f 100644
GIT binary patch
literal 2300
zcmb_dU2mf}6n*DcTxDLS6>VqdVIMlXD-m!KO9WU9O(Ts|Q9fErfFmHS^6&T9fixNI
zXr<NUCC0u!_uO-j?Yrw=`?FlNJ9P5pb)e7g6@C5k+wZi_y0@~fiMK=9wb>w5o7LnG
z#jRycYjfd|FY~hPOA2>7#Ikrr2eqfJ%uD%J7Bsxdo))q$sp?cS!P+LM$quA;0}YDy
zeQ9G;A^V||&-<aItS#<TXEmyj)!__g-xg(uZvd*gR`0TXq1uqpBam(STPyxR0xONB
zGmvblSNkqE==3bxtUCY(TWorl!z-!I{Hy&yCb7&-<+hb|CGCJMhXF<HI`t+CQ(Xr7
z7hH1H7E)``lit*n!@XtE_`9Y{W<9BDqLixw;ro7o4nqd28aI1ZZzbiY{<La9t@a6!
zj>^=~O+%e0N6nYaAZ}h~vMD?C@aK$>`AnIK5lSxh5bj?{ov?^TdjE@*?heq;&<d6B
zo3b5D4@N_fLQF?ZhEB_@?mv2A8mQ@=OoS#}R2r1%@o1hlYf7!y<mDEv*PHdc>53eB
zE$7jWs_T*RK+os&;3!C}sB8<Y1Fh3!8U^zn)dB*%YL0<1zc~xNs)l#%49yotJFB<f
zmAR~Bj_p!AvD0pAkG|{sV>QW&3liZX**GyHjH5Vw;2!g6zNKWv$PJ@y%$KW#R-x~)
zSdbHVm<^Jc&(kEt#LN-cInxW46Ksh+MllnD!kG9v@;ShO9y>w8nXrimuAh25SlR>t
z3c`eZzUB$SlF&9u$8FZfHVPNCX0f{hiZkavPqv20f+vB_wLmh5A}3C`oBB>nQ5r{~
zV1%+Pj|<m#_?mgQ$c~J}9$1i&SUJA`LzUqsV6motQR19|qciuJPGpMoc+A{HSMxD)
zAsp!WHi?M2To2eIg9J{zwMR_B{!S5uMe>}rvt+{h{2z*-C2ktCwWbUiL^>A<Ptt_Z
zG7LSVvtaQ9cbWKR`Jq;RL8)LiG9->k3<xMCzG)KkRB)pi4-yu~X_W9VxI%k3Pz7~6
z*y<T^!@!gZ8-(#zgK7<o_BL%+4D;x4a8%0CVhEVR)$KfmAs;-FoYhDHTl##-0+(qv
zp+?zo!LHCM4rWUYscp1zkP`+$UTs9MIu5z8Cc{EsG?Ms&9Pa@b-V}`13qIP!Nan6a
zxp9Jj?Q3^^XIXcDezL4jb=JNVWreG-Y;RJWi?V&eP5L^+ntq4yo<N|dB}<-G%#WTH
zX@mx`>FOjh2>a}%oB(Fl>^50Zwci!Epy&(D7P4#1aUZ90)iijHX5YK-t&SEe3Y;|?
zKTpx=5x_l0p9PC;5JrNFaf-(ODdQi$%ClO(w^25{{xz;%OwtYQu%>UWS_e}#QIw4?
zrNZVP&^1es2{-1(d*dp5bZ}JI{rEXj{y;mvU?SpF)mi^~d|@>@RsGj{Gk0TB-r~I(
KL8dx>8u1U73A2&_

literal 5146
zcmd6r+fN%;5XR@ZQvZh)c}b%HX&?GPFOo4PK{A+nZD^!ODA<@-!Zx){5&wMK?{|h_
zFE$rNsuWrFo;^Ef=9_OW=dAzzXWQO<)1U9{J8Rm^uI<j|HnvOqVoS^HwPt_N^(T90
zKibb49olC}{B0L@rB7xDHkIUs=B9eG)Y@4Z@vN=;p=}x3`PSF&T5fwuZfpbTnA$?W
znRSFCG{xEj8|lfNwBP7DmmDj`3CU11OCcU>eP;W*UL`#v$<1t{xvJ&2nh8x4p}x~S
zzT@#yqf9nHf*h8HN%K<Uv7PG~{$^S?)st<>&y#l(jgTBAee3Ytq!n=Gc+oP_Dwv$v
zt=3M(e5SjCkC=0gC&J}?cGu!^_5)k^ktNNU*23OAF;~c(r>8^}9>6mfXN%-LnD7LC
zKppq!fvv)45Et=(n;1bSK3?k=o#?_3;&rW=nW8t=ozGwg4Nr43&?<OGmwQXh!_q{$
zmbUYdahaZ#KW}vR6m#gBrA(`Gg;j9kF}VRsd|S#g5h^f$R)*jgvaG6C)KqgICwrZx
zGQJoW*+VY4J;(K!|8P>ESeI3v#RFv*m|<#Os?D$**OxHmp0CfJI#V9+q1eOo0_oFy
zQT>6ae66zR+PwPzU%sM}h|fjJvNEa|4;ABqJcVPrV^J4Tb>20|HP=LK(TTju#~NKJ
z>g%c`DzIR1wL5uT6n!^v#g*6|37gk;wI9*N!5wu_?VOqX@lN2lxp(=Za?r}1XKJ}?
zvXUp!bI+gP&^xf_G#wcx;S~*z4$eHQ=tAC;%UR|qs9O3q6^XWDPbg}PS|3Tnt$gv0
z6)bz7dn^kVsk05FeWdT;9uMq$uf(o*JUT?t1sC$69;2Rp&|aELF4z9IZ#_G;hI&;?
zGd_Q;yN;dcZcnp&n%}jL`eh|jO+7u<Oji=`HP_SJ2hFvUd^hQCDDJF8_DB-Q?pj}?
zj>cHukX5eO+|bomzyKrcwd_yX0a>0TS&96iX4|?tHb>u0t9ofRPdmziv@|8x7Y@en
z)2w44D?14{dJgsN-D?9MyK(qhwFbI%_BcuGYt^B&bY=C!J(`AmK1f)5$)jLpKUq9_
z@N7S^0tcCVBN}+p6!vzyW45o^W69-Og(SRy2k-LaX+t9r?5W$r(~*Ah6DCjeB@RR#
zbZvbKFV{u1BTqpH=g$1&vD}p$r?3NQ-qn>m_o*CDkb=4?9B>T6b#qNUA@jfsQe<=a
z&Ppu!4B64T&jr}{nB>YxVd@X@=9+wECe014YA7GbEAYKeNWMN-yk3YF-Vp(3+H)e;
zJm*g$+S8a!%VfQy&z|OkUC?$@)ipKB?U#hDEvd+UGOVw=R`L`-;0JcxYscZa#rl{h
z=kw%aR1(aCqpMF}%z}+N<pfS8pXwPIL+qQf;Z~{V$Y7+)vGsZZ2bJrdM?Mr40M=7k
zXvreKUeDxdkz0+2{D3q12KiECS5=#P?p>w#Xf&yVmN*9yai=p71z$}ka5SfS4!`g~
zPI2eGBkC!76J5YPC8FVRbPeaLJc}mys`p$NiR#1#F>WX?=)NF<b7wPjdk+9twYL=6
zM*peid9g!(+i!>4i6eO0w%_d4!`-WNmgJp<U6%JVKJ3(+DL2_oxVubmGz*=XHcD$b
z)v`nSJCA48S;~W+ou$aPRRd?@o?7s_B0E+;1&$l-;Fq#lN8xri)Pac?r+^#n$3sc`
zx#6AWHe_imM3d4vpkI;VL^DaJ7tSJETJcHppX5QIpFU1r)6H5d&#U@4HB{}zxr1{i
zrzH0UIo@cuR`hKt8?l!w>)BI|H6lanxU!X*Is?C|3OTiM@`MNM9VdRi*zYT=!!8!1
zOTEM@v3uN3M0QhBVViR<=Re+%9UalD^R|wy=Q#*3*t3Wi=NEeM^DFBsc2?Fr7wO_0
z8qvkCh5l*T(Uo^J>SeQ(2U~ixq*_+dt>*KlbbPJ8V1-?iow2LTIuSpd*<Qv@d1Y2v
zyUG(WCx=_o-&VD=FE`UZ;QMRjME%-JZ(zJn4U{2%n&$rrc=LCUiE5WDj(;5d3FrI2
xRQ(r{^CzoSRma5Xi9IP!qb*e}|6a^x=~g)6|0aL?;QiK5_}<y7U85Sk{{SUV_8R~I

-- 
2.7.4

[platforms: PATCH 4/4] Marvell/Drivers: MvPhyDxe: Cleanup the header

[Marcin Wojtas]

This patch removes unused macros defined in MvPhyDxe.h, as well
as improves the style and comments.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c |   2 +-
 Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h | 152 ++++----------------
 2 files changed, 31 insertions(+), 123 deletions(-)

diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
index e776a91..203dce2 100644
--- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
+++ b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
@@ -201,7 +201,7 @@ MvPhyParseStatus (
 
     DEBUG((DEBUG_ERROR,"MvPhyDxe: Waiting for PHY realtime link"));
     while (!(Data & MIIM_88E1xxx_PHYSTAT_SPDDONE)) {
-      if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
+      if (i > PHY_ANEG_TIMEOUT) {
         DEBUG((DEBUG_ERROR," TIMEOUT !\n"));
         PhyDev->LinkUp = FALSE;
         break;
diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
index 0c3d935..3cfcb80 100644
--- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
+++ b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
@@ -34,137 +34,45 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __MV_PHY_DXE_H__
 #define __MV_PHY_DXE_H__
 
-#define MII_BMCR      0x00  /* Basic mode control Register */
-#define MII_BMSR      0x01  /* Basic mode status Register  */
-#define MII_PHYSID1      0x02  /* PHYS ID 1           */
-#define MII_PHYSID2      0x03  /* PHYS ID 2           */
-#define MII_ADVERTISE      0x04  /* Advertisement control Reg   */
-#define MII_LPA        0x05  /* Link partner ability Reg    */
-#define MII_EXPANSION      0x06  /* Expansion Register         */
-#define MII_CTRL1000      0x09  /* 1000BASE-T control         */
-#define MII_STAT1000      0x0a  /* 1000BASE-T status         */
-#define MII_ESTATUS      0x0f  /* Extended Status */
-#define MII_DCOUNTER      0x12  /* Disconnect counter         */
-#define MII_FCSCOUNTER      0x13  /* False carrier counter       */
-#define MII_NWAYTEST      0x14  /* N-way auto-neg test Reg     */
-#define MII_RERRCOUNTER     0x15  /* Receive error counter       */
-#define MII_SREVISION      0x16  /* Silicon revision         */
-#define MII_RESV1      0x17  /* Reserved...           */
-#define MII_LBRERROR      0x18  /* Lpback, rx, bypass error    */
-#define MII_PHYADDR      0x19  /* PHY address           */
-#define MII_RESV2      0x1a  /* Reserved...           */
-#define MII_TPISTATUS      0x1b  /* TPI status for 10mbps       */
-#define MII_NCONFIG      0x1c  /* Network interface config    */
-
-/* Basic mode control Register. */
-#define BMCR_RESV    0x003f  /* Unused...           */
-#define BMCR_SPEED1000    0x0040  /* MSB of Speed (1000)         */
-#define BMCR_CTST    0x0080  /* Collision test         */
-#define BMCR_FULLDPLX    0x0100  /* Full duplex           */
-#define BMCR_ANRESTART    0x0200  /* Auto negotiation restart    */
-#define BMCR_ISOLATE    0x0400  /* Disconnect DP83840 from MII */
-#define BMCR_PDOWN    0x0800  /* Powerdown the DP83840       */
-#define BMCR_ANENABLE    0x1000  /* Enable auto negotiation     */
-#define BMCR_SPEED100    0x2000  /* Select 100Mbps         */
-#define BMCR_LOOPBACK    0x4000  /* TXD loopback bits         */
-#define BMCR_RESET    0x8000  /* Reset the DP83840         */
-
-/* Basic mode status Register. */
-#define BMSR_ERCAP    0x0001  /* Ext-Reg capability         */
-#define BMSR_JCD    0x0002  /* Jabber detected         */
-#define BMSR_LSTATUS    0x0004  /* Link status           */
-#define BMSR_ANEGCAPABLE  0x0008  /* Able to do auto-negotiation */
-#define BMSR_RFAULT    0x0010  /* Remote fault detected       */
-#define BMSR_ANEGCOMPLETE  0x0020  /* Auto-negotiation complete   */
-#define BMSR_RESV    0x00c0  /* Unused...           */
-#define BMSR_ESTATEN    0x0100  /* Extended Status in R15 */
-#define BMSR_100HALF2    0x0200  /* Can do 100BASE-T2 HDX */
-#define BMSR_100FULL2    0x0400  /* Can do 100BASE-T2 FDX */
-#define BMSR_10HALF    0x0800  /* Can do 10mbps, half-duplex  */
-#define BMSR_10FULL    0x1000  /* Can do 10mbps, full-duplex  */
-#define BMSR_100HALF    0x2000  /* Can do 100mbps, half-duplex */
-#define BMSR_100FULL    0x4000  /* Can do 100mbps, full-duplex */
-#define BMSR_100BASE4    0x8000  /* Can do 100mbps, 4k packets  */
-
-#define PHY_ANEG_TIMEOUT 4000
-
-#define PHY_INTERFACE_MODE_RGMII 0
-#define PHY_INTERFACE_MODE_RGMII_ID 1
-#define PHY_INTERFACE_MODE_RGMII_RXID 2
-#define PHY_INTERFACE_MODE_RGMII_TXID 3
-#define PHY_INTERFACE_MODE_SGMII 4
-#define PHY_INTERFACE_MODE_RTBI 5
-
-#define PHY_AUTONEGOTIATE_TIMEOUT 5000
+#define MII_BMCR                       0x00  /* Basic mode control Register */
+#define MII_BMSR                       0x01  /* Basic mode status Register  */
+
+/* BMCR */
+#define BMCR_ANRESTART                 0x0200 /* 1 = Restart autonegotiation */
+#define BMCR_ISOLATE                   0x0400 /* 0 = Isolate PHY */
+#define BMCR_ANENABLE                  0x1000 /* 1 = Enable autonegotiation */
+#define BMCR_RESET                     0x8000 /* 1 = Reset the PHY */
+
+/* BSMR */
+#define BMSR_LSTATUS                   0x0004 /* 1 = Link up */
+#define BMSR_ANEGCAPABLE               0x0008 /* 1 = Able to perform auto-neg */
+#define BMSR_ANEGCOMPLETE              0x0020 /* 1 = Auto-neg complete */
+
+#define PHY_ANEG_TIMEOUT               5000
 
 /* 88E1011 PHY Status Register */
-#define MIIM_88E1xxx_PHY_STATUS    0x11
-#define MIIM_88E1xxx_PHYSTAT_SPEED  0xc000
-#define MIIM_88E1xxx_PHYSTAT_GBIT  0x8000
-#define MIIM_88E1xxx_PHYSTAT_100  0x4000
-#define MIIM_88E1xxx_PHYSTAT_DUPLEX  0x2000
-#define MIIM_88E1xxx_PHYSTAT_SPDDONE  0x0800
-#define MIIM_88E1xxx_PHYSTAT_LINK  0x0400
-
-#define MIIM_88E1xxx_PHY_SCR    0x10
-#define MIIM_88E1xxx_PHY_MDI_X_AUTO  0x0060
-
-/* 88E1111 PHY LED Control Register */
-#define MIIM_88E1111_PHY_LED_CONTROL  24
-#define MIIM_88E1111_PHY_LED_DIRECT  0x4100
-#define MIIM_88E1111_PHY_LED_COMBINE  0x411C
+#define MIIM_88E1xxx_PHY_STATUS        0x11
+#define MIIM_88E1xxx_PHYSTAT_SPEED     0xc000
+#define MIIM_88E1xxx_PHYSTAT_GBIT      0x8000
+#define MIIM_88E1xxx_PHYSTAT_100       0x4000
+#define MIIM_88E1xxx_PHYSTAT_DUPLEX    0x2000
+#define MIIM_88E1xxx_PHYSTAT_SPDDONE   0x0800
+#define MIIM_88E1xxx_PHYSTAT_LINK      0x0400
 
 /* 88E1111 Extended PHY Specific Control Register */
-#define MIIM_88E1111_PHY_EXT_CR    0x14
-#define MIIM_88E1111_RX_DELAY    0x80
-#define MIIM_88E1111_TX_DELAY    0x2
+#define MIIM_88E1111_PHY_EXT_CR        0x14
+#define MIIM_88E1111_RX_DELAY          0x80
+#define MIIM_88E1111_TX_DELAY          0x02
 
 /* 88E1111 Extended PHY Specific Status Register */
-#define MIIM_88E1111_PHY_EXT_SR    0x1b
-#define MIIM_88E1111_HWCFG_MODE_MASK    0xf
+#define MIIM_88E1111_PHY_EXT_SR               0x1b
+#define MIIM_88E1111_HWCFG_MODE_MASK          0xf
 #define MIIM_88E1111_HWCFG_MODE_COPPER_RGMII  0xb
-#define MIIM_88E1111_HWCFG_MODE_FIBER_RGMII  0x3
+#define MIIM_88E1111_HWCFG_MODE_FIBER_RGMII   0x3
 #define MIIM_88E1111_HWCFG_MODE_SGMII_NO_CLK  0x4
-#define MIIM_88E1111_HWCFG_MODE_COPPER_RTBI  0x9
+#define MIIM_88E1111_HWCFG_MODE_COPPER_RTBI   0x9
 #define MIIM_88E1111_HWCFG_FIBER_COPPER_AUTO  0x8000
-#define MIIM_88E1111_HWCFG_FIBER_COPPER_RES  0x2000
-
-#define MIIM_88E1111_COPPER    0
-#define MIIM_88E1111_FIBER    1
-
-/* 88E1118 PHY defines */
-#define MIIM_88E1118_PHY_PAGE    22
-#define MIIM_88E1118_PHY_LED_PAGE  3
-
-/* 88E1121 PHY LED Control Register */
-#define MIIM_88E1121_PHY_LED_CTRL  16
-#define MIIM_88E1121_PHY_LED_PAGE  3
-#define MIIM_88E1121_PHY_LED_DEF  0x0030
-
-/* 88E1121 PHY IRQ Enable/Status Register */
-#define MIIM_88E1121_PHY_IRQ_EN    18
-#define MIIM_88E1121_PHY_IRQ_STATUS  19
-
-#define MIIM_88E1121_PHY_PAGE    22
-
-/* 88E1145 Extended PHY Specific Control Register */
-#define MIIM_88E1145_PHY_EXT_CR 20
-#define MIIM_M88E1145_RGMII_RX_DELAY  0x0080
-#define MIIM_M88E1145_RGMII_TX_DELAY  0x0002
-
-#define MIIM_88E1145_PHY_LED_CONTROL  24
-#define MIIM_88E1145_PHY_LED_DIRECT  0x4100
-
-#define MIIM_88E1145_PHY_PAGE  29
-#define MIIM_88E1145_PHY_CAL_OV 30
-
-#define MIIM_88E1149_PHY_PAGE  29
-
-/* 88E1310 PHY defines */
-#define MIIM_88E1310_PHY_LED_CTRL  16
-#define MIIM_88E1310_PHY_IRQ_EN    18
-#define MIIM_88E1310_PHY_RGMII_CTRL  21
-#define MIIM_88E1310_PHY_PAGE    22
+#define MIIM_88E1111_HWCFG_FIBER_COPPER_RES   0x2000
 
 typedef enum {
   MV_PHY_DEVICE_1512
-- 
2.7.4

Re: [platforms: PATCH 1/4] Marvell/Armada: Switch to dynamic tftp command

[Leif Lindholm]

On Fri, Dec 01, 2017 at 03:28:51AM +0100, Marcin Wojtas wrote:
> After removal of the tftp library in EDK2, the tftp was
> disabled on Armada platform. Re-enable this functionality
> as a dynamic command.

I did request this to be re-added as a build-time selectable option
like it is done on the Hisilicon platforms.

Including non-standard shell commands by default does not make sense
to me.

/
    Leif

> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  Platform/Marvell/Armada/Armada.dsc.inc | 1 +
>  Platform/Marvell/Armada/Armada70x0.fdf | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
> index 2a8a226..1b68ef3 100644
> --- a/Platform/Marvell/Armada/Armada.dsc.inc
> +++ b/Platform/Marvell/Armada/Armada.dsc.inc
> @@ -524,6 +524,7 @@
>        gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
>        gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
>    }
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  
>  [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
>    GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
> diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf
> index ca92c60..65c6474 100644
> --- a/Platform/Marvell/Armada/Armada70x0.fdf
> +++ b/Platform/Marvell/Armada/Armada70x0.fdf
> @@ -176,6 +176,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>  
>    # UEFI application (Shell Embedded Boot Loader)
>    INF ShellPkg/Application/Shell/Shell.inf
> +  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  
>    # Bds
>    INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
> -- 
> 2.7.4
> 

Re: [platforms: PATCH 4/4] Marvell/Drivers: MvPhyDxe: Cleanup the header

[Leif Lindholm]

On Fri, Dec 01, 2017 at 03:28:54AM +0100, Marcin Wojtas wrote:
> This patch removes unused macros defined in MvPhyDxe.h, as well
> as improves the style and comments.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c |   2 +-
>  Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h | 152 ++++----------------
>  2 files changed, 31 insertions(+), 123 deletions(-)
> 
> diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
> index e776a91..203dce2 100644
> --- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
> +++ b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
> @@ -201,7 +201,7 @@ MvPhyParseStatus (
>  
>      DEBUG((DEBUG_ERROR,"MvPhyDxe: Waiting for PHY realtime link"));
>      while (!(Data & MIIM_88E1xxx_PHYSTAT_SPDDONE)) {
> -      if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
> +      if (i > PHY_ANEG_TIMEOUT) {

I'm down with the cleanup, but this change is not needed, and ANEG
most certainly isn't an approved abbreviation. Please leave it as is.

>          DEBUG((DEBUG_ERROR," TIMEOUT !\n"));
>          PhyDev->LinkUp = FALSE;
>          break;
> diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
> index 0c3d935..3cfcb80 100644
> --- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
> +++ b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
> @@ -34,137 +34,45 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  #ifndef __MV_PHY_DXE_H__
>  #define __MV_PHY_DXE_H__
>  
> -#define MII_BMCR      0x00  /* Basic mode control Register */
> -#define MII_BMSR      0x01  /* Basic mode status Register  */
> -#define MII_PHYSID1      0x02  /* PHYS ID 1           */
> -#define MII_PHYSID2      0x03  /* PHYS ID 2           */
> -#define MII_ADVERTISE      0x04  /* Advertisement control Reg   */
> -#define MII_LPA        0x05  /* Link partner ability Reg    */
> -#define MII_EXPANSION      0x06  /* Expansion Register         */
> -#define MII_CTRL1000      0x09  /* 1000BASE-T control         */
> -#define MII_STAT1000      0x0a  /* 1000BASE-T status         */
> -#define MII_ESTATUS      0x0f  /* Extended Status */
> -#define MII_DCOUNTER      0x12  /* Disconnect counter         */
> -#define MII_FCSCOUNTER      0x13  /* False carrier counter       */
> -#define MII_NWAYTEST      0x14  /* N-way auto-neg test Reg     */
> -#define MII_RERRCOUNTER     0x15  /* Receive error counter       */
> -#define MII_SREVISION      0x16  /* Silicon revision         */
> -#define MII_RESV1      0x17  /* Reserved...           */
> -#define MII_LBRERROR      0x18  /* Lpback, rx, bypass error    */
> -#define MII_PHYADDR      0x19  /* PHY address           */
> -#define MII_RESV2      0x1a  /* Reserved...           */
> -#define MII_TPISTATUS      0x1b  /* TPI status for 10mbps       */
> -#define MII_NCONFIG      0x1c  /* Network interface config    */
> -
> -/* Basic mode control Register. */
> -#define BMCR_RESV    0x003f  /* Unused...           */
> -#define BMCR_SPEED1000    0x0040  /* MSB of Speed (1000)         */
> -#define BMCR_CTST    0x0080  /* Collision test         */
> -#define BMCR_FULLDPLX    0x0100  /* Full duplex           */
> -#define BMCR_ANRESTART    0x0200  /* Auto negotiation restart    */
> -#define BMCR_ISOLATE    0x0400  /* Disconnect DP83840 from MII */
> -#define BMCR_PDOWN    0x0800  /* Powerdown the DP83840       */
> -#define BMCR_ANENABLE    0x1000  /* Enable auto negotiation     */
> -#define BMCR_SPEED100    0x2000  /* Select 100Mbps         */
> -#define BMCR_LOOPBACK    0x4000  /* TXD loopback bits         */
> -#define BMCR_RESET    0x8000  /* Reset the DP83840         */
> -
> -/* Basic mode status Register. */
> -#define BMSR_ERCAP    0x0001  /* Ext-Reg capability         */
> -#define BMSR_JCD    0x0002  /* Jabber detected         */
> -#define BMSR_LSTATUS    0x0004  /* Link status           */
> -#define BMSR_ANEGCAPABLE  0x0008  /* Able to do auto-negotiation */
> -#define BMSR_RFAULT    0x0010  /* Remote fault detected       */
> -#define BMSR_ANEGCOMPLETE  0x0020  /* Auto-negotiation complete   */
> -#define BMSR_RESV    0x00c0  /* Unused...           */
> -#define BMSR_ESTATEN    0x0100  /* Extended Status in R15 */
> -#define BMSR_100HALF2    0x0200  /* Can do 100BASE-T2 HDX */
> -#define BMSR_100FULL2    0x0400  /* Can do 100BASE-T2 FDX */
> -#define BMSR_10HALF    0x0800  /* Can do 10mbps, half-duplex  */
> -#define BMSR_10FULL    0x1000  /* Can do 10mbps, full-duplex  */
> -#define BMSR_100HALF    0x2000  /* Can do 100mbps, half-duplex */
> -#define BMSR_100FULL    0x4000  /* Can do 100mbps, full-duplex */
> -#define BMSR_100BASE4    0x8000  /* Can do 100mbps, 4k packets  */
> -
> -#define PHY_ANEG_TIMEOUT 4000
> -
> -#define PHY_INTERFACE_MODE_RGMII 0
> -#define PHY_INTERFACE_MODE_RGMII_ID 1
> -#define PHY_INTERFACE_MODE_RGMII_RXID 2
> -#define PHY_INTERFACE_MODE_RGMII_TXID 3
> -#define PHY_INTERFACE_MODE_SGMII 4
> -#define PHY_INTERFACE_MODE_RTBI 5
> -
> -#define PHY_AUTONEGOTIATE_TIMEOUT 5000

Leave this.

> +#define MII_BMCR                       0x00  /* Basic mode control Register */
> +#define MII_BMSR                       0x01  /* Basic mode status Register  */
> +
> +/* BMCR */
> +#define BMCR_ANRESTART                 0x0200 /* 1 = Restart autonegotiation */
> +#define BMCR_ISOLATE                   0x0400 /* 0 = Isolate PHY */
> +#define BMCR_ANENABLE                  0x1000 /* 1 = Enable autonegotiation */
> +#define BMCR_RESET                     0x8000 /* 1 = Reset the PHY */
> +
> +/* BSMR */
> +#define BMSR_LSTATUS                   0x0004 /* 1 = Link up */
> +#define BMSR_ANEGCAPABLE               0x0008 /* 1 = Able to perform auto-neg */
> +#define BMSR_ANEGCOMPLETE              0x0020 /* 1 = Auto-neg complete */
> +
> +#define PHY_ANEG_TIMEOUT               5000

Drop this.

/
    Leif

>  
>  /* 88E1011 PHY Status Register */
> -#define MIIM_88E1xxx_PHY_STATUS    0x11
> -#define MIIM_88E1xxx_PHYSTAT_SPEED  0xc000
> -#define MIIM_88E1xxx_PHYSTAT_GBIT  0x8000
> -#define MIIM_88E1xxx_PHYSTAT_100  0x4000
> -#define MIIM_88E1xxx_PHYSTAT_DUPLEX  0x2000
> -#define MIIM_88E1xxx_PHYSTAT_SPDDONE  0x0800
> -#define MIIM_88E1xxx_PHYSTAT_LINK  0x0400
> -
> -#define MIIM_88E1xxx_PHY_SCR    0x10
> -#define MIIM_88E1xxx_PHY_MDI_X_AUTO  0x0060
> -
> -/* 88E1111 PHY LED Control Register */
> -#define MIIM_88E1111_PHY_LED_CONTROL  24
> -#define MIIM_88E1111_PHY_LED_DIRECT  0x4100
> -#define MIIM_88E1111_PHY_LED_COMBINE  0x411C
> +#define MIIM_88E1xxx_PHY_STATUS        0x11
> +#define MIIM_88E1xxx_PHYSTAT_SPEED     0xc000
> +#define MIIM_88E1xxx_PHYSTAT_GBIT      0x8000
> +#define MIIM_88E1xxx_PHYSTAT_100       0x4000
> +#define MIIM_88E1xxx_PHYSTAT_DUPLEX    0x2000
> +#define MIIM_88E1xxx_PHYSTAT_SPDDONE   0x0800
> +#define MIIM_88E1xxx_PHYSTAT_LINK      0x0400
>  
>  /* 88E1111 Extended PHY Specific Control Register */
> -#define MIIM_88E1111_PHY_EXT_CR    0x14
> -#define MIIM_88E1111_RX_DELAY    0x80
> -#define MIIM_88E1111_TX_DELAY    0x2
> +#define MIIM_88E1111_PHY_EXT_CR        0x14
> +#define MIIM_88E1111_RX_DELAY          0x80
> +#define MIIM_88E1111_TX_DELAY          0x02
>  
>  /* 88E1111 Extended PHY Specific Status Register */
> -#define MIIM_88E1111_PHY_EXT_SR    0x1b
> -#define MIIM_88E1111_HWCFG_MODE_MASK    0xf
> +#define MIIM_88E1111_PHY_EXT_SR               0x1b
> +#define MIIM_88E1111_HWCFG_MODE_MASK          0xf
>  #define MIIM_88E1111_HWCFG_MODE_COPPER_RGMII  0xb
> -#define MIIM_88E1111_HWCFG_MODE_FIBER_RGMII  0x3
> +#define MIIM_88E1111_HWCFG_MODE_FIBER_RGMII   0x3
>  #define MIIM_88E1111_HWCFG_MODE_SGMII_NO_CLK  0x4
> -#define MIIM_88E1111_HWCFG_MODE_COPPER_RTBI  0x9
> +#define MIIM_88E1111_HWCFG_MODE_COPPER_RTBI   0x9
>  #define MIIM_88E1111_HWCFG_FIBER_COPPER_AUTO  0x8000
> -#define MIIM_88E1111_HWCFG_FIBER_COPPER_RES  0x2000
> -
> -#define MIIM_88E1111_COPPER    0
> -#define MIIM_88E1111_FIBER    1
> -
> -/* 88E1118 PHY defines */
> -#define MIIM_88E1118_PHY_PAGE    22
> -#define MIIM_88E1118_PHY_LED_PAGE  3
> -
> -/* 88E1121 PHY LED Control Register */
> -#define MIIM_88E1121_PHY_LED_CTRL  16
> -#define MIIM_88E1121_PHY_LED_PAGE  3
> -#define MIIM_88E1121_PHY_LED_DEF  0x0030
> -
> -/* 88E1121 PHY IRQ Enable/Status Register */
> -#define MIIM_88E1121_PHY_IRQ_EN    18
> -#define MIIM_88E1121_PHY_IRQ_STATUS  19
> -
> -#define MIIM_88E1121_PHY_PAGE    22
> -
> -/* 88E1145 Extended PHY Specific Control Register */
> -#define MIIM_88E1145_PHY_EXT_CR 20
> -#define MIIM_M88E1145_RGMII_RX_DELAY  0x0080
> -#define MIIM_M88E1145_RGMII_TX_DELAY  0x0002
> -
> -#define MIIM_88E1145_PHY_LED_CONTROL  24
> -#define MIIM_88E1145_PHY_LED_DIRECT  0x4100
> -
> -#define MIIM_88E1145_PHY_PAGE  29
> -#define MIIM_88E1145_PHY_CAL_OV 30
> -
> -#define MIIM_88E1149_PHY_PAGE  29
> -
> -/* 88E1310 PHY defines */
> -#define MIIM_88E1310_PHY_LED_CTRL  16
> -#define MIIM_88E1310_PHY_IRQ_EN    18
> -#define MIIM_88E1310_PHY_RGMII_CTRL  21
> -#define MIIM_88E1310_PHY_PAGE    22
> +#define MIIM_88E1111_HWCFG_FIBER_COPPER_RES   0x2000
>  
>  typedef enum {
>    MV_PHY_DEVICE_1512
> -- 
> 2.7.4
> 

Re: [platforms: PATCH 2/4] Marvell/Armada: Fix watchdog control base

[Leif Lindholm]

On Fri, Dec 01, 2017 at 03:28:52AM +0100, Marcin Wojtas wrote:
> Proper watchdog control base is 0xf0610000, so fix the
> incorrect value.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  Platform/Marvell/Armada/Armada.dsc.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
> index 1b68ef3..cf81615 100644
> --- a/Platform/Marvell/Armada/Armada.dsc.inc
> +++ b/Platform/Marvell/Armada/Armada.dsc.inc
> @@ -269,7 +269,7 @@
>    gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000
>  
>    # ARM SBSA Watchdog
> -  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0620000
> +  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0610000

Hmm, do we never start the watchdog, or how did we not notice this?
I can confirm against the docs that the fix is correct, so:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

>    gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0xF0600000
>    gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|34
>  
> -- 
> 2.7.4
> 

Re: [platforms: PATCH 3/4] Marvell/Applications: FirmwareUpdate: Fix usage information

[Leif Lindholm]

On Fri, Dec 01, 2017 at 03:28:53AM +0100, Marcin Wojtas wrote:
> fupdate command's usage information referred to a deprecated
> flag in 'examples' section. Fix this and replace damaged
> FUpdate.uni file with its proper text version.

Mention which flag?

Also, it's called .uni because it's unicode.
Technically, it ought to be UCS-2, but I don't complain about UTF-8.
I don't see any issues with the existing version, it only happens to
be UTF-16 (according to 'file' - I guess it may be misidentified
UCS-2). Emacs doesn't have any issues editing it.

/
    Leif

> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni | Bin 5146 -> 2300 bytes
>  1 file changed, 0 insertions(+), 0 deletions(-)
> 
> diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni b/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni
> index 9d52e590c6d239621d226a240a3f9755210f52fe..293ae6650b92d04bcc977193ea4390e3d938a15f 100644
> GIT binary patch
> literal 2300
> zcmb_dU2mf}6n*DcTxDLS6>VqdVIMlXD-m!KO9WU9O(Ts|Q9fErfFmHS^6&T9fixNI
> zXr<NUCC0u!_uO-j?Yrw=`?FlNJ9P5pb)e7g6@C5k+wZi_y0@~fiMK=9wb>w5o7LnG
> z#jRycYjfd|FY~hPOA2>7#Ikrr2eqfJ%uD%J7Bsxdo))q$sp?cS!P+LM$quA;0}YDy
> zeQ9G;A^V||&-<aItS#<TXEmyj)!__g-xg(uZvd*gR`0TXq1uqpBam(STPyxR0xONB
> zGmvblSNkqE==3bxtUCY(TWorl!z-!I{Hy&yCb7&-<+hb|CGCJMhXF<HI`t+CQ(Xr7
> z7hH1H7E)``lit*n!@XtE_`9Y{W<9BDqLixw;ro7o4nqd28aI1ZZzbiY{<La9t@a6!
> zj>^=~O+%e0N6nYaAZ}h~vMD?C@aK$>`AnIK5lSxh5bj?{ov?^TdjE@*?heq;&<d6B
> zo3b5D4@N_fLQF?ZhEB_@?mv2A8mQ@=OoS#}R2r1%@o1hlYf7!y<mDEv*PHdc>53eB
> zE$7jWs_T*RK+os&;3!C}sB8<Y1Fh3!8U^zn)dB*%YL0<1zc~xNs)l#%49yotJFB<f
> zmAR~Bj_p!AvD0pAkG|{sV>QW&3liZX**GyHjH5Vw;2!g6zNKWv$PJ@y%$KW#R-x~)
> zSdbHVm<^Jc&(kEt#LN-cInxW46Ksh+MllnD!kG9v@;ShO9y>w8nXrimuAh25SlR>t
> z3c`eZzUB$SlF&9u$8FZfHVPNCX0f{hiZkavPqv20f+vB_wLmh5A}3C`oBB>nQ5r{~
> zV1%+Pj|<m#_?mgQ$c~J}9$1i&SUJA`LzUqsV6motQR19|qciuJPGpMoc+A{HSMxD)
> zAsp!WHi?M2To2eIg9J{zwMR_B{!S5uMe>}rvt+{h{2z*-C2ktCwWbUiL^>A<Ptt_Z
> zG7LSVvtaQ9cbWKR`Jq;RL8)LiG9->k3<xMCzG)KkRB)pi4-yu~X_W9VxI%k3Pz7~6
> z*y<T^!@!gZ8-(#zgK7<o_BL%+4D;x4a8%0CVhEVR)$KfmAs;-FoYhDHTl##-0+(qv
> zp+?zo!LHCM4rWUYscp1zkP`+$UTs9MIu5z8Cc{EsG?Ms&9Pa@b-V}`13qIP!Nan6a
> zxp9Jj?Q3^^XIXcDezL4jb=JNVWreG-Y;RJWi?V&eP5L^+ntq4yo<N|dB}<-G%#WTH
> zX@mx`>FOjh2>a}%oB(Fl>^50Zwci!Epy&(D7P4#1aUZ90)iijHX5YK-t&SEe3Y;|?
> zKTpx=5x_l0p9PC;5JrNFaf-(ODdQi$%ClO(w^25{{xz;%OwtYQu%>UWS_e}#QIw4?
> zrNZVP&^1es2{-1(d*dp5bZ}JI{rEXj{y;mvU?SpF)mi^~d|@>@RsGj{Gk0TB-r~I(
> KL8dx>8u1U73A2&_
> 
> literal 5146
> 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
> 
> -- 
> 2.7.4
> 

Re: [platforms: PATCH 1/4] Marvell/Armada: Switch to dynamic tftp command

[Marcin Wojtas]

Hi Leif,




2017-12-01 14:04 GMT+01:00 Leif Lindholm <leif.lindholm@linaro.org>:
> On Fri, Dec 01, 2017 at 03:28:51AM +0100, Marcin Wojtas wrote:
>> After removal of the tftp library in EDK2, the tftp was
>> disabled on Armada platform. Re-enable this functionality
>> as a dynamic command.
>
> I did request this to be re-added as a build-time selectable option
> like it is done on the Hisilicon platforms.
>
> Including non-standard shell commands by default does not make sense
> to me.
>

Sure, I read your comment after sending the patch... Will correct it
of course in v2.

Best regards,
Marcin

>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> ---
>>  Platform/Marvell/Armada/Armada.dsc.inc | 1 +
>>  Platform/Marvell/Armada/Armada70x0.fdf | 1 +
>>  2 files changed, 2 insertions(+)
>>
>> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
>> index 2a8a226..1b68ef3 100644
>> --- a/Platform/Marvell/Armada/Armada.dsc.inc
>> +++ b/Platform/Marvell/Armada/Armada.dsc.inc
>> @@ -524,6 +524,7 @@
>>        gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
>>        gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
>>    }
>> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>>
>>  [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
>>    GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>> diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf
>> index ca92c60..65c6474 100644
>> --- a/Platform/Marvell/Armada/Armada70x0.fdf
>> +++ b/Platform/Marvell/Armada/Armada70x0.fdf
>> @@ -176,6 +176,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>>
>>    # UEFI application (Shell Embedded Boot Loader)
>>    INF ShellPkg/Application/Shell/Shell.inf
>> +  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>>
>>    # Bds
>>    INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
>> --
>> 2.7.4
>>

Re: [platforms: PATCH 2/4] Marvell/Armada: Fix watchdog control base

[Marcin Wojtas]

2017-12-01 14:19 GMT+01:00 Leif Lindholm <leif.lindholm@linaro.org>:
> On Fri, Dec 01, 2017 at 03:28:52AM +0100, Marcin Wojtas wrote:
>> Proper watchdog control base is 0xf0610000, so fix the
>> incorrect value.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> ---
>>  Platform/Marvell/Armada/Armada.dsc.inc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
>> index 1b68ef3..cf81615 100644
>> --- a/Platform/Marvell/Armada/Armada.dsc.inc
>> +++ b/Platform/Marvell/Armada/Armada.dsc.inc
>> @@ -269,7 +269,7 @@
>>    gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000
>>
>>    # ARM SBSA Watchdog
>> -  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0620000
>> +  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0610000
>
> Hmm, do we never start the watchdog, or how did we not notice this?
> I can confirm against the docs that the fix is correct, so:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>

The problem was noticed when running SBSA test suite on a branch
already equipped with ACPI support.

Marcin

Re: [platforms: PATCH 3/4] Marvell/Applications: FirmwareUpdate: Fix usage information

[Marcin Wojtas]

2017-12-01 14:27 GMT+01:00 Leif Lindholm <leif.lindholm@linaro.org>:
> On Fri, Dec 01, 2017 at 03:28:53AM +0100, Marcin Wojtas wrote:
>> fupdate command's usage information referred to a deprecated
>> flag in 'examples' section. Fix this and replace damaged
>> FUpdate.uni file with its proper text version.
>
> Mention which flag?

The '-f' flag was removed from the function after your review a really
long time ago. Someone just noticed it still is in the 'help'. I will
be more verbose in the commit log.

>
> Also, it's called .uni because it's unicode.
> Technically, it ought to be UCS-2, but I don't complain about UTF-8.
> I don't see any issues with the existing version, it only happens to
> be UTF-16 (according to 'file' - I guess it may be misidentified
> UCS-2). Emacs doesn't have any issues editing it.
>

I use vim, but will try emacs for this file then.

Marcin

> /
>     Leif
>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> ---
>>  Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni | Bin 5146 -> 2300 bytes
>>  1 file changed, 0 insertions(+), 0 deletions(-)
>>
>> diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni b/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni
>> index 9d52e590c6d239621d226a240a3f9755210f52fe..293ae6650b92d04bcc977193ea4390e3d938a15f 100644
>> GIT binary patch
>> literal 2300
>> zcmb_dU2mf}6n*DcTxDLS6>VqdVIMlXD-m!KO9WU9O(Ts|Q9fErfFmHS^6&T9fixNI
>> zXr<NUCC0u!_uO-j?Yrw=`?FlNJ9P5pb)e7g6@C5k+wZi_y0@~fiMK=9wb>w5o7LnG
>> z#jRycYjfd|FY~hPOA2>7#Ikrr2eqfJ%uD%J7Bsxdo))q$sp?cS!P+LM$quA;0}YDy
>> zeQ9G;A^V||&-<aItS#<TXEmyj)!__g-xg(uZvd*gR`0TXq1uqpBam(STPyxR0xONB
>> zGmvblSNkqE==3bxtUCY(TWorl!z-!I{Hy&yCb7&-<+hb|CGCJMhXF<HI`t+CQ(Xr7
>> z7hH1H7E)``lit*n!@XtE_`9Y{W<9BDqLixw;ro7o4nqd28aI1ZZzbiY{<La9t@a6!
>> zj>^=~O+%e0N6nYaAZ}h~vMD?C@aK$>`AnIK5lSxh5bj?{ov?^TdjE@*?heq;&<d6B
>> zo3b5D4@N_fLQF?ZhEB_@?mv2A8mQ@=OoS#}R2r1%@o1hlYf7!y<mDEv*PHdc>53eB
>> zE$7jWs_T*RK+os&;3!C}sB8<Y1Fh3!8U^zn)dB*%YL0<1zc~xNs)l#%49yotJFB<f
>> zmAR~Bj_p!AvD0pAkG|{sV>QW&3liZX**GyHjH5Vw;2!g6zNKWv$PJ@y%$KW#R-x~)
>> zSdbHVm<^Jc&(kEt#LN-cInxW46Ksh+MllnD!kG9v@;ShO9y>w8nXrimuAh25SlR>t
>> z3c`eZzUB$SlF&9u$8FZfHVPNCX0f{hiZkavPqv20f+vB_wLmh5A}3C`oBB>nQ5r{~
>> zV1%+Pj|<m#_?mgQ$c~J}9$1i&SUJA`LzUqsV6motQR19|qciuJPGpMoc+A{HSMxD)
>> zAsp!WHi?M2To2eIg9J{zwMR_B{!S5uMe>}rvt+{h{2z*-C2ktCwWbUiL^>A<Ptt_Z
>> zG7LSVvtaQ9cbWKR`Jq;RL8)LiG9->k3<xMCzG)KkRB)pi4-yu~X_W9VxI%k3Pz7~6
>> z*y<T^!@!gZ8-(#zgK7<o_BL%+4D;x4a8%0CVhEVR)$KfmAs;-FoYhDHTl##-0+(qv
>> zp+?zo!LHCM4rWUYscp1zkP`+$UTs9MIu5z8Cc{EsG?Ms&9Pa@b-V}`13qIP!Nan6a
>> zxp9Jj?Q3^^XIXcDezL4jb=JNVWreG-Y;RJWi?V&eP5L^+ntq4yo<N|dB}<-G%#WTH
>> zX@mx`>FOjh2>a}%oB(Fl>^50Zwci!Epy&(D7P4#1aUZ90)iijHX5YK-t&SEe3Y;|?
>> zKTpx=5x_l0p9PC;5JrNFaf-(ODdQi$%ClO(w^25{{xz;%OwtYQu%>UWS_e}#QIw4?
>> zrNZVP&^1es2{-1(d*dp5bZ}JI{rEXj{y;mvU?SpF)mi^~d|@>@RsGj{Gk0TB-r~I(
>> KL8dx>8u1U73A2&_
>>
>> literal 5146
>> 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
>>
>> --
>> 2.7.4
>>