The 20-time Grand Slam champion revealed his plans on his official Twitter page.
“Happy to let you know that I will play Geneva and Paris. Until then I will use the time to train. Can’t wait to play in Switzerland again,” Federer wrote.
Federer will aim for his 104th career title at the Geneva Open, which takes place May 16-22 — shortly before Roland Garros begins in Paris on May 30. The 39-year-old Federer won his only French Open in 2009 and lost to 13-time champion Rafael Nadal in the semi-finals two years ago.
He did not play there last year.
Federer had a repeat operation on his right knee after a first procedure in February, 2020. When that bothersome knee kept swelling up after bike rides or walks with his four children, he announced in June that he had had a second surgery.
The seventh-ranked Federer made his comeback from a 13-month injury layoff at the Qatar Open last month, beating Dan Evans in three sets and then losing in three to Nikoloz Basilashvili after failing to convert a match point.
Federer is also trying to win Wimbledon for a record-extending ninth time, having lost to Novak Djokovic in a fifth-set tiebreaker two years ago. Federer served for the match and had two championship points.
The grass-court major was cancelled last year for the first time since 1945 because of the coronavirus pandemic.
It is scheduled to be played June 28 to July 11.