From patchwork Wed Oct 16 21:51:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 176531 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp51821ill; Wed, 16 Oct 2019 15:09:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqxFHF6N67CFWGYrSqMCkZQN80n4+pyj+UD9MlTqbYSwftoUyOtu/My0xj7QtWmZweu9N3yA X-Received: by 2002:aa7:c70d:: with SMTP id i13mr493483edq.214.1571263797026; Wed, 16 Oct 2019 15:09:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571263797; cv=none; d=google.com; s=arc-20160816; b=1LcLARiUESytIXCyFigElTLRyn5vm/KVftlrWGqMYiCT2L/+6cyuA+b71mWsF3+HVs vdK+fh44DetlPFB2gE2h9Gdtlhv2ASFWflNfpq0es9la0dhjs6qoI/ifRiMW4x0+uRDz NlyfZO7ofV21IpeNtccAJzPV/eg+/HbMj3++bj+30koi37B3vk6jOtEkPvgV3im8zyrw B0zeZp/mkxCtDQH9t2eil1VYUqLsgJ0n3SDP54ksOjw8Yuwhnxb+0hjGUNxIBtkBB7DL lhTh0HY0mQvDhA3i2xxq0vQJ/k1artk1EEB3IXforAuW83Y+2hM5mnXKMxUco5cLRE4b uwmg== 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:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Dr7f/LlvayJ6x9ytT44aT2hpjwb8sKDLK55Y9iW0mrw=; b=DqMPmJHEFAB64gNBJzK7qRgSdfLpSRVrGByK1aLCRuU8NCG3un1ID/UdukPiRib21n d/8iVNd81qozL/KaW1/+4MJ27M2dsmCOX1Ym9uJHM4LdYnJ8ocuy1BQQMPTzqxEsGWiT SwJ2dSqBD47hoA0LUyx+aGnI3oIvA/kuHGaiFKfa5+eaTMt68h30HZWdjWiAUrHnQ2ri /Vy/T2FINotFXHxd9qkIrb/B80frsximQ9ihPFO+hZVNsjtQ+fVha6HmxrD7BLYNJ27n 8Tg1pi1sryVc/0xRfav1rpvOI/GlhRy6x5bUda46jm75VZqWCug3LMw31fiOVwFQjgXl YcIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=o67WOPaX; 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 w18si199068eda.445.2019.10.16.15.09.56; Wed, 16 Oct 2019 15:09:57 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=o67WOPaX; 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 S2439144AbfJPWJz (ORCPT + 26 others); Wed, 16 Oct 2019 18:09:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:50042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395471AbfJPV5Z (ORCPT ); Wed, 16 Oct 2019 17:57:25 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B48CD20872; Wed, 16 Oct 2019 21:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571263044; bh=tLqn9fDciW0EARsJzKSJ3fsSJmySKLNnTrfEp8YU+jU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o67WOPaXzENmDg2LM8JUomPHIO/78dBZ6aPEvVsAUnrv80LGOufjg+0FvVDoFocjA Lhx1kSZ6xHTeQJoAwcZC+MDwGsstM0hMUA21To65hcniaXVR2KP/0zs1mtVcs9u836 beqvv6RkHSWtVbqzMLe6TJXInImJF5SSMMxhoNwM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Scott Talbert , Ard Biesheuvel , Ben Dooks , Dave Young , Jarkko Sakkinen , Jerry Snitselaar , Linus Torvalds , Lukas Wunner , Lyude Paul , Matthew Garrett , Octavian Purdila , Peter Jones , Peter Zijlstra , Thomas Gleixner , linux-efi@vger.kernel.org, linux-integrity@vger.kernel.org, Ingo Molnar Subject: [PATCH 4.19 49/81] efivar/ssdt: Dont iterate over EFI vars if no SSDT override was specified Date: Wed, 16 Oct 2019 14:51:00 -0700 Message-Id: <20191016214840.161364695@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214805.727399379@linuxfoundation.org> References: <20191016214805.727399379@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel commit c05f8f92b701576b615f30aac31fabdc0648649b upstream. The kernel command line option efivar_ssdt= allows the name to be specified of an EFI variable containing an ACPI SSDT table that should be loaded into memory by the OS, and treated as if it was provided by the firmware. Currently, that code will always iterate over the EFI variables and compare each name with the provided name, even if the command line option wasn't set to begin with. So bail early when no variable name was provided. This works around a boot regression on the 2012 Mac Pro, as reported by Scott. Tested-by: Scott Talbert Signed-off-by: Ard Biesheuvel Cc: # v4.9+ Cc: Ben Dooks Cc: Dave Young Cc: Jarkko Sakkinen Cc: Jerry Snitselaar Cc: Linus Torvalds Cc: Lukas Wunner Cc: Lyude Paul Cc: Matthew Garrett Cc: Octavian Purdila Cc: Peter Jones Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Cc: linux-integrity@vger.kernel.org Fixes: 475fb4e8b2f4 ("efi / ACPI: load SSTDs from EFI variables") Link: https://lkml.kernel.org/r/20191002165904.8819-3-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efi/efi.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -281,6 +281,9 @@ static __init int efivar_ssdt_load(void) void *data; int ret; + if (!efivar_ssdt[0]) + return 0; + ret = efivar_init(efivar_ssdt_iter, &entries, true, &entries); list_for_each_entry_safe(entry, aux, &entries, list) { From patchwork Wed Oct 16 21:51:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 176530 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp50082ill; Wed, 16 Oct 2019 15:08:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxdmx4wxCFqL76/rM/zdO3ZNerDlrwjzCYJa5gthi+umRW5Ad02fV9DQ76JWtQ+F/JmujK5 X-Received: by 2002:a17:906:85c5:: with SMTP id i5mr553347ejy.222.1571263707082; Wed, 16 Oct 2019 15:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571263707; cv=none; d=google.com; s=arc-20160816; b=eOOtexrF7Mwj+MV7WGSLRBjTkI8a6iAZ6mYT2O94GmYspnytxoHs2mprnch0eGwpV2 Xf9kQA6+Jop1CH8V7ewIYXDB2eZCRolCdWFMT9mZtVHuqpVk/7MeS21FzfY73FfotqvC XZQybkrRpQAmlOTqzuf8mvxobxXGp+VlKqwV8tJGCcXcVsfAWp275qiTG3gXA4ho3ao7 picE1jTNAkEynRlXg/TCXu1tf4SOr04Wpeuoyy9XZdhOfQsvKl2rQ6mJhaSHMzK1xTa7 bK7wMym8qyXMH94SCDtQQhMjqb0yHDvuAmKVowMkkHC+OmS+8ls1zzZybMtM0dr6Gylu gbrg== 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:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/fOsADwDD1GQpM3h0qUFtWJw2jNXs0GIvv/iHQ5TJLQ=; b=tonq1fT1ilPh4kqDM/uaN5uhTInJUfFe/z3xtZwnzW8nmaVEhFg0MCfhZ94OCaWHsC mtsSH/dvKUYkzsSHp/mFXbCg2tApJJB/0H8NFrOGsuhxPndPVtjmmoLC50D4VH7WlOys AtuvTwl2xl8aV2c53jqmlscxgCviAi9lvKaLgiyNg3x3hAR08K/rhiXia0RZIpeP5JuR ij3zWx8i2HYRsn1kq9c11wT5J+l/BGv47Hnr/xbd4/bxYz/xYgivQFAQ2xy7uvjGB3vr NW/2c4sj5reOwYmcsb2kJK93TMH1HqbgRSk8ZYLw1Y6pZYqhmA8VtcQR1Z+9SKiab1+U h03Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zMDIxj9i; 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 e23si216164ejt.379.2019.10.16.15.08.26; Wed, 16 Oct 2019 15:08:27 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=zMDIxj9i; 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 S2438070AbfJPWIV (ORCPT + 26 others); Wed, 16 Oct 2019 18:08:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:50784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391233AbfJPV5u (ORCPT ); Wed, 16 Oct 2019 17:57:50 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 37F4E21D7D; Wed, 16 Oct 2019 21:57:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571263069; bh=qbbtywL0VKu2zBaJP9W9WFBm4xk1t57/2QfOShygBEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zMDIxj9iiQ6VCr+Fd4GauMOTJW+mD2Xyz7vKQu83rk6ZRbwukVAv0XwuyD3hSTjaT HAkbp5SAhBe+TEaH/xFMMsn7KVFd5eidGRSjlvro36tCrI1TK7M3/WPh0wRvGgrbSA TOVfOLdbCcnmm7CeJQwSYxeaw/MqKU9GBkrUeMCQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Linton , Sudeep Holla , Robert Richter , "Rafael J. Wysocki" , Will Deacon , John Garry , Sasha Levin Subject: [PATCH 4.19 69/81] ACPI/PPTT: Add support for ACPI 6.3 thread flag Date: Wed, 16 Oct 2019 14:51:20 -0700 Message-Id: <20191016214846.213102586@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214805.727399379@linuxfoundation.org> References: <20191016214805.727399379@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Linton Commit bbd1b70639f785a970d998f35155c713f975e3ac upstream. ACPI 6.3 adds a flag to the CPU node to indicate whether the given PE is a thread. Add a function to return that information for a given linux logical CPU. Signed-off-by: Jeremy Linton Reviewed-by: Sudeep Holla Reviewed-by: Robert Richter Acked-by: Rafael J. Wysocki Signed-off-by: Will Deacon [jpg: backport for 4.19, replace acpi_pptt_warn_missing()] Signed-off-by: John Garry Signed-off-by: Sasha Levin --- drivers/acpi/pptt.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 5 +++++ 2 files changed, 57 insertions(+) -- 2.20.1 diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index da031b1df6f5c..9dbf86a0c8277 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -509,6 +509,44 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag) return retval; } +/** + * check_acpi_cpu_flag() - Determine if CPU node has a flag set + * @cpu: Kernel logical CPU number + * @rev: The minimum PPTT revision defining the flag + * @flag: The flag itself + * + * Check the node representing a CPU for a given flag. + * + * Return: -ENOENT if the PPTT doesn't exist, the CPU cannot be found or + * the table revision isn't new enough. + * 1, any passed flag set + * 0, flag unset + */ +static int check_acpi_cpu_flag(unsigned int cpu, int rev, u32 flag) +{ + struct acpi_table_header *table; + acpi_status status; + u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu); + struct acpi_pptt_processor *cpu_node = NULL; + int ret = -ENOENT; + + status = acpi_get_table(ACPI_SIG_PPTT, 0, &table); + if (ACPI_FAILURE(status)) { + pr_warn_once("No PPTT table found, cpu topology may be inaccurate\n"); + return ret; + } + + if (table->revision >= rev) + cpu_node = acpi_find_processor_node(table, acpi_cpu_id); + + if (cpu_node) + ret = (cpu_node->flags & flag) != 0; + + acpi_put_table(table); + + return ret; +} + /** * acpi_find_last_cache_level() - Determines the number of cache levels for a PE * @cpu: Kernel logical cpu number @@ -573,6 +611,20 @@ int cache_setup_acpi(unsigned int cpu) return status; } +/** + * acpi_pptt_cpu_is_thread() - Determine if CPU is a thread + * @cpu: Kernel logical CPU number + * + * Return: 1, a thread + * 0, not a thread + * -ENOENT ,if the PPTT doesn't exist, the CPU cannot be found or + * the table revision isn't new enough. + */ +int acpi_pptt_cpu_is_thread(unsigned int cpu) +{ + return check_acpi_cpu_flag(cpu, 2, ACPI_PPTT_ACPI_PROCESSOR_IS_THREAD); +} + /** * find_acpi_cpu_topology() - Determine a unique topology value for a given cpu * @cpu: Kernel logical cpu number diff --git a/include/linux/acpi.h b/include/linux/acpi.h index b4d23b3a2ef2d..59a416dfcaaa2 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1291,10 +1291,15 @@ static inline int lpit_read_residency_count_address(u64 *address) #endif #ifdef CONFIG_ACPI_PPTT +int acpi_pptt_cpu_is_thread(unsigned int cpu); int find_acpi_cpu_topology(unsigned int cpu, int level); int find_acpi_cpu_topology_package(unsigned int cpu); int find_acpi_cpu_cache_topology(unsigned int cpu, int level); #else +static inline int acpi_pptt_cpu_is_thread(unsigned int cpu) +{ + return -EINVAL; +} static inline int find_acpi_cpu_topology(unsigned int cpu, int level) { return -EINVAL;