| Message ID | 7105112c38cfe0642a2d9e1779bf784a7aa63d16.1658411666.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 32d00f62db4e982edbee137109407636f71f79b6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: ipa: fix build | expand |
On 7/21/22 8:55 AM, Paolo Abeni wrote: > After commit 2c7b9b936bdc ("net: ipa: move configuration data files > into a subdirectory"), build of the ipa driver fails with the > following error: > > drivers/net/ipa/data/ipa_data-v3.1.c:9:10: fatal error: gsi.h: No such file or directory > > After the mentioned commit, all the file included by the configuration > are in the parent directory. Fix the issue updating the include path. > > Fixes: 2c7b9b936bdc ("net: ipa: move configuration data files into a subdirectory") > Signed-off-by: Paolo Abeni <pabeni@redhat.com> Interesting... This didn't happen for me. Can you tell me more about your particular build environment so I can try to reproduce it? I haven't tested your fix yet in my environment. -Alex > --- > Note: I could not use CFLAGS_* here, due to the relevant compilation > unit name including a slash. Any better option more than welcome! > --- > drivers/net/ipa/data/ipa_data-v3.1.c | 8 ++++---- > drivers/net/ipa/data/ipa_data-v3.5.1.c | 8 ++++---- > drivers/net/ipa/data/ipa_data-v4.11.c | 8 ++++---- > drivers/net/ipa/data/ipa_data-v4.2.c | 8 ++++---- > drivers/net/ipa/data/ipa_data-v4.5.c | 8 ++++---- > drivers/net/ipa/data/ipa_data-v4.9.c | 8 ++++---- > 6 files changed, 24 insertions(+), 24 deletions(-) > > diff --git a/drivers/net/ipa/data/ipa_data-v3.1.c b/drivers/net/ipa/data/ipa_data-v3.1.c > index 00f4e506e6e5..1c1895aea811 100644 > --- a/drivers/net/ipa/data/ipa_data-v3.1.c > +++ b/drivers/net/ipa/data/ipa_data-v3.1.c > @@ -6,10 +6,10 @@ > > #include <linux/log2.h> > > -#include "gsi.h" > -#include "ipa_data.h" > -#include "ipa_endpoint.h" > -#include "ipa_mem.h" > +#include "../gsi.h" > +#include "../ipa_data.h" > +#include "../ipa_endpoint.h" > +#include "../ipa_mem.h" > > /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.1 */ > enum ipa_resource_type { > diff --git a/drivers/net/ipa/data/ipa_data-v3.5.1.c b/drivers/net/ipa/data/ipa_data-v3.5.1.c > index b7e32e87733e..58b708d2fc75 100644 > --- a/drivers/net/ipa/data/ipa_data-v3.5.1.c > +++ b/drivers/net/ipa/data/ipa_data-v3.5.1.c > @@ -6,10 +6,10 @@ > > #include <linux/log2.h> > > -#include "gsi.h" > -#include "ipa_data.h" > -#include "ipa_endpoint.h" > -#include "ipa_mem.h" > +#include "../gsi.h" > +#include "../ipa_data.h" > +#include "../ipa_endpoint.h" > +#include "../ipa_mem.h" > > /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.5.1 */ > enum ipa_resource_type { > diff --git a/drivers/net/ipa/data/ipa_data-v4.11.c b/drivers/net/ipa/data/ipa_data-v4.11.c > index 1be823e5c5c2..a204e439c23d 100644 > --- a/drivers/net/ipa/data/ipa_data-v4.11.c > +++ b/drivers/net/ipa/data/ipa_data-v4.11.c > @@ -4,10 +4,10 @@ > > #include <linux/log2.h> > > -#include "gsi.h" > -#include "ipa_data.h" > -#include "ipa_endpoint.h" > -#include "ipa_mem.h" > +#include "../gsi.h" > +#include "../ipa_data.h" > +#include "../ipa_endpoint.h" > +#include "../ipa_mem.h" > > /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.11 */ > enum ipa_resource_type { > diff --git a/drivers/net/ipa/data/ipa_data-v4.2.c b/drivers/net/ipa/data/ipa_data-v4.2.c > index 683f1f91042f..04f574fe006f 100644 > --- a/drivers/net/ipa/data/ipa_data-v4.2.c > +++ b/drivers/net/ipa/data/ipa_data-v4.2.c > @@ -4,10 +4,10 @@ > > #include <linux/log2.h> > > -#include "gsi.h" > -#include "ipa_data.h" > -#include "ipa_endpoint.h" > -#include "ipa_mem.h" > +#include "../gsi.h" > +#include "../ipa_data.h" > +#include "../ipa_endpoint.h" > +#include "../ipa_mem.h" > > /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.2 */ > enum ipa_resource_type { > diff --git a/drivers/net/ipa/data/ipa_data-v4.5.c b/drivers/net/ipa/data/ipa_data-v4.5.c > index 79398f286a9c..684239e71f46 100644 > --- a/drivers/net/ipa/data/ipa_data-v4.5.c > +++ b/drivers/net/ipa/data/ipa_data-v4.5.c > @@ -4,10 +4,10 @@ > > #include <linux/log2.h> > > -#include "gsi.h" > -#include "ipa_data.h" > -#include "ipa_endpoint.h" > -#include "ipa_mem.h" > +#include "../gsi.h" > +#include "../ipa_data.h" > +#include "../ipa_endpoint.h" > +#include "../ipa_mem.h" > > /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.5 */ > enum ipa_resource_type { > diff --git a/drivers/net/ipa/data/ipa_data-v4.9.c b/drivers/net/ipa/data/ipa_data-v4.9.c > index 4b96efd05cf2..2333e15f9533 100644 > --- a/drivers/net/ipa/data/ipa_data-v4.9.c > +++ b/drivers/net/ipa/data/ipa_data-v4.9.c > @@ -4,10 +4,10 @@ > > #include <linux/log2.h> > > -#include "gsi.h" > -#include "ipa_data.h" > -#include "ipa_endpoint.h" > -#include "ipa_mem.h" > +#include "../gsi.h" > +#include "../ipa_data.h" > +#include "../ipa_endpoint.h" > +#include "../ipa_mem.h" > > /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.9 */ > enum ipa_resource_type {
On Thu, 2022-07-21 at 09:15 -0500, Alex Elder wrote: > On 7/21/22 8:55 AM, Paolo Abeni wrote: > > After commit 2c7b9b936bdc ("net: ipa: move configuration data files > > into a subdirectory"), build of the ipa driver fails with the > > following error: > > > > drivers/net/ipa/data/ipa_data-v3.1.c:9:10: fatal error: gsi.h: No such file or directory > > > > After the mentioned commit, all the file included by the configuration > > are in the parent directory. Fix the issue updating the include path. > > > > Fixes: 2c7b9b936bdc ("net: ipa: move configuration data files into a subdirectory") > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > > Interesting... This didn't happen for me. > > > Can you tell me more about your particular build environment > so I can try to reproduce it? I haven't tested your fix yet > in my environment. Possibly ENOCOFFEE here, but on net-next@bf2200e8491b, make clean; make allmodconfig; make fails reproducibly here, with gcc 11.3.1, make 4.3. Do you have by chance uncommited local changes? Thanks Paolo
On Thu, 21 Jul 2022 16:50:20 +0200 Paolo Abeni wrote: > > Interesting... This didn't happen for me. > > > > > > Can you tell me more about your particular build environment > > so I can try to reproduce it? I haven't tested your fix yet > > in my environment. > > Possibly ENOCOFFEE here, but on net-next@bf2200e8491b, > > make clean; make allmodconfig; make > > fails reproducibly here, with gcc 11.3.1, make 4.3. > > Do you have by chance uncommited local changes? Oh, poops. You're right. I think all - the build bots, Alex and I build with O=builddir, in which case the build works. I'll let the build bot catch up to your fix and apply it. Sorry about that!
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 21 Jul 2022 15:55:14 +0200 you wrote: > After commit 2c7b9b936bdc ("net: ipa: move configuration data files > into a subdirectory"), build of the ipa driver fails with the > following error: > > drivers/net/ipa/data/ipa_data-v3.1.c:9:10: fatal error: gsi.h: No such file or directory > > After the mentioned commit, all the file included by the configuration > are in the parent directory. Fix the issue updating the include path. > > [...] Here is the summary with links: - [net-next] net: ipa: fix build https://git.kernel.org/netdev/net-next/c/32d00f62db4e You are awesome, thank you!
On 7/21/22 11:41 AM, Jakub Kicinski wrote: > On Thu, 21 Jul 2022 16:50:20 +0200 Paolo Abeni wrote: >>> Interesting... This didn't happen for me. >>> >>> >>> Can you tell me more about your particular build environment >>> so I can try to reproduce it? I haven't tested your fix yet >>> in my environment. >> >> Possibly ENOCOFFEE here, but on net-next@bf2200e8491b, >> >> make clean; make allmodconfig; make >> >> fails reproducibly here, with gcc 11.3.1, make 4.3. >> >> Do you have by chance uncommited local changes? > > Oh, poops. You're right. I think all - the build bots, Alex and I > build with O=builddir, in which case the build works. I'll let the > build bot catch up to your fix and apply it. Sorry about that! I'm glad you know this, I was just about to start figuring out what the difference was: - gcc vs clang - module vs built-in - x86 vs aarch64 And I didn't even think about "O=<builddir>"... Is this the right fix? It's A-OK with me if it is. (I'm about to try to reproduce it now without "O="...) Thank you. -Alex
On Fri, 22 Jul 2022 08:12:03 -0500 Alex Elder wrote:
> Is this the right fix? It's A-OK with me if it is.
It seems so. AFAICT the headers are located one level down in the
directory structure so ../ looks right. Not sure why O=dir/ makes
it work but there are bigger mysteries to chase :)
diff --git a/drivers/net/ipa/data/ipa_data-v3.1.c b/drivers/net/ipa/data/ipa_data-v3.1.c index 00f4e506e6e5..1c1895aea811 100644 --- a/drivers/net/ipa/data/ipa_data-v3.1.c +++ b/drivers/net/ipa/data/ipa_data-v3.1.c @@ -6,10 +6,10 @@ #include <linux/log2.h> -#include "gsi.h" -#include "ipa_data.h" -#include "ipa_endpoint.h" -#include "ipa_mem.h" +#include "../gsi.h" +#include "../ipa_data.h" +#include "../ipa_endpoint.h" +#include "../ipa_mem.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.1 */ enum ipa_resource_type { diff --git a/drivers/net/ipa/data/ipa_data-v3.5.1.c b/drivers/net/ipa/data/ipa_data-v3.5.1.c index b7e32e87733e..58b708d2fc75 100644 --- a/drivers/net/ipa/data/ipa_data-v3.5.1.c +++ b/drivers/net/ipa/data/ipa_data-v3.5.1.c @@ -6,10 +6,10 @@ #include <linux/log2.h> -#include "gsi.h" -#include "ipa_data.h" -#include "ipa_endpoint.h" -#include "ipa_mem.h" +#include "../gsi.h" +#include "../ipa_data.h" +#include "../ipa_endpoint.h" +#include "../ipa_mem.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.5.1 */ enum ipa_resource_type { diff --git a/drivers/net/ipa/data/ipa_data-v4.11.c b/drivers/net/ipa/data/ipa_data-v4.11.c index 1be823e5c5c2..a204e439c23d 100644 --- a/drivers/net/ipa/data/ipa_data-v4.11.c +++ b/drivers/net/ipa/data/ipa_data-v4.11.c @@ -4,10 +4,10 @@ #include <linux/log2.h> -#include "gsi.h" -#include "ipa_data.h" -#include "ipa_endpoint.h" -#include "ipa_mem.h" +#include "../gsi.h" +#include "../ipa_data.h" +#include "../ipa_endpoint.h" +#include "../ipa_mem.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.11 */ enum ipa_resource_type { diff --git a/drivers/net/ipa/data/ipa_data-v4.2.c b/drivers/net/ipa/data/ipa_data-v4.2.c index 683f1f91042f..04f574fe006f 100644 --- a/drivers/net/ipa/data/ipa_data-v4.2.c +++ b/drivers/net/ipa/data/ipa_data-v4.2.c @@ -4,10 +4,10 @@ #include <linux/log2.h> -#include "gsi.h" -#include "ipa_data.h" -#include "ipa_endpoint.h" -#include "ipa_mem.h" +#include "../gsi.h" +#include "../ipa_data.h" +#include "../ipa_endpoint.h" +#include "../ipa_mem.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.2 */ enum ipa_resource_type { diff --git a/drivers/net/ipa/data/ipa_data-v4.5.c b/drivers/net/ipa/data/ipa_data-v4.5.c index 79398f286a9c..684239e71f46 100644 --- a/drivers/net/ipa/data/ipa_data-v4.5.c +++ b/drivers/net/ipa/data/ipa_data-v4.5.c @@ -4,10 +4,10 @@ #include <linux/log2.h> -#include "gsi.h" -#include "ipa_data.h" -#include "ipa_endpoint.h" -#include "ipa_mem.h" +#include "../gsi.h" +#include "../ipa_data.h" +#include "../ipa_endpoint.h" +#include "../ipa_mem.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.5 */ enum ipa_resource_type { diff --git a/drivers/net/ipa/data/ipa_data-v4.9.c b/drivers/net/ipa/data/ipa_data-v4.9.c index 4b96efd05cf2..2333e15f9533 100644 --- a/drivers/net/ipa/data/ipa_data-v4.9.c +++ b/drivers/net/ipa/data/ipa_data-v4.9.c @@ -4,10 +4,10 @@ #include <linux/log2.h> -#include "gsi.h" -#include "ipa_data.h" -#include "ipa_endpoint.h" -#include "ipa_mem.h" +#include "../gsi.h" +#include "../ipa_data.h" +#include "../ipa_endpoint.h" +#include "../ipa_mem.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.9 */ enum ipa_resource_type {
After commit 2c7b9b936bdc ("net: ipa: move configuration data files into a subdirectory"), build of the ipa driver fails with the following error: drivers/net/ipa/data/ipa_data-v3.1.c:9:10: fatal error: gsi.h: No such file or directory After the mentioned commit, all the file included by the configuration are in the parent directory. Fix the issue updating the include path. Fixes: 2c7b9b936bdc ("net: ipa: move configuration data files into a subdirectory") Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- Note: I could not use CFLAGS_* here, due to the relevant compilation unit name including a slash. Any better option more than welcome! --- drivers/net/ipa/data/ipa_data-v3.1.c | 8 ++++---- drivers/net/ipa/data/ipa_data-v3.5.1.c | 8 ++++---- drivers/net/ipa/data/ipa_data-v4.11.c | 8 ++++---- drivers/net/ipa/data/ipa_data-v4.2.c | 8 ++++---- drivers/net/ipa/data/ipa_data-v4.5.c | 8 ++++---- drivers/net/ipa/data/ipa_data-v4.9.c | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-)