[GIT PULL] Coresight fix for v5.16