Skip to contentSkip to conversation

Commit 9a11899 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) breaks several builds

PATCH In review Guenter Roeck 3 participants 12 messages Aug 26, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Broken builds:
mips:ath79_defconfig
parisc:defconfig
sparc32:defconfig
sparc64:defconfig
tile:defconfig

Error log:
drivers/usb/host/ohci-pci.c: In function 'ohci_pci_init':
drivers/usb/host/ohci-pci.c:309:35: error: 'ohci_suspend' undeclared (first use in this function) drivers/usb/host/ohci-pci.c:309:35: note: each undeclared identifier is reported only once for each function it appears in drivers/usb/host/ohci-pci.c:310:34: error: 'ohci_resume' undeclared (first use in this function) make[3]: *** [drivers/usb/host/ohci-pci.o] Error 1

Guenter

#1 lore raw
Quoted 7 lines · Guenter Roeck

Broken builds:
mips:ath79_defconfig
parisc:defconfig
sparc32:defconfig
sparc64:defconfig
tile:defconfig

Add:
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerps:maple_defconfig

That makes it 8 out of 82 builds, or roughly 10% of all builds.

My qemu test build for powerpc (which has its own config file) fails as well :(.

Guenter

Quoted 8 lines

Error log:
drivers/usb/host/ohci-pci.c: In function 'ohci_pci_init':
drivers/usb/host/ohci-pci.c:309:35: error: 'ohci_suspend' undeclared (first use in this function) drivers/usb/host/ohci-pci.c:309:35: note: each undeclared identifier is reported only once for each function it appears in drivers/usb/host/ohci-pci.c:310:34: error: 'ohci_resume' undeclared (first use in this function) make[3]: *** [drivers/usb/host/ohci-pci.o] Error 1

Guenter

#2 lore raw
Quoted 8 lines · Guenter Roeck
Quoted 7 lines · Guenter Roeck

Broken builds:
mips:ath79_defconfig
parisc:defconfig
sparc32:defconfig
sparc64:defconfig
tile:defconfig

Quoted 8 lines

Add:
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerps:maple_defconfig

That makes it 8 out of 82 builds, or roughly 10% of all builds.

My qemu test build for powerpc (which has its own config file) fails as well :(.

Ugh, I got no reports of this from linux-next or the 0-day build system, odd.

Alan, can you send a follow-on patch to fix this?

thanks,

greg k-h

#3 lore raw
Quoted 14 lines · Greg Kroah-Hartman
Quoted 13 lines · Guenter Roeck
Quoted 7 lines · Guenter Roeck

Broken builds:
mips:ath79_defconfig
parisc:defconfig
sparc32:defconfig
sparc64:defconfig
tile:defconfig

Add:
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerps:maple_defconfig

Quoted 7 lines
Quoted 3 lines

That makes it 8 out of 82 builds, or roughly 10% of all builds.

My qemu test build for powerpc (which has its own config file) fails as well :(.

Ugh, I got no reports of this from linux-next or the 0-day build system, odd.

Maybe the build system isn't as comprehensive as mine, or it just takes a bit longer. My system caught it because you updated linux-stable to 3.11-rc7, which triggers all builds.

The functions are only declared if CONFIG_PM is defined, yet are called unconditionally. This means the patch breaks in all configurations where CONFIG_PM is undefined and CONFIG_USB_OHCI_HCD_PCI is defined.

Add this to the agenda at the kernel summit: We need more automated test coverage. It is a bit scary that my little pc-based server farm catches problems like this faster than everything else out there. And it isn't even the kind of problem I am looking for, but rather a side effect of the builds I am running.

Guenter

maintainer
#4 lore raw
In reply to Greg Kroah-Hartman
Quoted 14 lines · Greg Kroah-Hartman
Quoted 13 lines · Guenter Roeck
Quoted 7 lines · Guenter Roeck

Broken builds:
mips:ath79_defconfig
parisc:defconfig
sparc32:defconfig
sparc64:defconfig
tile:defconfig

Add:
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerps:maple_defconfig

Quoted 8 lines
Quoted 3 lines

That makes it 8 out of 82 builds, or roughly 10% of all builds.

My qemu test build for powerpc (which has its own config file) fails as well :(.

Ugh, I got no reports of this from linux-next or the 0-day build system, odd.

Alan, can you send a follow-on patch to fix this?

I seem to have a blind spot for this sort of thing. Oh well, follow-on patch coming up...

Alan Stern

maintainer
#5 lore raw

PATCH 1/1 USB: OHCI: fix build error related to ohci_suspend/resume

In reply to Greg Kroah-Hartman

Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled.

This patch adds a preprocessor conditional to avoid build errors when PM is disabled.

---

[as1702]

 drivers/usb/host/ohci-pci.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/usb/host/ohci-pci.c +2 -0
Index: usb-3.11/drivers/usb/host/ohci-pci.c
===================================================================
@@ -305,9 +305,11 @@ static int __init ohci_pci_init(void)
 
 	ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides);
 
+#ifdef	CONFIG_PM
 	/* Entries for the PCI suspend/resume callbacks are special */
 	ohci_pci_hc_driver.pci_suspend = ohci_suspend;
 	ohci_pci_hc_driver.pci_resume = ohci_resume;
+#endif
 
 	return pci_register_driver(&ohci_pci_driver);
 }
#6 lore raw

Re: [PATCH] USB: OHCI: fix build error related to ohci_suspend/resume

Quoted 11 lines · Alan Stern

Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled.

This patch adds a preprocessor conditional to avoid build errors when PM is disabled.

---

Guenter and Meelis, does the patch below fix the problem for you?

thanks,

greg k-h

author Tested-by
#7 lore raw

Re: [PATCH] USB: OHCI: fix build error related to ohci_suspend/resume

Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Alan Stern

Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled.

Quoted 9 lines
Quoted 6 lines

This patch adds a preprocessor conditional to avoid build errors when PM is disabled.

---

Guenter and Meelis, does the patch below fix the problem for you?

Previously failing builds:
mips:ath79_defconfig
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerpc:maple_defconfig
parisc:defconfig
tile:defconfig
sparc32:defconfig
sparc64:defconfig

as well as the powerpc qemu test (with the config file used by the yocto project)

All builds pass with the patch applied, as does the qemu test.

Guenter

#8 lore raw

Re: [PATCH] USB: OHCI: fix build error related to ohci_suspend/resume

Quoted 28 lines · Guenter Roeck
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Alan Stern

Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled.

Quoted 9 lines
Quoted 6 lines

This patch adds a preprocessor conditional to avoid build errors when PM is disabled.

---

Guenter and Meelis, does the patch below fix the problem for you?

Previously failing builds:
mips:ath79_defconfig
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerpc:maple_defconfig
parisc:defconfig
tile:defconfig
sparc32:defconfig
sparc64:defconfig

Quoted 4 lines

as well as the powerpc qemu test (with the config file used by the yocto project)

All builds pass with the patch applied, as does the qemu test.

Thanks for testing, I'll queue it up later today (at an airport right now, about to board a flight), and send it to Linus later tonight if no one else has any problems with it.

thanks,

greg k-h

#9 lore raw

Re: [PATCH] USB: OHCI: fix build error related to ohci_suspend/resume

Quoted 29 lines · Greg Kroah-Hartman
Quoted 28 lines · Guenter Roeck
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Alan Stern

Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled.

Quoted 9 lines
Quoted 6 lines

This patch adds a preprocessor conditional to avoid build errors when PM is disabled.

---

Guenter and Meelis, does the patch below fix the problem for you?

Previously failing builds:
mips:ath79_defconfig
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerpc:maple_defconfig
parisc:defconfig
tile:defconfig
sparc32:defconfig
sparc64:defconfig

Quoted 9 lines
Quoted 4 lines

as well as the powerpc qemu test (with the config file used by the yocto project)

All builds pass with the patch applied, as does the qemu test.

Thanks for testing, I'll queue it up later today (at an airport right now, about to board a flight), and send it to Linus later tonight if no one else has any problems with it.

To simplify this kind of testing, I added a 'testing' branch to the list of branches I am auto-building. Right now it runs a complete test cycle with the patch applied on top of v3.11-rc7. This should ensure that the patch doesn't break any previously passing builds. You should see the results in the 'testing' column of the stable queue build table on http://server.roeck-us.net:8010/builders
when you get out of the plane.

Guenter

#10 lore raw

Re: [PATCH] USB: OHCI: fix build error related to ohci_suspend/resume

Quoted 39 lines · Guenter Roeck
Quoted 29 lines · Greg Kroah-Hartman
Quoted 28 lines · Guenter Roeck
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Alan Stern

Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled.

Quoted 9 lines
Quoted 6 lines

This patch adds a preprocessor conditional to avoid build errors when PM is disabled.

---

Guenter and Meelis, does the patch below fix the problem for you?

Previously failing builds:
mips:ath79_defconfig
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerpc:maple_defconfig
parisc:defconfig
tile:defconfig
sparc32:defconfig
sparc64:defconfig

Quoted 9 lines
Quoted 4 lines

as well as the powerpc qemu test (with the config file used by the yocto project)

All builds pass with the patch applied, as does the qemu test.

Thanks for testing, I'll queue it up later today (at an airport right now, about to board a flight), and send it to Linus later tonight if no one else has any problems with it.

Quoted 6 lines

To simplify this kind of testing, I added a 'testing' branch to the list of branches I am auto-building. Right now it runs a complete test cycle with the patch applied on top of v3.11-rc7. This should ensure that the patch doesn't break any previously passing builds. You should see the results in the 'testing' column of the stable queue build table on http://server.roeck-us.net:8010/builders
when you get out of the plane.

Thanks, all looks good, except for xtensa, which says I broke something, but I can't understand what, as I don't see any networking patches in my tree at the moment.

Any ideas?

thanks,

greg k-h

#11 lore raw

Re: [PATCH] USB: OHCI: fix build error related to ohci_suspend/resume

Quoted 47 lines · Greg Kroah-Hartman
Quoted 39 lines · Guenter Roeck
Quoted 29 lines · Greg Kroah-Hartman
Quoted 28 lines · Guenter Roeck
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Alan Stern

Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled.

Quoted 9 lines
Quoted 6 lines

This patch adds a preprocessor conditional to avoid build errors when PM is disabled.

---

Guenter and Meelis, does the patch below fix the problem for you?

Previously failing builds:
mips:ath79_defconfig
powerpc:ppc64e_defconfig
powerpc:cell_defconfig
powerpc:maple_defconfig
parisc:defconfig
tile:defconfig
sparc32:defconfig
sparc64:defconfig

Quoted 9 lines
Quoted 4 lines

as well as the powerpc qemu test (with the config file used by the yocto project)

All builds pass with the patch applied, as does the qemu test.

Thanks for testing, I'll queue it up later today (at an airport right now, about to board a flight), and send it to Linus later tonight if no one else has any problems with it.

Quoted 6 lines

To simplify this kind of testing, I added a 'testing' branch to the list of branches I am auto-building. Right now it runs a complete test cycle with the patch applied on top of v3.11-rc7. This should ensure that the patch doesn't break any previously passing builds. You should see the results in the 'testing' column of the stable queue build table on http://server.roeck-us.net:8010/builders
when you get out of the plane.

Quoted 4 lines

Thanks, all looks good, except for xtensa, which says I broke something, but I can't understand what, as I don't see any networking patches in my tree at the moment.

That has been broken in Linus' tree for a while - at least since I started running my test builds. I don't understand xtensa good enough to know how to fix it. I have seen similar problems before, though, so I suspect it has something to do with the architecture and not with the affected file itself.

I submitted a patch to fix the broken arm:allmodconfig build. Hopefully it should find its way into Linus' tree in the near future.

Guenter