On Wed, Feb 06, 2019 at 02:17:11PM -0800, Guenter Roeck wrote: > On Thu, Jan 24, 2019 at 07:03:53PM +0200, Timo Alho wrote: > > Split BPMP driver into common and chip specific parts to facilitate > > adding support for previous and future Tegra chips that are using BPMP > > as co-processor. > > > > Signed-off-by: Timo Alho <ta...@nvidia.com> > > Acked-by: Jon Hunter <jonath...@nvidia.com> > > Signed-off-by: Thierry Reding <tred...@nvidia.com> > > arm:allmodconfig in linux-next: > > drivers/firmware/tegra/bpmp.o:(.rodata+0x280): undefined reference to > `tegra210_bpmp_ops' > drivers/firmware/tegra/bpmp.o:(.rodata+0x2ac): undefined reference to > `tegra186_bpmp_ops'
Hi Guenter, this should be fixed by the below patch. Running build tests now. Thierry --- >8 --- diff --git a/drivers/firmware/tegra/bpmp-private.h b/drivers/firmware/tegra/bpmp-private.h index 07c3d46abb87..cc343f4ebafb 100644 --- a/drivers/firmware/tegra/bpmp-private.h +++ b/drivers/firmware/tegra/bpmp-private.h @@ -23,7 +23,11 @@ struct tegra_bpmp_ops { int (*resume)(struct tegra_bpmp *bpmp); }; +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) extern const struct tegra_bpmp_ops tegra186_bpmp_ops; +#endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) extern const struct tegra_bpmp_ops tegra210_bpmp_ops; +#endif #endif diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 8e3f79959d48..6498c848c82c 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -813,6 +813,7 @@ static int __maybe_unused tegra_bpmp_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(tegra_bpmp_pm_ops, NULL, tegra_bpmp_resume); +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) static const struct tegra_bpmp_soc tegra186_soc = { .channels = { .cpu_tx = { @@ -832,7 +833,9 @@ static const struct tegra_bpmp_soc tegra186_soc = { .ops = &tegra186_bpmp_ops, .num_resets = 193, }; +#endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) static const struct tegra_bpmp_soc tegra210_soc = { .channels = { .cpu_tx = { @@ -853,10 +856,15 @@ static const struct tegra_bpmp_soc tegra210_soc = { }, .ops = &tegra210_bpmp_ops, }; +#endif static const struct of_device_id tegra_bpmp_match[] = { +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc }, +#endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) { .compatible = "nvidia,tegra210-bpmp", .data = &tegra210_soc }, +#endif { } };
signature.asc
Description: PGP signature