isci: merge smp request substates into primary state machine