| Message ID | 20210920100301.1466486-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] firmware: arm_scmi: fix VIRTIO dependency | expand |
On Mon, Sep 20, 2021 at 12:02:51PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Building with CONFIG_VIRTIO=m but CONFIG_ARM_SCMI_PROTOCOL=y leads to > a link error for the scmi virtio transport: > > arm-linux-gnueabi-ld: drivers/firmware/arm_scmi/virtio.o: in function `virtio_send_message': > virtio.c:(.text+0x200): undefined reference to `virtqueue_add_sgs' > arm-linux-gnueabi-ld: virtio.c:(.text+0x280): undefined reference to `virtqueue_kick' > arm-linux-gnueabi-ld: drivers/firmware/arm_scmi/virtio.o: in function `scmi_vio_feed_vq_rx': > virtio.c:(.text+0x390): undefined reference to `virtqueue_add_inbuf' > arm-linux-gnueabi-ld: virtio.c:(.text+0x3dc): undefined reference to `virtqueue_kick' > arm-linux-gnueabi-ld: drivers/firmware/arm_scmi/virtio.o: in function `virtio_scmi_exit': > virtio.c:(.text+0x538): undefined reference to `unregister_virtio_driver' > arm-linux-gnueabi-ld: drivers/firmware/arm_scmi/virtio.o: in function `virtio_chan_available': > > Prevent this configuration by making the Kconfig dependency a bit > stricter. > > Fixes: 46abe13b5e3d ("firmware: arm_scmi: Add virtio transport") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/firmware/arm_scmi/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Hi Arnd, I have already queued similar fix by Cristain[1] a while ago. I was waiting to get other possible fixes sorted before sending pull request. Sorry for that, will do that soon.
diff --git a/drivers/firmware/arm_scmi/Kconfig b/drivers/firmware/arm_scmi/Kconfig index 7f4d2435503b..3d7081e84853 100644 --- a/drivers/firmware/arm_scmi/Kconfig +++ b/drivers/firmware/arm_scmi/Kconfig @@ -68,7 +68,7 @@ config ARM_SCMI_TRANSPORT_SMC config ARM_SCMI_TRANSPORT_VIRTIO bool "SCMI transport based on VirtIO" - depends on VIRTIO + depends on VIRTIO=y || VIRTIO=ARM_SCMI_PROTOCOL select ARM_SCMI_HAVE_TRANSPORT select ARM_SCMI_HAVE_MSG help