Skip to contentSkip to conversation

linux: adjust Solarflare Kconfig additions

PATCH In review Jan Beulich 3 participants 6 messages Feb 21, 2008 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux: adjust Solarflare Kconfig additions

Cleanup drivers/xen/Kconfig after the Solarflare additions:
- placement of new items should not disturb menu hierarchy
- dependencies of XEN_NETDEV_ACCEL_SFC_BACKEND were missing
- use tabs for indentation

As usual, written and tested on 2.6.24.1 and made apply to the 2.6.18 tree without further testing.

drivers/xen/Kconfig +12 -13
Index: head-2008-02-20/drivers/xen/Kconfig
===================================================================
@@ -30,6 +30,9 @@ config XEN_XENBUS_DEV
 	def_bool y
 	depends on PROC_FS
 
+config XEN_NETDEV_ACCEL_SFC_UTIL
+	tristate
+
 config XEN_BACKEND
         tristate "Backend driver support"
         default XEN_PRIVILEGED_GUEST
@@ -79,15 +82,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
 	  are unsure; or if you experience network hangs when this option is
 	  enabled; then you must say N here.
 
-config XEN_NETDEV_ACCEL_SFC_UTIL
-        tristate
-        default n
-
 config XEN_NETDEV_ACCEL_SFC_BACKEND
 	tristate "Network-device backend driver acceleration for Solarflare NICs"
-        depends on XEN_NETDEV_BACKEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-        default m
+	depends on SFC && SFC_RESOURCE && XEN_NETDEV_BACKEND
+	select XEN_NETDEV_ACCEL_SFC_UTIL
+	default m
 
 config XEN_NETDEV_LOOPBACK
 	tristate "Network-device loopback driver"
@@ -185,6 +184,12 @@ config XEN_NETDEV_FRONTEND
 	  dedicated device-driver domain, or your master control domain
 	  (domain 0), then you almost certainly want to say Y here.
 
+config XEN_NETDEV_ACCEL_SFC_FRONTEND
+	tristate "Network-device frontend driver acceleration for Solarflare NICs"
+	depends on XEN_NETDEV_FRONTEND
+	select XEN_NETDEV_ACCEL_SFC_UTIL
+	default m
+
 config XEN_GRANT_DEV
 	tristate "User-space granted page access driver"
 	default XEN_PRIVILEGED_GUEST
@@ -192,12 +197,6 @@ config XEN_GRANT_DEV
 	  Device for accessing (in user-space) pages that have been granted
 	  by other domains.
 
-config XEN_NETDEV_ACCEL_SFC_FRONTEND
-	tristate "Network-device frontend driver acceleration for Solarflare NICs"
-	depends on XEN_NETDEV_FRONTEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-	default m
-
 config XEN_FRAMEBUFFER
 	tristate "Framebuffer-device frontend driver"
 	depends on FB
#1 lore raw

Does this require changing our defconfig files?

-- Keir

Quoted 78 lines · Jan Beulich

Cleanup drivers/xen/Kconfig after the Solarflare additions:
- placement of new items should not disturb menu hierarchy
- dependencies of XEN_NETDEV_ACCEL_SFC_BACKEND were missing
- use tabs for indentation

As usual, written and tested on 2.6.24.1 and made apply to the 2.6.18 tree without further testing.

Index: head-2008-02-20/drivers/xen/Kconfig
===================================================================
--- head-2008-02-20.orig/drivers/xen/Kconfig 2008-02-20 15:30:01.000000000 +0100
+++ head-2008-02-20/drivers/xen/Kconfig 2008-02-20 15:32:18.000000000 +0100

(quoted diff) +0 -0
@@ -30,6 +30,9 @@ config XEN_XENBUS_DEV

def_bool y
depends on PROC_FS

drivers/xen/Kconfig +3 -4
+config XEN_NETDEV_ACCEL_SFC_UTIL
+ tristate
+
 config XEN_BACKEND
         tristate "Backend driver support"
         default XEN_PRIVILEGED_GUEST
@@ -79,15 +82,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
 are unsure; or if you experience network hangs when this option is
 enabled; then you must say N here.
 
-config XEN_NETDEV_ACCEL_SFC_UTIL
-        tristate
-        default n
-
 config XEN_NETDEV_ACCEL_SFC_BACKEND

tristate "Network-device backend driver acceleration for Solarflare NICs"

drivers/xen/Kconfig +3 -3
-        depends on XEN_NETDEV_BACKEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-        default m
+ depends on SFC && SFC_RESOURCE && XEN_NETDEV_BACKEND
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m
 
 config XEN_NETDEV_LOOPBACK

tristate "Network-device loopback driver"

drivers/xen/Kconfig +6 -0
@@ -185,6 +184,12 @@ config XEN_NETDEV_FRONTEND
 dedicated device-driver domain, or your master control domain
 (domain 0), then you almost certainly want to say Y here.
 
+config XEN_NETDEV_ACCEL_SFC_FRONTEND
+ tristate "Network-device frontend driver acceleration for Solarflare NICs"
+ depends on XEN_NETDEV_FRONTEND
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m
+
 config XEN_GRANT_DEV

tristate "User-space granted page access driver"
default XEN_PRIVILEGED_GUEST

drivers/xen/Kconfig +0 -6
@@ -192,12 +197,6 @@ config XEN_GRANT_DEV
 Device for accessing (in user-space) pages that have been granted
 by other domains.
 
-config XEN_NETDEV_ACCEL_SFC_FRONTEND
- tristate "Network-device frontend driver acceleration for Solarflare NICs"
- depends on XEN_NETDEV_FRONTEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
- default m
-
 config XEN_FRAMEBUFFER

tristate "Framebuffer-device frontend driver"
depends on FB

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#2 lore raw

I don't think so, unless you require them to go through a 'make oldconfig' entirely unmodified. The patch just modifies ordering (and dependencies), so the present settings (all SFC options off) should work fine (with SFC off, the line

# CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND is not set

would be removed by a subsequent 'make oldconfig', and

# CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL is not set

is also not being generated in 2.6.24 anymore - not sure about older kernel versions, though).

Jan

Quoted 1 line
Quoted 1 line
Quoted 1 line

Keir Fraser <[email protected]> 21.02.08 10:21 >>>

Does this require changing our defconfig files?

-- Keir

Quoted 78 lines · Jan Beulich

Cleanup drivers/xen/Kconfig after the Solarflare additions:
- placement of new items should not disturb menu hierarchy
- dependencies of XEN_NETDEV_ACCEL_SFC_BACKEND were missing
- use tabs for indentation

As usual, written and tested on 2.6.24.1 and made apply to the 2.6.18 tree without further testing.

Index: head-2008-02-20/drivers/xen/Kconfig
===================================================================
--- head-2008-02-20.orig/drivers/xen/Kconfig 2008-02-20 15:30:01.000000000 +0100
+++ head-2008-02-20/drivers/xen/Kconfig 2008-02-20 15:32:18.000000000 +0100

(quoted diff) +0 -0
@@ -30,6 +30,9 @@ config XEN_XENBUS_DEV

def_bool y
depends on PROC_FS

drivers/xen/Kconfig +3 -4
+config XEN_NETDEV_ACCEL_SFC_UTIL
+ tristate
+
 config XEN_BACKEND
         tristate "Backend driver support"
         default XEN_PRIVILEGED_GUEST
@@ -79,15 +82,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
 are unsure; or if you experience network hangs when this option is
 enabled; then you must say N here.
 
-config XEN_NETDEV_ACCEL_SFC_UTIL
-        tristate
-        default n
-
 config XEN_NETDEV_ACCEL_SFC_BACKEND

tristate "Network-device backend driver acceleration for Solarflare NICs"

drivers/xen/Kconfig +3 -3
-        depends on XEN_NETDEV_BACKEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-        default m
+ depends on SFC && SFC_RESOURCE && XEN_NETDEV_BACKEND
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m
 
 config XEN_NETDEV_LOOPBACK

tristate "Network-device loopback driver"

drivers/xen/Kconfig +6 -0
@@ -185,6 +184,12 @@ config XEN_NETDEV_FRONTEND
 dedicated device-driver domain, or your master control domain
 (domain 0), then you almost certainly want to say Y here.
 
+config XEN_NETDEV_ACCEL_SFC_FRONTEND
+ tristate "Network-device frontend driver acceleration for Solarflare NICs"
+ depends on XEN_NETDEV_FRONTEND
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m
+
 config XEN_GRANT_DEV

tristate "User-space granted page access driver"
default XEN_PRIVILEGED_GUEST

drivers/xen/Kconfig +0 -6
@@ -192,12 +197,6 @@ config XEN_GRANT_DEV
 Device for accessing (in user-space) pages that have been granted
 by other domains.
 
-config XEN_NETDEV_ACCEL_SFC_FRONTEND
- tristate "Network-device frontend driver acceleration for Solarflare NICs"
- depends on XEN_NETDEV_FRONTEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
- default m
-
 config XEN_FRAMEBUFFER

tristate "Framebuffer-device frontend driver"
depends on FB

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#3 lore raw

Oh, that's fine, so long as the existing defconfigs can be used without requiring manual intervention.

-- Keir

Quoted 104 lines · Jan Beulich

I don't think so, unless you require them to go through a 'make oldconfig' entirely unmodified. The patch just modifies ordering (and dependencies), so the present settings (all SFC options off) should work fine (with SFC off, the line

# CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND is not set

would be removed by a subsequent 'make oldconfig', and

# CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL is not set

is also not being generated in 2.6.24 anymore - not sure about older kernel versions, though).

Jan

Quoted 1 line
Quoted 1 line
Quoted 1 line

Keir Fraser <[email protected]> 21.02.08 10:21 >>>

Does this require changing our defconfig files?

-- Keir

Quoted 78 lines · Jan Beulich

Cleanup drivers/xen/Kconfig after the Solarflare additions:
- placement of new items should not disturb menu hierarchy
- dependencies of XEN_NETDEV_ACCEL_SFC_BACKEND were missing
- use tabs for indentation

As usual, written and tested on 2.6.24.1 and made apply to the 2.6.18 tree without further testing.

Index: head-2008-02-20/drivers/xen/Kconfig
===================================================================
--- head-2008-02-20.orig/drivers/xen/Kconfig 2008-02-20 15:30:01.000000000 +0100
+++ head-2008-02-20/drivers/xen/Kconfig 2008-02-20 15:32:18.000000000 +0100

(quoted diff) +0 -0
@@ -30,6 +30,9 @@ config XEN_XENBUS_DEV

def_bool y
depends on PROC_FS

drivers/xen/Kconfig +3 -4
+config XEN_NETDEV_ACCEL_SFC_UTIL
+ tristate
+
 config XEN_BACKEND
         tristate "Backend driver support"
         default XEN_PRIVILEGED_GUEST
@@ -79,15 +82,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
 are unsure; or if you experience network hangs when this option is
 enabled; then you must say N here.
 
-config XEN_NETDEV_ACCEL_SFC_UTIL
-        tristate
-        default n
-
 config XEN_NETDEV_ACCEL_SFC_BACKEND

tristate "Network-device backend driver acceleration for Solarflare NICs"

drivers/xen/Kconfig +3 -3
-        depends on XEN_NETDEV_BACKEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-        default m
+ depends on SFC && SFC_RESOURCE && XEN_NETDEV_BACKEND
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m
 
 config XEN_NETDEV_LOOPBACK

tristate "Network-device loopback driver"

drivers/xen/Kconfig +6 -0
@@ -185,6 +184,12 @@ config XEN_NETDEV_FRONTEND
 dedicated device-driver domain, or your master control domain
 (domain 0), then you almost certainly want to say Y here.
 
+config XEN_NETDEV_ACCEL_SFC_FRONTEND
+ tristate "Network-device frontend driver acceleration for Solarflare NICs"
+ depends on XEN_NETDEV_FRONTEND
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m
+
 config XEN_GRANT_DEV

tristate "User-space granted page access driver"
default XEN_PRIVILEGED_GUEST

drivers/xen/Kconfig +0 -6
@@ -192,12 +197,6 @@ config XEN_GRANT_DEV
 Device for accessing (in user-space) pages that have been granted
 by other domains.
 
-config XEN_NETDEV_ACCEL_SFC_FRONTEND
- tristate "Network-device frontend driver acceleration for Solarflare NICs"
- depends on XEN_NETDEV_FRONTEND
-        select XEN_NETDEV_ACCEL_SFC_UTIL
- default m
-
 config XEN_FRAMEBUFFER

tristate "Framebuffer-device frontend driver"
depends on FB

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#4 lore raw
In reply to Jan Beulich
Quoted 4 lines · Jan Beulich

Cleanup drivers/xen/Kconfig after the Solarflare additions:
- placement of new items should not disturb menu hierarchy
- dependencies of XEN_NETDEV_ACCEL_SFC_BACKEND were missing
- use tabs for indentation

Here's a respin to apply to the staging tree that won't conflict with the earlier change to depend on X86.

Signed-off-by Kieran Mansley <[email protected]>

drivers/xen/Kconfig +4 -5
diff -r e65b5bb502d3 drivers/xen/Kconfig
@@ -29,6 +29,10 @@ config XEN_XENBUS_DEV
 config XEN_XENBUS_DEV
 	def_bool y
 	depends on PROC_FS
+
+config XEN_NETDEV_ACCEL_SFC_UTIL
+    	depends on X86    
+	tristate
 
 config XEN_BACKEND
         tristate "Backend driver support"
@@ -79,16 +83,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
 	  are unsure; or if you experience network hangs when this option is
 	  enabled; then you must say N here.
 
-config XEN_NETDEV_ACCEL_SFC_UTIL
-        tristate
-        depends on X86
-        default n
-
 config XEN_NETDEV_ACCEL_SFC_BACKEND
 	tristate "Network-device backend driver acceleration for Solarflare

NICs"

-        depends on XEN_NETDEV_BACKEND && SFC && SFC_RESOURCE && X86
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-        default m

+ depends on XEN_NETDEV_BACKEND && SFC && SFC_RESOURCE && X86
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m

config XEN_NETDEV_LOOPBACK
tristate "Network-device loopback driver"
@@ -186,18 +185,18 @@ config XEN_NETDEV_FRONTEND
dedicated device-driver domain, or your master control domain (domain 0), then you almost certainly want to say Y here.

+config XEN_NETDEV_ACCEL_SFC_FRONTEND
+ tristate "Network-device frontend driver acceleration for Solarflare
NICs"
+ depends on XEN_NETDEV_FRONTEND && X86
+ select XEN_NETDEV_ACCEL_SFC_UTIL
+ default m
+
config XEN_GRANT_DEV
tristate "User-space granted page access driver" default XEN_PRIVILEGED_GUEST
help
Device for accessing (in user-space) pages that have been granted by other domains.
-
-config XEN_NETDEV_ACCEL_SFC_FRONTEND
- tristate "Network-device frontend driver acceleration for Solarflare
NICs"
- depends on XEN_NETDEV_FRONTEND && X86
- select XEN_NETDEV_ACCEL_SFC_UTIL
- default m

config XEN_FRAMEBUFFER
tristate "Framebuffer-device frontend driver"

drivers/xen/Kconfig +13 -14
diff -r e65b5bb502d3 drivers/xen/Kconfig
@@ -29,6 +29,10 @@ config XEN_XENBUS_DEV
 config XEN_XENBUS_DEV
 	def_bool y
 	depends on PROC_FS
+
+config XEN_NETDEV_ACCEL_SFC_UTIL
+    	depends on X86    
+	tristate
 
 config XEN_BACKEND
         tristate "Backend driver support"
@@ -79,16 +83,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
 	  are unsure; or if you experience network hangs when this option is
 	  enabled; then you must say N here.
 
-config XEN_NETDEV_ACCEL_SFC_UTIL
-        tristate
-        depends on X86
-        default n
-
 config XEN_NETDEV_ACCEL_SFC_BACKEND
 	tristate "Network-device backend driver acceleration for Solarflare NICs"
-        depends on XEN_NETDEV_BACKEND && SFC && SFC_RESOURCE && X86
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-        default m
+	depends on XEN_NETDEV_BACKEND && SFC && SFC_RESOURCE && X86
+	select XEN_NETDEV_ACCEL_SFC_UTIL
+	default m
 
 config XEN_NETDEV_LOOPBACK
 	tristate "Network-device loopback driver"
@@ -186,18 +185,18 @@ config XEN_NETDEV_FRONTEND
 	  dedicated device-driver domain, or your master control domain
 	  (domain 0), then you almost certainly want to say Y here.
 
+config XEN_NETDEV_ACCEL_SFC_FRONTEND
+	tristate "Network-device frontend driver acceleration for Solarflare NICs"
+	depends on XEN_NETDEV_FRONTEND && X86
+	select XEN_NETDEV_ACCEL_SFC_UTIL
+	default m
+
 config XEN_GRANT_DEV
 	tristate "User-space granted page access driver"
 	default XEN_PRIVILEGED_GUEST
 	help
 	  Device for accessing (in user-space) pages that have been granted
 	  by other domains.
-
-config XEN_NETDEV_ACCEL_SFC_FRONTEND
-	tristate "Network-device frontend driver acceleration for Solarflare NICs"
-	depends on XEN_NETDEV_FRONTEND && X86
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-	default m
 
 config XEN_FRAMEBUFFER
 	tristate "Framebuffer-device frontend driver"

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#5 lore raw
Quoted 11 lines
drivers/xen/Kconfig +0 -0
@@ -29,6 +29,10 @@ config XEN_XENBUS_DEV

config XEN_XENBUS_DEV
def_bool y
depends on PROC_FS

drivers/xen/Kconfig +4 -0
+
+config XEN_NETDEV_ACCEL_SFC_UTIL
+    	depends on X86    
+	tristate
Quoted 2 lines

config XEN_BACKEND
tristate "Backend driver support"

The 'depends on X86' here is unnecessary, as this is an option that can only be 'select'-ed.

Jan