ehea: Merge swqe2 TSO and non TSO paths