In the meantime I found a single post-2.1 fix for hikey960, but it didn't help. https://github.com/ARM-software/arm-trusted-firmware/commit/7d76df7db2c79b37f3c2357758fb2c565d4cce6f