From patchwork Fri Jan 5 13:12:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 123523 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp802316qgn; Fri, 5 Jan 2018 05:14:55 -0800 (PST) X-Google-Smtp-Source: ACJfBosLiwU8FF0MF/t2VU++kKqBpA6aD8xDHGVCa4ssnYXnnKm32SkRf76wGTtw6iJQQkWUJ+FJ X-Received: by 10.99.143.5 with SMTP id n5mr2673508pgd.14.1515158094969; Fri, 05 Jan 2018 05:14:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515158094; cv=none; d=google.com; s=arc-20160816; b=YSSBGmwvf0i71LkuR+nGQLiW65clP34YulVbW95jm84R1DY7ZoxdWQ3Oks0+yLMai5 hQTC/7ZGzEjCaJyHjCre0jOQLMtVt4L3lq4bsBOZQuViCsQnluRHP0Z1B0AEedbn72+x vfYrO0lE8+4P2PG6hXPv6mnFzDZHfHi8ovcEM0MCdTpwhd7udddDRc422QhQom6+TrKW 3lto7khiOE5mCs8L/mv/GMmXkG2wndhFcdJBaXYatxNjmacunrHxfJj74icWFYB46h+P 16FO4J1J4/wR3HrO9K6uh1Sv3QkZGYk2ZSEjhfni93cQLZlCOQeFO5u2Xex9hXCRhmv3 eEjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=UykPvai+4kuWW7i6WcE8r17hxZr4Xa8ijpKJ/9ZJaPA=; b=DV/vfBm9elmjvjkhV5srGNs7vBBggFfIl4EW7xoBjloKcRZVViAgVDKoEDBU4vjXoW gy/zVsTggj1gdhRrOPCApc9a+TB1vg4MC3frYcrefp+c2Sg+uO/Mi8wm8BhQmEVePH2h A5mM7c3QxDTIybctAAT1OMOAx9yIpOchA7zM4xDzf0YDcSvSt72NOzYVE0hk0e8TMdYM cPzW23wIiwC6IoVKstwEUFEmAKCnaB0lxm+4t+J8JFcBDcItIynnYV32YYuE0V7NuGDN X778oH5fWeokg5NehdQrJ+55PifwppRKfe/l+CB7w8LNM7SSZeegEvZCSi9dYbOx2BsY M++A== 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 g23si3555725pgn.58.2018.01.05.05.14.54; Fri, 05 Jan 2018 05:14:54 -0800 (PST) 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 S1752023AbeAENOY (ORCPT + 27 others); Fri, 5 Jan 2018 08:14:24 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:44774 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbeAENMn (ORCPT ); Fri, 5 Jan 2018 08:12:43 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AAFD9164F; Fri, 5 Jan 2018 05:12:43 -0800 (PST) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 798E43F53D; Fri, 5 Jan 2018 05:12:43 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 34A421AE1894; Fri, 5 Jan 2018 13:12:43 +0000 (GMT) From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, christoffer.dall@linaro.org, linux-kernel@vger.kernel.org, labbott@redhat.com, Will Deacon Subject: [PATCH v2 05/11] drivers/firmware: Expose psci_get_version through psci_ops structure Date: Fri, 5 Jan 2018 13:12:35 +0000 Message-Id: <1515157961-20963-6-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1515157961-20963-1-git-send-email-will.deacon@arm.com> References: <1515157961-20963-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Entry into recent versions of ARM Trusted Firmware will invalidate the CPU branch predictor state in order to protect against aliasing attacks. This patch exposes the PSCI "VERSION" function via psci_ops, so that it can be invoked outside of the PSCI driver where necessary. Acked-by: Lorenzo Pieralisi Signed-off-by: Will Deacon --- drivers/firmware/psci.c | 2 ++ include/linux/psci.h | 1 + 2 files changed, 3 insertions(+) -- 2.1.4 diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index d687ca3d5049..8b25d31e8401 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -496,6 +496,8 @@ static void __init psci_init_migrate(void) static void __init psci_0_2_set_functions(void) { pr_info("Using standard PSCI v0.2 function IDs\n"); + psci_ops.get_version = psci_get_version; + psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_FN_NATIVE(0_2, CPU_SUSPEND); psci_ops.cpu_suspend = psci_cpu_suspend; diff --git a/include/linux/psci.h b/include/linux/psci.h index bdea1cb5e1db..6306ab10af18 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -26,6 +26,7 @@ int psci_cpu_init_idle(unsigned int cpu); int psci_cpu_suspend_enter(unsigned long index); struct psci_operations { + u32 (*get_version)(void); int (*cpu_suspend)(u32 state, unsigned long entry_point); int (*cpu_off)(u32 state); int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);