Retirement tax questions

Thank you very much for the quick reply. Just to make sure I fully understand:

 

1. Even if the entirety of the excess contribution and subsequent earnings all happened in 2022, it needs to be taxable on my 2021 return?

2. If I amend my 2021 return for this, does this mean the 1099-R I received this year doesn't need to be reported in my 2022 return?

 

Thank you!