Fixed. The solution was to remove the CMOS battery.
When I put it back in, the computer went to BIOS right away, and FastBoot was not selected. THen I used the mouse to re-set the boot order, exited and the kb was working again on grub. I opened Windows and it reported detecting both kb and mouse.