From patchwork Fri Mar 27 13:55:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 46409 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A917721597 for ; Fri, 27 Mar 2015 13:56:36 +0000 (UTC) Received: by lbcgc5 with SMTP id gc5sf3684008lbc.1 for ; Fri, 27 Mar 2015 06:56:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=bvXuwCg6IZDfeO9jN/p3+VtIzFobIjlr+fWAIa3QqEU=; b=eR+GAMReM8YTBb9YxOqRcrACuwDSulBvdVUK4uKnJZyICT1AzoOhihU7AlcLRtFA8/ F9LdWwpSF57iKfig9R8/+TmtR5iKz0WNwVRXEo8dDx9f+/h0+jYH6ZMuxG/LgoVMrk9m PLF9BcpJGgO6hpIRGZxPzHTYkDgQHxdR0B6N2TThOrbD36bvJqL2HavaIUdhLS++w+xG W0Csg4VpQ0yQD9o0M2UaaX3Bu99zoirFyGASqfRZFOTrFZsoeQyeQY+v3sKqeBl7KguW cHtl7bn6Czw31+Q6PHsf/7DVkn/UBko9n4C8lSQqu4VTUv1Zd6sQGlJjS0Z/qJuJEeLY a4zA== X-Gm-Message-State: ALoCoQmlrKd41M+SpukEkMTKx0T+VgiysL+WnRcNAORy2tdprZ1hcVtdYTd7o54hD7hJQpU0dp8Q X-Received: by 10.180.218.2 with SMTP id pc2mr669910wic.0.1427464591886; Fri, 27 Mar 2015 06:56:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.199 with SMTP id le7ls103740lab.89.gmail; Fri, 27 Mar 2015 06:56:31 -0700 (PDT) X-Received: by 10.112.161.66 with SMTP id xq2mr17890433lbb.103.1427464591449; Fri, 27 Mar 2015 06:56:31 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id v7si1442290lbw.153.2015.03.27.06.56.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Mar 2015 06:56:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbbug6 with SMTP id ug6so64112710lbb.3 for ; Fri, 27 Mar 2015 06:56:31 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr18015681lab.106.1427464591245; Fri, 27 Mar 2015 06:56:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp1275961lbq; Fri, 27 Mar 2015 06:56:30 -0700 (PDT) X-Received: by 10.68.215.100 with SMTP id oh4mr7738378pbc.110.1427464589465; Fri, 27 Mar 2015 06:56:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dn1si2940342pbb.242.2015.03.27.06.56.28; Fri, 27 Mar 2015 06:56:29 -0700 (PDT) Received-SPF: none (google.com: linux-acpi-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753087AbbC0N4K (ORCPT + 7 others); Fri, 27 Mar 2015 09:56:10 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:35815 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752908AbbC0N4J (ORCPT ); Fri, 27 Mar 2015 09:56:09 -0400 Received: by pdbop1 with SMTP id op1so97265705pdb.2 for ; Fri, 27 Mar 2015 06:56:08 -0700 (PDT) X-Received: by 10.69.3.4 with SMTP id bs4mr35436052pbd.167.1427464568480; Fri, 27 Mar 2015 06:56:08 -0700 (PDT) Received: from localhost ([104.207.83.1]) by mx.google.com with ESMTPSA id fk4sm2289501pbb.80.2015.03.27.06.56.07 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 27 Mar 2015 06:56:07 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" Cc: Will Deacon , Catalin Marinas , Boris Ostrovsky , Stefano Stabellini , Lorenzo Pieralisi , Sudeep Holla , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH 3/7] ACPI / processor: Introduce invalid_logical_cpuid() Date: Fri, 27 Mar 2015 21:55:09 +0800 Message-Id: <1427464513-14414-6-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427464513-14414-1-git-send-email-hanjun.guo@linaro.org> References: <1427464513-14414-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In ACPI processor drivers, we use direct comparisons of cpu logical id with -1 which are error prone in case logical cpuid is accidentally assinged an error code and prevents us from returning an error-encoding cpuid directly in some cases. So introduce invalid_logical_cpuid() to identify cpu with invalid logical cpu num, then it will be used to replace the direct comparisons with -1. Signed-off-by: Hanjun Guo --- drivers/acpi/acpi_processor.c | 4 ++-- drivers/acpi/processor_pdc.c | 5 +---- include/linux/acpi.h | 5 +++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 95492d0..62c846b 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -274,7 +274,7 @@ static int acpi_processor_get_info(struct acpi_device *device) * Handle UP system running SMP kernel, with no CPU * entry in MADT */ - if ((pr->id == -1) && (num_online_cpus() == 1)) + if (invalid_logical_cpuid(pr->id) && (num_online_cpus() == 1)) pr->id = 0; } @@ -283,7 +283,7 @@ static int acpi_processor_get_info(struct acpi_device *device) * less than the max # of CPUs. They should be ignored _iff * they are physically not present. */ - if (pr->id == -1) { + if (invalid_logical_cpuid(pr->id)) { int ret = acpi_processor_hotadd_init(pr); if (ret) return ret; diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c index e5dd808..6dd98d0 100644 --- a/drivers/acpi/processor_pdc.c +++ b/drivers/acpi/processor_pdc.c @@ -52,10 +52,7 @@ static bool __init processor_physically_present(acpi_handle handle) type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0; cpuid = acpi_get_cpuid(handle, type, acpi_id); - if (cpuid == -1) - return false; - - return true; + return invalid_logical_cpuid(cpuid) ? false : true; } static void acpi_set_pdc_bits(u32 *buf) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index de4e86f..fd8a2a4 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -152,6 +152,11 @@ typedef u32 phys_cpuid_t; #define PHYS_CPUID_INVALID (phys_cpuid_t)(-1) #endif +static inline bool invalid_logical_cpuid(u32 cpuid) +{ + return (int)cpuid < 0; +} + #ifdef CONFIG_ACPI_HOTPLUG_CPU /* Arch dependent functions for cpu hotplug support */ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu);