Skip to contentSkip to conversation

vdpa: move to drivers/vdpa

PATCH In review Michael S. Tsirkin 3 participants 3 messages Mar 31, 2020 – Apr 1, 2020

Subsystems (2)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

PATCH 1/1 vdpa: move to drivers/vdpa

We have both vhost and virtio drivers that depend on vdpa. It's easier to locate it at a top level directory otherwise we run into issues e.g. if vhost is built-in but virtio is modular. Let's just move it up a level.

---

Randy I'd say the issue you are reporting (vhost=y, virtio=m) is esoteric enough not to require a rebase for this. So I'd just apply this on top.
Do you agree?

 MAINTAINERS                                   | 1 +
 drivers/Kconfig                               | 2 ++
 drivers/Makefile                              | 1 +
 drivers/{virtio => }/vdpa/Kconfig             | 0
 drivers/{virtio => }/vdpa/Makefile            | 0
 drivers/{virtio => }/vdpa/ifcvf/Makefile      | 0
 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c  | 0
 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h  | 0
 drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c  | 0
 drivers/{virtio => }/vdpa/vdpa.c              | 0
 drivers/{virtio => }/vdpa/vdpa_sim/Makefile   | 0
 drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c | 0
 drivers/virtio/Kconfig                        | 2 --
 13 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/{virtio => }/vdpa/Kconfig (100%)
 rename drivers/{virtio => }/vdpa/Makefile (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/Makefile (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c (100%)
 rename drivers/{virtio => }/vdpa/vdpa.c (100%)
 rename drivers/{virtio => }/vdpa/vdpa_sim/Makefile (100%)
 rename drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c (100%)
MAINTAINERS +1 -0
index 70c47bc55343..7cfa55c765fd 100644
@@ -17695,6 +17695,7 @@ L:	[email protected]
 S:	Maintained
 F:	Documentation/devicetree/bindings/virtio/
 F:	drivers/virtio/
+F:	drivers/vdpa/
 F:	tools/virtio/
 F:	drivers/net/virtio_net.c
 F:	drivers/block/virtio_blk.c
drivers/Kconfig +2 -0
index 7a6d8b2b68b4..ac23d520e916 100644
@@ -138,6 +138,8 @@ source "drivers/virt/Kconfig"
 
 source "drivers/virtio/Kconfig"
 
+source "drivers/vdpa/Kconfig"
+
 source "drivers/vhost/Kconfig"
 
 source "drivers/hv/Kconfig"
drivers/Makefile +1 -0
index 31cf17dee252..21688f3b1588 100644
@@ -42,6 +42,7 @@ obj-$(CONFIG_DMADEVICES)	+= dma/
 obj-y				+= soc/
 
 obj-$(CONFIG_VIRTIO)		+= virtio/
+obj-$(CONFIG_VDPA)		+= vdpa/
 obj-$(CONFIG_XEN)		+= xen/
 
 # regulators early, since some subsystems rely on them to initialize
drivers/vdpa/Kconfig renamed from drivers/virtio/vdpa/Kconfig +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/Kconfig
rename to drivers/vdpa/Kconfig
drivers/vdpa/Makefile renamed from drivers/virtio/vdpa/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/Makefile
rename to drivers/vdpa/Makefile
drivers/vdpa/ifcvf/Makefile renamed from drivers/virtio/vdpa/ifcvf/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/Makefile
rename to drivers/vdpa/ifcvf/Makefile
drivers/vdpa/ifcvf/ifcvf_base.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_base.c
rename to drivers/vdpa/ifcvf/ifcvf_base.c
drivers/vdpa/ifcvf/ifcvf_base.h renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.h +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_base.h
rename to drivers/vdpa/ifcvf/ifcvf_base.h
drivers/vdpa/ifcvf/ifcvf_main.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_main.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_main.c
rename to drivers/vdpa/ifcvf/ifcvf_main.c
drivers/vdpa/vdpa.c renamed from drivers/virtio/vdpa/vdpa.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa.c
rename to drivers/vdpa/vdpa.c
drivers/vdpa/vdpa_sim/Makefile renamed from drivers/virtio/vdpa/vdpa_sim/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa_sim/Makefile
rename to drivers/vdpa/vdpa_sim/Makefile
drivers/vdpa/vdpa_sim/vdpa_sim.c renamed from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c
rename to drivers/vdpa/vdpa_sim/vdpa_sim.c
drivers/virtio/Kconfig +0 -2
index 99e424570644..2aadf398d8cc 100644
@@ -109,5 +109,3 @@ config VIRTIO_MMIO_CMDLINE_DEVICES
 	 If unsure, say 'N'.
 
 endif # VIRTIO_MENU
-
-source "drivers/virtio/vdpa/Kconfig"
Signature · 1 line
MST
#1 lore raw
Quoted 5 lines · Michael S. Tsirkin

We have both vhost and virtio drivers that depend on vdpa. It's easier to locate it at a top level directory otherwise we run into issues e.g. if vhost is built-in but virtio is modular. Let's just move it up a level.

Quoted 8 lines

---

Randy I'd say the issue you are reporting (vhost=y, virtio=m) is esoteric enough not to require a rebase for this. So I'd just apply this on top.
Do you agree?

Sure, looks fine from just reading it.
I haven't had a chance to test it yet.

Thanks.

Quoted 108 lines
 MAINTAINERS                                   | 1 +
 drivers/Kconfig                               | 2 ++
 drivers/Makefile                              | 1 +
 drivers/{virtio => }/vdpa/Kconfig             | 0
 drivers/{virtio => }/vdpa/Makefile            | 0
 drivers/{virtio => }/vdpa/ifcvf/Makefile      | 0
 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c  | 0
 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h  | 0
 drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c  | 0
 drivers/{virtio => }/vdpa/vdpa.c              | 0
 drivers/{virtio => }/vdpa/vdpa_sim/Makefile   | 0
 drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c | 0
 drivers/virtio/Kconfig                        | 2 --
 13 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/{virtio => }/vdpa/Kconfig (100%)
 rename drivers/{virtio => }/vdpa/Makefile (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/Makefile (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h (100%)
 rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c (100%)
 rename drivers/{virtio => }/vdpa/vdpa.c (100%)
 rename drivers/{virtio => }/vdpa/vdpa_sim/Makefile (100%)
 rename drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c (100%)
MAINTAINERS +1 -0
index 70c47bc55343..7cfa55c765fd 100644
@@ -17695,6 +17695,7 @@ L:	[email protected]
 S:	Maintained
 F:	Documentation/devicetree/bindings/virtio/
 F:	drivers/virtio/
+F:	drivers/vdpa/
 F:	tools/virtio/
 F:	drivers/net/virtio_net.c
 F:	drivers/block/virtio_blk.c
drivers/Kconfig +2 -0
index 7a6d8b2b68b4..ac23d520e916 100644
@@ -138,6 +138,8 @@ source "drivers/virt/Kconfig"
 
 source "drivers/virtio/Kconfig"
 
+source "drivers/vdpa/Kconfig"
+
 source "drivers/vhost/Kconfig"
 
 source "drivers/hv/Kconfig"
drivers/Makefile +1 -0
index 31cf17dee252..21688f3b1588 100644
@@ -42,6 +42,7 @@ obj-$(CONFIG_DMADEVICES)	+= dma/
 obj-y				+= soc/
 
 obj-$(CONFIG_VIRTIO)		+= virtio/
+obj-$(CONFIG_VDPA)		+= vdpa/
 obj-$(CONFIG_XEN)		+= xen/
 
 # regulators early, since some subsystems rely on them to initialize
drivers/vdpa/Kconfig renamed from drivers/virtio/vdpa/Kconfig +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/Kconfig
rename to drivers/vdpa/Kconfig
drivers/vdpa/Makefile renamed from drivers/virtio/vdpa/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/Makefile
rename to drivers/vdpa/Makefile
drivers/vdpa/ifcvf/Makefile renamed from drivers/virtio/vdpa/ifcvf/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/Makefile
rename to drivers/vdpa/ifcvf/Makefile
drivers/vdpa/ifcvf/ifcvf_base.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_base.c
rename to drivers/vdpa/ifcvf/ifcvf_base.c
drivers/vdpa/ifcvf/ifcvf_base.h renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.h +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_base.h
rename to drivers/vdpa/ifcvf/ifcvf_base.h
drivers/vdpa/ifcvf/ifcvf_main.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_main.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_main.c
rename to drivers/vdpa/ifcvf/ifcvf_main.c
drivers/vdpa/vdpa.c renamed from drivers/virtio/vdpa/vdpa.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa.c
rename to drivers/vdpa/vdpa.c
drivers/vdpa/vdpa_sim/Makefile renamed from drivers/virtio/vdpa/vdpa_sim/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa_sim/Makefile
rename to drivers/vdpa/vdpa_sim/Makefile
drivers/vdpa/vdpa_sim/vdpa_sim.c renamed from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c
rename to drivers/vdpa/vdpa_sim/vdpa_sim.c
drivers/virtio/Kconfig +0 -2
index 99e424570644..2aadf398d8cc 100644
@@ -109,5 +109,3 @@ config VIRTIO_MMIO_CMDLINE_DEVICES
 	 If unsure, say 'N'.
 
 endif # VIRTIO_MENU
-
-source "drivers/virtio/vdpa/Kconfig"
Signature · 2 lines
~Randy
Reported-by: Randy Dunlap <[email protected]>
Acked-by on v1 1/1
#2 lore raw
In reply to Michael S. Tsirkin
Quoted 7 lines · Michael S. Tsirkin

We have both vhost and virtio drivers that depend on vdpa. It's easier to locate it at a top level directory otherwise we run into issues e.g. if vhost is built-in but virtio is modular. Let's just move it up a level.

Thanks

Quoted 114 lines

---

Randy I'd say the issue you are reporting (vhost=y, virtio=m) is esoteric enough not to require a rebase for this. So I'd just apply this on top.
Do you agree?

  MAINTAINERS                                   | 1 +
  drivers/Kconfig                               | 2 ++
  drivers/Makefile                              | 1 +
  drivers/{virtio => }/vdpa/Kconfig             | 0
  drivers/{virtio => }/vdpa/Makefile            | 0
  drivers/{virtio => }/vdpa/ifcvf/Makefile      | 0
  drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c  | 0
  drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h  | 0
  drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c  | 0
  drivers/{virtio => }/vdpa/vdpa.c              | 0
  drivers/{virtio => }/vdpa/vdpa_sim/Makefile   | 0
  drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c | 0
  drivers/virtio/Kconfig                        | 2 --
  13 files changed, 4 insertions(+), 2 deletions(-)

rename drivers/{virtio => }/vdpa/Kconfig (100%) rename drivers/{virtio => }/vdpa/Makefile (100%) rename drivers/{virtio => }/vdpa/ifcvf/Makefile (100%) rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c (100%) rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h (100%) rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c (100%) rename drivers/{virtio => }/vdpa/vdpa.c (100%) rename drivers/{virtio => }/vdpa/vdpa_sim/Makefile (100%) rename drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c (100%)

MAINTAINERS +1 -0
index 70c47bc55343..7cfa55c765fd 100644
@@ -17695,6 +17695,7 @@ L:	[email protected]
  S:	Maintained
  F:	Documentation/devicetree/bindings/virtio/
  F:	drivers/virtio/
+F:	drivers/vdpa/
  F:	tools/virtio/
  F:	drivers/net/virtio_net.c
  F:	drivers/block/virtio_blk.c
drivers/Kconfig +2 -0
index 7a6d8b2b68b4..ac23d520e916 100644
@@ -138,6 +138,8 @@ source "drivers/virt/Kconfig"
 
  source "drivers/virtio/Kconfig"
 
+source "drivers/vdpa/Kconfig"
+
  source "drivers/vhost/Kconfig"
 
  source "drivers/hv/Kconfig"
drivers/Makefile +1 -0
index 31cf17dee252..21688f3b1588 100644
@@ -42,6 +42,7 @@ obj-$(CONFIG_DMADEVICES)	+= dma/
  obj-y				+= soc/
 
  obj-$(CONFIG_VIRTIO)		+= virtio/
+obj-$(CONFIG_VDPA)		+= vdpa/
  obj-$(CONFIG_XEN)		+= xen/
 
  # regulators early, since some subsystems rely on them to initialize
drivers/vdpa/Kconfig renamed from drivers/virtio/vdpa/Kconfig +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/Kconfig
rename to drivers/vdpa/Kconfig
drivers/vdpa/Makefile renamed from drivers/virtio/vdpa/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/Makefile
rename to drivers/vdpa/Makefile
drivers/vdpa/ifcvf/Makefile renamed from drivers/virtio/vdpa/ifcvf/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/Makefile
rename to drivers/vdpa/ifcvf/Makefile
drivers/vdpa/ifcvf/ifcvf_base.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_base.c
rename to drivers/vdpa/ifcvf/ifcvf_base.c
drivers/vdpa/ifcvf/ifcvf_base.h renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.h +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_base.h
rename to drivers/vdpa/ifcvf/ifcvf_base.h
drivers/vdpa/ifcvf/ifcvf_main.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_main.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/ifcvf/ifcvf_main.c
rename to drivers/vdpa/ifcvf/ifcvf_main.c
drivers/vdpa/vdpa.c renamed from drivers/virtio/vdpa/vdpa.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa.c
rename to drivers/vdpa/vdpa.c
drivers/vdpa/vdpa_sim/Makefile renamed from drivers/virtio/vdpa/vdpa_sim/Makefile +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa_sim/Makefile
rename to drivers/vdpa/vdpa_sim/Makefile
drivers/vdpa/vdpa_sim/vdpa_sim.c renamed from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c +0 -0
similarity index 100%
rename from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c
rename to drivers/vdpa/vdpa_sim/vdpa_sim.c
drivers/virtio/Kconfig +0 -2
index 99e424570644..2aadf398d8cc 100644
@@ -109,5 +109,3 @@ config VIRTIO_MMIO_CMDLINE_DEVICES
  	 If unsure, say 'N'.
 
  endif # VIRTIO_MENU
-
-source "drivers/virtio/vdpa/Kconfig"