From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH] xen/arm: Fix dom0 boot following c/s 580c45869
Date: Fri, 31 Aug 2018 19:01:25 +0100
Message-ID: <1535738485-9637-1-git-send-email-andrew.cooper3@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xenproject.org>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wei.liu2@citrix.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Julien Grall <julien.grall@arm.com>, Jan Beulich <JBeulich@suse.com>, =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
List-Id: xen-devel@lists.xenproject.org

Yy9zIDU4MGM0NTg2OSAiQ2FsbCBhcmNoX2RvbWFpbl9jcmVhdGUoKSBhcyBlYXJseSBhcyBwb3Nz
aWJsZSBpbgpkb21haW5fY3JlYXRlKCkiIG92ZXJsb29rZWQgdGhlIGZhY3QgdGhhdCBBUk0gdXNl
cyBpc19oYXJkd2FyZV9kb21haW4oKSBpbiBhdApsZWFzdCB0d28gcGxhY2VzIGR1cmluZyBhcmNo
X2RvbWFpbl9jcmVhdGUoKS4KClRoZSBidWcgbWFuaWZlc3RzIGFzOgoKICAoWEVOKSBGcmVlZCAy
OTJrQiBpbml0IG1lbW9yeS4KICAoWEVOKSB0cmFwcy5jOjIwMTc6ZDB2MCBIU1I9MHg5MzhjMDAw
NyBwYz0weGMwNjM5ZDA4IGd2YT0weGUwODAwMDA0IGdwYT0weDAwMDAwMDEwNDgxMDA0Cgp3aGVu
IGRvbTAgdHJpZXMgdG8gdXNlIHRoZSB2dWFydC4gIEp1ZGdpbmcgYnkgb3RoZXIgdXNlcyBvZgpp
c19oYXJkd2FyZV9kb21haW4oKSwgSSBleHBlY3QgdGhlIHg4NiBQVkggZG9tMCBib290IGlzIHNp
bWlsYXJseSBicm9rZW4uCgpSZXBvc2l0aW9uIHRoZSBjb2RlIHdoaWNoIHNldHMgdXAgaGFyZHdh
cmVfZG9tYWluIHNvIHRoYXQgdGhlCmlzX2hhcmR3YXJlX2RvbWFpbigpIHByZWRpY2F0ZSB3b3Jr
cyBjb3JyZWN0bHkgYWxsIHRoZSB3YXkgdGhyb3VnaCBkb21haW4KY3JlYXRpb24uCgpXaGlsZSBt
b3ZpbmcgaXQsIGxlYXZlIGEgcmVsYXRlZCBjb21tZW50IGV4cGxhaW5pbmcgdGhlIHBvc2l0aW9u
aW5nIG9mIHRoZQppc19wcml2IGFzc2lnbm1lbnQsIHdoaWNoIGluIGhpbmRzaWdodCBzaG91bGQg
aGF2ZSBiZWVuIHBhcnQgb2YgYy9zIGVmNzY1ZWM5OAp3aGVuIGV4YWN0bHkgdGhlIHNhbWUgcHJv
YmxlbSB3YXMgZGlzY292ZXJlZCBmb3IgdGhlIGlzX2NvbnRyb2xfZG9tYWluKCkKcHJlZGljYXRl
LgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNv
bT4KLS0tCkNDOiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+CkND
OiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0uY29tPgpDQzogSmFuIEJldWxpY2ggPEpC
ZXVsaWNoQHN1c2UuY29tPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ0M6IFJv
Z2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgoKVGhhbmtzIHRvIEp1bGllbiBm
b3IgaGVscGluZyBkZWJ1ZyB0aGlzIGFmdGVyIE9TU1Rlc3QgZ2F2ZSBtZSBhbiBlcnJvciBJCmRp
ZG4ndCB1bmRlcnN0YW5kLCBhbmQgc29ycnkgZm9yIGJyZWFraW5nIGl0IQoKSSd2ZSBnb3Qgc29t
ZSBvdGhlciBjbGVhbnVwIEknZCBsaWtlIHRvIGRvIHRvIHRoZSBnZW5lcmFsIGhhcmR3YXJlX2Rv
bWFpbgppbmZyYXN0cnVjdXRyZSwgYnV0IEknbGwgbGVhdmUgdGhhdCB0byBhIGxhdGVyIGNoYW5n
ZSBzbyBhcyB0byB1bmR1bHkgYmxvY2sKc3RhZ2luZy4KLS0tCiB4ZW4vY29tbW9uL2RvbWFpbi5j
IHwgMjQgKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0
aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9kb21haW4u
YyBiL3hlbi9jb21tb24vZG9tYWluLmMKaW5kZXggZjY0YWQ1Zi4uMjU2YzU5YSAxMDA2NDQKLS0t
IGEveGVuL2NvbW1vbi9kb21haW4uYworKysgYi94ZW4vY29tbW9uL2RvbWFpbi5jCkBAIC0yNzMs
OCArMjczLDIyIEBAIHN0cnVjdCBkb21haW4gKmRvbWFpbl9jcmVhdGUoZG9taWRfdCBkb21pZCwK
ICAgICAgICAgcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CiAKICAgICBkLT5kb21haW5faWQgPSBk
b21pZDsKKworICAgIC8qIFNvcnQgb3V0IG91ciBpZGVhIG9mIGlzX2NvbnRyb2xfZG9tYWluKCku
ICovCiAgICAgZC0+aXNfcHJpdmlsZWdlZCA9IGlzX3ByaXY7CiAKKyAgICAvKiBTb3J0IG91dCBv
dXIgaWRlYSBvZiBpc19oYXJkd2FyZV9kb21haW4oKS4gKi8KKyAgICBpZiAoIGRvbWlkID09IDAg
fHwgZG9taWQgPT0gaGFyZHdhcmVfZG9taWQgKQorICAgIHsKKyAgICAgICAgaWYgKCBoYXJkd2Fy
ZV9kb21pZCA8IDAgfHwgaGFyZHdhcmVfZG9taWQgPj0gRE9NSURfRklSU1RfUkVTRVJWRUQgKQor
ICAgICAgICAgICAgcGFuaWMoIlRoZSB2YWx1ZSBvZiBoYXJkd2FyZV9kb20gbXVzdCBiZSBhIHZh
bGlkIGRvbWFpbiBJRCIpOworCisgICAgICAgIGQtPmlzX3Bpbm5lZCA9IG9wdF9kb20wX3ZjcHVz
X3BpbjsKKyAgICAgICAgZC0+ZGlzYWJsZV9taWdyYXRlID0gMTsKKyAgICAgICAgb2xkX2h3ZG9t
ID0gaGFyZHdhcmVfZG9tYWluOworICAgICAgICBoYXJkd2FyZV9kb21haW4gPSBkOworICAgIH0K
KwogICAgIC8qIERlYnVnIHNhbml0eS4gKi8KICAgICBBU1NFUlQoaXNfc3lzdGVtX2RvbWFpbihk
KSA/IGNvbmZpZyA9PSBOVUxMIDogY29uZmlnICE9IE5VTEwpOwogCkBAIC0zNTQsMTYgKzM2OCw2
IEBAIHN0cnVjdCBkb21haW4gKmRvbWFpbl9jcmVhdGUoZG9taWRfdCBkb21pZCwKICAgICAgICAg
d2F0Y2hkb2dfZG9tYWluX2luaXQoZCk7CiAgICAgICAgIGluaXRfc3RhdHVzIHw9IElOSVRfd2F0
Y2hkb2c7CiAKLSAgICAgICAgaWYgKCBkb21pZCA9PSAwIHx8IGRvbWlkID09IGhhcmR3YXJlX2Rv
bWlkICkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKCBoYXJkd2FyZV9kb21pZCA8IDAgfHwg
aGFyZHdhcmVfZG9taWQgPj0gRE9NSURfRklSU1RfUkVTRVJWRUQgKQotICAgICAgICAgICAgICAg
IHBhbmljKCJUaGUgdmFsdWUgb2YgaGFyZHdhcmVfZG9tIG11c3QgYmUgYSB2YWxpZCBkb21haW4g
SUQiKTsKLSAgICAgICAgICAgIGQtPmlzX3Bpbm5lZCA9IG9wdF9kb20wX3ZjcHVzX3BpbjsKLSAg
ICAgICAgICAgIGQtPmRpc2FibGVfbWlncmF0ZSA9IDE7Ci0gICAgICAgICAgICBvbGRfaHdkb20g
PSBoYXJkd2FyZV9kb21haW47Ci0gICAgICAgICAgICBoYXJkd2FyZV9kb21haW4gPSBkOwotICAg
ICAgICB9Ci0KICAgICAgICAgaWYgKCBjb25maWctPmZsYWdzICYgWEVOX0RPTUNUTF9DREZfeHNf
ZG9tYWluICkKICAgICAgICAgewogICAgICAgICAgICAgZC0+aXNfeGVuc3RvcmUgPSAxOwotLSAK
Mi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpY
ZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRw
czovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs