Revert "Merge branch 'octeontx2-af-CPT'"

This reverts commit b4fbf0b2, reversing
changes made to 6c977c5c

.

This seems like net-next material.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>