Skip to contentSkip to conversation

xen: Silence compiler warnings

PATCH In review Daniel Kiper 4 participants 14 messages Jul 12, 2014 – Jul 28, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover xen: Silence compiler warnings

Hi,

Here are two patches that follow earlier Xen dom0 EFI series and fix some compiler warnings found during detailed build tests.

Both patches should be applied to:

git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git next

v2 contains fix suggested by Konrad Rzeszutek Wilk.

Daniel

PS I will be on vacation from 14th Jul till 25th Jul.

 arch/x86/xen/Makefile    |    1 +
 arch/x86/xen/efi.c       |   43 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/xen/enlighten.c |   15 +--------------
 arch/x86/xen/xen-ops.h   |    8 ++++++++
 include/xen/xen-ops.h    |    2 +-
 5 files changed, 54 insertions(+), 15 deletions(-)

Daniel Kiper (2):
xen: Silence compiler warnings
arch/x86/xen: Silence compiler warnings

#1 lore raw

PATCH v2 1/2 xen: Silence compiler warnings

Add inline keyword to silence the following compiler warnings if xen_efi_probe() is not used:

CC arch/x86/xen/setup.o
In file included from arch/x86/xen/xen-ops.h:7:0,

                 from arch/x86/xen/setup.c:31:

include/xen/xen-ops.h:43:35: warning: ‘xen_efi_probe’ defined but not used [-Wunused-function]

---
 include/xen/xen-ops.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/xen/xen-ops.h +1 -1
index 771bbba..7491ee5 100644
@@ -40,7 +40,7 @@ bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
 #ifdef CONFIG_XEN_EFI
 extern efi_system_table_t *xen_efi_probe(void);
 #else
-static efi_system_table_t __init *xen_efi_probe(void)
+static inline efi_system_table_t __init *xen_efi_probe(void)
 {
 	return NULL;
 }
Signature · 7 lines
1.7.10.4


_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
#2 lore raw

PATCH v2 1/2 xen: Silence compiler warnings

In reply to Daniel Kiper

Add inline keyword to silence the following compiler warnings if xen_efi_probe() is not used:

CC arch/x86/xen/setup.o
In file included from arch/x86/xen/xen-ops.h:7:0,

                 from arch/x86/xen/setup.c:31:

include/xen/xen-ops.h:43:35: warning: ‘xen_efi_probe’ defined but not used [-Wunused-function]

---
 include/xen/xen-ops.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/xen/xen-ops.h +1 -1
index 771bbba..7491ee5 100644
@@ -40,7 +40,7 @@ bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
 #ifdef CONFIG_XEN_EFI
 extern efi_system_table_t *xen_efi_probe(void);
 #else
-static efi_system_table_t __init *xen_efi_probe(void)
+static inline efi_system_table_t __init *xen_efi_probe(void)
 {
 	return NULL;
 }
Signature · 1 line
1.7.10.4
Reviewed-by on v2 1/2
#3 lore raw
Quoted 10 lines · Daniel Kiper

Add inline keyword to silence the following compiler warnings if xen_efi_probe() is not used:

CC arch/x86/xen/setup.o
In file included from arch/x86/xen/xen-ops.h:7:0,

                from arch/x86/xen/setup.c:31:

include/xen/xen-ops.h:43:35: warning: ‘xen_efi_probe’ defined but not used [-Wunused-function]

Quoted 17 lines

---
include/xen/xen-ops.h | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
include/xen/xen-ops.h +1 -1
index 771bbba..7491ee5 100644
@@ -40,7 +40,7 @@ bool xen_running_on_version_or_later(unsigned int
 major, unsigned int minor);
 #ifdef CONFIG_XEN_EFI
 extern efi_system_table_t *xen_efi_probe(void);
 #else
-static efi_system_table_t __init *xen_efi_probe(void)
+static inline efi_system_table_t __init *xen_efi_probe(void)
 {
 	return NULL;
Quoted 1 line

}

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

Reviewed-by on v2 1/2
#4 lore raw
In reply to Daniel Kiper
Quoted 10 lines · Daniel Kiper

Add inline keyword to silence the following compiler warnings if xen_efi_probe() is not used:

CC arch/x86/xen/setup.o
In file included from arch/x86/xen/xen-ops.h:7:0,

                from arch/x86/xen/setup.c:31:

include/xen/xen-ops.h:43:35: warning: ‘xen_efi_probe’ defined but not used [-Wunused-function]

Quoted 18 lines

---
include/xen/xen-ops.h | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
include/xen/xen-ops.h +1 -1
index 771bbba..7491ee5 100644
@@ -40,7 +40,7 @@ bool xen_running_on_version_or_later(unsigned int
 major, unsigned int minor);
 #ifdef CONFIG_XEN_EFI
 extern efi_system_table_t *xen_efi_probe(void);
 #else
-static efi_system_table_t __init *xen_efi_probe(void)
+static inline efi_system_table_t __init *xen_efi_probe(void)
 {
 	return NULL;

}

#5 lore raw
In reply to Daniel Kiper
Quoted 2 lines · Daniel Kiper

Add inline keyword to silence the following compiler warnings if xen_efi_probe() is not used:

The title and should be:

xen: make stub xen_efi_probe() static inline

Empty stub functions in headers should be inline or the compiler will warn that it is unused.

Do you want this to go via the Xen tree or the EFI one?

David

#6 lore raw

PATCH v2 2/2 arch/x86/xen: Silence compiler warnings

In reply to Daniel Kiper

Compiler complains in the following way when x86 32-bit kernel with Xen support is build:

CC arch/x86/xen/enlighten.o
arch/x86/xen/enlighten.c: In function ‘xen_start_kernel’:
arch/x86/xen/enlighten.c:1726:3: warning: right shift count >= width of type [enabled by default]

Such line contains following EFI initialization code:

boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);

There is no issue if x86 64-bit kernel is build. However, 32-bit case generate warning (even if that code will not be executed because Xen does not work on 32-bit EFI platforms) due to __pa() returning unsigned long type which has 32-bits width. So move whole EFI initialization stuff to separate function and build it conditionally to avoid above mentioned warning on x86 32-bit architecture.

---
v2 - suggestions/fixes:
- move xen_efi_init() to separate module
(suggested by Konrad Rzeszutek Wilk).

---
 arch/x86/xen/Makefile    |    1 +
 arch/x86/xen/efi.c       |   43 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/xen/enlighten.c |   15 +--------------
 arch/x86/xen/xen-ops.h   |    8 ++++++++
 4 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 arch/x86/xen/efi.c
arch/x86/xen/Makefile +1 -0
index 96ab2c0..7322755 100644
@@ -22,3 +22,4 @@ obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
 obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
 obj-$(CONFIG_XEN_DOM0)		+= apic.o vga.o
 obj-$(CONFIG_SWIOTLB_XEN)	+= pci-swiotlb-xen.o
+obj-$(CONFIG_XEN_EFI)		+= efi.o
arch/x86/xen/efi.c new file +43 -0

43 lines not on this page · raw message

arch/x86/xen/enlighten.c +1 -14
index bc89647..2cd0463 100644
@@ -32,7 +32,6 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/edd.h>
-#include <linux/efi.h>
 
 #include <xen/xen.h>
 #include <xen/events.h>
@@ -1521,7 +1520,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
 {
 	struct physdev_set_iopl set_iopl;
 	int rc;
-	efi_system_table_t *efi_systab_xen;
 
 	if (!xen_start_info)
 		return;
@@ -1717,18 +1715,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
 
 	xen_setup_runstate_info(0);
 
-	efi_systab_xen = xen_efi_probe();
-
-	if (efi_systab_xen) {
-		strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",
-				sizeof(boot_params.efi_info.efi_loader_signature));
-		boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);
-		boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);
-
-		set_bit(EFI_BOOT, &efi.flags);
-		set_bit(EFI_PARAVIRT, &efi.flags);
-		set_bit(EFI_64BIT, &efi.flags);
-	}
+	xen_efi_init();
 
 	/* Start the world */
 #ifdef CONFIG_X86_32
arch/x86/xen/xen-ops.h +8 -0
index c834d4b..75f98fe 100644
@@ -104,6 +104,14 @@ static inline void __init xen_init_apic(void)
 }
 #endif
 
+#ifdef CONFIG_XEN_EFI
+extern void xen_efi_init(void);
+#else
+static inline void __init xen_efi_init(void)
+{
+}
+#endif
+
 /* Declare an asm function, along with symbols needed to make it
    inlineable */
 #define DECL_ASM(ret, name, ...)		\
Signature · 7 lines
1.7.10.4


_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
#7 lore raw

PATCH v2 2/2 arch/x86/xen: Silence compiler warnings

In reply to Daniel Kiper

Compiler complains in the following way when x86 32-bit kernel with Xen support is build:

CC arch/x86/xen/enlighten.o
arch/x86/xen/enlighten.c: In function ‘xen_start_kernel’:
arch/x86/xen/enlighten.c:1726:3: warning: right shift count >= width of type [enabled by default]

Such line contains following EFI initialization code:

boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);

There is no issue if x86 64-bit kernel is build. However, 32-bit case generate warning (even if that code will not be executed because Xen does not work on 32-bit EFI platforms) due to __pa() returning unsigned long type which has 32-bits width. So move whole EFI initialization stuff to separate function and build it conditionally to avoid above mentioned warning on x86 32-bit architecture.

---
v2 - suggestions/fixes:
- move xen_efi_init() to separate module
(suggested by Konrad Rzeszutek Wilk).

---
 arch/x86/xen/Makefile    |    1 +
 arch/x86/xen/efi.c       |   43 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/xen/enlighten.c |   15 +--------------
 arch/x86/xen/xen-ops.h   |    8 ++++++++
 4 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 arch/x86/xen/efi.c
arch/x86/xen/Makefile +1 -0
index 96ab2c0..7322755 100644
@@ -22,3 +22,4 @@ obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
 obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
 obj-$(CONFIG_XEN_DOM0)		+= apic.o vga.o
 obj-$(CONFIG_SWIOTLB_XEN)	+= pci-swiotlb-xen.o
+obj-$(CONFIG_XEN_EFI)		+= efi.o
arch/x86/xen/efi.c new file +43 -0

43 lines not on this page · raw message

arch/x86/xen/enlighten.c +1 -14
index bc89647..2cd0463 100644
@@ -32,7 +32,6 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/edd.h>
-#include <linux/efi.h>
 
 #include <xen/xen.h>
 #include <xen/events.h>
@@ -1521,7 +1520,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
 {
 	struct physdev_set_iopl set_iopl;
 	int rc;
-	efi_system_table_t *efi_systab_xen;
 
 	if (!xen_start_info)
 		return;
@@ -1717,18 +1715,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
 
 	xen_setup_runstate_info(0);
 
-	efi_systab_xen = xen_efi_probe();
-
-	if (efi_systab_xen) {
-		strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",
-				sizeof(boot_params.efi_info.efi_loader_signature));
-		boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);
-		boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);
-
-		set_bit(EFI_BOOT, &efi.flags);
-		set_bit(EFI_PARAVIRT, &efi.flags);
-		set_bit(EFI_64BIT, &efi.flags);
-	}
+	xen_efi_init();
 
 	/* Start the world */
 #ifdef CONFIG_X86_32
arch/x86/xen/xen-ops.h +8 -0
index c834d4b..75f98fe 100644
@@ -104,6 +104,14 @@ static inline void __init xen_init_apic(void)
 }
 #endif
 
+#ifdef CONFIG_XEN_EFI
+extern void xen_efi_init(void);
+#else
+static inline void __init xen_efi_init(void)
+{
+}
+#endif
+
 /* Declare an asm function, along with symbols needed to make it
    inlineable */
 #define DECL_ASM(ret, name, ...)		\
Signature · 1 line
1.7.10.4
Reviewed-by on v2 2/2
#8 lore raw

Re: [PATCH v2 2/2] arch/x86/xen: Silence compiler warnings

Quoted 13 lines · Daniel Kiper

Compiler complains in the following way when x86 32-bit kernel with Xen support is build:

CC arch/x86/xen/enlighten.o
arch/x86/xen/enlighten.c: In function ‘xen_start_kernel’:
arch/x86/xen/enlighten.c:1726:3: warning: right shift count >= width of type [enabled by default]

Such line contains following EFI initialization code:

boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);

Quoted 9 lines

There is no issue if x86 64-bit kernel is build. However, 32-bit case generate warning (even if that code will not be executed because Xen does not work on 32-bit EFI platforms) due to __pa() returning unsigned long
type which has 32-bits width. So move whole EFI initialization stuff to separate function and build it conditionally to avoid above mentioned
warning on x86 32-bit architecture.

Quoted 128 lines

---
v2 - suggestions/fixes:
- move xen_efi_init() to separate module
(suggested by Konrad Rzeszutek Wilk).
---
arch/x86/xen/Makefile | 1 +
arch/x86/xen/efi.c | 43
+++++++++++++++++++++++++++++++++++++++++++
arch/x86/xen/enlighten.c | 15 +--------------
arch/x86/xen/xen-ops.h | 8 ++++++++

4 files changed, 53 insertions(+), 14 deletions(-)

create mode 100644 arch/x86/xen/efi.c

arch/x86/xen/Makefile +0 -0
index 96ab2c0..7322755 100644
@@ -22,3 +22,4 @@ obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o
obj-$(CONFIG_XEN_DOM0) += apic.o vga.o
obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o

arch/x86/xen/Makefile +1 -0
+obj-$(CONFIG_XEN_EFI)		+= efi.o
arch/x86/xen/efi.c new file +4 -0
new file mode 100644
index 0000000..a02e09e
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014 Oracle Co., Daniel Kiper
+ *
+ * This program is free software; you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */

arch/x86/xen/efi.c new file +22 -0
+
+#include <linux/efi.h>
+#include <linux/init.h>
+#include <linux/string.h>
+
+#include <xen/xen-ops.h>
+
+#include <asm/setup.h>
+
+void __init xen_efi_init(void)
+{
+	efi_system_table_t *efi_systab_xen;
+
+	efi_systab_xen = xen_efi_probe();
+
+	if (efi_systab_xen == NULL)
+		return;
+
+	strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",
+			sizeof(boot_params.efi_info.efi_loader_signature));
+	boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);
+	boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >>

32);

arch/x86/xen/efi.c new file +5 -0
+
+	set_bit(EFI_BOOT, &efi.flags);
+	set_bit(EFI_PARAVIRT, &efi.flags);
+	set_bit(EFI_64BIT, &efi.flags);
+}
arch/x86/xen/enlighten.c +0 -2
index bc89647..2cd0463 100644
@@ -32,7 +32,6 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/edd.h>
-#include <linux/efi.h>
 
 #include <xen/xen.h>
 #include <xen/events.h>
@@ -1521,7 +1520,6 @@ asmlinkage __visible void __init
 xen_start_kernel(void)
 {
 	struct physdev_set_iopl set_iopl;
 	int rc;
-	efi_system_table_t *efi_systab_xen;
 
 	if (!xen_start_info)
		return;
arch/x86/xen/enlighten.c +1 -12
@@ -1717,18 +1715,7 @@ asmlinkage __visible void __init
 xen_start_kernel(void)
 
 	xen_setup_runstate_info(0);
 
-	efi_systab_xen = xen_efi_probe();
-
-	if (efi_systab_xen) {
-		strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",
-				sizeof(boot_params.efi_info.efi_loader_signature));
-		boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);
-		boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >>
 32);
-
-		set_bit(EFI_BOOT, &efi.flags);
-		set_bit(EFI_PARAVIRT, &efi.flags);
-		set_bit(EFI_64BIT, &efi.flags);
-	}
+	xen_efi_init();
 
	/* Start the world */

#ifdef CONFIG_X86_32

arch/x86/xen/xen-ops.h +1 -0
index c834d4b..75f98fe 100644
@@ -104,6 +104,14 @@ static inline void __init xen_init_apic(void)
 }
 #endif
 
+#ifdef CONFIG_XEN_EFI

arch/x86/xen/xen-ops.h static inline void __init xen_init_apic(void) · line 117

Quoted 10 lines
arch/x86/xen/xen-ops.h +7 -0
+extern void xen_efi_init(void);
+#else
+static inline void __init xen_efi_init(void)
+{
+}
+#endif
+
 /* Declare an asm function, along with symbols needed to make it
   inlineable */
 #define DECL_ASM(ret, name, ...)		\

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

Reviewed-by on v2 2/2
#9 lore raw

Re: [PATCH v2 2/2] arch/x86/xen: Silence compiler warnings

In reply to Daniel Kiper
Quoted 13 lines · Daniel Kiper

Compiler complains in the following way when x86 32-bit kernel with Xen support is build:

CC arch/x86/xen/enlighten.o
arch/x86/xen/enlighten.c: In function ‘xen_start_kernel’:
arch/x86/xen/enlighten.c:1726:3: warning: right shift count >= width of type [enabled by default]

Such line contains following EFI initialization code:

boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);

Quoted 9 lines

There is no issue if x86 64-bit kernel is build. However, 32-bit case generate warning (even if that code will not be executed because Xen does not work on 32-bit EFI platforms) due to __pa() returning unsigned long
type which has 32-bits width. So move whole EFI initialization stuff to separate function and build it conditionally to avoid above mentioned
warning on x86 32-bit architecture.

Quoted 138 lines

---
v2 - suggestions/fixes:
- move xen_efi_init() to separate module
(suggested by Konrad Rzeszutek Wilk).
---
arch/x86/xen/Makefile | 1 +
arch/x86/xen/efi.c | 43
+++++++++++++++++++++++++++++++++++++++++++
arch/x86/xen/enlighten.c | 15 +--------------
arch/x86/xen/xen-ops.h | 8 ++++++++

4 files changed, 53 insertions(+), 14 deletions(-)

create mode 100644 arch/x86/xen/efi.c

arch/x86/xen/Makefile +0 -0
index 96ab2c0..7322755 100644
@@ -22,3 +22,4 @@ obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o
obj-$(CONFIG_XEN_DOM0) += apic.o vga.o
obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o

arch/x86/xen/Makefile +1 -0
+obj-$(CONFIG_XEN_EFI)		+= efi.o
arch/x86/xen/efi.c new file +4 -0
new file mode 100644
index 0000000..a02e09e
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014 Oracle Co., Daniel Kiper
+ *
+ * This program is free software; you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */

arch/x86/xen/efi.c new file +22 -0
+
+#include <linux/efi.h>
+#include <linux/init.h>
+#include <linux/string.h>
+
+#include <xen/xen-ops.h>
+
+#include <asm/setup.h>
+
+void __init xen_efi_init(void)
+{
+	efi_system_table_t *efi_systab_xen;
+
+	efi_systab_xen = xen_efi_probe();
+
+	if (efi_systab_xen == NULL)
+		return;
+
+	strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",
+			sizeof(boot_params.efi_info.efi_loader_signature));
+	boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);
+	boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >>

32);

arch/x86/xen/efi.c new file +5 -0
+
+	set_bit(EFI_BOOT, &efi.flags);
+	set_bit(EFI_PARAVIRT, &efi.flags);
+	set_bit(EFI_64BIT, &efi.flags);
+}
arch/x86/xen/enlighten.c +0 -2
index bc89647..2cd0463 100644
@@ -32,7 +32,6 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/edd.h>
-#include <linux/efi.h>
 
 #include <xen/xen.h>
 #include <xen/events.h>
@@ -1521,7 +1520,6 @@ asmlinkage __visible void __init
 xen_start_kernel(void)
 {
 	struct physdev_set_iopl set_iopl;
 	int rc;
-	efi_system_table_t *efi_systab_xen;
 
 	if (!xen_start_info)
		return;
arch/x86/xen/enlighten.c +1 -12
@@ -1717,18 +1715,7 @@ asmlinkage __visible void __init
 xen_start_kernel(void)
 
 	xen_setup_runstate_info(0);
 
-	efi_systab_xen = xen_efi_probe();
-
-	if (efi_systab_xen) {
-		strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",
-				sizeof(boot_params.efi_info.efi_loader_signature));
-		boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);
-		boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >>
 32);
-
-		set_bit(EFI_BOOT, &efi.flags);
-		set_bit(EFI_PARAVIRT, &efi.flags);
-		set_bit(EFI_64BIT, &efi.flags);
-	}
+	xen_efi_init();
 
	/* Start the world */

#ifdef CONFIG_X86_32

arch/x86/xen/xen-ops.h +8 -0
index c834d4b..75f98fe 100644
@@ -104,6 +104,14 @@ static inline void __init xen_init_apic(void)
 }
 #endif
 
+#ifdef CONFIG_XEN_EFI
+extern void xen_efi_init(void);
+#else
+static inline void __init xen_efi_init(void)
+{
+}
+#endif
+
 /* Declare an asm function, along with symbols needed to make it
   inlineable */
 #define DECL_ASM(ret, name, ...)		\
#10 lore raw
In reply to Daniel Kiper
Quoted 8 lines · Daniel Kiper

Hi,

Here are two patches that follow earlier Xen dom0 EFI series and fix some compiler warnings found during detailed build tests.

Both patches should be applied to:

git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git next

Hey Matt,

David Vrabel (who reviewed them earlier and is also an maintainer of the Xen tree) is out on vacation so I am responding here.

I reviewed the patches and hopefully my mailer (Android phone) sent it correctly. If not, all of them can have the Reviewed-by:
Konrad Rzeszutek Wilk <[email protected]> tag on them.

If you would be so kind and pull them in your git tree - that would be appreciated!

Thanks!

Quoted 18 lines

v2 contains fix suggested by Konrad Rzeszutek Wilk.

Daniel

PS I will be on vacation from 14th Jul till 25th Jul.

 arch/x86/xen/Makefile    |    1 +
 arch/x86/xen/efi.c       |   43 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/xen/enlighten.c |   15 +--------------
 arch/x86/xen/xen-ops.h   |    8 ++++++++
 include/xen/xen-ops.h    |    2 +-
 5 files changed, 54 insertions(+), 15 deletions(-)

Daniel Kiper (2):
xen: Silence compiler warnings
arch/x86/xen: Silence compiler warnings

#11 lore raw
In reply to Daniel Kiper
Quoted 8 lines · Daniel Kiper

Hi,

Here are two patches that follow earlier Xen dom0 EFI series and fix some compiler warnings found during detailed build tests.

Both patches should be applied to:

git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git next

Hey Matt,

David Vrabel (who reviewed them earlier and is also an maintainer of the Xen tree) is out on vacation so I am responding here.

I reviewed the patches and hopefully my mailer (Android phone) sent it correctly. If not, all of them can have the Reviewed-by:
Konrad Rzeszutek Wilk <[email protected]> tag on them.

If you would be so kind and pull them in your git tree - that would be appreciated!

Thanks!

Quoted 18 lines

v2 contains fix suggested by Konrad Rzeszutek Wilk.

Daniel

PS I will be on vacation from 14th Jul till 25th Jul.

 arch/x86/xen/Makefile    |    1 +
 arch/x86/xen/efi.c       |   43 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/xen/enlighten.c |   15 +--------------
 arch/x86/xen/xen-ops.h   |    8 ++++++++
 include/xen/xen-ops.h    |    2 +-
 5 files changed, 54 insertions(+), 15 deletions(-)

Daniel Kiper (2):
xen: Silence compiler warnings
arch/x86/xen: Silence compiler warnings

#12 lore raw
Quoted 6 lines · Konrad Rzeszutek Wilk

Hey Matt,

David Vrabel (who reviewed them earlier and is also an maintainer of the Xen tree) is out on vacation so I am responding here.

Quoted 6 lines

I reviewed the patches and hopefully my mailer (Android phone) sent it correctly. If not, all of them can have the Reviewed-by:
Konrad Rzeszutek Wilk <[email protected]> tag on them.

If you would be so kind and pull them in your git tree - that would be appreciated!

Sure, I'll do that. Thanks.

#13 lore raw
In reply to Konrad Rzeszutek Wilk
Quoted 6 lines · Konrad Rzeszutek Wilk

Hey Matt,

David Vrabel (who reviewed them earlier and is also an maintainer of the Xen tree) is out on vacation so I am responding here.

Quoted 6 lines

I reviewed the patches and hopefully my mailer (Android phone) sent it correctly. If not, all of them can have the Reviewed-by:
Konrad Rzeszutek Wilk <[email protected]> tag on them.

If you would be so kind and pull them in your git tree - that would be appreciated!

Sure, I'll do that. Thanks.