Received: by 10.223.185.116 with SMTP id b49csp1791532wrg; Thu, 15 Feb 2018 01:26:30 -0800 (PST) X-Google-Smtp-Source: AH8x224MAeVe8Umio47WJXbfr0en/dGkbSrNtXVSCJsM+2nvqzXBJh6e3H+eLmzBxQUky8gTT195 X-Received: by 2002:a17:902:868f:: with SMTP id g15-v6mr1926546plo.137.1518686790365; Thu, 15 Feb 2018 01:26:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518686790; cv=none; d=google.com; s=arc-20160816; b=MtKaKkuEiCytjVupg3dkjoJy/suf0cdEWKNfLIhW1OTTjh0Lhr+6tkTC09fbOpZeNC Yy+ERS1U8GdtzetfJAmAV8bQUNvNBG/su+0N+HLKFSlM5ecst7GghKXR8Ol7j0/9UySb JqclPjjpSJBPThqrW5jQh9D4sqQ8G+vDmnZMdi8ew6POCTxNe/0Lk4EByyHyPNClLJao xgXu7+H824cCsQaSMDXNB3J25b6kJ4fBJeX9Y4CHpT5KIufA755Cnc5pZPt3qDbx6gOe 4o2wMsgBJAQqzEFVH4irKjtBGMQdfXQATB076VbwCZlbK18uxC5O8NwvAS6uB+//TA4K 98kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:cc:to:subject :message-id:date:from:references:in-reply-to:mime-version :arc-authentication-results; bh=COXTFoT0DM4cpQH6QUdkmlxa8UC/TGhhxDR6W5R7xoo=; b=QmYLlWeEuPdyWAmKxCbu+dgg6c+9LmE3VOyCRobebvGsuyZgji1kif3/0I1ehBdZye gFudgHgZd7sdom5g08GwxZJrxpGSE/7qHQFj55TE1Ggi+pVlRDn/B/CS6BO/tTA+tseh UoGgxiLAaiUYD/E1Yqlk2L0N3fFkkbmqcEg5oqsnoyNvz0oLrkDJF61j1GTvBKUsp2UU VbY64gEDS8jA3iQFs+K67bNzoE9pIIc1WhbemYKksoYxOnoskCrIPvO/PLckopn/oQIP CL4djWW7KPBxcpVw8+/+IxzmP9y4j96l7+QZ3WnYb3Zx/EaKhFKOjLEbP/3obBWW75Lq F5pQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u18si1638557pfl.259.2018.02.15.01.26.15; Thu, 15 Feb 2018 01:26:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755198AbeBOJZc convert rfc822-to-8bit (ORCPT + 99 others); Thu, 15 Feb 2018 04:25:32 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:42110 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755126AbeBOJZ3 (ORCPT ); Thu, 15 Feb 2018 04:25:29 -0500 Received: by mail-qk0-f195.google.com with SMTP id b130so12959516qkg.9 for ; Thu, 15 Feb 2018 01:25:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=vmc05UeobEuKumvicoFqoEgNHGXgmOFrfUXFaLaulh0=; b=R3EyXNOdv1yn1H7C7oic78JekoPdG4Aq5K/4tRrLXSWO3NW8YBXyv5qmlWJ1jLCE1F m5vw7ROGjbcCRCGoYH/5+M6GDJqPF/oFDgLEBQGQ2c7aPqwFS7HyNaKFayG0nndrZ1et yAssXUS68jTGaNstuoqjjQaqiUfsCR8KUnHnLK1P2zn4eM1O1p5LpavhbJAkg08O3LCD tVV4nEwZnDspV2dm3NKO60ESOk9yQAzyOLj5eTDESFWxOtmfQ9qXqCW3pG0N+fgehMbG RYYkwCyKTGex+9/y0KVcVXTgF/9Dfnd7gT6G0fretLdHJ03dBnLE8/m761eutjzzUso/ stLg== X-Gm-Message-State: APf1xPCpiwn2UkEbVriMwf14SfoL0bBWsLfFbRwWZAg6WhFCG/xsBsL+ 8hnK6vArIHPSg3CQpv47LTVimhUekJhc3QVfSgYFnHe+ X-Received: by 10.55.209.87 with SMTP id s84mr3115822qki.324.1518686728279; Thu, 15 Feb 2018 01:25:28 -0800 (PST) MIME-Version: 1.0 Received: by 10.12.146.213 with HTTP; Thu, 15 Feb 2018 01:25:27 -0800 (PST) In-Reply-To: <20180214223631-mutt-send-email-mst@kernel.org> References: <20180214141850.4017-1-marcandre.lureau@redhat.com> <20180214141850.4017-3-marcandre.lureau@redhat.com> <20180214223631-mutt-send-email-mst@kernel.org> From: Marc-Andre Lureau Date: Thu, 15 Feb 2018 10:25:27 +0100 Message-ID: Subject: Re: [PATCH v14 2/9] fw_cfg: add a public uapi header To: "Michael S. Tsirkin" Cc: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , Linux Kernel Mailing List , Baoquan He , Sergio Lopez Pascual , "Somlo, Gabriel" , xiaolong.ye@intel.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi On Wed, Feb 14, 2018 at 9:41 PM, Michael S. Tsirkin wrote: > On Wed, Feb 14, 2018 at 03:18:43PM +0100, Marc-André Lureau wrote: >> Create a common header file for well-known values and structures to be >> shared by the Linux kernel with qemu or other projects. >> >> Suggested-by: Michael S. Tsirkin >> Signed-off-by: Marc-André Lureau >> >> --- >> >> The related qemu patch making use of it, to be submitted: >> https://github.com/elmarco/qemu/commit/4884fc9e9c4c4467a371e5a40f3181239e1b70f5 >> --- >> MAINTAINERS | 1 + >> drivers/firmware/qemu_fw_cfg.c | 22 +-------- >> include/uapi/linux/fw_cfg.h | 102 +++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 105 insertions(+), 20 deletions(-) >> create mode 100644 include/uapi/linux/fw_cfg.h >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 3bdc260e36b7..a66b65f62811 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -11352,6 +11352,7 @@ M: "Michael S. Tsirkin" >> L: qemu-devel@nongnu.org >> S: Maintained >> F: drivers/firmware/qemu_fw_cfg.c >> +F: include/uapi/linux/fw_cfg.h >> >> QIB DRIVER >> M: Dennis Dalessandro >> diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c >> index a41b572eeeb1..90f467232777 100644 >> --- a/drivers/firmware/qemu_fw_cfg.c >> +++ b/drivers/firmware/qemu_fw_cfg.c >> @@ -32,30 +32,12 @@ >> #include >> #include >> #include >> +#include >> >> MODULE_AUTHOR("Gabriel L. Somlo "); >> MODULE_DESCRIPTION("QEMU fw_cfg sysfs support"); >> MODULE_LICENSE("GPL"); >> >> -/* selector key values for "well-known" fw_cfg entries */ >> -#define FW_CFG_SIGNATURE 0x00 >> -#define FW_CFG_ID 0x01 >> -#define FW_CFG_FILE_DIR 0x19 >> - >> -/* size in bytes of fw_cfg signature */ >> -#define FW_CFG_SIG_SIZE 4 >> - >> -/* fw_cfg "file name" is up to 56 characters (including terminating nul) */ >> -#define FW_CFG_MAX_FILE_PATH 56 >> - >> -/* fw_cfg file directory entry type */ >> -struct fw_cfg_file { >> - u32 size; >> - u16 select; >> - u16 reserved; >> - char name[FW_CFG_MAX_FILE_PATH]; >> -}; >> - >> /* fw_cfg device i/o register addresses */ >> static bool fw_cfg_is_mmio; >> static phys_addr_t fw_cfg_p_base; >> @@ -597,7 +579,7 @@ MODULE_DEVICE_TABLE(of, fw_cfg_sysfs_mmio_match); >> >> #ifdef CONFIG_ACPI >> static const struct acpi_device_id fw_cfg_sysfs_acpi_match[] = { >> - { "QEMU0002", }, >> + { FW_CFG_ACPI_DEVICE_ID, }, >> {}, >> }; >> MODULE_DEVICE_TABLE(acpi, fw_cfg_sysfs_acpi_match); >> diff --git a/include/uapi/linux/fw_cfg.h b/include/uapi/linux/fw_cfg.h >> new file mode 100644 >> index 000000000000..5b8136ce46ee >> --- /dev/null >> +++ b/include/uapi/linux/fw_cfg.h >> @@ -0,0 +1,102 @@ >> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ >> +#ifndef _LINUX_FW_CFG_H >> +#define _LINUX_FW_CFG_H >> + >> +#include >> + >> +#define FW_CFG_ACPI_DEVICE_ID "QEMU0002" >> + >> +/* selector key values for "well-known" fw_cfg entries */ >> +#define FW_CFG_SIGNATURE 0x00 >> +#define FW_CFG_ID 0x01 >> +#define FW_CFG_UUID 0x02 >> +#define FW_CFG_RAM_SIZE 0x03 >> +#define FW_CFG_NOGRAPHIC 0x04 >> +#define FW_CFG_NB_CPUS 0x05 >> +#define FW_CFG_MACHINE_ID 0x06 >> +#define FW_CFG_KERNEL_ADDR 0x07 >> +#define FW_CFG_KERNEL_SIZE 0x08 >> +#define FW_CFG_KERNEL_CMDLINE 0x09 >> +#define FW_CFG_INITRD_ADDR 0x0a >> +#define FW_CFG_INITRD_SIZE 0x0b >> +#define FW_CFG_BOOT_DEVICE 0x0c >> +#define FW_CFG_NUMA 0x0d >> +#define FW_CFG_BOOT_MENU 0x0e >> +#define FW_CFG_MAX_CPUS 0x0f >> +#define FW_CFG_KERNEL_ENTRY 0x10 >> +#define FW_CFG_KERNEL_DATA 0x11 >> +#define FW_CFG_INITRD_DATA 0x12 >> +#define FW_CFG_CMDLINE_ADDR 0x13 >> +#define FW_CFG_CMDLINE_SIZE 0x14 >> +#define FW_CFG_CMDLINE_DATA 0x15 >> +#define FW_CFG_SETUP_ADDR 0x16 >> +#define FW_CFG_SETUP_SIZE 0x17 >> +#define FW_CFG_SETUP_DATA 0x18 >> +#define FW_CFG_FILE_DIR 0x19 >> + >> +#define FW_CFG_FILE_FIRST 0x20 >> +#define FW_CFG_FILE_SLOTS_MIN 0x10 >> + >> +#define FW_CFG_WRITE_CHANNEL 0x4000 >> +#define FW_CFG_ARCH_LOCAL 0x8000 >> +#define FW_CFG_ENTRY_MASK (~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL)) >> + >> +#define FW_CFG_INVALID 0xffff >> + >> +/* width in bytes of fw_cfg control register */ >> +#define FW_CFG_CTL_SIZE 0x02 >> + >> +/* fw_cfg "file name" is up to 56 characters (including terminating nul) */ >> +#define FW_CFG_MAX_FILE_PATH 56 >> + >> +/* size in bytes of fw_cfg signature */ >> +#define FW_CFG_SIG_SIZE 4 >> + >> +/* FW_CFG_ID bits */ >> +#define FW_CFG_VERSION 0x01 >> +#define FW_CFG_VERSION_DMA 0x02 >> + >> +/* fw_cfg file directory entry type */ >> +struct fw_cfg_file { >> + __be32 size; /* file size */ >> + __be16 select; /* write this to 0x510 to read it */ >> + __u16 reserved; >> + char name[FW_CFG_MAX_FILE_PATH]; >> +}; >> + >> +struct fw_cfg_files { >> + __be32 count; /* number of entries */ >> + struct fw_cfg_file f[]; >> +}; > > This struct wasn't there in the original file. > Is the source of these structures QEMU or Linux? > If Linux, then pls split this > 1. move code out to a header > 2. add more structs It is based from Linux source + qemu docs/specs/fw_cfg.txt which references include/hw/nvram/fw_cfg_keys.h "for the most up-to-date and authoritative list" & vmcoreinfo.txt. QEMU ./include/hw/nvram/fw_cfg_keys.h doesn't have specific licence text, and QEMU as a whole is released under the GNU General Public License, version 2. Let me know if I still need to change the license and what you recommend instead. > >> + >> +/* FW_CFG_DMA_CONTROL bits */ >> +#define FW_CFG_DMA_CTL_ERROR 0x01 >> +#define FW_CFG_DMA_CTL_READ 0x02 >> +#define FW_CFG_DMA_CTL_SKIP 0x04 >> +#define FW_CFG_DMA_CTL_SELECT 0x08 >> +#define FW_CFG_DMA_CTL_WRITE 0x10 >> + >> +#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */ >> + >> +/* Control as first field allows for different structures selected by this >> + * field, which might be useful in the future >> + */ >> +struct fw_cfg_dma_access { >> + __be32 control; >> + __be32 length; >> + __be64 address; >> +}; > > Maybe this should be part of the dma patch. I prefer to introduce all the spec defines in one patch, but I can split it if it helps. > >> + >> +#define FW_CFG_VMCOREINFO_FILENAME "etc/vmcoreinfo" >> + >> +#define FW_CFG_VMCOREINFO_FORMAT_NONE 0x0 >> +#define FW_CFG_VMCOREINFO_FORMAT_ELF 0x1 >> + >> +struct fw_cfg_vmcoreinfo { >> + __le16 host_format; >> + __le16 guest_format; >> + __le32 size; >> + __le64 paddr; >> +}; > > Maybe this should be part of the vmcore patch. same Thanks