From patchwork Wed Jan 24 18:34:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 125703 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp591955ljf; Wed, 24 Jan 2018 10:36:59 -0800 (PST) X-Google-Smtp-Source: AH8x226pt1aOs5g1L+8QSG2TDa9Cv6QGtGXp8vzp4jzNU3Ykfxiovy2ELO7mkEqUCEGPhF9Al0+k X-Received: by 10.107.37.19 with SMTP id l19mr10114972iol.193.1516819019690; Wed, 24 Jan 2018 10:36:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516819019; cv=none; d=google.com; s=arc-20160816; b=nFTgEA4ya6sDY/D1TATaluvOa5T3quV2GzT/AWlKOb0v6HRZUboD3UJ4x0LxdWFA52 E1fSacpcBmwJcjNYwAbVcbF0yzzcNWVEecxGe46bEyia3ybXxho77hBPFIszhoiRS0DA UvJIYLZl2PZf0XOnAYW+kNTYsfRRHNl4lpnVbPfTOeFU8wxFu0RK+I6Ye3Bioc2Xi6qT IB4ydIFKC2cACg4N0zOTjVvKBD5F3VcXNf5xIlZD3QvK6soZkqVBanNSGenJ+7aaW7Al KnPmCWZhBK+hYccIDrT9icgDCUpnZmXt//RZB3vzjfPb58IC6AAXfYep3rfYMwQg8kMG B29A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=Qd/wckh9hGNUHaTVsLeTnkhg5hLUGL/q56TkUswXoHs=; b=h4T8XcTaHURBjMP6Bhpuvx09DxCxN/ZKJpDQIlRgAQniocE3LV0KdFDFn6K/2axbX0 AKdFdLMn3t4A+dS+oIrTPTG0byPicjvPPAK5ac42BIUW+WWDAknpl1y+3X1Tw3pUbXYA NZ0Yj7BWFGAMyQb0cA3+5b++UYKnu8lZJU0WPkaqcSyNJUlkEdnqWSqfnWUxH/ZFmQez IhxUgfmx5DX+2skFrEtC7qrZelL6l4KYIa/7faPQsaAM4akbNzH0D/8VtSDmAWHci5vL bLm3Tu42f7yI4FaQx2OTJT9LIncbdrn4D/AV36LvZPTpyyPFpLbE3QDHLKs02NxJg+iv lIbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aRm6ZmUC; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id b11si653538iob.148.2018.01.24.10.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 10:36:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aRm6ZmUC; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eePsq-0001c3-1i; Wed, 24 Jan 2018 18:34:52 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eePsp-0001bV-9w for xen-devel@lists.xen.org; Wed, 24 Jan 2018 18:34:51 +0000 X-Inumbo-ID: 4011088a-0135-11e8-ba59-bc764e045a96 Received: from mail-wm0-x244.google.com (unknown [2a00:1450:400c:c09::244]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 4011088a-0135-11e8-ba59-bc764e045a96; Wed, 24 Jan 2018 19:34:46 +0100 (CET) Received: by mail-wm0-x244.google.com with SMTP id g1so10217978wmg.2 for ; Wed, 24 Jan 2018 10:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AZK4I2Huzf9nDMly0fxwv0p4G3NSC6wmmfnk/60OBmY=; b=aRm6ZmUCxFR6U2TwMbXyzgJZ8eUp7Prxk/Xnr/Gt79BKXzXebySARJ9LfuV8//d/4y dKVKDlCtnEB+85b7RLgS2syZgLDZFAAzha07olCT6R7S4mBAF+m3E9RQGaj3d9R89eBi k/Ydi2SkGFmXiSeNHWDOsoQ3aKQ8KHYKLvD9E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AZK4I2Huzf9nDMly0fxwv0p4G3NSC6wmmfnk/60OBmY=; b=oigP4dIVs54H9jw4c1OAtzXp9VrpcQrnjeRjq8RWiFKZ1Ru0ndNkQGaNM5GtaqUnPd eJQQBHdLagD7QWNV3idoKEPzWu/+7mB+RtlLmvp3EgRkR3WJDLYi/bj4thJyufi6PMCM oIBijunMKLXRgVk++eC58wADIhUEaPfksGdTUcejM/txCqJBzh/Tnalu0cDIr963lTp8 3BFFv2+Ad4PkkytjTi1L9oI9qi57QYtahHbAMnfmFcGPy/JvWUrZe3FFln2mxYweZsBg R8Te+38aUhkzoMYeYhXLyqe7laZbIrKYq2dYFJciFIidm8+r7WcjykjXOqGjWy+sQcmK cusA== X-Gm-Message-State: AKwxytdt3N5Wl6LfY/0axgh8pPl22EegnPmCkMWUX/2v1VrY/JinnLYN HiVukGtmj+f08sWOwyXCAPbvLe3gPzM= X-Received: by 10.28.45.74 with SMTP id t71mr5381390wmt.90.1516818888523; Wed, 24 Jan 2018 10:34:48 -0800 (PST) Received: from e108454-lin.cambridge.arm.com ([2001:41d0:1:6c23::1]) by smtp.gmail.com with ESMTPSA id 186sm1080120wmu.16.2018.01.24.10.34.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 10:34:48 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 24 Jan 2018 18:34:43 +0000 Message-Id: <20180124183445.23705-2-julien.grall@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180124183445.23705-1-julien.grall@linaro.org> References: <20180124183445.23705-1-julien.grall@linaro.org> Cc: sstabellini@kernel.org, volodymyr_babchuk@epam.com, andre.przywara@linaro.org, Julien Grall Subject: [Xen-devel] [PATCH 1/3] xen/arm: vpsci: Removing dummy MIGRATE and MIGRATE_INFO_UP_CPU X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The PSCI call MIGRATE and MIGRATE_INFO_UP_CPU are optional and implemented as just returning PSCI_NOT_SUPPORTED (aka UNKNOWN_FUNCTION for SMCCC). The new SMCCC framework is able to deal with unimplemented function and return the proper error code. So remove the implementations for both function. Signed-off-by: Julien Grall --- xen/arch/arm/vpsci.c | 10 ---------- xen/arch/arm/vsmc.c | 14 -------------- xen/include/asm-arm/perfc_defn.h | 2 -- xen/include/asm-arm/psci.h | 2 -- 4 files changed, 28 deletions(-) diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index cd724904ef..979d32ed6d 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -172,21 +172,11 @@ int32_t do_psci_0_2_affinity_info(register_t target_affinity, return PSCI_0_2_AFFINITY_LEVEL_OFF; } -int32_t do_psci_0_2_migrate(uint32_t target_cpu) -{ - return PSCI_NOT_SUPPORTED; -} - uint32_t do_psci_0_2_migrate_info_type(void) { return PSCI_0_2_TOS_MP_OR_NOT_PRESENT; } -register_t do_psci_0_2_migrate_info_up_cpu(void) -{ - return PSCI_NOT_SUPPORTED; -} - void do_psci_0_2_system_off( void ) { struct domain *d = current->domain; diff --git a/xen/arch/arm/vsmc.c b/xen/arch/arm/vsmc.c index c9064de37a..563c2d8dda 100644 --- a/xen/arch/arm/vsmc.c +++ b/xen/arch/arm/vsmc.c @@ -157,11 +157,6 @@ static bool handle_sssc(struct cpu_user_regs *regs) PSCI_SET_RESULT(regs, do_psci_0_2_migrate_info_type()); return true; - case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU: - perfc_incr(vpsci_migrate_info_up_cpu); - PSCI_SET_RESULT(regs, do_psci_0_2_migrate_info_up_cpu()); - return true; - case PSCI_0_2_FN_SYSTEM_OFF: perfc_incr(vpsci_system_off); do_psci_0_2_system_off(); @@ -206,15 +201,6 @@ static bool handle_sssc(struct cpu_user_regs *regs) return true; } - case PSCI_0_2_FN_MIGRATE: - { - uint32_t tcpu = PSCI_ARG32(regs, 1); - - perfc_incr(vpsci_cpu_migrate); - PSCI_SET_RESULT(regs, do_psci_0_2_migrate(tcpu)); - return true; - } - case ARM_SMCCC_FUNC_CALL_COUNT: return fill_function_call_count(regs, SSSC_SMCCC_FUNCTION_COUNT); diff --git a/xen/include/asm-arm/perfc_defn.h b/xen/include/asm-arm/perfc_defn.h index 5f957ee6ec..a7acb7d21c 100644 --- a/xen/include/asm-arm/perfc_defn.h +++ b/xen/include/asm-arm/perfc_defn.h @@ -27,12 +27,10 @@ PERFCOUNTER(vpsci_cpu_on, "vpsci: cpu_on") PERFCOUNTER(vpsci_cpu_off, "vpsci: cpu_off") PERFCOUNTER(vpsci_version, "vpsci: version") PERFCOUNTER(vpsci_migrate_info_type, "vpsci: migrate_info_type") -PERFCOUNTER(vpsci_migrate_info_up_cpu, "vpsci: migrate_info_up_cpu") PERFCOUNTER(vpsci_system_off, "vpsci: system_off") PERFCOUNTER(vpsci_system_reset, "vpsci: system_reset") PERFCOUNTER(vpsci_cpu_suspend, "vpsci: cpu_suspend") PERFCOUNTER(vpsci_cpu_affinity_info, "vpsci: cpu_affinity_info") -PERFCOUNTER(vpsci_cpu_migrate, "vpsci: cpu_migrate") PERFCOUNTER(vgicd_reads, "vgicd: read") PERFCOUNTER(vgicd_writes, "vgicd: write") diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h index 635ea5dae4..f7e2139031 100644 --- a/xen/include/asm-arm/psci.h +++ b/xen/include/asm-arm/psci.h @@ -37,9 +37,7 @@ int32_t do_psci_0_2_cpu_on(register_t target_cpu, register_t entry_point, register_t context_id); int32_t do_psci_0_2_affinity_info(register_t target_affinity, uint32_t lowest_affinity_level); -int32_t do_psci_0_2_migrate(uint32_t target_cpu); uint32_t do_psci_0_2_migrate_info_type(void); -register_t do_psci_0_2_migrate_info_up_cpu(void); void do_psci_0_2_system_off(void); void do_psci_0_2_system_reset(void);