From patchwork Fri Jan 11 05:12:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 10757361 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A9E6591E for ; Fri, 11 Jan 2019 05:13:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BC07299BC for ; Fri, 11 Jan 2019 05:13:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EDA2299BE; Fri, 11 Jan 2019 05:13:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E7D1299B3 for ; Fri, 11 Jan 2019 05:13:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 120258E0005; Fri, 11 Jan 2019 00:13:34 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0F7E68E0001; Fri, 11 Jan 2019 00:13:34 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00F838E0005; Fri, 11 Jan 2019 00:13:33 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id B33CD8E0001 for ; Fri, 11 Jan 2019 00:13:33 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id d18so9505115pfe.0 for ; Thu, 10 Jan 2019 21:13:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=Fl+859MCIsPrIsKoMm9QR3qOmotIpRzZocMuktvJB6I=; b=frm76vvshB+FrQ8vWgK5yyb03IW0h7wGi27YCouNafLJmbxBKIvXHSTrSLLMZaR7W1 2K6BX+LLw8blYcTSH32s0XTAmoamCQaZJlaJynLT4OeW48xR/z+46jIVYOYojjvx7AU2 63DWqaJwzI9XwnjyG7PV+hSualOi5g9H5+QWAp634CstbwDVI1nNmFx8P79QEneCgd1x g8FnYNm/V56eaIVi7AZ3NRDwgSP32jAlatZCh0DCkxGVkAQRY5CvKiRup3KDWvFrrDUl VZ+EinLffSvwjN9SlhyYMUOy9Ni750JRDu1vZFePLbcDxU8bRWqzr2puXPFVJDZ4pf2X g5wA== X-Gm-Message-State: AJcUukcYwkJmWbfDObyZJaNGWKwqZa3HuHfpLm//SixnaDvmY9JUCU6O +18SeqabIPfMMyOGPi2POJ9dKDRciqmyGMvDuZQlIzgFw03r0W8mjRaRrM9VonBdUU+9ZCWsg8+ cLYPdn8+4rWYZqngOn3inoP3EL62448bIHeMUYRqcEYrE7qRmxRhkqQSNNzftHSZe3zU7CK5OUs M+v7t4/MHBJaVmeXdqA2CcG6bLypEA7I9rRYFtWUQNt77QTGBjdo6DXoTEVLbCG3RjgqVyyu4nh QeMC2xbZdIYAU5S4u6XpxBtNrnyGpWPFkpPFbXSMQFlKugfYDbr9ytItgVKO1PAUwUP2tFB1/LU Bu9dfzbTEcyaKslsJmdb60ppyvhWeO6a7cfyCJcI6+GIv25hwuDrJqte3Z0bivk0gP0T4or5dES + X-Received: by 2002:a63:3507:: with SMTP id c7mr12105810pga.315.1547183613315; Thu, 10 Jan 2019 21:13:33 -0800 (PST) X-Received: by 2002:a63:3507:: with SMTP id c7mr12105769pga.315.1547183612202; Thu, 10 Jan 2019 21:13:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547183612; cv=none; d=google.com; s=arc-20160816; b=s7y6lDzotlchbTvbifteBBF7gwDfPf3hoygZ0MlUZ6s8eNsCvl5MSOyKKI8nel2sYR 9ZzaPWggyUWtvIXCco/YNjUc51QP+DS1qM7HY8raDcTrp4hfhyRPcShuZ+IqBvt7RA95 GkDZrc8h9vNSUgSmg2n1w+azYaO2Hq07bZ8iPGsaCDxu2OOhsA7rcoUiCmmDbBFAX5Vn m1KrMWCaxN0epOYefURKblIUL+fUOOgKuwZ7tM78lJP6Qa7mGPx6EIjJOevqUn6vWYDB jaQH68TAV/c57V9dIWGulcZSADS3iGgVZVeeMLPyzkVXqVnrYI42KJcajFXSDwZyIfJv KUSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Fl+859MCIsPrIsKoMm9QR3qOmotIpRzZocMuktvJB6I=; b=F/5wQElItY8ovYZDos3gTFPQnzaDV3HxcKV+q4HR3UencSrWq23Zab0WhG52oNPecp 6uspdbs1MZA5Nvjti7IFdFfHv7FcS4XWeXYFphJQSC5qCAqu8f2HxNMAysEZ0ZUCKHZV cK9xqBjn8QnUgduF+l3gOsiOtZKzhj7dCSlyOKNGv6AUZuriB7/Rp/zd1rKzMVo/Wene uq0XRWt4KLAh/k3YpYL+2GG7pVvfJ98kVMQIExagPhWskfS96htYbtArtblpGt0JFXIu ykOMAHBbhXmGADapw+kJroFIYZo6A8nhpSN9u5PK8geZ8iHMbWJmoOIvdrO/SpRJUMFu K3EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=J8FShFzH; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c8sor1650019plr.70.2019.01.10.21.13.32 for (Google Transport Security); Thu, 10 Jan 2019 21:13:32 -0800 (PST) Received-SPF: pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=J8FShFzH; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fl+859MCIsPrIsKoMm9QR3qOmotIpRzZocMuktvJB6I=; b=J8FShFzHpRwxxdAjPdsiYXXAAyRJEOJ7x+Ptmmt4Wb0lGPeFqtyC/n60IU/sB46Qha KkpZPD9RHyntynn6sKdVgFQnmo+mQ4xtUceXylBrPNJPrv4HEEMzhb63T7rUtJHHazbv 3Kj9X/gAQ+r9zkfqOkDZ0SgXhMRPEO8mzItkC3NKFgk1vkYl4DwDPCTBC3iugC0LcnLg +cgcIjFI0ugxScM9kmJOi1X8WxxFOWMCWKQ/zdyKC0dQJW9EhdhawghMZNNPgjdxMXqY //Q19MPdQEUsSe+IL4wM706RIeimx2acLihtqYBdxd5cN/bVgpoMawedTsMV674r3atT BpHw== X-Google-Smtp-Source: ALg8bN7JOdeQYRn3zkVi+6IJkspRtFUCj2IVmwO03Kj270ObKQXYdJIXZvMHTdOdX/LYWeVLxSP2JQ== X-Received: by 2002:a17:902:7e4f:: with SMTP id a15mr8905337pln.149.1547183611922; Thu, 10 Jan 2019 21:13:31 -0800 (PST) Received: from mylaptop.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id q7sm93490471pgp.40.2019.01.10.21.13.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 21:13:31 -0800 (PST) From: Pingfan Liu To: linux-kernel@vger.kernel.org Cc: Pingfan Liu , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , "Rafael J. Wysocki" , Len Brown , Yinghai Lu , Tejun Heo , Chao Fan , Baoquan He , Juergen Gross , Andrew Morton , Mike Rapoport , Vlastimil Babka , Michal Hocko , x86@kernel.org, linux-acpi@vger.kernel.org, linux-mm@kvack.org Subject: [PATCHv2 2/7] acpi: change the topo of acpi_table_upgrade() Date: Fri, 11 Jan 2019 13:12:52 +0800 Message-Id: <1547183577-20309-3-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547183577-20309-1-git-send-email-kernelfans@gmail.com> References: <1547183577-20309-1-git-send-email-kernelfans@gmail.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The current acpi_table_upgrade() relies on initrd_start, but this var is only valid after relocate_initrd(). There is requirement to extract the acpi info from initrd before memblock-allocator can work(see [2/4]), hence acpi_table_upgrade() need to accept the input param directly. Signed-off-by: Pingfan Liu Acked-by: "Rafael J. Wysocki" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Yinghai Lu Cc: Tejun Heo Cc: Chao Fan Cc: Baoquan He Cc: Juergen Gross Cc: Andrew Morton Cc: Mike Rapoport Cc: Vlastimil Babka Cc: Michal Hocko Cc: x86@kernel.org Cc: linux-acpi@vger.kernel.org Cc: linux-mm@kvack.org --- arch/arm64/kernel/setup.c | 2 +- arch/x86/kernel/setup.c | 2 +- drivers/acpi/tables.c | 4 +--- include/linux/acpi.h | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index f4fc1e0..bc4b47d 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -315,7 +315,7 @@ void __init setup_arch(char **cmdline_p) paging_init(); efi_apply_persistent_mem_reservations(); - acpi_table_upgrade(); + acpi_table_upgrade((void *)initrd_start, initrd_end - initrd_start); /* Parse the ACPI tables for possible boot-time configuration */ acpi_boot_table_init(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index ac432ae..dc8fc5d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1172,8 +1172,8 @@ void __init setup_arch(char **cmdline_p) reserve_initrd(); - acpi_table_upgrade(); + acpi_table_upgrade((void *)initrd_start, initrd_end - initrd_start); vsmp_init(); io_delay_init(); diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 61203ee..84e0a79 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -471,10 +471,8 @@ static DECLARE_BITMAP(acpi_initrd_installed, NR_ACPI_INITRD_TABLES); #define MAP_CHUNK_SIZE (NR_FIX_BTMAPS << PAGE_SHIFT) -void __init acpi_table_upgrade(void) +void __init acpi_table_upgrade(void *data, size_t size) { - void *data = (void *)initrd_start; - size_t size = initrd_end - initrd_start; int sig, no, table_nr = 0, total_offset = 0; long offset = 0; struct acpi_table_header *table; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ed80f14..0b6e0b6 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1254,9 +1254,9 @@ acpi_graph_get_remote_endpoint(const struct fwnode_handle *fwnode, #endif #ifdef CONFIG_ACPI_TABLE_UPGRADE -void acpi_table_upgrade(void); +void acpi_table_upgrade(void *data, size_t size); #else -static inline void acpi_table_upgrade(void) { } +static inline void acpi_table_upgrade(void *data, size_t size) { } #endif #if defined(CONFIG_ACPI) && defined(CONFIG_ACPI_WATCHDOG)