* [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64
@ 2016-02-05 3:05 Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
` (16 more replies)
0 siblings, 17 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
This patch set adds ACPI support for Xen Dom0 on ARM64. The relevant Xen
ACPI on ARM64 design document could be found from [1].
This patch set adds a new FDT node "uefi" under /hypervisor to pass UEFI
information. Introduce a bus notifier of AMBA and Platform bus to map
the new added device's MMIO space. Make Xen domain use
xlated_setup_gnttab_pages to setup grant table and a new hypercall to
get event-channel irq.
Regarding the initialization flow of Linux kernel, it needs to move
xen_early_init() before efi_init(). Then xen_early_init() will check
whether it runs on Xen through the /hypervisor node and efi_init() will
call a new function fdt_find_xen_uefi_params(), to parse those
xen,uefi-* parameters just like the existing efi_get_fdt_params().
And in arm64_enable_runtime_services() it will check whether it runs on
Xen and call another new function xen_efi_runtime_setup() to setup
runtime service instead of efi_native_runtime_setup(). The
xen_efi_runtime_setup() will assign the runtime function pointers with
the functions of driver/xen/efi.c.
And since we pass a /hypervisor node and a /chosen node to Dom0, it
needs to check whether the DTS only contains a /hypervisor node and a
/chosen node in acpi_boot_table_init().
Patches are tested on FVP base model. The corresponding Xen patches can
be fetched from [2].
Thanks,
Shannon
[1] http://lists.xen.org/archives/html/xen-devel/2015-11/msg00488.html
[2] http://git.linaro.org/people/shannon.zhao/xen.git ACPI_XEN_ARM_V4
Changes since v3:
* rebase on linux master
* print a warning when there is no SPCR table
* rephase the commit message of PATCH 3
* rephase the words of PATCH 13
* use strcmp and factor the function in PATCH 16
* Add several ACKs and RBs, thanks a lot
Changes since v2:
* Use 0 to check if it should ignore the UART
* Fix the use of page_to_xen_pfn
* Factor ACPI and DT parts in xen_guest_init
* Check "uefi" node by full path
* Fix the statement of Documentation/devicetree/bindings/arm/xen.txt
Changes since v1:
* Rebase on linux mainline and wallclock patch from Stefano
* Refactor AMBA and platform device MMIO map to one file
* Use EFI_PARAVIRT to check if it supports XEN EFI
* Refactor Xen EFI codes
* Address other comments
Shannon Zhao (17):
Xen: ACPI: Hide UART used by Xen
xen/grant-table: Move xlated_setup_gnttab_pages to common place
Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn
arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table
xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio
Xen: ARM: Add support for mapping platform device mmio
Xen: ARM: Add support for mapping AMBA device mmio
Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen
xen/hvm/params: Add a new delivery type for event-channel in
HVM_PARAM_CALLBACK_IRQ
arm/xen: Get event-channel irq through HVM_PARAM when booting with
ACPI
ARM: XEN: Move xen_early_init() before efi_init()
ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI
ARM: Xen: Document UEFI support on Xen ARM virtual platforms
XEN: EFI: Move x86 specific codes to architecture directory
ARM64: XEN: Add a function to initialize Xen specific UEFI runtime
services
FDT: Add a helper to get specified name subnode
Xen: EFI: Parse DT parameters for Xen specific UEFI
Documentation/devicetree/bindings/arm/xen.txt | 33 +++++
arch/arm/include/asm/xen/xen-ops.h | 6 +
arch/arm/xen/Makefile | 1 +
arch/arm/xen/efi.c | 40 ++++++
arch/arm/xen/enlighten.c | 109 +++++++++++----
arch/arm64/include/asm/xen/xen-ops.h | 6 +
arch/arm64/kernel/acpi.c | 12 +-
arch/arm64/kernel/setup.c | 2 +-
arch/arm64/xen/Makefile | 1 +
arch/x86/xen/efi.c | 112 ++++++++++++++++
arch/x86/xen/grant-table.c | 57 +-------
drivers/acpi/bus.c | 38 +++++-
drivers/firmware/efi/arm-runtime.c | 17 ++-
drivers/firmware/efi/efi.c | 45 ++++++-
drivers/of/fdt.c | 25 ++++
drivers/xen/Kconfig | 2 +-
drivers/xen/Makefile | 1 +
drivers/xen/arm-device.c | 184 ++++++++++++++++++++++++++
drivers/xen/efi.c | 174 +++++-------------------
drivers/xen/xlate_mmu.c | 67 ++++++++++
include/linux/of_fdt.h | 2 +
include/xen/interface/hvm/params.h | 36 ++++-
include/xen/interface/memory.h | 1 +
include/xen/xen-ops.h | 32 +++--
24 files changed, 755 insertions(+), 248 deletions(-)
create mode 100644 arch/arm/include/asm/xen/xen-ops.h
create mode 100644 arch/arm/xen/efi.c
create mode 100644 arch/arm64/include/asm/xen/xen-ops.h
create mode 100644 drivers/xen/arm-device.c
--
2.0.4
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-06 10:23 ` Rafael J. Wysocki
2016-02-05 3:05 ` [PATCH v4 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
` (15 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng, Rafael J. Wysocki, Len Brown,
open list:ACPI
From: Shannon Zhao <shannon.zhao@linaro.org>
ACPI 6.0 introduces a new table STAO to list the devices which are used
by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
UART is used by Xen. So here it hides UART from Dom0.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
CC: "Rafael J. Wysocki" <rjw@rjwysocki.net> (supporter:ACPI)
CC: Len Brown <lenb@kernel.org> (supporter:ACPI)
CC: linux-acpi@vger.kernel.org (open list:ACPI)
---
drivers/acpi/bus.c | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 891c42d..5b5433d 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -46,6 +46,7 @@ ACPI_MODULE_NAME("bus");
struct acpi_device *acpi_root;
struct proc_dir_entry *acpi_root_dir;
EXPORT_SYMBOL(acpi_root_dir);
+static u64 spcr_uart_addr;
#ifdef CONFIG_X86
#ifdef CONFIG_ACPI_CUSTOM_DSDT
@@ -105,6 +106,22 @@ acpi_status acpi_bus_get_status_handle(acpi_handle handle,
return status;
}
+static bool acpi_check_device_is_ignored(acpi_handle handle)
+{
+ acpi_status status;
+ u64 addr;
+
+ /* Check if it should ignore the UART device */
+ if (spcr_uart_addr != 0) {
+ status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
+ &addr);
+ if (ACPI_SUCCESS(status) && addr == spcr_uart_addr)
+ return true;
+ }
+
+ return false;
+}
+
int acpi_bus_get_status(struct acpi_device *device)
{
acpi_status status;
@@ -114,7 +131,8 @@ int acpi_bus_get_status(struct acpi_device *device)
if (ACPI_FAILURE(status))
return -ENODEV;
- acpi_set_device_status(device, sta);
+ if (!acpi_check_device_is_ignored(device->handle))
+ acpi_set_device_status(device, sta);
if (device->status.functional && !device->status.present) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] status [%08x]: "
@@ -1070,6 +1088,8 @@ EXPORT_SYMBOL_GPL(acpi_kobj);
static int __init acpi_init(void)
{
int result;
+ acpi_status status;
+ struct acpi_table_stao *stao_ptr;
if (acpi_disabled) {
printk(KERN_INFO PREFIX "Interpreter disabled.\n");
@@ -1082,6 +1102,22 @@ static int __init acpi_init(void)
acpi_kobj = NULL;
}
+ /* If there is STAO table, check whether it needs to ignore the UART
+ * device in SPCR table.
+ */
+ status = acpi_get_table(ACPI_SIG_STAO, 0,
+ (struct acpi_table_header **)&stao_ptr);
+ if (ACPI_SUCCESS(status) && stao_ptr->ignore_uart) {
+ struct acpi_table_spcr *spcr_ptr;
+
+ status = acpi_get_table(ACPI_SIG_SPCR, 0,
+ (struct acpi_table_header **)&spcr_ptr);
+ if (ACPI_SUCCESS(status))
+ spcr_uart_addr = spcr_ptr->serial_port.address;
+ else
+ printk(KERN_WARNING "STAO table present, but SPCR is missing.\n");
+ }
+
init_acpi_device_notify();
result = acpi_bus_init();
if (result) {
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
` (14 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Move xlated_setup_gnttab_pages to common place, so it can be reused by
ARM to setup grant table.
Rename it to xen_xlate_map_ballooned_pages.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/x86/xen/grant-table.c | 57 +++++--------------------------------------
drivers/xen/xlate_mmu.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++
include/xen/xen-ops.h | 2 ++
3 files changed, 69 insertions(+), 51 deletions(-)
diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c
index e079500..de4144c 100644
--- a/arch/x86/xen/grant-table.c
+++ b/arch/x86/xen/grant-table.c
@@ -111,63 +111,18 @@ int arch_gnttab_init(unsigned long nr_shared)
}
#ifdef CONFIG_XEN_PVH
-#include <xen/balloon.h>
#include <xen/events.h>
-#include <linux/slab.h>
-static int __init xlated_setup_gnttab_pages(void)
-{
- struct page **pages;
- xen_pfn_t *pfns;
- void *vaddr;
- int rc;
- unsigned int i;
- unsigned long nr_grant_frames = gnttab_max_grant_frames();
-
- BUG_ON(nr_grant_frames == 0);
- pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL);
- if (!pages)
- return -ENOMEM;
-
- pfns = kcalloc(nr_grant_frames, sizeof(pfns[0]), GFP_KERNEL);
- if (!pfns) {
- kfree(pages);
- return -ENOMEM;
- }
- rc = alloc_xenballooned_pages(nr_grant_frames, pages);
- if (rc) {
- pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__,
- nr_grant_frames, rc);
- kfree(pages);
- kfree(pfns);
- return rc;
- }
- for (i = 0; i < nr_grant_frames; i++)
- pfns[i] = page_to_pfn(pages[i]);
-
- vaddr = vmap(pages, nr_grant_frames, 0, PAGE_KERNEL);
- if (!vaddr) {
- pr_warn("%s Couldn't map %ld pfns rc:%d\n", __func__,
- nr_grant_frames, rc);
- free_xenballooned_pages(nr_grant_frames, pages);
- kfree(pages);
- kfree(pfns);
- return -ENOMEM;
- }
- kfree(pages);
-
- xen_auto_xlat_grant_frames.pfn = pfns;
- xen_auto_xlat_grant_frames.count = nr_grant_frames;
- xen_auto_xlat_grant_frames.vaddr = vaddr;
-
- return 0;
-}
-
+#include <xen/xen-ops.h>
static int __init xen_pvh_gnttab_setup(void)
{
if (!xen_pvh_domain())
return -ENODEV;
- return xlated_setup_gnttab_pages();
+ xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames();
+
+ return xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn,
+ &xen_auto_xlat_grant_frames.vaddr,
+ xen_auto_xlat_grant_frames.count);
}
/* Call it _before_ __gnttab_init as we need to initialize the
* xen_auto_xlat_grant_frames first. */
diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c
index 5063c5e..9692656 100644
--- a/drivers/xen/xlate_mmu.c
+++ b/drivers/xen/xlate_mmu.c
@@ -29,6 +29,8 @@
*/
#include <linux/kernel.h>
#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
#include <asm/xen/hypercall.h>
#include <asm/xen/hypervisor.h>
@@ -37,6 +39,7 @@
#include <xen/page.h>
#include <xen/interface/xen.h>
#include <xen/interface/memory.h>
+#include <xen/balloon.h>
typedef void (*xen_gfn_fn_t)(unsigned long gfn, void *data);
@@ -185,3 +188,61 @@ int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
return 0;
}
EXPORT_SYMBOL_GPL(xen_xlate_unmap_gfn_range);
+
+/**
+ * xen_xlate_map_ballooned_pages - map a new set of ballooned pages
+ * @gfns: returns the array of corresponding GFNs
+ * @virt: returns the virtual address of the mapped region
+ * @nr_grant_frames: number of GFNs
+ * @return 0 on success, error otherwise
+ *
+ * This allocates a set of ballooned pages and maps them into the
+ * kernel's address space.
+ */
+int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
+ unsigned long nr_grant_frames)
+{
+ struct page **pages;
+ xen_pfn_t *pfns;
+ void *vaddr;
+ int rc;
+ unsigned int i;
+
+ BUG_ON(nr_grant_frames == 0);
+ pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL);
+ if (!pages)
+ return -ENOMEM;
+
+ pfns = kcalloc(nr_grant_frames, sizeof(pfns[0]), GFP_KERNEL);
+ if (!pfns) {
+ kfree(pages);
+ return -ENOMEM;
+ }
+ rc = alloc_xenballooned_pages(nr_grant_frames, pages);
+ if (rc) {
+ pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__,
+ nr_grant_frames, rc);
+ kfree(pages);
+ kfree(pfns);
+ return rc;
+ }
+ for (i = 0; i < nr_grant_frames; i++)
+ pfns[i] = page_to_pfn(pages[i]);
+
+ vaddr = vmap(pages, nr_grant_frames, 0, PAGE_KERNEL);
+ if (!vaddr) {
+ pr_warn("%s Couldn't map %ld pfns rc:%d\n", __func__,
+ nr_grant_frames, rc);
+ free_xenballooned_pages(nr_grant_frames, pages);
+ kfree(pages);
+ kfree(pfns);
+ return -ENOMEM;
+ }
+ kfree(pages);
+
+ *gfns = pfns;
+ *virt = vaddr;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(xen_xlate_map_ballooned_pages);
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 86abe07..072be1c 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -85,6 +85,8 @@ int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
struct page **pages);
int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
int nr, struct page **pages);
+int xen_xlate_map_ballooned_pages(xen_pfn_t **pfns, void **vaddr,
+ unsigned long nr_grant_frames);
bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
` (13 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Make xen_xlate_map_ballooned_pages work with 64K pages. In that case
Kernel pages are 64K in size but Xen pages remain 4K in size. Xen pfns
refer to 4K pages.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
drivers/xen/xlate_mmu.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c
index 9692656..28f728b 100644
--- a/drivers/xen/xlate_mmu.c
+++ b/drivers/xen/xlate_mmu.c
@@ -207,9 +207,12 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
void *vaddr;
int rc;
unsigned int i;
+ unsigned long nr_pages;
+ xen_pfn_t xen_pfn = 0;
BUG_ON(nr_grant_frames == 0);
- pages = kcalloc(nr_grant_frames, sizeof(pages[0]), GFP_KERNEL);
+ nr_pages = DIV_ROUND_UP(nr_grant_frames, XEN_PFN_PER_PAGE);
+ pages = kcalloc(nr_pages, sizeof(pages[0]), GFP_KERNEL);
if (!pages)
return -ENOMEM;
@@ -218,22 +221,25 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
kfree(pages);
return -ENOMEM;
}
- rc = alloc_xenballooned_pages(nr_grant_frames, pages);
+ rc = alloc_xenballooned_pages(nr_pages, pages);
if (rc) {
- pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__,
- nr_grant_frames, rc);
+ pr_warn("%s Couldn't balloon alloc %ld pages rc:%d\n", __func__,
+ nr_pages, rc);
kfree(pages);
kfree(pfns);
return rc;
}
- for (i = 0; i < nr_grant_frames; i++)
- pfns[i] = page_to_pfn(pages[i]);
+ for (i = 0; i < nr_grant_frames; i++) {
+ if ((i % XEN_PFN_PER_PAGE) == 0)
+ xen_pfn = page_to_xen_pfn(pages[i / XEN_PFN_PER_PAGE]);
+ pfns[i] = pfn_to_gfn(xen_pfn++);
+ }
- vaddr = vmap(pages, nr_grant_frames, 0, PAGE_KERNEL);
+ vaddr = vmap(pages, nr_pages, 0, PAGE_KERNEL);
if (!vaddr) {
- pr_warn("%s Couldn't map %ld pfns rc:%d\n", __func__,
- nr_grant_frames, rc);
- free_xenballooned_pages(nr_grant_frames, pages);
+ pr_warn("%s Couldn't map %ld pages rc:%d\n", __func__,
+ nr_pages, rc);
+ free_xenballooned_pages(nr_pages, pages);
kfree(pages);
kfree(pfns);
return -ENOMEM;
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (2 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
` (12 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Use xen_xlate_map_ballooned_pages to setup grant table. Then it doesn't
rely on DT or ACPI to pass the start address and size of grant table.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/arm/xen/enlighten.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 75cd734..d94f726 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -282,18 +282,10 @@ static int __init xen_guest_init(void)
{
struct xen_add_to_physmap xatp;
struct shared_info *shared_info_page = NULL;
- struct resource res;
- phys_addr_t grant_frames;
if (!xen_domain())
return 0;
- if (of_address_to_resource(xen_node, GRANT_TABLE_PHYSADDR, &res)) {
- pr_err("Xen grant table base address not found\n");
- return -ENODEV;
- }
- grant_frames = res.start;
-
xen_events_irq = irq_of_parse_and_map(xen_node, 0);
if (!xen_events_irq) {
pr_err("Xen event channel interrupt not found\n");
@@ -328,7 +320,10 @@ static int __init xen_guest_init(void)
if (xen_vcpu_info == NULL)
return -ENOMEM;
- if (gnttab_setup_auto_xlat_frames(grant_frames)) {
+ xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames();
+ if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn,
+ &xen_auto_xlat_grant_frames.vaddr,
+ xen_auto_xlat_grant_frames.count)) {
free_percpu(xen_vcpu_info);
return -ENOMEM;
}
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (3 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-08 11:43 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
` (11 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Add a new type of Xen map space for Dom0 to map device's MMIO region.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
include/xen/interface/memory.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
index 2ecfe4f..9aa8988 100644
--- a/include/xen/interface/memory.h
+++ b/include/xen/interface/memory.h
@@ -160,6 +160,7 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mapping_t);
#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom,
* XENMEM_add_to_physmap_range only.
*/
+#define XENMAPSPACE_dev_mmio 5 /* device mmio region */
/*
* Sets the GPFN at which a particular page appears in the specified guest's
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 06/17] Xen: ARM: Add support for mapping platform device mmio
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (4 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
` (10 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Add a bus_notifier for platform bus device in order to map the device
mmio regions when DOM0 booting with ACPI.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
drivers/xen/Makefile | 1 +
drivers/xen/arm-device.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 142 insertions(+)
create mode 100644 drivers/xen/arm-device.c
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 9b7a35c..415f286 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -9,6 +9,7 @@ CFLAGS_features.o := $(nostackp)
CFLAGS_efi.o += -fshort-wchar
+dom0-$(CONFIG_ARM64) += arm-device.o
dom0-$(CONFIG_PCI) += pci.o
dom0-$(CONFIG_USB_SUPPORT) += dbgp.o
dom0-$(CONFIG_XEN_ACPI) += acpi.o $(xen-pad-y)
diff --git a/drivers/xen/arm-device.c b/drivers/xen/arm-device.c
new file mode 100644
index 0000000..76e26e5
--- /dev/null
+++ b/drivers/xen/arm-device.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2015, Linaro Limited, Shannon Zhao
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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/>.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/acpi.h>
+#include <xen/xen.h>
+#include <xen/page.h>
+#include <xen/interface/memory.h>
+#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
+
+static int xen_unmap_device_mmio(struct resource *resource, unsigned int count)
+{
+ unsigned int i, j, nr;
+ int rc = 0;
+ struct resource *r;
+ struct xen_remove_from_physmap xrp;
+
+ for (i = 0; i < count; i++) {
+ r = &resource[i];
+ nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
+ if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
+ continue;
+
+ for (j = 0; j < nr; j++) {
+ xrp.domid = DOMID_SELF;
+ xrp.gpfn = XEN_PFN_DOWN(r->start) + j;
+ rc = HYPERVISOR_memory_op(XENMEM_remove_from_physmap,
+ &xrp);
+ if (rc)
+ return rc;
+ }
+ }
+
+ return rc;
+}
+
+static int xen_map_device_mmio(struct resource *resource, unsigned int count)
+{
+ unsigned int i, j, nr;
+ int rc = 0;
+ struct resource *r;
+ xen_pfn_t *gpfns;
+ xen_ulong_t *idxs;
+ int *errs;
+ struct xen_add_to_physmap_range xatp;
+
+ for (i = 0; i < count; i++) {
+ r = &resource[i];
+ nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
+ if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
+ continue;
+
+ gpfns = kzalloc(sizeof(xen_pfn_t) * nr, GFP_KERNEL);
+ idxs = kzalloc(sizeof(xen_ulong_t) * nr, GFP_KERNEL);
+ errs = kzalloc(sizeof(int) * nr, GFP_KERNEL);
+ if (!gpfns || !idxs || !errs) {
+ kfree(gpfns);
+ kfree(idxs);
+ kfree(errs);
+ return -ENOMEM;
+ }
+
+ for (j = 0; j < nr; j++) {
+ gpfns[j] = XEN_PFN_DOWN(r->start) + j;
+ idxs[j] = XEN_PFN_DOWN(r->start) + j;
+ }
+
+ xatp.domid = DOMID_SELF;
+ xatp.size = nr;
+ xatp.space = XENMAPSPACE_dev_mmio;
+
+ set_xen_guest_handle(xatp.gpfns, gpfns);
+ set_xen_guest_handle(xatp.idxs, idxs);
+ set_xen_guest_handle(xatp.errs, errs);
+
+ rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap_range, &xatp);
+ kfree(gpfns);
+ kfree(idxs);
+ kfree(errs);
+ if (rc)
+ return rc;
+ }
+
+ return rc;
+}
+
+static int xen_platform_notifier(struct notifier_block *nb,
+ unsigned long action, void *data)
+{
+ struct platform_device *pdev = to_platform_device(data);
+ int r = 0;
+
+ if (pdev->num_resources == 0 || pdev->resource == NULL)
+ return NOTIFY_OK;
+
+ switch (action) {
+ case BUS_NOTIFY_ADD_DEVICE:
+ r = xen_map_device_mmio(pdev->resource, pdev->num_resources);
+ break;
+ case BUS_NOTIFY_DEL_DEVICE:
+ r = xen_unmap_device_mmio(pdev->resource, pdev->num_resources);
+ break;
+ default:
+ return NOTIFY_DONE;
+ }
+ if (r)
+ dev_err(&pdev->dev, "Platform: Failed to %s device %s MMIO!\n",
+ action == BUS_NOTIFY_ADD_DEVICE ? "map" :
+ (action == BUS_NOTIFY_DEL_DEVICE ? "unmap" : "?"),
+ pdev->name);
+
+ return NOTIFY_OK;
+}
+
+static struct notifier_block platform_device_nb = {
+ .notifier_call = xen_platform_notifier,
+};
+
+static int __init register_xen_platform_notifier(void)
+{
+ if (!xen_initial_domain() || acpi_disabled)
+ return 0;
+
+ return bus_register_notifier(&platform_bus_type, &platform_device_nb);
+}
+
+arch_initcall(register_xen_platform_notifier);
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 07/17] Xen: ARM: Add support for mapping AMBA device mmio
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (5 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
` (9 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Add a bus_notifier for AMBA bus device in order to map the device
mmio regions when DOM0 booting with ACPI.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
drivers/xen/arm-device.c | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/drivers/xen/arm-device.c b/drivers/xen/arm-device.c
index 76e26e5..3854043 100644
--- a/drivers/xen/arm-device.c
+++ b/drivers/xen/arm-device.c
@@ -139,3 +139,46 @@ static int __init register_xen_platform_notifier(void)
}
arch_initcall(register_xen_platform_notifier);
+
+#ifdef CONFIG_ARM_AMBA
+#include <linux/amba/bus.h>
+
+static int xen_amba_notifier(struct notifier_block *nb,
+ unsigned long action, void *data)
+{
+ struct amba_device *adev = to_amba_device(data);
+ int r = 0;
+
+ switch (action) {
+ case BUS_NOTIFY_ADD_DEVICE:
+ r = xen_map_device_mmio(&adev->res, 1);
+ break;
+ case BUS_NOTIFY_DEL_DEVICE:
+ r = xen_unmap_device_mmio(&adev->res, 1);
+ break;
+ default:
+ return NOTIFY_DONE;
+ }
+ if (r)
+ dev_err(&adev->dev, "AMBA: Failed to %s device %s MMIO!\n",
+ action == BUS_NOTIFY_ADD_DEVICE ? "map" :
+ (action == BUS_NOTIFY_DEL_DEVICE ? "unmap" : "?"),
+ adev->dev.init_name);
+
+ return NOTIFY_OK;
+}
+
+static struct notifier_block amba_device_nb = {
+ .notifier_call = xen_amba_notifier,
+};
+
+static int __init register_xen_amba_notifier(void)
+{
+ if (!xen_initial_domain() || acpi_disabled)
+ return 0;
+
+ return bus_register_notifier(&amba_bustype, &amba_device_nb);
+}
+
+arch_initcall(register_xen_amba_notifier);
+#endif
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (6 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
` (8 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Sync the changes of HVM_PARAM_CALLBACK_VIA ABI introduced by
Xen commit <ca5c54b6ff05> (public/hvm: export the HVM_PARAM_CALLBACK_VIA
ABI in the API).
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
include/xen/interface/hvm/params.h | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/include/xen/interface/hvm/params.h b/include/xen/interface/hvm/params.h
index a6c7991..70ad208 100644
--- a/include/xen/interface/hvm/params.h
+++ b/include/xen/interface/hvm/params.h
@@ -27,16 +27,31 @@
* Parameter space for HVMOP_{set,get}_param.
*/
+#define HVM_PARAM_CALLBACK_IRQ 0
/*
* How should CPU0 event-channel notifications be delivered?
- * val[63:56] == 0: val[55:0] is a delivery GSI (Global System Interrupt).
- * val[63:56] == 1: val[55:0] is a delivery PCI INTx line, as follows:
- * Domain = val[47:32], Bus = val[31:16],
- * DevFn = val[15: 8], IntX = val[ 1: 0]
- * val[63:56] == 2: val[7:0] is a vector number.
+ *
* If val == 0 then CPU0 event-channel notifications are not delivered.
+ * If val != 0, val[63:56] encodes the type, as follows:
+ */
+
+#define HVM_PARAM_CALLBACK_TYPE_GSI 0
+/*
+ * val[55:0] is a delivery GSI. GSI 0 cannot be used, as it aliases val == 0,
+ * and disables all notifications.
+ */
+
+#define HVM_PARAM_CALLBACK_TYPE_PCI_INTX 1
+/*
+ * val[55:0] is a delivery PCI INTx line:
+ * Domain = val[47:32], Bus = val[31:16] DevFn = val[15:8], IntX = val[1:0]
+ */
+
+#define HVM_PARAM_CALLBACK_TYPE_VECTOR 2
+/*
+ * val[7:0] is a vector number. Check for XENFEAT_hvm_callback_vector to know
+ * if this delivery method is available.
*/
-#define HVM_PARAM_CALLBACK_IRQ 0
#define HVM_PARAM_STORE_PFN 1
#define HVM_PARAM_STORE_EVTCHN 2
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (7 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
` (7 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Add a new delivery type:
val[63:56] == 3: val[15:8] is flag: val[7:0] is a PPI.
To the flag, bit 0 stands the interrupt mode is edge(1) or level(0) and
bit 1 stands the interrupt polarity is active low(1) or high(0).
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
include/xen/interface/hvm/params.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/include/xen/interface/hvm/params.h b/include/xen/interface/hvm/params.h
index 70ad208..5dd629f 100644
--- a/include/xen/interface/hvm/params.h
+++ b/include/xen/interface/hvm/params.h
@@ -53,6 +53,15 @@
* if this delivery method is available.
*/
+#define HVM_PARAM_CALLBACK_TYPE_EVENT 3
+/*
+ * val[15:8] is flag of event-channel interrupt:
+ * bit 0: interrupt is edge(1) or level(0) triggered
+ * bit 1: interrupt is active low(1) or high(0)
+ * val[7:0] is PPI number used by event-channel.
+ * This is only used by ARM/ARM64.
+ */
+
#define HVM_PARAM_STORE_PFN 1
#define HVM_PARAM_STORE_EVTCHN 2
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (8 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
` (6 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
When booting with ACPI, it could get the event-channel irq through
HVM_PARAM_CALLBACK_IRQ.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/arm/xen/enlighten.c | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index d94f726..807a93e 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -30,6 +30,7 @@
#include <linux/time64.h>
#include <linux/timekeeping.h>
#include <linux/timekeeper_internal.h>
+#include <linux/acpi.h>
#include <linux/mm.h>
@@ -278,6 +279,35 @@ void __init xen_early_init(void)
add_preferred_console("hvc", 0, NULL);
}
+static void __init xen_acpi_guest_init(void)
+{
+#ifdef CONFIG_ACPI
+ struct xen_hvm_param a;
+ int interrupt, trigger, polarity;
+
+ a.domid = DOMID_SELF;
+ a.index = HVM_PARAM_CALLBACK_IRQ;
+ xen_events_irq = 0;
+
+ if (!HYPERVISOR_hvm_op(HVMOP_get_param, &a)) {
+ if ((a.value >> 56) == HVM_PARAM_CALLBACK_TYPE_EVENT) {
+ interrupt = a.value & 0xff;
+ trigger = ((a.value >> 8) & 0x1) ? ACPI_EDGE_SENSITIVE
+ : ACPI_LEVEL_SENSITIVE;
+ polarity = ((a.value >> 8) & 0x2) ? ACPI_ACTIVE_LOW
+ : ACPI_ACTIVE_HIGH;
+ xen_events_irq = acpi_register_gsi(NULL, interrupt,
+ trigger, polarity);
+ }
+ }
+#endif
+}
+
+static void __init xen_dt_guest_init(void)
+{
+ xen_events_irq = irq_of_parse_and_map(xen_node, 0);
+}
+
static int __init xen_guest_init(void)
{
struct xen_add_to_physmap xatp;
@@ -286,7 +316,11 @@ static int __init xen_guest_init(void)
if (!xen_domain())
return 0;
- xen_events_irq = irq_of_parse_and_map(xen_node, 0);
+ if (!acpi_disabled)
+ xen_acpi_guest_init();
+ else
+ xen_dt_guest_init();
+
if (!xen_events_irq) {
pr_err("Xen event channel interrupt not found\n");
return -ENODEV;
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 11/17] ARM: XEN: Move xen_early_init() before efi_init()
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (9 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
` (5 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Move xen_early_init() before efi_init(), then when calling efi_init()
could initialize Xen specific UEFI.
Check if it runs on Xen hypervisor through the flat dts.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/arm/xen/enlighten.c | 56 ++++++++++++++++++++++++++++++++++-------------
arch/arm64/kernel/setup.c | 2 +-
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 807a93e..0e542b8 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -20,6 +20,7 @@
#include <linux/irqreturn.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_fdt.h>
#include <linux/of_irq.h>
#include <linux/of_address.h>
#include <linux/cpuidle.h>
@@ -53,8 +54,6 @@ struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata;
static __read_mostly unsigned int xen_events_irq;
-static __initdata struct device_node *xen_node;
-
int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
unsigned long addr,
xen_pfn_t *gfn, int nr,
@@ -238,6 +237,33 @@ static irqreturn_t xen_arm_callback(int irq, void *arg)
return IRQ_HANDLED;
}
+static __initdata struct {
+ const char *compat;
+ const char *prefix;
+ const char *version;
+ bool found;
+} hyper_node = {"xen,xen", "xen,xen-", NULL, false};
+
+static int __init fdt_find_hyper_node(unsigned long node, const char *uname,
+ int depth, void *data)
+{
+ const void *s = NULL;
+ int len;
+
+ if (depth != 1 || strcmp(uname, "hypervisor") != 0)
+ return 0;
+
+ if (of_flat_dt_is_compatible(node, hyper_node.compat))
+ hyper_node.found = true;
+
+ s = of_get_flat_dt_prop(node, "compatible", &len);
+ if (strlen(hyper_node.prefix) + 3 < len &&
+ !strncmp(hyper_node.prefix, s, strlen(hyper_node.prefix)))
+ hyper_node.version = s + strlen(hyper_node.prefix);
+
+ return 0;
+}
+
/*
* see Documentation/devicetree/bindings/arm/xen.txt for the
* documentation of the Xen Device Tree format.
@@ -245,26 +271,18 @@ static irqreturn_t xen_arm_callback(int irq, void *arg)
#define GRANT_TABLE_PHYSADDR 0
void __init xen_early_init(void)
{
- int len;
- const char *s = NULL;
- const char *version = NULL;
- const char *xen_prefix = "xen,xen-";
-
- xen_node = of_find_compatible_node(NULL, NULL, "xen,xen");
- if (!xen_node) {
+ of_scan_flat_dt(fdt_find_hyper_node, NULL);
+ if (!hyper_node.found) {
pr_debug("No Xen support\n");
return;
}
- s = of_get_property(xen_node, "compatible", &len);
- if (strlen(xen_prefix) + 3 < len &&
- !strncmp(xen_prefix, s, strlen(xen_prefix)))
- version = s + strlen(xen_prefix);
- if (version == NULL) {
+
+ if (hyper_node.version == NULL) {
pr_debug("Xen version not found\n");
return;
}
- pr_info("Xen %s support found\n", version);
+ pr_info("Xen %s support found\n", hyper_node.version);
xen_domain_type = XEN_HVM_DOMAIN;
@@ -305,6 +323,14 @@ static void __init xen_acpi_guest_init(void)
static void __init xen_dt_guest_init(void)
{
+ struct device_node *xen_node;
+
+ xen_node = of_find_compatible_node(NULL, NULL, "xen,xen");
+ if (!xen_node) {
+ pr_err("Xen support was detected before, but it has disappeared\n");
+ return;
+ }
+
xen_events_irq = irq_of_parse_and_map(xen_node, 0);
}
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 8119479..a4a2878 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -313,6 +313,7 @@ void __init setup_arch(char **cmdline_p)
*/
local_async_enable();
+ xen_early_init();
efi_init();
arm64_memblock_init();
@@ -334,7 +335,6 @@ void __init setup_arch(char **cmdline_p)
} else {
psci_acpi_init();
}
- xen_early_init();
cpu_read_bootcpu_ops();
smp_init_cpus();
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (10 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
` (4 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng, Hanjun Guo
From: Shannon Zhao <shannon.zhao@linaro.org>
When it's a Xen domain0 booting with ACPI, it will supply a /chosen and
a /hypervisor node in DT. So check if it needs to enable ACPI.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
---
CC: Hanjun Guo <hanjun.guo@linaro.org>
---
arch/arm64/kernel/acpi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index d1ce8e2..4e92be0 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -67,10 +67,13 @@ static int __init dt_scan_depth1_nodes(unsigned long node,
{
/*
* Return 1 as soon as we encounter a node at depth 1 that is
- * not the /chosen node.
+ * not the /chosen node, or /hypervisor node when running on Xen.
*/
- if (depth == 1 && (strcmp(uname, "chosen") != 0))
- return 1;
+ if (depth == 1 && (strcmp(uname, "chosen") != 0)) {
+ if (!xen_initial_domain() || (strcmp(uname, "hypervisor") != 0))
+ return 1;
+ }
+
return 0;
}
@@ -184,7 +187,8 @@ void __init acpi_boot_table_init(void)
/*
* Enable ACPI instead of device tree unless
* - ACPI has been disabled explicitly (acpi=off), or
- * - the device tree is not empty (it has more than just a /chosen node)
+ * - the device tree is not empty (it has more than just a /chosen node,
+ * and a /hypervisor node when running on Xen)
* and ACPI has not been force enabled (acpi=force)
*/
if (param_acpi_off ||
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (11 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-08 11:31 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
` (3 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng, Rob Herring
From: Shannon Zhao <shannon.zhao@linaro.org>
Add a "uefi" node under /hypervisor node in FDT, then Linux kernel could
scan this to get the UEFI information.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
---
CC: Rob Herring <robh@kernel.org>
---
Documentation/devicetree/bindings/arm/xen.txt | 33 +++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/xen.txt b/Documentation/devicetree/bindings/arm/xen.txt
index 0f7b9c2..6f83f76 100644
--- a/Documentation/devicetree/bindings/arm/xen.txt
+++ b/Documentation/devicetree/bindings/arm/xen.txt
@@ -15,6 +15,26 @@ the following properties:
- interrupts: the interrupt used by Xen to inject event notifications.
A GIC node is also required.
+To support UEFI on Xen ARM virtual platforms, Xen populates the FDT "uefi" node
+under /hypervisor with following parameters:
+
+________________________________________________________________________________
+Name | Size | Description
+================================================================================
+xen,uefi-system-table | 64-bit | Guest physical address of the UEFI System
+ | | Table.
+--------------------------------------------------------------------------------
+xen,uefi-mmap-start | 64-bit | Guest physical address of the UEFI memory
+ | | map.
+--------------------------------------------------------------------------------
+xen,uefi-mmap-size | 32-bit | Size in bytes of the UEFI memory map
+ | | pointed to in previous entry.
+--------------------------------------------------------------------------------
+xen,uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI
+ | | memory map.
+--------------------------------------------------------------------------------
+xen,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format.
+--------------------------------------------------------------------------------
Example (assuming #address-cells = <2> and #size-cells = <2>):
@@ -22,4 +42,17 @@ hypervisor {
compatible = "xen,xen-4.3", "xen,xen";
reg = <0 0xb0000000 0 0x20000>;
interrupts = <1 15 0xf08>;
+ uefi {
+ xen,uefi-system-table = <0xXXXXXXXX>;
+ xen,uefi-mmap-start = <0xXXXXXXXX>;
+ xen,uefi-mmap-size = <0xXXXXXXXX>;
+ xen,uefi-mmap-desc-size = <0xXXXXXXXX>;
+ xen,uefi-mmap-desc-ver = <0xXXXXXXXX>;
+ };
};
+
+The format and meaning of the "xen,uefi-*" parameters are similar to those in
+Documentation/arm/uefi.txt, which are provided by the regular UEFI stub. However
+they differ because they are provided by the Xen hypervisor, together with a set
+of UEFI runtime services implemented via hypercalls, see
+http://xenbits.xen.org/docs/unstable/hypercall/x86_64/include,public,platform.h.html.
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 14/17] XEN: EFI: Move x86 specific codes to architecture directory
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (12 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
` (2 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
Move x86 specific codes to architecture directory and export those EFI
runtime service functions. This will be useful for initializing runtime
service on ARM later.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/x86/xen/efi.c | 112 ++++++++++++++++++++++++++++++++
drivers/xen/efi.c | 174 ++++++++++----------------------------------------
include/xen/xen-ops.h | 30 ++++++---
3 files changed, 168 insertions(+), 148 deletions(-)
diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c
index be14cc3..86527f1 100644
--- a/arch/x86/xen/efi.c
+++ b/arch/x86/xen/efi.c
@@ -20,10 +20,122 @@
#include <linux/init.h>
#include <linux/string.h>
+#include <xen/xen.h>
#include <xen/xen-ops.h>
+#include <xen/interface/platform.h>
#include <asm/page.h>
#include <asm/setup.h>
+#include <asm/xen/hypercall.h>
+
+static efi_char16_t vendor[100] __initdata;
+
+static efi_system_table_t efi_systab_xen __initdata = {
+ .hdr = {
+ .signature = EFI_SYSTEM_TABLE_SIGNATURE,
+ .revision = 0, /* Initialized later. */
+ .headersize = 0, /* Ignored by Linux Kernel. */
+ .crc32 = 0, /* Ignored by Linux Kernel. */
+ .reserved = 0
+ },
+ .fw_vendor = EFI_INVALID_TABLE_ADDR, /* Initialized later. */
+ .fw_revision = 0, /* Initialized later. */
+ .con_in_handle = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
+ .con_in = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
+ .con_out_handle = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
+ .con_out = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
+ .stderr_handle = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
+ .stderr = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
+ .runtime = (efi_runtime_services_t *)EFI_INVALID_TABLE_ADDR,
+ /* Not used under Xen. */
+ .boottime = (efi_boot_services_t *)EFI_INVALID_TABLE_ADDR,
+ /* Not used under Xen. */
+ .nr_tables = 0, /* Initialized later. */
+ .tables = EFI_INVALID_TABLE_ADDR /* Initialized later. */
+};
+
+static const struct efi efi_xen __initconst = {
+ .systab = NULL, /* Initialized later. */
+ .runtime_version = 0, /* Initialized later. */
+ .mps = EFI_INVALID_TABLE_ADDR,
+ .acpi = EFI_INVALID_TABLE_ADDR,
+ .acpi20 = EFI_INVALID_TABLE_ADDR,
+ .smbios = EFI_INVALID_TABLE_ADDR,
+ .smbios3 = EFI_INVALID_TABLE_ADDR,
+ .sal_systab = EFI_INVALID_TABLE_ADDR,
+ .boot_info = EFI_INVALID_TABLE_ADDR,
+ .hcdp = EFI_INVALID_TABLE_ADDR,
+ .uga = EFI_INVALID_TABLE_ADDR,
+ .uv_systab = EFI_INVALID_TABLE_ADDR,
+ .fw_vendor = EFI_INVALID_TABLE_ADDR,
+ .runtime = EFI_INVALID_TABLE_ADDR,
+ .config_table = EFI_INVALID_TABLE_ADDR,
+ .get_time = xen_efi_get_time,
+ .set_time = xen_efi_set_time,
+ .get_wakeup_time = xen_efi_get_wakeup_time,
+ .set_wakeup_time = xen_efi_set_wakeup_time,
+ .get_variable = xen_efi_get_variable,
+ .get_next_variable = xen_efi_get_next_variable,
+ .set_variable = xen_efi_set_variable,
+ .query_variable_info = xen_efi_query_variable_info,
+ .update_capsule = xen_efi_update_capsule,
+ .query_capsule_caps = xen_efi_query_capsule_caps,
+ .get_next_high_mono_count = xen_efi_get_next_high_mono_count,
+ .reset_system = NULL, /* Functionality provided by Xen. */
+ .set_virtual_address_map = NULL, /* Not used under Xen. */
+ .memmap = NULL, /* Not used under Xen. */
+ .flags = 0 /* Initialized later. */
+};
+
+static efi_system_table_t __init *xen_efi_probe(void)
+{
+ struct xen_platform_op op = {
+ .cmd = XENPF_firmware_info,
+ .u.firmware_info = {
+ .type = XEN_FW_EFI_INFO,
+ .index = XEN_FW_EFI_CONFIG_TABLE
+ }
+ };
+ union xenpf_efi_info *info = &op.u.firmware_info.u.efi_info;
+
+ if (!xen_initial_domain() || HYPERVISOR_platform_op(&op) < 0)
+ return NULL;
+
+ /* Here we know that Xen runs on EFI platform. */
+
+ efi = efi_xen;
+
+ efi_systab_xen.tables = info->cfg.addr;
+ efi_systab_xen.nr_tables = info->cfg.nent;
+
+ op.cmd = XENPF_firmware_info;
+ op.u.firmware_info.type = XEN_FW_EFI_INFO;
+ op.u.firmware_info.index = XEN_FW_EFI_VENDOR;
+ info->vendor.bufsz = sizeof(vendor);
+ set_xen_guest_handle(info->vendor.name, vendor);
+
+ if (HYPERVISOR_platform_op(&op) == 0) {
+ efi_systab_xen.fw_vendor = __pa_symbol(vendor);
+ efi_systab_xen.fw_revision = info->vendor.revision;
+ } else
+ efi_systab_xen.fw_vendor = __pa_symbol(L"UNKNOWN");
+
+ op.cmd = XENPF_firmware_info;
+ op.u.firmware_info.type = XEN_FW_EFI_INFO;
+ op.u.firmware_info.index = XEN_FW_EFI_VERSION;
+
+ if (HYPERVISOR_platform_op(&op) == 0)
+ efi_systab_xen.hdr.revision = info->version;
+
+ op.cmd = XENPF_firmware_info;
+ op.u.firmware_info.type = XEN_FW_EFI_INFO;
+ op.u.firmware_info.index = XEN_FW_EFI_RT_VERSION;
+
+ if (HYPERVISOR_platform_op(&op) == 0)
+ efi.runtime_version = info->version;
+
+ return &efi_systab_xen;
+}
void __init xen_efi_init(void)
{
diff --git a/drivers/xen/efi.c b/drivers/xen/efi.c
index be7e56a..22f71ff 100644
--- a/drivers/xen/efi.c
+++ b/drivers/xen/efi.c
@@ -38,7 +38,7 @@
#define efi_data(op) (op.u.efi_runtime_call)
-static efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
+efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
{
struct xen_platform_op op = INIT_EFI_OP(get_time);
@@ -59,8 +59,9 @@ static efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_get_time);
-static efi_status_t xen_efi_set_time(efi_time_t *tm)
+efi_status_t xen_efi_set_time(efi_time_t *tm)
{
struct xen_platform_op op = INIT_EFI_OP(set_time);
@@ -72,10 +73,10 @@ static efi_status_t xen_efi_set_time(efi_time_t *tm)
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_set_time);
-static efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled,
- efi_bool_t *pending,
- efi_time_t *tm)
+efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled, efi_bool_t *pending,
+ efi_time_t *tm)
{
struct xen_platform_op op = INIT_EFI_OP(get_wakeup_time);
@@ -95,8 +96,9 @@ static efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled,
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_get_wakeup_time);
-static efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
+efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
{
struct xen_platform_op op = INIT_EFI_OP(set_wakeup_time);
@@ -113,12 +115,11 @@ static efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_set_wakeup_time);
-static efi_status_t xen_efi_get_variable(efi_char16_t *name,
- efi_guid_t *vendor,
- u32 *attr,
- unsigned long *data_size,
- void *data)
+efi_status_t xen_efi_get_variable(efi_char16_t *name, efi_guid_t *vendor,
+ u32 *attr, unsigned long *data_size,
+ void *data)
{
struct xen_platform_op op = INIT_EFI_OP(get_variable);
@@ -138,10 +139,11 @@ static efi_status_t xen_efi_get_variable(efi_char16_t *name,
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_get_variable);
-static efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
- efi_char16_t *name,
- efi_guid_t *vendor)
+efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
+ efi_char16_t *name,
+ efi_guid_t *vendor)
{
struct xen_platform_op op = INIT_EFI_OP(get_next_variable_name);
@@ -161,12 +163,11 @@ static efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_get_next_variable);
-static efi_status_t xen_efi_set_variable(efi_char16_t *name,
- efi_guid_t *vendor,
- u32 attr,
- unsigned long data_size,
- void *data)
+efi_status_t xen_efi_set_variable(efi_char16_t *name, efi_guid_t *vendor,
+ u32 attr, unsigned long data_size,
+ void *data)
{
struct xen_platform_op op = INIT_EFI_OP(set_variable);
@@ -183,11 +184,11 @@ static efi_status_t xen_efi_set_variable(efi_char16_t *name,
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_set_variable);
-static efi_status_t xen_efi_query_variable_info(u32 attr,
- u64 *storage_space,
- u64 *remaining_space,
- u64 *max_variable_size)
+efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
+ u64 *remaining_space,
+ u64 *max_variable_size)
{
struct xen_platform_op op = INIT_EFI_OP(query_variable_info);
@@ -205,8 +206,9 @@ static efi_status_t xen_efi_query_variable_info(u32 attr,
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_query_variable_info);
-static efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
+efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
{
struct xen_platform_op op = INIT_EFI_OP(get_next_high_monotonic_count);
@@ -217,10 +219,10 @@ static efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_get_next_high_mono_count);
-static efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
- unsigned long count,
- unsigned long sg_list)
+efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
+ unsigned long count, unsigned long sg_list)
{
struct xen_platform_op op = INIT_EFI_OP(update_capsule);
@@ -237,11 +239,11 @@ static efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
return efi_data(op).status;
}
+EXPORT_SYMBOL_GPL(xen_efi_update_capsule);
-static efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
- unsigned long count,
- u64 *max_size,
- int *reset_type)
+efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
+ unsigned long count, u64 *max_size,
+ int *reset_type)
{
struct xen_platform_op op = INIT_EFI_OP(query_capsule_capabilities);
@@ -260,112 +262,4 @@ static efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
return efi_data(op).status;
}
-
-static efi_char16_t vendor[100] __initdata;
-
-static efi_system_table_t efi_systab_xen __initdata = {
- .hdr = {
- .signature = EFI_SYSTEM_TABLE_SIGNATURE,
- .revision = 0, /* Initialized later. */
- .headersize = 0, /* Ignored by Linux Kernel. */
- .crc32 = 0, /* Ignored by Linux Kernel. */
- .reserved = 0
- },
- .fw_vendor = EFI_INVALID_TABLE_ADDR, /* Initialized later. */
- .fw_revision = 0, /* Initialized later. */
- .con_in_handle = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
- .con_in = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
- .con_out_handle = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
- .con_out = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
- .stderr_handle = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
- .stderr = EFI_INVALID_TABLE_ADDR, /* Not used under Xen. */
- .runtime = (efi_runtime_services_t *)EFI_INVALID_TABLE_ADDR,
- /* Not used under Xen. */
- .boottime = (efi_boot_services_t *)EFI_INVALID_TABLE_ADDR,
- /* Not used under Xen. */
- .nr_tables = 0, /* Initialized later. */
- .tables = EFI_INVALID_TABLE_ADDR /* Initialized later. */
-};
-
-static const struct efi efi_xen __initconst = {
- .systab = NULL, /* Initialized later. */
- .runtime_version = 0, /* Initialized later. */
- .mps = EFI_INVALID_TABLE_ADDR,
- .acpi = EFI_INVALID_TABLE_ADDR,
- .acpi20 = EFI_INVALID_TABLE_ADDR,
- .smbios = EFI_INVALID_TABLE_ADDR,
- .smbios3 = EFI_INVALID_TABLE_ADDR,
- .sal_systab = EFI_INVALID_TABLE_ADDR,
- .boot_info = EFI_INVALID_TABLE_ADDR,
- .hcdp = EFI_INVALID_TABLE_ADDR,
- .uga = EFI_INVALID_TABLE_ADDR,
- .uv_systab = EFI_INVALID_TABLE_ADDR,
- .fw_vendor = EFI_INVALID_TABLE_ADDR,
- .runtime = EFI_INVALID_TABLE_ADDR,
- .config_table = EFI_INVALID_TABLE_ADDR,
- .get_time = xen_efi_get_time,
- .set_time = xen_efi_set_time,
- .get_wakeup_time = xen_efi_get_wakeup_time,
- .set_wakeup_time = xen_efi_set_wakeup_time,
- .get_variable = xen_efi_get_variable,
- .get_next_variable = xen_efi_get_next_variable,
- .set_variable = xen_efi_set_variable,
- .query_variable_info = xen_efi_query_variable_info,
- .update_capsule = xen_efi_update_capsule,
- .query_capsule_caps = xen_efi_query_capsule_caps,
- .get_next_high_mono_count = xen_efi_get_next_high_mono_count,
- .reset_system = NULL, /* Functionality provided by Xen. */
- .set_virtual_address_map = NULL, /* Not used under Xen. */
- .memmap = NULL, /* Not used under Xen. */
- .flags = 0 /* Initialized later. */
-};
-
-efi_system_table_t __init *xen_efi_probe(void)
-{
- struct xen_platform_op op = {
- .cmd = XENPF_firmware_info,
- .u.firmware_info = {
- .type = XEN_FW_EFI_INFO,
- .index = XEN_FW_EFI_CONFIG_TABLE
- }
- };
- union xenpf_efi_info *info = &op.u.firmware_info.u.efi_info;
-
- if (!xen_initial_domain() || HYPERVISOR_platform_op(&op) < 0)
- return NULL;
-
- /* Here we know that Xen runs on EFI platform. */
-
- efi = efi_xen;
-
- efi_systab_xen.tables = info->cfg.addr;
- efi_systab_xen.nr_tables = info->cfg.nent;
-
- op.cmd = XENPF_firmware_info;
- op.u.firmware_info.type = XEN_FW_EFI_INFO;
- op.u.firmware_info.index = XEN_FW_EFI_VENDOR;
- info->vendor.bufsz = sizeof(vendor);
- set_xen_guest_handle(info->vendor.name, vendor);
-
- if (HYPERVISOR_platform_op(&op) == 0) {
- efi_systab_xen.fw_vendor = __pa_symbol(vendor);
- efi_systab_xen.fw_revision = info->vendor.revision;
- } else
- efi_systab_xen.fw_vendor = __pa_symbol(L"UNKNOWN");
-
- op.cmd = XENPF_firmware_info;
- op.u.firmware_info.type = XEN_FW_EFI_INFO;
- op.u.firmware_info.index = XEN_FW_EFI_VERSION;
-
- if (HYPERVISOR_platform_op(&op) == 0)
- efi_systab_xen.hdr.revision = info->version;
-
- op.cmd = XENPF_firmware_info;
- op.u.firmware_info.type = XEN_FW_EFI_INFO;
- op.u.firmware_info.index = XEN_FW_EFI_RT_VERSION;
-
- if (HYPERVISOR_platform_op(&op) == 0)
- efi.runtime_version = info->version;
-
- return &efi_systab_xen;
-}
+EXPORT_SYMBOL_GPL(xen_efi_query_capsule_caps);
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 072be1c..3491582 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -90,14 +90,28 @@ int xen_xlate_map_ballooned_pages(xen_pfn_t **pfns, void **vaddr,
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 inline efi_system_table_t __init *xen_efi_probe(void)
-{
- return NULL;
-}
-#endif
+efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc);
+efi_status_t xen_efi_set_time(efi_time_t *tm);
+efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled, efi_bool_t *pending,
+ efi_time_t *tm);
+efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm);
+efi_status_t xen_efi_get_variable(efi_char16_t *name, efi_guid_t *vendor,
+ u32 *attr, unsigned long *data_size,
+ void *data);
+efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
+ efi_char16_t *name, efi_guid_t *vendor);
+efi_status_t xen_efi_set_variable(efi_char16_t *name, efi_guid_t *vendor,
+ u32 attr, unsigned long data_size,
+ void *data);
+efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
+ u64 *remaining_space,
+ u64 *max_variable_size);
+efi_status_t xen_efi_get_next_high_mono_count(u32 *count);
+efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
+ unsigned long count, unsigned long sg_list);
+efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
+ unsigned long count, u64 *max_size,
+ int *reset_type);
#ifdef CONFIG_PREEMPT
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (13 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng
From: Shannon Zhao <shannon.zhao@linaro.org>
When running on Xen hypervisor, runtime services are supported through
hypercall. Add a Xen specific function to initialize runtime services.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/arm/include/asm/xen/xen-ops.h | 6 ++++++
arch/arm/xen/Makefile | 1 +
arch/arm/xen/efi.c | 40 ++++++++++++++++++++++++++++++++++++
arch/arm64/include/asm/xen/xen-ops.h | 6 ++++++
arch/arm64/xen/Makefile | 1 +
drivers/xen/Kconfig | 2 +-
6 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/include/asm/xen/xen-ops.h
create mode 100644 arch/arm/xen/efi.c
create mode 100644 arch/arm64/include/asm/xen/xen-ops.h
diff --git a/arch/arm/include/asm/xen/xen-ops.h b/arch/arm/include/asm/xen/xen-ops.h
new file mode 100644
index 0000000..ec154e7
--- /dev/null
+++ b/arch/arm/include/asm/xen/xen-ops.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_XEN_OPS_H
+#define _ASM_XEN_OPS_H
+
+void xen_efi_runtime_setup(void);
+
+#endif /* _ASM_XEN_OPS_H */
diff --git a/arch/arm/xen/Makefile b/arch/arm/xen/Makefile
index 1296952..2279521 100644
--- a/arch/arm/xen/Makefile
+++ b/arch/arm/xen/Makefile
@@ -1 +1,2 @@
obj-y := enlighten.o hypercall.o grant-table.o p2m.o mm.o
+obj-$(CONFIG_XEN_EFI) += efi.o
diff --git a/arch/arm/xen/efi.c b/arch/arm/xen/efi.c
new file mode 100644
index 0000000..16db419
--- /dev/null
+++ b/arch/arm/xen/efi.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015, Linaro Limited, Shannon Zhao
+ *
+ * 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/>.
+ */
+
+#include <linux/efi.h>
+#include <xen/xen-ops.h>
+#include <asm/xen/xen-ops.h>
+
+/* Set XEN EFI runtime services function pointers. Other fields of struct efi,
+ * e.g. efi.systab, will be set like normal EFI.
+ */
+void __init xen_efi_runtime_setup(void)
+{
+ efi.get_time = xen_efi_get_time;
+ efi.set_time = xen_efi_set_time;
+ efi.get_wakeup_time = xen_efi_get_wakeup_time;
+ efi.set_wakeup_time = xen_efi_set_wakeup_time;
+ efi.get_variable = xen_efi_get_variable;
+ efi.get_next_variable = xen_efi_get_next_variable;
+ efi.set_variable = xen_efi_set_variable;
+ efi.query_variable_info = xen_efi_query_variable_info;
+ efi.update_capsule = xen_efi_update_capsule;
+ efi.query_capsule_caps = xen_efi_query_capsule_caps;
+ efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;
+ efi.reset_system = NULL; /* Functionality provided by Xen. */
+}
+EXPORT_SYMBOL_GPL(xen_efi_runtime_setup);
diff --git a/arch/arm64/include/asm/xen/xen-ops.h b/arch/arm64/include/asm/xen/xen-ops.h
new file mode 100644
index 0000000..ec154e7
--- /dev/null
+++ b/arch/arm64/include/asm/xen/xen-ops.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_XEN_OPS_H
+#define _ASM_XEN_OPS_H
+
+void xen_efi_runtime_setup(void);
+
+#endif /* _ASM_XEN_OPS_H */
diff --git a/arch/arm64/xen/Makefile b/arch/arm64/xen/Makefile
index 74a8d87..8ff8aa9 100644
--- a/arch/arm64/xen/Makefile
+++ b/arch/arm64/xen/Makefile
@@ -1,2 +1,3 @@
xen-arm-y += $(addprefix ../../arm/xen/, enlighten.o grant-table.o p2m.o mm.o)
obj-y := xen-arm.o hypercall.o
+obj-$(CONFIG_XEN_EFI) += $(addprefix ../../arm/xen/, efi.o)
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 73708ac..d50571c 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -268,7 +268,7 @@ config XEN_HAVE_PVMMU
config XEN_EFI
def_bool y
- depends on X86_64 && EFI
+ depends on (ARM || ARM64 || X86_64) && EFI
config XEN_AUTO_XLATE
def_bool y
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 16/17] FDT: Add a helper to get specified name subnode
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (14 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
2016-02-05 14:15 ` Stefano Stabellini
2016-02-09 5:04 ` Rob Herring
2016-02-05 3:05 ` [PATCH v4 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
16 siblings, 2 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng, Rob Herring
From: Shannon Zhao <shannon.zhao@linaro.org>
Sometimes it needs to check if there is a node in FDT by full path.
Introduce this helper to get the specified name subnode if it exists.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
CC: Rob Herring <robh@kernel.org>
---
drivers/of/fdt.c | 25 +++++++++++++++++++++++++
include/linux/of_fdt.h | 2 ++
2 files changed, 27 insertions(+)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 655f79d..eacb188 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -645,6 +645,31 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
}
/**
+ * of_get_flat_dt_subnode_by_name - get subnode of specified node by name
+ *
+ * @node: the parent node
+ * @uname: the name of subnode
+ * @return offset of the subnode, or -FDT_ERR_NOTFOUND if there is none
+ */
+
+int of_get_flat_dt_subnode_by_name(unsigned long node, const char *uname)
+{
+ const void *blob = initial_boot_params;
+ int offset;
+ const char *pathp;
+
+ for (offset = fdt_first_subnode(blob, node);
+ offset >= 0;
+ offset = fdt_next_subnode(blob, offset)) {
+ pathp = fdt_get_name(blob, offset, NULL);
+ if (strcmp(pathp, uname) == 0)
+ return offset;
+ }
+
+ return -FDT_ERR_NOTFOUND;
+}
+
+/**
* of_get_flat_dt_root - find the root node in the flat blob
*/
unsigned long __init of_get_flat_dt_root(void)
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index df9ef38..fc28162 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -52,6 +52,8 @@ extern char __dtb_end[];
extern int of_scan_flat_dt(int (*it)(unsigned long node, const char *uname,
int depth, void *data),
void *data);
+extern int of_get_flat_dt_subnode_by_name(unsigned long node,
+ const char *uname);
extern const void *of_get_flat_dt_prop(unsigned long node, const char *name,
int *size);
extern int of_flat_dt_is_compatible(unsigned long node, const char *name);
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
` (15 preceding siblings ...)
2016-02-05 3:05 ` [PATCH v4 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
@ 2016-02-05 3:05 ` Shannon Zhao
16 siblings, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel
Cc: catalin.marinas, will.deacon, mark.rutland, julien.grall,
xen-devel, devicetree, linux-efi, linux-kernel, ian.campbell,
shannon.zhao, peter.huangpeng, Matt Fleming
From: Shannon Zhao <shannon.zhao@linaro.org>
Add a new function to parse DT parameters for Xen specific UEFI just
like the way for normal UEFI. Then it could reuse the existing codes.
If Xen supports EFI, initialize runtime services.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
CC: Matt Fleming <matt@codeblueprint.co.uk>
---
arch/arm/xen/enlighten.c | 6 +++++
drivers/firmware/efi/arm-runtime.c | 17 +++++++++-----
drivers/firmware/efi/efi.c | 45 ++++++++++++++++++++++++++++++++------
3 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 0e542b8..026b5a7 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -261,6 +261,12 @@ static int __init fdt_find_hyper_node(unsigned long node, const char *uname,
!strncmp(hyper_node.prefix, s, strlen(hyper_node.prefix)))
hyper_node.version = s + strlen(hyper_node.prefix);
+ if (IS_ENABLED(CONFIG_XEN_EFI)) {
+ /* Check if Xen supports EFI */
+ if (of_get_flat_dt_subnode_by_name(node, "uefi") > 0)
+ set_bit(EFI_PARAVIRT, &efi.flags);
+ }
+
return 0;
}
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 6ae21e4..ac609b9 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -27,6 +27,7 @@
#include <asm/mmu.h>
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
+#include <asm/xen/xen-ops.h>
extern u64 efi_system_table;
@@ -107,13 +108,19 @@ static int __init arm_enable_runtime_services(void)
}
set_bit(EFI_SYSTEM_TABLES, &efi.flags);
- if (!efi_virtmap_init()) {
- pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
- return -ENOMEM;
+ if (IS_ENABLED(CONFIG_XEN_EFI) && efi_enabled(EFI_PARAVIRT)) {
+ /* Set up runtime services function pointers for Xen Dom0 */
+ xen_efi_runtime_setup();
+ } else {
+ if (!efi_virtmap_init()) {
+ pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
+ return -ENOMEM;
+ }
+
+ /* Set up runtime services function pointers */
+ efi_native_runtime_setup();
}
- /* Set up runtime services function pointers */
- efi_native_runtime_setup();
set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
efi.runtime_version = efi.systab->hdr.revision;
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 2cd37da..1328cb7 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -500,12 +500,14 @@ device_initcall(efi_load_efivars);
FIELD_SIZEOF(struct efi_fdt_params, field) \
}
-static __initdata struct {
+struct params {
const char name[32];
const char propname[32];
int offset;
int size;
-} dt_params[] = {
+};
+
+static struct params fdt_params[] __initdata = {
UEFI_PARAM("System Table", "linux,uefi-system-table", system_table),
UEFI_PARAM("MemMap Address", "linux,uefi-mmap-start", mmap),
UEFI_PARAM("MemMap Size", "linux,uefi-mmap-size", mmap_size),
@@ -513,24 +515,45 @@ static __initdata struct {
UEFI_PARAM("MemMap Desc. Version", "linux,uefi-mmap-desc-ver", desc_ver)
};
+static struct params xen_fdt_params[] __initdata = {
+ UEFI_PARAM("System Table", "xen,uefi-system-table", system_table),
+ UEFI_PARAM("MemMap Address", "xen,uefi-mmap-start", mmap),
+ UEFI_PARAM("MemMap Size", "xen,uefi-mmap-size", mmap_size),
+ UEFI_PARAM("MemMap Desc. Size", "xen,uefi-mmap-desc-size", desc_size),
+ UEFI_PARAM("MemMap Desc. Version", "xen,uefi-mmap-desc-ver", desc_ver)
+};
+
struct param_info {
int found;
void *params;
+ struct params *dt_params;
+ int size;
};
static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
int depth, void *data)
{
struct param_info *info = data;
+ struct params *dt_params = info->dt_params;
const void *prop;
void *dest;
u64 val;
- int i, len;
+ int i, len, offset;
- if (depth != 1 || strcmp(uname, "chosen") != 0)
- return 0;
+ if (efi_enabled(EFI_PARAVIRT)) {
+ if (depth != 1 || strcmp(uname, "hypervisor") != 0)
+ return 0;
- for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
+ offset = of_get_flat_dt_subnode_by_name(node, "uefi");
+ if (offset < 0)
+ return 0;
+ node = offset;
+ } else {
+ if (depth != 1 || strcmp(uname, "chosen") != 0)
+ return 0;
+ }
+
+ for (i = 0; i < info->size; i++) {
prop = of_get_flat_dt_prop(node, dt_params[i].propname, &len);
if (!prop)
return 0;
@@ -561,12 +584,20 @@ int __init efi_get_fdt_params(struct efi_fdt_params *params)
info.found = 0;
info.params = params;
+ if (efi_enabled(EFI_PARAVIRT)) {
+ info.dt_params = xen_fdt_params;
+ info.size = ARRAY_SIZE(xen_fdt_params);
+ } else {
+ info.dt_params = fdt_params;
+ info.size = ARRAY_SIZE(fdt_params);
+ }
+
ret = of_scan_flat_dt(fdt_find_uefi_params, &info);
if (!info.found)
pr_info("UEFI not found.\n");
else if (!ret)
pr_err("Can't find '%s' in device tree!\n",
- dt_params[info.found].name);
+ info.dt_params[info.found].name);
return ret;
}
--
2.0.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH v4 16/17] FDT: Add a helper to get specified name subnode
2016-02-05 3:05 ` [PATCH v4 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
@ 2016-02-05 14:15 ` Stefano Stabellini
2016-02-09 5:04 ` Rob Herring
1 sibling, 0 replies; 34+ messages in thread
From: Stefano Stabellini @ 2016-02-05 14:15 UTC (permalink / raw)
To: Shannon Zhao
Cc: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel, catalin.marinas, will.deacon, mark.rutland,
julien.grall, xen-devel, devicetree, linux-efi, linux-kernel,
ian.campbell, shannon.zhao, peter.huangpeng, Rob Herring
On Fri, 5 Feb 2016, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Sometimes it needs to check if there is a node in FDT by full path.
> Introduce this helper to get the specified name subnode if it exists.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> CC: Rob Herring <robh@kernel.org>
> ---
> drivers/of/fdt.c | 25 +++++++++++++++++++++++++
> include/linux/of_fdt.h | 2 ++
> 2 files changed, 27 insertions(+)
>
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index 655f79d..eacb188 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -645,6 +645,31 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
> }
>
> /**
> + * of_get_flat_dt_subnode_by_name - get subnode of specified node by name
> + *
> + * @node: the parent node
> + * @uname: the name of subnode
> + * @return offset of the subnode, or -FDT_ERR_NOTFOUND if there is none
> + */
> +
> +int of_get_flat_dt_subnode_by_name(unsigned long node, const char *uname)
> +{
> + const void *blob = initial_boot_params;
> + int offset;
> + const char *pathp;
> +
> + for (offset = fdt_first_subnode(blob, node);
> + offset >= 0;
> + offset = fdt_next_subnode(blob, offset)) {
> + pathp = fdt_get_name(blob, offset, NULL);
> + if (strcmp(pathp, uname) == 0)
> + return offset;
> + }
> +
> + return -FDT_ERR_NOTFOUND;
> +}
> +
> +/**
> * of_get_flat_dt_root - find the root node in the flat blob
> */
> unsigned long __init of_get_flat_dt_root(void)
> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
> index df9ef38..fc28162 100644
> --- a/include/linux/of_fdt.h
> +++ b/include/linux/of_fdt.h
> @@ -52,6 +52,8 @@ extern char __dtb_end[];
> extern int of_scan_flat_dt(int (*it)(unsigned long node, const char *uname,
> int depth, void *data),
> void *data);
> +extern int of_get_flat_dt_subnode_by_name(unsigned long node,
> + const char *uname);
> extern const void *of_get_flat_dt_prop(unsigned long node, const char *name,
> int *size);
> extern int of_flat_dt_is_compatible(unsigned long node, const char *name);
> --
> 2.0.4
>
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-05 3:05 ` [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
@ 2016-02-06 10:23 ` Rafael J. Wysocki
2016-02-08 10:57 ` Stefano Stabellini
0 siblings, 1 reply; 34+ messages in thread
From: Rafael J. Wysocki @ 2016-02-06 10:23 UTC (permalink / raw)
To: Shannon Zhao
Cc: linux-arm-kernel@lists.infradead.org, ard.biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, ian.campbell, Shannon Zhao,
peter.huangpeng, Rafael J. Wysocki, Len Brown, open list:ACPI
On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> ACPI 6.0 introduces a new table STAO to list the devices which are used
> by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> UART is used by Xen. So here it hides UART from Dom0.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Well, this doesn't look right to me.
We need to find a nicer way to achieve what you want.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-06 10:23 ` Rafael J. Wysocki
@ 2016-02-08 10:57 ` Stefano Stabellini
2016-02-08 22:25 ` Rafael J. Wysocki
0 siblings, 1 reply; 34+ messages in thread
From: Stefano Stabellini @ 2016-02-08 10:57 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Shannon Zhao, linux-arm-kernel@lists.infradead.org,
ard.biesheuvel, stefano.stabellini, david.vrabel, Catalin Marinas,
Will Deacon, Mark Rutland, julien.grall, xen-devel,
devicetree@vger.kernel.org, linux-efi, Linux Kernel Mailing List,
ian.campbell, Shannon Zhao, peter.huangpeng, Rafael J. Wysocki,
Len Brown, open list:ACPI
On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
> On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> > From: Shannon Zhao <shannon.zhao@linaro.org>
> >
> > ACPI 6.0 introduces a new table STAO to list the devices which are used
> > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> > UART is used by Xen. So here it hides UART from Dom0.
> >
> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
>
> Well, this doesn't look right to me.
>
> We need to find a nicer way to achieve what you want.
I take that you are talking about how to honor the STAO table in Linux.
Do you have any concrete suggestions?
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms
2016-02-05 3:05 ` [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
@ 2016-02-08 11:31 ` Stefano Stabellini
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Stabellini @ 2016-02-08 11:31 UTC (permalink / raw)
To: Shannon Zhao
Cc: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel, catalin.marinas, will.deacon, mark.rutland,
julien.grall, xen-devel, devicetree, linux-efi, linux-kernel,
ian.campbell, shannon.zhao, peter.huangpeng, Rob Herring
On Fri, 5 Feb 2016, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Add a "uefi" node under /hypervisor node in FDT, then Linux kernel could
> scan this to get the UEFI information.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> CC: Rob Herring <robh@kernel.org>
> ---
> Documentation/devicetree/bindings/arm/xen.txt | 33 +++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/xen.txt b/Documentation/devicetree/bindings/arm/xen.txt
> index 0f7b9c2..6f83f76 100644
> --- a/Documentation/devicetree/bindings/arm/xen.txt
> +++ b/Documentation/devicetree/bindings/arm/xen.txt
> @@ -15,6 +15,26 @@ the following properties:
> - interrupts: the interrupt used by Xen to inject event notifications.
> A GIC node is also required.
>
> +To support UEFI on Xen ARM virtual platforms, Xen populates the FDT "uefi" node
> +under /hypervisor with following parameters:
> +
> +________________________________________________________________________________
> +Name | Size | Description
> +================================================================================
> +xen,uefi-system-table | 64-bit | Guest physical address of the UEFI System
> + | | Table.
> +--------------------------------------------------------------------------------
> +xen,uefi-mmap-start | 64-bit | Guest physical address of the UEFI memory
> + | | map.
> +--------------------------------------------------------------------------------
> +xen,uefi-mmap-size | 32-bit | Size in bytes of the UEFI memory map
> + | | pointed to in previous entry.
> +--------------------------------------------------------------------------------
> +xen,uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI
> + | | memory map.
> +--------------------------------------------------------------------------------
> +xen,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format.
> +--------------------------------------------------------------------------------
>
> Example (assuming #address-cells = <2> and #size-cells = <2>):
>
> @@ -22,4 +42,17 @@ hypervisor {
> compatible = "xen,xen-4.3", "xen,xen";
> reg = <0 0xb0000000 0 0x20000>;
> interrupts = <1 15 0xf08>;
> + uefi {
> + xen,uefi-system-table = <0xXXXXXXXX>;
> + xen,uefi-mmap-start = <0xXXXXXXXX>;
> + xen,uefi-mmap-size = <0xXXXXXXXX>;
> + xen,uefi-mmap-desc-size = <0xXXXXXXXX>;
> + xen,uefi-mmap-desc-ver = <0xXXXXXXXX>;
> + };
> };
> +
> +The format and meaning of the "xen,uefi-*" parameters are similar to those in
> +Documentation/arm/uefi.txt, which are provided by the regular UEFI stub. However
> +they differ because they are provided by the Xen hypervisor, together with a set
> +of UEFI runtime services implemented via hypercalls, see
> +http://xenbits.xen.org/docs/unstable/hypercall/x86_64/include,public,platform.h.html.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio
2016-02-05 3:05 ` [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
@ 2016-02-08 11:43 ` Stefano Stabellini
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Stabellini @ 2016-02-08 11:43 UTC (permalink / raw)
To: Shannon Zhao
Cc: linux-arm-kernel, ard.biesheuvel, stefano.stabellini,
david.vrabel, catalin.marinas, will.deacon, mark.rutland,
julien.grall, xen-devel, devicetree, linux-efi, linux-kernel,
ian.campbell, shannon.zhao, peter.huangpeng
On Fri, 5 Feb 2016, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Add a new type of Xen map space for Dom0 to map device's MMIO region.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
> include/xen/interface/memory.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
> index 2ecfe4f..9aa8988 100644
> --- a/include/xen/interface/memory.h
> +++ b/include/xen/interface/memory.h
> @@ -160,6 +160,7 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mapping_t);
> #define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom,
> * XENMEM_add_to_physmap_range only.
> */
> +#define XENMAPSPACE_dev_mmio 5 /* device mmio region */
>
> /*
> * Sets the GPFN at which a particular page appears in the specified guest's
This patch needs to wait at least until the corresponding Xen patch
(the one which introduces XENMAPSPACE_dev_mmio on the Xen side) is
Acked by one of the Xen maintainers.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-08 10:57 ` Stefano Stabellini
@ 2016-02-08 22:25 ` Rafael J. Wysocki
2016-02-09 11:19 ` Stefano Stabellini
0 siblings, 1 reply; 34+ messages in thread
From: Rafael J. Wysocki @ 2016-02-08 22:25 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Rafael J. Wysocki, Shannon Zhao,
linux-arm-kernel@lists.infradead.org, ard.biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, ian.campbell, Shannon Zhao,
peter.huangpeng, Len Brown, open list:ACPI
On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
> On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
> > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> > > From: Shannon Zhao <shannon.zhao@linaro.org>
> > >
> > > ACPI 6.0 introduces a new table STAO to list the devices which are used
> > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> > > UART is used by Xen. So here it hides UART from Dom0.
> > >
> > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> >
> > Well, this doesn't look right to me.
> >
> > We need to find a nicer way to achieve what you want.
>
> I take that you are talking about how to honor the STAO table in Linux.
> Do you have any concrete suggestions?
I do.
The last hunk of the patch is likely what it needs to be, although I'm
not sure if the place it is added to is the right one. That's a minor thing,
though.
The other part is problematic. Not that as it doesn't work, but because of
how it works. With these changes the device will be visible to the OS (in
fact to user space even), but will never be "present". I'm not sure if
that's what you want?
It might be better to add a check to acpi_bus_type_and_status() that will
evaluate the "should ignore?" thing and return -ENODEV if this is true. This
way the device won't be visible at all.
Thanks,
Rafael
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 16/17] FDT: Add a helper to get specified name subnode
2016-02-05 3:05 ` [PATCH v4 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
2016-02-05 14:15 ` Stefano Stabellini
@ 2016-02-09 5:04 ` Rob Herring
2016-02-23 11:13 ` Shannon Zhao
1 sibling, 1 reply; 34+ messages in thread
From: Rob Herring @ 2016-02-09 5:04 UTC (permalink / raw)
To: Shannon Zhao
Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel,
Stefano Stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel@lists.xen.org,
devicetree@vger.kernel.org, linux-efi@vger.kernel.org,
linux-kernel@vger.kernel.org, Ian Campbell, shannon.zhao,
peter.huangpeng
On Thu, Feb 4, 2016 at 9:05 PM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Sometimes it needs to check if there is a node in FDT by full path.
I'm confused. Are you searching by full path or...
> Introduce this helper to get the specified name subnode if it exists.
name of sub node?
Either way, fdt_subnode_offset or fdt_path_offset doesn't work?
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
> CC: Rob Herring <robh@kernel.org>
> ---
> drivers/of/fdt.c | 25 +++++++++++++++++++++++++
> include/linux/of_fdt.h | 2 ++
> 2 files changed, 27 insertions(+)
>
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index 655f79d..eacb188 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -645,6 +645,31 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
> }
>
> /**
> + * of_get_flat_dt_subnode_by_name - get subnode of specified node by name
> + *
> + * @node: the parent node
> + * @uname: the name of subnode
> + * @return offset of the subnode, or -FDT_ERR_NOTFOUND if there is none
> + */
> +
> +int of_get_flat_dt_subnode_by_name(unsigned long node, const char *uname)
> +{
> + const void *blob = initial_boot_params;
> + int offset;
> + const char *pathp;
> +
> + for (offset = fdt_first_subnode(blob, node);
> + offset >= 0;
> + offset = fdt_next_subnode(blob, offset)) {
> + pathp = fdt_get_name(blob, offset, NULL);
> + if (strcmp(pathp, uname) == 0)
> + return offset;
> + }
> +
> + return -FDT_ERR_NOTFOUND;
> +}
> +
> +/**
> * of_get_flat_dt_root - find the root node in the flat blob
> */
> unsigned long __init of_get_flat_dt_root(void)
> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
> index df9ef38..fc28162 100644
> --- a/include/linux/of_fdt.h
> +++ b/include/linux/of_fdt.h
> @@ -52,6 +52,8 @@ extern char __dtb_end[];
> extern int of_scan_flat_dt(int (*it)(unsigned long node, const char *uname,
> int depth, void *data),
> void *data);
> +extern int of_get_flat_dt_subnode_by_name(unsigned long node,
> + const char *uname);
> extern const void *of_get_flat_dt_prop(unsigned long node, const char *name,
> int *size);
> extern int of_flat_dt_is_compatible(unsigned long node, const char *name);
> --
> 2.0.4
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-08 22:25 ` Rafael J. Wysocki
@ 2016-02-09 11:19 ` Stefano Stabellini
2016-02-10 22:29 ` Rafael J. Wysocki
0 siblings, 1 reply; 34+ messages in thread
From: Stefano Stabellini @ 2016-02-09 11:19 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stefano Stabellini, Rafael J. Wysocki, Shannon Zhao,
linux-arm-kernel@lists.infradead.org, ard.biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, ian.campbell, Shannon Zhao,
peter.huangpeng, Len Brown, open list:ACPI
On Mon, 8 Feb 2016, Rafael J. Wysocki wrote:
> On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
> > On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
> > > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> > > > From: Shannon Zhao <shannon.zhao@linaro.org>
> > > >
> > > > ACPI 6.0 introduces a new table STAO to list the devices which are used
> > > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> > > > UART is used by Xen. So here it hides UART from Dom0.
> > > >
> > > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > >
> > > Well, this doesn't look right to me.
> > >
> > > We need to find a nicer way to achieve what you want.
> >
> > I take that you are talking about how to honor the STAO table in Linux.
> > Do you have any concrete suggestions?
>
> I do.
>
> The last hunk of the patch is likely what it needs to be, although I'm
> not sure if the place it is added to is the right one. That's a minor thing,
> though.
>
> The other part is problematic. Not that as it doesn't work, but because of
> how it works. With these changes the device will be visible to the OS (in
> fact to user space even), but will never be "present". I'm not sure if
> that's what you want?
>
> It might be better to add a check to acpi_bus_type_and_status() that will
> evaluate the "should ignore?" thing and return -ENODEV if this is true. This
> way the device won't be visible at all.
Something like below? Actually your suggestion is better, thank you!
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 78d5f02..4778c51 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1455,6 +1455,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
if (ACPI_FAILURE(status))
return -ENODEV;
+ if (acpi_check_device_is_ignored(handle))
+ return -ENODEV;
+
switch (acpi_type) {
case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */
case ACPI_TYPE_DEVICE:
^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-09 11:19 ` Stefano Stabellini
@ 2016-02-10 22:29 ` Rafael J. Wysocki
2016-02-11 16:04 ` Stefano Stabellini
0 siblings, 1 reply; 34+ messages in thread
From: Rafael J. Wysocki @ 2016-02-10 22:29 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Rafael J. Wysocki, Shannon Zhao,
linux-arm-kernel@lists.infradead.org, ard.biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, ian.campbell, Shannon Zhao,
peter.huangpeng, Len Brown, open list:ACPI
On Tuesday, February 09, 2016 11:19:02 AM Stefano Stabellini wrote:
> On Mon, 8 Feb 2016, Rafael J. Wysocki wrote:
> > On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
> > > On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
> > > > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> > > > > From: Shannon Zhao <shannon.zhao@linaro.org>
> > > > >
> > > > > ACPI 6.0 introduces a new table STAO to list the devices which are used
> > > > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> > > > > UART is used by Xen. So here it hides UART from Dom0.
> > > > >
> > > > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > > > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > >
> > > > Well, this doesn't look right to me.
> > > >
> > > > We need to find a nicer way to achieve what you want.
> > >
> > > I take that you are talking about how to honor the STAO table in Linux.
> > > Do you have any concrete suggestions?
> >
> > I do.
> >
> > The last hunk of the patch is likely what it needs to be, although I'm
> > not sure if the place it is added to is the right one. That's a minor thing,
> > though.
> >
> > The other part is problematic. Not that as it doesn't work, but because of
> > how it works. With these changes the device will be visible to the OS (in
> > fact to user space even), but will never be "present". I'm not sure if
> > that's what you want?
> >
> > It might be better to add a check to acpi_bus_type_and_status() that will
> > evaluate the "should ignore?" thing and return -ENODEV if this is true. This
> > way the device won't be visible at all.
>
> Something like below? Actually your suggestion is better, thank you!
>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 78d5f02..4778c51 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1455,6 +1455,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
> if (ACPI_FAILURE(status))
> return -ENODEV;
>
> + if (acpi_check_device_is_ignored(handle))
> + return -ENODEV;
> +
> switch (acpi_type) {
> case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */
> case ACPI_TYPE_DEVICE:
>
I thought about doing that under ACPI_TYPE_DEVICE, because it shouldn't be
applicable to the other types. But generally, yes.
Plus I'd move the table checks to acpi_scan_init(), so the UART address can
be a static variable in scan.c.
Also maybe rename acpi_check_device_is_ignored() to something like
acpi_device_should_be_hidden().
Thanks,
Rafael
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-10 22:29 ` Rafael J. Wysocki
@ 2016-02-11 16:04 ` Stefano Stabellini
2016-02-11 22:22 ` Rafael J. Wysocki
0 siblings, 1 reply; 34+ messages in thread
From: Stefano Stabellini @ 2016-02-11 16:04 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stefano Stabellini, Rafael J. Wysocki, Shannon Zhao,
linux-arm-kernel@lists.infradead.org, ard.biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, ian.campbell, Shannon Zhao,
peter.huangpeng, Len Brown, open list:ACPI
On Wed, 10 Feb 2016, Rafael J. Wysocki wrote:
> On Tuesday, February 09, 2016 11:19:02 AM Stefano Stabellini wrote:
> > On Mon, 8 Feb 2016, Rafael J. Wysocki wrote:
> > > On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
> > > > On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
> > > > > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> > > > > > From: Shannon Zhao <shannon.zhao@linaro.org>
> > > > > >
> > > > > > ACPI 6.0 introduces a new table STAO to list the devices which are used
> > > > > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> > > > > > UART is used by Xen. So here it hides UART from Dom0.
> > > > > >
> > > > > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > > > > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > > >
> > > > > Well, this doesn't look right to me.
> > > > >
> > > > > We need to find a nicer way to achieve what you want.
> > > >
> > > > I take that you are talking about how to honor the STAO table in Linux.
> > > > Do you have any concrete suggestions?
> > >
> > > I do.
> > >
> > > The last hunk of the patch is likely what it needs to be, although I'm
> > > not sure if the place it is added to is the right one. That's a minor thing,
> > > though.
> > >
> > > The other part is problematic. Not that as it doesn't work, but because of
> > > how it works. With these changes the device will be visible to the OS (in
> > > fact to user space even), but will never be "present". I'm not sure if
> > > that's what you want?
> > >
> > > It might be better to add a check to acpi_bus_type_and_status() that will
> > > evaluate the "should ignore?" thing and return -ENODEV if this is true. This
> > > way the device won't be visible at all.
> >
> > Something like below? Actually your suggestion is better, thank you!
> >
> > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> > index 78d5f02..4778c51 100644
> > --- a/drivers/acpi/scan.c
> > +++ b/drivers/acpi/scan.c
> > @@ -1455,6 +1455,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
> > if (ACPI_FAILURE(status))
> > return -ENODEV;
> >
> > + if (acpi_check_device_is_ignored(handle))
> > + return -ENODEV;
> > +
> > switch (acpi_type) {
> > case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */
> > case ACPI_TYPE_DEVICE:
> >
>
> I thought about doing that under ACPI_TYPE_DEVICE, because it shouldn't be
> applicable to the other types. But generally, yes.
I was pondering about it myself. Maybe an ACPI_TYPE_PROCESSOR object
could theoretically be hidden with the STAO? I added the check before
the switch because I thought that there would be no harm in being
caution about it.
> Plus I'd move the table checks to acpi_scan_init(), so the UART address can
> be a static variable in scan.c.
>
> Also maybe rename acpi_check_device_is_ignored() to something like
> acpi_device_should_be_hidden().
Both make sense. Shannon, are you happy to make these changes?
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-11 16:04 ` Stefano Stabellini
@ 2016-02-11 22:22 ` Rafael J. Wysocki
2016-02-12 11:50 ` Stefano Stabellini
2016-02-29 2:02 ` Shannon Zhao
0 siblings, 2 replies; 34+ messages in thread
From: Rafael J. Wysocki @ 2016-02-11 22:22 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Rafael J. Wysocki, Shannon Zhao,
linux-arm-kernel@lists.infradead.org, ard.biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, ian.campbell, Shannon Zhao,
peter.huangpeng, Len Brown, open list:ACPI
On Thursday, February 11, 2016 04:04:14 PM Stefano Stabellini wrote:
> On Wed, 10 Feb 2016, Rafael J. Wysocki wrote:
> > On Tuesday, February 09, 2016 11:19:02 AM Stefano Stabellini wrote:
> > > On Mon, 8 Feb 2016, Rafael J. Wysocki wrote:
> > > > On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
> > > > > On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
> > > > > > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> > > > > > > From: Shannon Zhao <shannon.zhao@linaro.org>
> > > > > > >
> > > > > > > ACPI 6.0 introduces a new table STAO to list the devices which are used
> > > > > > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> > > > > > > UART is used by Xen. So here it hides UART from Dom0.
> > > > > > >
> > > > > > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > > > > > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > > > >
> > > > > > Well, this doesn't look right to me.
> > > > > >
> > > > > > We need to find a nicer way to achieve what you want.
> > > > >
> > > > > I take that you are talking about how to honor the STAO table in Linux.
> > > > > Do you have any concrete suggestions?
> > > >
> > > > I do.
> > > >
> > > > The last hunk of the patch is likely what it needs to be, although I'm
> > > > not sure if the place it is added to is the right one. That's a minor thing,
> > > > though.
> > > >
> > > > The other part is problematic. Not that as it doesn't work, but because of
> > > > how it works. With these changes the device will be visible to the OS (in
> > > > fact to user space even), but will never be "present". I'm not sure if
> > > > that's what you want?
> > > >
> > > > It might be better to add a check to acpi_bus_type_and_status() that will
> > > > evaluate the "should ignore?" thing and return -ENODEV if this is true. This
> > > > way the device won't be visible at all.
> > >
> > > Something like below? Actually your suggestion is better, thank you!
> > >
> > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> > > index 78d5f02..4778c51 100644
> > > --- a/drivers/acpi/scan.c
> > > +++ b/drivers/acpi/scan.c
> > > @@ -1455,6 +1455,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
> > > if (ACPI_FAILURE(status))
> > > return -ENODEV;
> > >
> > > + if (acpi_check_device_is_ignored(handle))
> > > + return -ENODEV;
> > > +
> > > switch (acpi_type) {
> > > case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */
> > > case ACPI_TYPE_DEVICE:
> > >
> >
> > I thought about doing that under ACPI_TYPE_DEVICE, because it shouldn't be
> > applicable to the other types. But generally, yes.
>
> I was pondering about it myself. Maybe an ACPI_TYPE_PROCESSOR object
> could theoretically be hidden with the STAO?
But this patch won't check for it anyway, will it?
It seems to be only checking against the UART address or have I missed
anything?
> I added the check before
> the switch because I thought that there would be no harm in being
> caution about it.
>
>
> > Plus I'd move the table checks to acpi_scan_init(), so the UART address can
> > be a static variable in scan.c.
> >
> > Also maybe rename acpi_check_device_is_ignored() to something like
> > acpi_device_should_be_hidden().
>
> Both make sense. Shannon, are you happy to make these changes?
Plus maybe make acpi_device_should_be_hidden() print a (KERN_INFO) message
when it decides to hide something?
Thanks,
Rafael
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-11 22:22 ` Rafael J. Wysocki
@ 2016-02-12 11:50 ` Stefano Stabellini
2016-02-12 12:57 ` Rafael J. Wysocki
2016-02-29 2:02 ` Shannon Zhao
1 sibling, 1 reply; 34+ messages in thread
From: Stefano Stabellini @ 2016-02-12 11:50 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stefano Stabellini, Rafael J. Wysocki, Shannon Zhao,
linux-arm-kernel@lists.infradead.org, ard.biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, ian.campbell, Shannon Zhao,
peter.huangpeng, Len Brown, open list:ACPI
On Thu, 11 Feb 2016, Rafael J. Wysocki wrote:
> On Thursday, February 11, 2016 04:04:14 PM Stefano Stabellini wrote:
> > On Wed, 10 Feb 2016, Rafael J. Wysocki wrote:
> > > On Tuesday, February 09, 2016 11:19:02 AM Stefano Stabellini wrote:
> > > > On Mon, 8 Feb 2016, Rafael J. Wysocki wrote:
> > > > > On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
> > > > > > On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
> > > > > > > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> > > > > > > > From: Shannon Zhao <shannon.zhao@linaro.org>
> > > > > > > >
> > > > > > > > ACPI 6.0 introduces a new table STAO to list the devices which are used
> > > > > > > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
> > > > > > > > UART is used by Xen. So here it hides UART from Dom0.
> > > > > > > >
> > > > > > > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > > > > > > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > > > > >
> > > > > > > Well, this doesn't look right to me.
> > > > > > >
> > > > > > > We need to find a nicer way to achieve what you want.
> > > > > >
> > > > > > I take that you are talking about how to honor the STAO table in Linux.
> > > > > > Do you have any concrete suggestions?
> > > > >
> > > > > I do.
> > > > >
> > > > > The last hunk of the patch is likely what it needs to be, although I'm
> > > > > not sure if the place it is added to is the right one. That's a minor thing,
> > > > > though.
> > > > >
> > > > > The other part is problematic. Not that as it doesn't work, but because of
> > > > > how it works. With these changes the device will be visible to the OS (in
> > > > > fact to user space even), but will never be "present". I'm not sure if
> > > > > that's what you want?
> > > > >
> > > > > It might be better to add a check to acpi_bus_type_and_status() that will
> > > > > evaluate the "should ignore?" thing and return -ENODEV if this is true. This
> > > > > way the device won't be visible at all.
> > > >
> > > > Something like below? Actually your suggestion is better, thank you!
> > > >
> > > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> > > > index 78d5f02..4778c51 100644
> > > > --- a/drivers/acpi/scan.c
> > > > +++ b/drivers/acpi/scan.c
> > > > @@ -1455,6 +1455,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
> > > > if (ACPI_FAILURE(status))
> > > > return -ENODEV;
> > > >
> > > > + if (acpi_check_device_is_ignored(handle))
> > > > + return -ENODEV;
> > > > +
> > > > switch (acpi_type) {
> > > > case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */
> > > > case ACPI_TYPE_DEVICE:
> > > >
> > >
> > > I thought about doing that under ACPI_TYPE_DEVICE, because it shouldn't be
> > > applicable to the other types. But generally, yes.
> >
> > I was pondering about it myself. Maybe an ACPI_TYPE_PROCESSOR object
> > could theoretically be hidden with the STAO?
>
> But this patch won't check for it anyway, will it?
>
> It seems to be only checking against the UART address or have I missed
> anything?
You are right, this patch only checks for the UART address, which is
critical.
However the STAO also has a "Name List" field with a list of paths in
ACPI namespace to hide. If not implementing proper "Name List" support,
at least, as part of this patch, it would be nice to check for the
presence of the Name List field in the table, and print a warning such
as "STAO Name List not yet supported" when the field is present.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-12 11:50 ` Stefano Stabellini
@ 2016-02-12 12:57 ` Rafael J. Wysocki
0 siblings, 0 replies; 34+ messages in thread
From: Rafael J. Wysocki @ 2016-02-12 12:57 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Rafael J. Wysocki, Rafael J. Wysocki, Shannon Zhao,
linux-arm-kernel@lists.infradead.org, Ard Biesheuvel,
stefano.stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel, devicetree@vger.kernel.org,
linux-efi, Linux Kernel Mailing List, Ian Campbell, Shannon Zhao,
peter.huangpeng, Len Brown, open list:ACPI
On Fri, Feb 12, 2016 at 12:50 PM, Stefano Stabellini
<stefano.stabellini@eu.citrix.com> wrote:
> On Thu, 11 Feb 2016, Rafael J. Wysocki wrote:
>> On Thursday, February 11, 2016 04:04:14 PM Stefano Stabellini wrote:
>> > On Wed, 10 Feb 2016, Rafael J. Wysocki wrote:
>> > > On Tuesday, February 09, 2016 11:19:02 AM Stefano Stabellini wrote:
>> > > > On Mon, 8 Feb 2016, Rafael J. Wysocki wrote:
>> > > > > On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
>> > > > > > On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
>> > > > > > > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
>> > > > > > > > From: Shannon Zhao <shannon.zhao@linaro.org>
>> > > > > > > >
>> > > > > > > > ACPI 6.0 introduces a new table STAO to list the devices which are used
>> > > > > > > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
>> > > > > > > > UART is used by Xen. So here it hides UART from Dom0.
>> > > > > > > >
>> > > > > > > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> > > > > > > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
>> > > > > > >
>> > > > > > > Well, this doesn't look right to me.
>> > > > > > >
>> > > > > > > We need to find a nicer way to achieve what you want.
>> > > > > >
>> > > > > > I take that you are talking about how to honor the STAO table in Linux.
>> > > > > > Do you have any concrete suggestions?
>> > > > >
>> > > > > I do.
>> > > > >
>> > > > > The last hunk of the patch is likely what it needs to be, although I'm
>> > > > > not sure if the place it is added to is the right one. That's a minor thing,
>> > > > > though.
>> > > > >
>> > > > > The other part is problematic. Not that as it doesn't work, but because of
>> > > > > how it works. With these changes the device will be visible to the OS (in
>> > > > > fact to user space even), but will never be "present". I'm not sure if
>> > > > > that's what you want?
>> > > > >
>> > > > > It might be better to add a check to acpi_bus_type_and_status() that will
>> > > > > evaluate the "should ignore?" thing and return -ENODEV if this is true. This
>> > > > > way the device won't be visible at all.
>> > > >
>> > > > Something like below? Actually your suggestion is better, thank you!
>> > > >
>> > > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
>> > > > index 78d5f02..4778c51 100644
>> > > > --- a/drivers/acpi/scan.c
>> > > > +++ b/drivers/acpi/scan.c
>> > > > @@ -1455,6 +1455,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
>> > > > if (ACPI_FAILURE(status))
>> > > > return -ENODEV;
>> > > >
>> > > > + if (acpi_check_device_is_ignored(handle))
>> > > > + return -ENODEV;
>> > > > +
>> > > > switch (acpi_type) {
>> > > > case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */
>> > > > case ACPI_TYPE_DEVICE:
>> > > >
>> > >
>> > > I thought about doing that under ACPI_TYPE_DEVICE, because it shouldn't be
>> > > applicable to the other types. But generally, yes.
>> >
>> > I was pondering about it myself. Maybe an ACPI_TYPE_PROCESSOR object
>> > could theoretically be hidden with the STAO?
>>
>> But this patch won't check for it anyway, will it?
>>
>> It seems to be only checking against the UART address or have I missed
>> anything?
>
> You are right, this patch only checks for the UART address, which is
> critical.
>
> However the STAO also has a "Name List" field with a list of paths in
> ACPI namespace to hide. If not implementing proper "Name List" support,
> at least, as part of this patch, it would be nice to check for the
> presence of the Name List field in the table, and print a warning such
> as "STAO Name List not yet supported" when the field is present.
That would be fine, but anyway it belongs to the table parsing part IMO.
And the check can be moved when adding proper support for the name list part.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 16/17] FDT: Add a helper to get specified name subnode
2016-02-09 5:04 ` Rob Herring
@ 2016-02-23 11:13 ` Shannon Zhao
2016-02-24 14:53 ` Rob Herring
0 siblings, 1 reply; 34+ messages in thread
From: Shannon Zhao @ 2016-02-23 11:13 UTC (permalink / raw)
To: Rob Herring
Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel,
Stefano Stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel@lists.xen.org,
devicetree@vger.kernel.org, linux-efi@vger.kernel.org,
linux-kernel@vger.kernel.org, Ian Campbell, shannon.zhao,
peter.huangpeng
On 2016/2/9 13:04, Rob Herring wrote:
> On Thu, Feb 4, 2016 at 9:05 PM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
>> From: Shannon Zhao <shannon.zhao@linaro.org>
>>
>> Sometimes it needs to check if there is a node in FDT by full path.
>
> I'm confused. Are you searching by full path or...
>
>> Introduce this helper to get the specified name subnode if it exists.
>
> name of sub node?
>
get the offset of sub node by specified name.
> Either way, fdt_subnode_offset or fdt_path_offset doesn't work?
>
Ah，right，both of them should work. Does it need to add a wrapper in
drivers/of/fdt.c for them or directly use them with the parameter
initial_boot_params?
Thanks,
>>
>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> ---
>> CC: Rob Herring <robh@kernel.org>
>> ---
>> drivers/of/fdt.c | 25 +++++++++++++++++++++++++
>> include/linux/of_fdt.h | 2 ++
>> 2 files changed, 27 insertions(+)
>>
>> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
>> index 655f79d..eacb188 100644
>> --- a/drivers/of/fdt.c
>> +++ b/drivers/of/fdt.c
>> @@ -645,6 +645,31 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
>> }
>>
>> /**
>> + * of_get_flat_dt_subnode_by_name - get subnode of specified node by name
>> + *
>> + * @node: the parent node
>> + * @uname: the name of subnode
>> + * @return offset of the subnode, or -FDT_ERR_NOTFOUND if there is none
>> + */
>> +
>> +int of_get_flat_dt_subnode_by_name(unsigned long node, const char *uname)
>> +{
>> + const void *blob = initial_boot_params;
>> + int offset;
>> + const char *pathp;
>> +
>> + for (offset = fdt_first_subnode(blob, node);
>> + offset >= 0;
>> + offset = fdt_next_subnode(blob, offset)) {
>> + pathp = fdt_get_name(blob, offset, NULL);
>> + if (strcmp(pathp, uname) == 0)
>> + return offset;
>> + }
>> +
>> + return -FDT_ERR_NOTFOUND;
>> +}
>> +
>> +/**
>> * of_get_flat_dt_root - find the root node in the flat blob
>> */
>> unsigned long __init of_get_flat_dt_root(void)
>> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
>> index df9ef38..fc28162 100644
>> --- a/include/linux/of_fdt.h
>> +++ b/include/linux/of_fdt.h
>> @@ -52,6 +52,8 @@ extern char __dtb_end[];
>> extern int of_scan_flat_dt(int (*it)(unsigned long node, const char *uname,
>> int depth, void *data),
>> void *data);
>> +extern int of_get_flat_dt_subnode_by_name(unsigned long node,
>> + const char *uname);
>> extern const void *of_get_flat_dt_prop(unsigned long node, const char *name,
>> int *size);
>> extern int of_flat_dt_is_compatible(unsigned long node, const char *name);
>> --
>> 2.0.4
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe devicetree" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> .
>
--
Shannon
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 16/17] FDT: Add a helper to get specified name subnode
2016-02-23 11:13 ` Shannon Zhao
@ 2016-02-24 14:53 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2016-02-24 14:53 UTC (permalink / raw)
To: Shannon Zhao
Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel,
Stefano Stabellini, david.vrabel, Catalin Marinas, Will Deacon,
Mark Rutland, julien.grall, xen-devel@lists.xen.org,
devicetree@vger.kernel.org, linux-efi@vger.kernel.org,
linux-kernel@vger.kernel.org, Ian Campbell, Shannon Zhao,
peter.huangpeng
On Tue, Feb 23, 2016 at 5:13 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
>
>
> On 2016/2/9 13:04, Rob Herring wrote:
>> On Thu, Feb 4, 2016 at 9:05 PM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
>>> From: Shannon Zhao <shannon.zhao@linaro.org>
>>>
>>> Sometimes it needs to check if there is a node in FDT by full path.
>>
>> I'm confused. Are you searching by full path or...
>>
>>> Introduce this helper to get the specified name subnode if it exists.
>>
>> name of sub node?
>>
> get the offset of sub node by specified name.
>
>> Either way, fdt_subnode_offset or fdt_path_offset doesn't work?
>>
> Ah，right，both of them should work. Does it need to add a wrapper in
> drivers/of/fdt.c for them or directly use them with the parameter
> initial_boot_params?
Add a wrapper in fdt.c.
Rob
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen
2016-02-11 22:22 ` Rafael J. Wysocki
2016-02-12 11:50 ` Stefano Stabellini
@ 2016-02-29 2:02 ` Shannon Zhao
1 sibling, 0 replies; 34+ messages in thread
From: Shannon Zhao @ 2016-02-29 2:02 UTC (permalink / raw)
To: Rafael J. Wysocki, Stefano Stabellini
Cc: Rafael J. Wysocki, linux-arm-kernel@lists.infradead.org,
ard.biesheuvel, stefano.stabellini, david.vrabel, Catalin Marinas,
Will Deacon, Mark Rutland, julien.grall, xen-devel,
devicetree@vger.kernel.org, linux-efi, Linux Kernel Mailing List,
ian.campbell, Shannon Zhao, peter.huangpeng, Len Brown, ACPI
On 2016/2/12 6:22, Rafael J. Wysocki wrote:
> On Thursday, February 11, 2016 04:04:14 PM Stefano Stabellini wrote:
>> > On Wed, 10 Feb 2016, Rafael J. Wysocki wrote:
>>> > > On Tuesday, February 09, 2016 11:19:02 AM Stefano Stabellini wrote:
>>>> > > > On Mon, 8 Feb 2016, Rafael J. Wysocki wrote:
>>>>> > > > > On Monday, February 08, 2016 10:57:01 AM Stefano Stabellini wrote:
>>>>>> > > > > > On Sat, 6 Feb 2016, Rafael J. Wysocki wrote:
>>>>>>> > > > > > > On Fri, Feb 5, 2016 at 4:05 AM, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
>>>>>>>> > > > > > > > From: Shannon Zhao <shannon.zhao@linaro.org>
>>>>>>>> > > > > > > >
>>>>>>>> > > > > > > > ACPI 6.0 introduces a new table STAO to list the devices which are used
>>>>>>>> > > > > > > > by Xen and can't be used by Dom0. On Xen virtual platforms, the physical
>>>>>>>> > > > > > > > UART is used by Xen. So here it hides UART from Dom0.
>>>>>>>> > > > > > > >
>>>>>>>> > > > > > > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>>>>>>>> > > > > > > > Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
>>>>>>> > > > > > >
>>>>>>> > > > > > > Well, this doesn't look right to me.
>>>>>>> > > > > > >
>>>>>>> > > > > > > We need to find a nicer way to achieve what you want.
>>>>>> > > > > >
>>>>>> > > > > > I take that you are talking about how to honor the STAO table in Linux.
>>>>>> > > > > > Do you have any concrete suggestions?
>>>>> > > > >
>>>>> > > > > I do.
>>>>> > > > >
>>>>> > > > > The last hunk of the patch is likely what it needs to be, although I'm
>>>>> > > > > not sure if the place it is added to is the right one. That's a minor thing,
>>>>> > > > > though.
>>>>> > > > >
>>>>> > > > > The other part is problematic. Not that as it doesn't work, but because of
>>>>> > > > > how it works. With these changes the device will be visible to the OS (in
>>>>> > > > > fact to user space even), but will never be "present". I'm not sure if
>>>>> > > > > that's what you want?
>>>>> > > > >
>>>>> > > > > It might be better to add a check to acpi_bus_type_and_status() that will
>>>>> > > > > evaluate the "should ignore?" thing and return -ENODEV if this is true. This
>>>>> > > > > way the device won't be visible at all.
>>>> > > >
>>>> > > > Something like below? Actually your suggestion is better, thank you!
>>>> > > >
>>>> > > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
>>>> > > > index 78d5f02..4778c51 100644
>>>> > > > --- a/drivers/acpi/scan.c
>>>> > > > +++ b/drivers/acpi/scan.c
>>>> > > > @@ -1455,6 +1455,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
>>>> > > > if (ACPI_FAILURE(status))
>>>> > > > return -ENODEV;
>>>> > > >
>>>> > > > + if (acpi_check_device_is_ignored(handle))
>>>> > > > + return -ENODEV;
>>>> > > > +
>>>> > > > switch (acpi_type) {
>>>> > > > case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */
>>>> > > > case ACPI_TYPE_DEVICE:
>>>> > > >
>>> > >
>>> > > I thought about doing that under ACPI_TYPE_DEVICE, because it shouldn't be
>>> > > applicable to the other types. But generally, yes.
>> >
>> > I was pondering about it myself. Maybe an ACPI_TYPE_PROCESSOR object
>> > could theoretically be hidden with the STAO?
> But this patch won't check for it anyway, will it?
>
> It seems to be only checking against the UART address or have I missed
> anything?
>
>> > I added the check before
>> > the switch because I thought that there would be no harm in being
>> > caution about it.
>> >
>> >
>>> > > Plus I'd move the table checks to acpi_scan_init(), so the UART address can
>>> > > be a static variable in scan.c.
>>> > >
>>> > > Also maybe rename acpi_check_device_is_ignored() to something like
>>> > > acpi_device_should_be_hidden().
>> >
>> > Both make sense. Shannon, are you happy to make these changes?
> Plus maybe make acpi_device_should_be_hidden() print a (KERN_INFO) message
> when it decides to hide something?
Ok, will update this patch. Thanks a lot!
--
Shannon
^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2016-02-29 2:03 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-02-06 10:23 ` Rafael J. Wysocki
2016-02-08 10:57 ` Stefano Stabellini
2016-02-08 22:25 ` Rafael J. Wysocki
2016-02-09 11:19 ` Stefano Stabellini
2016-02-10 22:29 ` Rafael J. Wysocki
2016-02-11 16:04 ` Stefano Stabellini
2016-02-11 22:22 ` Rafael J. Wysocki
2016-02-12 11:50 ` Stefano Stabellini
2016-02-12 12:57 ` Rafael J. Wysocki
2016-02-29 2:02 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-02-08 11:43 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-02-08 11:31 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
2016-02-05 14:15 ` Stefano Stabellini
2016-02-09 5:04 ` Rob Herring
2016-02-23 11:13 ` Shannon Zhao
2016-02-24 14:53 ` Rob Herring
2016-02-05 3:05 ` [PATCH v4 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).