From patchwork Sat Jun 15 01:09:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 166938 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp144537ilk; Fri, 14 Jun 2019 18:11:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIamTMShwQ7LlVq7Cs2ynjOloC499RY6pmXoaXVbeDneZvX6HHkSHaoNuhFFcrL+l49+U9 X-Received: by 2002:a17:90a:8a10:: with SMTP id w16mr13817353pjn.133.1560561062565; Fri, 14 Jun 2019 18:11:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560561062; cv=none; d=google.com; s=arc-20160816; b=mFgSLMPAiNUhYom13BaIJDbCihueKhfl8XwKJOEzyeGuLb1WCZZvy3diYY9NMkGBHE c6MMTJ8/70W2JFLRj7RS26VMOFB5tUp52+wKeF+l5TSuMWpsUCYfMA1Nu1W6x1PxQ0cA eDJQd4NWYfK/+2Iw1TftF0Jo3tR7riRkiD4s5wm4+nJxHr4pFAGzgJLIcMY4xIIeHVwV L0tycRPPzvujb9L6z9InQn+JcImUyv4tZ1+eVcLJP7iNv5TnaPXiCYs/Xjkzlcqk5+5u 4hNToipQjOHuq1ngrEvxYBvD/goI5p6cxxifZlgivE8JVAwJEliu//8iu37zq+xtmGJ8 to+g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=OYoo1ak2g+SGDEVRRO6vghlnYPs6UYKmTldtiipy0wU=; b=Q+xjncojDJpGKsz1oWjlREg5Y56H+FBW9jb7WMHa3Kg4L0wF7kwaDtuSMsLuXf/0Rn 4SS4FqtEZJqP3NOYIEznzgcrFpNoF4evyrx8MysO4hyTnyRv6nyp1iWRSRpYgkXjj0o6 SNMvAkMrsonS3SDBPM8e6DCPojykcDVgfSMO2V77fV+e6Ouw+COypH/8Sifp6ZuL8a9P 1TkE63ZCvhI5KfCMRQN3wHW5Plg6y4HvkaRdPmzUYR6bu2LEf2vGMxAMLADvNDEa6XR3 pBUBk6nbbG/HUf4F0RJuHnRStpX8f0HuoKj4Vq2O7aUDYd24hJiRmqYHYli9F6YE1FqJ /8Jw== 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 d12si3497271plo.68.2019.06.14.18.11.02; Fri, 14 Jun 2019 18:11:02 -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; 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 S1726353AbfFOBLA (ORCPT + 19 others); Fri, 14 Jun 2019 21:11:00 -0400 Received: from foss.arm.com ([217.140.110.172]:45078 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725809AbfFOBK7 (ORCPT ); Fri, 14 Jun 2019 21:10:59 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EC658344; Fri, 14 Jun 2019 18:10:58 -0700 (PDT) Received: from mammon-tx2.austin.arm.com (mammon-tx2.austin.arm.com [10.118.30.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DAC753F718; Fri, 14 Jun 2019 18:10:58 -0700 (PDT) From: Jeremy Linton To: linux-arm-kernel@lists.infradead.org Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, rjw@rjwysocki.net, lenb@kernel.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, sudeep.holla@arm.com, Jeremy Linton Subject: [PATCH 1/4] ACPI/PPTT: Modify node flag detection to find last IDENTICAL Date: Fri, 14 Jun 2019 20:09:07 -0500 Message-Id: <20190615010910.33921-2-jeremy.linton@arm.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190615010910.33921-1-jeremy.linton@arm.com> References: <20190615010910.33921-1-jeremy.linton@arm.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ACPI specification implies that the IDENTICAL flag should be set on all non leaf nodes where the children are identical. This means that we need to be searching for the last node with the identical flag set rather than the first one. Since this flag is also dependent on the table revision, we need to add a bit of extra code to verify the table revision, and the next node's state in the traversal. Since we want to avoid function pointers here, lets just special case the IDENTICAL flag. Reviewed-by: Sudeep Holla Signed-off-by: Jeremy Linton --- drivers/acpi/pptt.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) -- 2.21.0 diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index b72e6afaa8fb..05344413f199 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -432,17 +432,40 @@ static void cache_setup_acpi_cpu(struct acpi_table_header *table, } } +static bool flag_identical(struct acpi_table_header *table_hdr, + struct acpi_pptt_processor *cpu) +{ + struct acpi_pptt_processor *next; + + /* heterogeneous machines must use PPTT revision > 1 */ + if (table_hdr->revision < 2) + return false; + + /* Locate the last node in the tree with IDENTICAL set */ + if (cpu->flags & ACPI_PPTT_ACPI_IDENTICAL) { + next = fetch_pptt_node(table_hdr, cpu->parent); + if (!(next && next->flags & ACPI_PPTT_ACPI_IDENTICAL)) + return true; + } + + return false; +} + /* Passing level values greater than this will result in search termination */ #define PPTT_ABORT_PACKAGE 0xFF -static struct acpi_pptt_processor *acpi_find_processor_package_id(struct acpi_table_header *table_hdr, - struct acpi_pptt_processor *cpu, - int level, int flag) +static struct acpi_pptt_processor *acpi_find_processor_tag(struct acpi_table_header *table_hdr, + struct acpi_pptt_processor *cpu, + int level, int flag) { struct acpi_pptt_processor *prev_node; while (cpu && level) { - if (cpu->flags & flag) + /* special case the identical flag to find last identical */ + if (flag == ACPI_PPTT_ACPI_IDENTICAL) { + if (flag_identical(table_hdr, cpu)) + break; + } else if (cpu->flags & flag) break; pr_debug("level %d\n", level); prev_node = fetch_pptt_node(table_hdr, cpu->parent); @@ -480,8 +503,8 @@ static int topology_get_acpi_cpu_tag(struct acpi_table_header *table, cpu_node = acpi_find_processor_node(table, acpi_cpu_id); if (cpu_node) { - cpu_node = acpi_find_processor_package_id(table, cpu_node, - level, flag); + cpu_node = acpi_find_processor_tag(table, cpu_node, + level, flag); /* * As per specification if the processor structure represents * an actual processor, then ACPI processor ID must be valid.