[v2,RESEND] soc/fsl/qe: fix usb.c build errors

Commit Message

Randy Dunlap May 21, 2023, 10:52 p.m. UTC

Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set.
This happens when PPC_EP88XC is set, which selects CPM1 & CPM.
When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE
being set. When USB_FSL_QE is set, QE_USB deafults to y, which
causes build errors when QUICC_ENGINE is not set. Making
QE_USB depend on QUICC_ENGINE prevents QE_USB from defaulting to y.

Fixes these build errors:

drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
usb.c:(.text+0x1e): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'

Fixes: 5e41486c408e ("powerpc/QE: add support for QE USB clocks routing")
Signed-off-by: Randy Dunlap <[e-mail]>
Reported-by: kernel test robot <[e-mail]>
Link: https://lore.kernel.org/all/[e-mail]/
Suggested-by: Michael Ellerman <[e-mail]>
Cc: Christophe Leroy <[e-mail]>
Cc: Leo Li <[e-mail]>
Cc: Masahiro Yamada <[e-mail]>
Cc: Nicolas Schier <[e-mail]>
Cc: Qiang Zhao <[e-mail]>
Cc: linuxppc-dev <[e-mail]>
Cc: [e-mail]
Cc: Kumar Gala <[e-mail]>
---
v2: drop Anton Vorontsov <[e-mail]>; rebase/resend

 drivers/soc/fsl/qe/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Comments

Nicolas Schier May 31, 2023, 7:29 a.m. UTC | #1

On Sun, May 21, 2023 at 03:52:16PM -0700 Randy Dunlap wrote:
> Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set.
> This happens when PPC_EP88XC is set, which selects CPM1 & CPM.
> When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE
> being set. When USB_FSL_QE is set, QE_USB deafults to y, which
> causes build errors when QUICC_ENGINE is not set. Making
> QE_USB depend on QUICC_ENGINE prevents QE_USB from defaulting to y.
> 
> Fixes these build errors:
> 
> drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
> usb.c:(.text+0x1e): undefined reference to `qe_immr'
> powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
> powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
> powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
> powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'
> 
> Fixes: 5e41486c408e ("powerpc/QE: add support for QE USB clocks routing")
> Signed-off-by: Randy Dunlap <[e-mail]>
> Reported-by: kernel test robot <[e-mail]>
> Link: https://lore.kernel.org/all/[e-mail]/
> Suggested-by: Michael Ellerman <[e-mail]>
> Cc: Christophe Leroy <[e-mail]>
> Cc: Leo Li <[e-mail]>
> Cc: Masahiro Yamada <[e-mail]>
> Cc: Nicolas Schier <[e-mail]>
> Cc: Qiang Zhao <[e-mail]>
> Cc: linuxppc-dev <[e-mail]>
> Cc: [e-mail]
> Cc: Kumar Gala <[e-mail]>
> ---

I can reproduce the build error and confirm the build dependency fix (but I
have no hardware for testing).

Acked-by: Nicolas Schier <[e-mail]>



> v2: drop Anton Vorontsov <[e-mail]>; rebase/resend
> 
>  drivers/soc/fsl/qe/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff -- a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig
> --- a/drivers/soc/fsl/qe/Kconfig
> +++ b/drivers/soc/fsl/qe/Kconfig
> @@ -62,6 +62,7 @@ config QE_TDM
>  
>  config QE_USB
>  	bool
> +	depends on QUICC_ENGINE
>  	default y if USB_FSL_QE
>  	help
>  	  QE USB Controller support

Leo Li May 31, 2023, 3:58 p.m. UTC | #2

> -----Original Message-----
> From: Randy Dunlap <[e-mail]>
> Sent: Sunday, May 21, 2023 5:52 PM
> To: [e-mail]
> Cc: Randy Dunlap <[e-mail]>; kernel test robot
> <[e-mail]>; Michael Ellerman <[e-mail]>; Christophe
> Leroy <[e-mail]>; Leo Li <[e-mail]>;
> Masahiro Yamada <[e-mail]>; Nicolas Schier
> <[e-mail]>; Qiang Zhao <[e-mail]>; linuxppc-dev
> <[e-mail]>; [e-mail];
> Kumar Gala <[e-mail]>
> Subject: [PATCH v2 RESEND] soc/fsl/qe: fix usb.c build errors
>
> Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set.
> This happens when PPC_EP88XC is set, which selects CPM1 & CPM.
> When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE being set.
> When USB_FSL_QE is set, QE_USB deafults to y, which causes build errors
> when QUICC_ENGINE is not set. Making QE_USB depend on QUICC_ENGINE
> prevents QE_USB from defaulting to y.
>
> Fixes these build errors:
>
> drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
> usb.c:(.text+0x1e): undefined reference to `qe_immr'
> powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
> powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
> powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
> powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'
>
> Fixes: 5e41486c408e ("powerpc/QE: add support for QE USB clocks routing")
> Signed-off-by: Randy Dunlap <[e-mail]>
> Reported-by: kernel test robot <[e-mail]>
> Link:
> https://lore.k/
> ernel.org%2Fall%2F202301101500.pillNv6R-
> lkp%40intel.com%2F&data=05%7C01%7Cleoyang.li%40nxp.com%7Ca43927d9
> 554b4434845608db5a4e0db5%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%
> 7C0%7C638203063513512722%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4
> wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7
> C%7C%7C&sdata=LkLi6lS%2Fh3pVXW%2Bg9fauCWmptC9lRt3sTdkvn0Extqk%
> 3D&reserved=0
> Suggested-by: Michael Ellerman <[e-mail]>
> Cc: Christophe Leroy <[e-mail]>
> Cc: Leo Li <[e-mail]>
> Cc: Masahiro Yamada <[e-mail]>
> Cc: Nicolas Schier <[e-mail]>
> Cc: Qiang Zhao <[e-mail]>
> Cc: linuxppc-dev <[e-mail]>
> Cc: [e-mail]
> Cc: Kumar Gala <[e-mail]>

Applied for next.  Thanks.

Regards,
Leo

Patch

diff -- a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig
--- a/drivers/soc/fsl/qe/Kconfig
+++ b/drivers/soc/fsl/qe/Kconfig
@@ -62,6 +62,7 @@  config QE_TDM
 
 config QE_USB
 	bool
+	depends on QUICC_ENGINE
 	default y if USB_FSL_QE
 	help
 	  QE USB Controller support