Retirement tax questions

I run into the same situation this year when unexpected over contribute to my 401K account. The tax software instruction said :

1. need to notify the broker to get the refund and form 1099-R (already did)

2. enter the excess deferral in box 1 and 2a, enter code P in box 7 no matter we have received the 1099-R or not.

Is it all I need to do? 

 

Thank you