From patchwork Mon May 11 04:17:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 48194 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 13C2821550 for ; Mon, 11 May 2015 04:18:19 +0000 (UTC) Received: by lamp14 with SMTP id p14sf38380268lam.3 for ; Sun, 10 May 2015 21:18:18 -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=QjyQNmIvqpYfdgrJtB0GAaT0qmIUGoO5j3Iuo3NR/3Y=; b=MiqaFoKUU4cuOAyKVMgqpqbykmMKjMozE00z++Nut9KNcvfcrjBPv5r81w7xRhdBY0 D+uHgveVcByIXrszCPXguqnGzOVXAHE4yZD6GywS3YtCIRLqKWP4JGL3HZRfO0o0VFHD ePFcZhHAaVpo8e81TTKWKM/jJlMvXBP1NF4Np0dIX1aIOC8n8DtOSwcYmHqEysFOR6tc 85+JtXXcwLiJqpiA/yuQEK8cS3pDS6ZOYdO02+NCYxQbkurtVoc2WEYgEi0Jbp3rStyb FBlQgYAZVI3MTPizwkDpGuTanoDdS4upH4NCSkulyip5wsXcBr4FLTidui6j9sffct3D o8/A== X-Gm-Message-State: ALoCoQlAjolaXTly0H+POemqPZxwXyet37Rscq37b3tjHsry6CdCHJ3pi8cJW1hn2/LczHwWnB2i X-Received: by 10.152.37.101 with SMTP id x5mr6318334laj.5.1431317897927; Sun, 10 May 2015 21:18:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.101 with SMTP id r5ls533209lar.78.gmail; Sun, 10 May 2015 21:18:17 -0700 (PDT) X-Received: by 10.112.161.66 with SMTP id xq2mr6734433lbb.31.1431317897752; Sun, 10 May 2015 21:18:17 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id yo3si7636351lbb.167.2015.05.10.21.18.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 May 2015 21:18:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lagv1 with SMTP id v1so84952439lag.3 for ; Sun, 10 May 2015 21:18:17 -0700 (PDT) X-Received: by 10.152.36.2 with SMTP id m2mr6534235laj.72.1431317897587; Sun, 10 May 2015 21:18:17 -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.108.230 with SMTP id hn6csp1290213lbb; Sun, 10 May 2015 21:18:16 -0700 (PDT) X-Received: by 10.70.32.164 with SMTP id k4mr16195271pdi.138.1431317895431; Sun, 10 May 2015 21:18:15 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si5554627pas.76.2015.05.10.21.18.14; Sun, 10 May 2015 21:18:15 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1752210AbbEKESD (ORCPT + 28 others); Mon, 11 May 2015 00:18:03 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:33964 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751058AbbEKESA (ORCPT ); Mon, 11 May 2015 00:18:00 -0400 Received: by pdbqa5 with SMTP id qa5so134271193pdb.1 for ; Sun, 10 May 2015 21:17:59 -0700 (PDT) X-Received: by 10.66.63.72 with SMTP id e8mr15552258pas.3.1431317879643; Sun, 10 May 2015 21:17:59 -0700 (PDT) Received: from localhost ([180.150.153.56]) by mx.google.com with ESMTPSA id c15sm11489722pbu.81.2015.05.10.21.17.57 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 10 May 2015 21:17:58 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org Cc: Will Deacon , Catalin Marinas , Boris Ostrovsky , Stefano Stabellini , Lorenzo Pieralisi , Sudeep Holla , Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH v3 1/7] ACPI / processor: Introduce invalid_logical_cpuid() Date: Mon, 11 May 2015 12:17:13 +0800 Message-Id: <1431317839-4584-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431317839-4584-1-git-send-email-hanjun.guo@linaro.org> References: <1431317839-4584-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.41 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 | 5 +++-- drivers/acpi/processor_pdc.c | 5 +---- include/linux/acpi.h | 5 +++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 58f335c..ac6bda0 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -275,7 +275,8 @@ static int acpi_processor_get_info(struct acpi_device *device) * Handle UP system running SMP kernel, with no CPU * entry in MADT */ - if ((cpu_index == -1) && (num_online_cpus() == 1)) + if (invalid_logical_cpuid(cpu_index) + && (num_online_cpus() == 1)) cpu_index = 0; } pr->id = cpu_index; @@ -285,7 +286,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..7cfbda4 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); } 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);