From patchwork Tue May 5 02:46:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 48011 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D9EA62121F for ; Tue, 5 May 2015 02:48:09 +0000 (UTC) Received: by wgin8 with SMTP id n8sf49023603wgi.0 for ; Mon, 04 May 2015 19:48:09 -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=xwEJFsQTNkNaGfz1gX1Tax63BnOKKWG0yYKd/ULJxXI=; b=gGutHTI4zlrZ9mNN0K3CCiPx8INhkjOqXMpbec0nk3bIHtmJYmK7E0Q+G4BmZn/7u+ 3BexEyqoQOherKvr8cGL7RgtUVmip5ZKJ2xcRO6ukO/pnUM/fPIrPpn67olOWuINnsx5 +lYug0ePUsM3KqRZlQq069dhNYQAzWxeDuOKYVABa+afcNQjaX61WoZzB7yD7CFDhi/P yzc6GBhVDxYclhVa5GstoGNth+0eHVXR9r6fFNQz53Du8nRhmy8cTVSMdevecEvEbxP0 bJk13TZVggoKimg8GoSQm0JPAsN30GX5i5iS0l4qwy+e78v0LegThxPo1VUnChUaSvKz afSg== X-Gm-Message-State: ALoCoQmyZ8M9NRA09dVh42Jek/YPBsyvQNpg1+CcDnr8Dq7GV360pcL3kf9bWpAswhbjTV+E+Tz5 X-Received: by 10.194.143.98 with SMTP id sd2mr20574880wjb.6.1430794089140; Mon, 04 May 2015 19:48:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.129 with SMTP id m1ls780141laf.76.gmail; Mon, 04 May 2015 19:48:08 -0700 (PDT) X-Received: by 10.112.204.199 with SMTP id la7mr21722577lbc.114.1430794088862; Mon, 04 May 2015 19:48:08 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id d9si11306725lad.19.2015.05.04.19.48.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 May 2015 19:48:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lagv1 with SMTP id v1so117309110lag.3 for ; Mon, 04 May 2015 19:48:08 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr21536286lac.41.1430794088778; Mon, 04 May 2015 19:48:08 -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.67.65 with SMTP id l1csp1987398lbt; Mon, 4 May 2015 19:48:07 -0700 (PDT) X-Received: by 10.70.101.2 with SMTP id fc2mr47872671pdb.77.1430794086918; Mon, 04 May 2015 19:48:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hx10si22151576pbc.131.2015.05.04.19.48.06; Mon, 04 May 2015 19:48:06 -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 S965431AbbEECrx (ORCPT + 7 others); Mon, 4 May 2015 22:47:53 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34644 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965407AbbEECrn (ORCPT ); Mon, 4 May 2015 22:47:43 -0400 Received: by pacyx8 with SMTP id yx8so177883033pac.1 for ; Mon, 04 May 2015 19:47:42 -0700 (PDT) X-Received: by 10.70.126.225 with SMTP id nb1mr47922550pdb.71.1430794062148; Mon, 04 May 2015 19:47:42 -0700 (PDT) Received: from localhost ([180.150.157.4]) by mx.google.com with ESMTPSA id jz10sm14085480pbc.48.2015.05.04.19.47.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 May 2015 19:47:41 -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 v2 3/7] ACPI / processor: Introduce invalid_logical_cpuid() Date: Tue, 5 May 2015 10:46:34 +0800 Message-Id: <1430793998-21631-4-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430793998-21631-1-git-send-email-hanjun.guo@linaro.org> References: <1430793998-21631-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.215.44 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 e4da5e3..913b49f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -158,6 +158,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);