From 131566b8f80355aa64bba904f9de4d1506b90442 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Wed, 29 Jun 2022 23:22:55 +0100 Subject: x1000: fix linux boot USB issues If the USB controller is active when we hand over to Linux it'll often trigger "irq nobody cared" warnings. Disabling the controller before boot prevents that. Also move the USB PHY bit workaround from the dualboot cleanup hook to the main Linux boot function. Mainline kernels don't clear these bits either. Change-Id: Ieaf896c3b8c3e58a8c47de5afeb384ae2511a5fa --- firmware/target/mips/ingenic_x1000/boot-x1000.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'firmware/target/mips') diff --git a/firmware/target/mips/ingenic_x1000/boot-x1000.c b/firmware/target/mips/ingenic_x1000/boot-x1000.c index c8e97b4d6a..f59ec5c4ea 100644 --- a/firmware/target/mips/ingenic_x1000/boot-x1000.c +++ b/firmware/target/mips/ingenic_x1000/boot-x1000.c @@ -20,6 +20,7 @@ ****************************************************************************/ #include "system.h" +#include "usb.h" #include "boot-x1000.h" #include "nand-x1000.h" #include "gpio-x1000.h" @@ -113,6 +114,14 @@ void x1000_boot_linux(const void* source, size_t length, { size_t args_len = strlen(args); + /* Shut off USB to avoid "irq 21 nobody cared" error */ + usb_close(); + usb_enable(false); + + /* clear USB PHY voodoo bits, not all kernels use them */ + jz_writef(CPM_OPCR, GATE_USBPHY_CLK(0)); + jz_writef(CPM_USBCDR, PHY_GATE(0)); + disable_irq(); /* --- Beyond this point, do not call into DRAM --- */ @@ -151,10 +160,6 @@ void x1000_dualboot_cleanup(void) jz_writef(LCD_CTRL, BEDN(0), EOFM(0), SOFM(0), IFUM(0), QDM(0)); jz_writef(CPM_CLKGR, LCD(1)); - /* clear USB PHY voodoo bits, not all kernels use them */ - jz_writef(CPM_OPCR, GATE_USBPHY_CLK(0)); - jz_writef(CPM_USBCDR, PHY_GATE(0)); - #if defined(FIIO_M3K) || defined(EROS_QN) /* * Need to bring up MPLL before booting Linux -- cgit v1.2.3