Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2419893imu; Mon, 17 Dec 2018 01:27:22 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ww2orjIK3jwDJyRQoygNZuJhmVpFQ/s3WKSrG1jVAR2LrWBbBy7Mgw1QuKHwjn40o/ssox X-Received: by 2002:a63:b81a:: with SMTP id p26mr11759713pge.433.1545038842807; Mon, 17 Dec 2018 01:27:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545038842; cv=none; d=google.com; s=arc-20160816; b=DzDSlfKPyuII/ID91/Nt7L+/K9OqQJl9QqzGym2Z5FjmPWBX4oNxT1E4GOmPd9e7IQ Li76pTSHm6Nin/NlvpDE7Yt/8R9FqbttsbvZDu3hCNfKxTfxIjg6axgZ09JD5O7XLG5U uDwlMtnPq1maREzw2Sff+0Uv8quO3HNDe4ItfMhm6RZr4+yxBtree1azlywqfdjTsth2 lCW/8cNI5govxZF5zGoiRDmP2f9NCeNbTMsE6U+nMwPGMtt+Kt5BvfUYTdPVxZdIHXe9 5RBHGJ0wfhZp8QK7QUjCw77yI9hxNGZoOuj1FztVE5KyhUYZi6qMxWGyoauWHPDQj8XF h9xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:references:message-id:date :thread-index:thread-topic:subject:cc:to:from; bh=3O3JtTZd95BMKYCWV4BCs9x97ACeCW+hoqMgUkghT14=; b=YmW47EAqHNnkl+vpmj+Tho8M66pZENQyNnym4fIN8SFnFhKCK3QF+naHoldD8oQRxY EIZWmiiwME+bXyOWi8Oh3oHmRdyIbDAgXn+PnXBO4Eekca2hoz0bA7PksghOlcAkq+YV yyMaJaK2DDrm1I8ZH56lcIeFBQQwevXiPpNEBjxRFzMAwaJRQvmP5gMaLrkYDux4kK9J syq2iSW/Ynd0BQKvU+0PSecVJPc0VnULq5ODC2oDmXF8vRqb0O/7XGAbC0O49ltvdMkW Mv7aS+w/J0ILT87wsQirkXLS0QcCETBnBWX3M4njG4XRyXxSv2s+p2yIqIRchlHHvG0p Ig9A== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k15si10644938pgi.99.2018.12.17.01.27.05; Mon, 17 Dec 2018 01:27:22 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731882AbeLQJSW convert rfc822-to-8bit (ORCPT + 99 others); Mon, 17 Dec 2018 04:18:22 -0500 Received: from [38.106.11.25] ([38.106.11.25]:39542 "EHLO barracuda02.hxt-semitech.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1731839AbeLQJSW (ORCPT ); Mon, 17 Dec 2018 04:18:22 -0500 X-ASG-Debug-ID: 1545038297-107606139f09ef0001-xx1T2L Received: from HXTBJIDCEMVIW02.hxtcorp.net (localhost [10.128.0.15]) by barracuda02.hxt-semitech.com with ESMTP id thCvZeGtrCs26qU5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Mon, 17 Dec 2018 17:18:17 +0800 (CST) X-Barracuda-Envelope-From: shunyong.yang@hxt-semitech.com Received: from HXTBJIDCEMVIW01.hxtcorp.net (10.128.0.14) by HXTBJIDCEMVIW02.hxtcorp.net (10.128.0.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 17 Dec 2018 17:17:22 +0800 Received: from HXTBJIDCEMVIW01.hxtcorp.net ([fe80::f451:a443:c0b5:87d1]) by HXTBJIDCEMVIW01.hxtcorp.net ([fe80::f451:a443:c0b5:87d1%12]) with mapi id 15.00.1395.000; Mon, 17 Dec 2018 17:17:22 +0800 From: "Yang, Shunyong" To: "Rafael J. Wysocki" CC: "Rafael J. Wysocki" , Len Brown , "ACPI Devel Maling List" , Linux Kernel Mailing List , "Zheng, Joey" Subject: Re: [PATCH] ACPI / tables: table upgrade from built-in initrd Thread-Topic: [PATCH] ACPI / tables: table upgrade from built-in initrd X-ASG-Orig-Subj: Re: [PATCH] ACPI / tables: table upgrade from built-in initrd Thread-Index: AQHUla75pLHf4djd9EmmRCWXKkRMKA== Date: Mon, 17 Dec 2018 09:17:21 +0000 Message-ID: <36fdf717ba5345e2956e48645f6667e6@HXTBJIDCEMVIW01.hxtcorp.net> References: <1545013184-2487-1-git-send-email-shunyong.yang@hxt-semitech.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.64.6.186] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Barracuda-Connect: localhost[10.128.0.15] X-Barracuda-Start-Time: 1545038297 X-Barracuda-Encrypted: ECDHE-RSA-AES256-SHA384 X-Barracuda-URL: https://192.168.50.102:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 3238 X-Virus-Scanned: by bsmtpd at hxt-semitech.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.4928 1.0000 0.0000 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.63926 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Rafael, I think "override" is more accurate. I just follow the existing description of "ACPI_TABLE_UPGRADE" in drivers/acpi/Kconfig. Should I change all upgrade/UPGRADE to "override/OVERRIDE" in this patch? Thanks. Shunyong. On 2018/12/17 17:03, Rafael J. Wysocki wrote: > On Mon, Dec 17, 2018 at 3:40 AM Shunyong Yang > wrote: >> >> In some scenario, we need to build initrd with kernel in a single image. >> This can simplify system deployment process by downloading the whole system >> once, such as in IC verification. >> >> This patch adds support to upgrade ACPI tables from built-in initrd. > > What do you mean by "upgrade"? > >> >> Cc: Joey Zheng >> Signed-off-by: Shunyong Yang >> --- >> drivers/acpi/Kconfig | 9 +++++++++ >> drivers/acpi/tables.c | 12 ++++++++++-- >> include/linux/initrd.h | 3 +++ >> 3 files changed, 22 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig >> index 7cea769c37df..30976496fe77 100644 >> --- a/drivers/acpi/Kconfig >> +++ b/drivers/acpi/Kconfig >> @@ -357,6 +357,15 @@ config ACPI_TABLE_UPGRADE >> initrd, therefore it's safe to say Y. >> See Documentation/acpi/initrd_table_override.txt for details >> >> +config ACPI_TABLE_UPGRADE_VIA_BUILTIN_INITRD >> + bool "Upgrade ACPI tables from built-in initrd" >> + depends on ACPI_TABLE_UPGRADE >> + depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION="" >> + def_bool n >> + help >> + This option provides functionality to upgrade arbitrary ACPI tables >> + from built-in uncompressed initrd. >> + >> config ACPI_DEBUG >> bool "Debug Statements" >> help >> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c >> index 61203eebf3a1..88e3a34443da 100644 >> --- a/drivers/acpi/tables.c >> +++ b/drivers/acpi/tables.c >> @@ -473,14 +473,22 @@ static u8 __init acpi_table_checksum(u8 *buffer, u32 length) >> >> void __init acpi_table_upgrade(void) >> { >> - void *data = (void *)initrd_start; >> - size_t size = initrd_end - initrd_start; >> + void *data; >> + size_t size; >> int sig, no, table_nr = 0, total_offset = 0; >> long offset = 0; >> struct acpi_table_header *table; >> char cpio_path[32] = "kernel/firmware/acpi/"; >> struct cpio_data file; >> >> + if (IS_ENABLED(CONFIG_ACPI_TABLE_UPGRADE_VIA_BUILTIN_INITRD)) { >> + data = __initramfs_start; >> + size = __initramfs_size; >> + } else { >> + data = (void *)initrd_start; >> + size = initrd_end - initrd_start; >> + } >> + >> if (data == NULL || size == 0) >> return; >> >> diff --git a/include/linux/initrd.h b/include/linux/initrd.h >> index 84b423044088..02d94aae54c7 100644 >> --- a/include/linux/initrd.h >> +++ b/include/linux/initrd.h >> @@ -22,3 +22,6 @@ >> extern void free_initrd_mem(unsigned long, unsigned long); >> >> extern unsigned int real_root_dev; >> + >> +extern char __initramfs_start[]; >> +extern unsigned long __initramfs_size; >> -- >> 1.8.3.1 >> >