From nobody Wed Apr 8 14:46:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4824AC54E94 for ; Mon, 23 Jan 2023 15:25:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232759AbjAWPYt (ORCPT ); Mon, 23 Jan 2023 10:24:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232716AbjAWPYX (ORCPT ); Mon, 23 Jan 2023 10:24:23 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 36F319773 for ; Mon, 23 Jan 2023 07:23:52 -0800 (PST) Received: from vm02.corp.microsoft.com (unknown [167.220.196.155]) by linux.microsoft.com (Postfix) with ESMTPSA id 009E320E2D18; Mon, 23 Jan 2023 07:23:32 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 009E320E2D18 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1674487414; bh=6yVfbftlAEMVDoy2/KKdGqDFHRZaTDzPvLDX+11tzNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kArLyiRwH+OznKs79i5G67uEcgHmCnUZbMnLN0JL1ZXdhJhmVOmfef7eambtIiwpu /NTl2+i5amoldWk4AHR3xPs/NtPrijLuGLfZg91lpbkRmo+jw2E2NwDi3XfcDyhIlO ZI8pb/3yStKSmRegYbSVGDNMdLVoQwg3u7XxQ0ik= From: Jeremi Piotrowski To: linux-kernel@vger.kernel.org Cc: Jeremi Piotrowski , "Brijesh Singh" , "Tom Lendacky" , "Kalra, Ashish" , "Thomas Gleixner" , "Ingo Molnar" , "Borislav Petkov" , "Dave Hansen" , x86@kernel.org Subject: [PATCH v1 4/8] x86/psp: Add IRQ support Date: Mon, 23 Jan 2023 15:22:46 +0000 Message-Id: <20230123152250.26413-5-jpiotrowski@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123152250.26413-1-jpiotrowski@linux.microsoft.com> References: <20230123152250.26413-1-jpiotrowski@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The ACPI PSP device provides a mailbox irq that needs to be configured through the ACPI mailbox register first. This requires passing a CPU vector and physical CPU id and then enabling interrupt delivery. Allocate the irq directly from the default irq domain (x86_vector_domain) to get access to the required information. By passing a cpumask through irq_alloc_info the vector is immediately allocated (and not later during activation) and can be retrieved. Signed-off-by: Jeremi Piotrowski --- arch/x86/kernel/psp.c | 179 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 175 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/psp.c b/arch/x86/kernel/psp.c index d404df47cc04..24181d132bae 100644 --- a/arch/x86/kernel/psp.c +++ b/arch/x86/kernel/psp.c @@ -1,8 +1,176 @@ // SPDX-License-Identifier: GPL-2.0-only - +#define pr_fmt(fmt) "psp: " fmt #include #include +#include +#include #include +#include + +#define PSP_ACPI_DATA_SHIFT 0 +#define PSP_ACPI_DATA_MASK GENMASK(15, 0) +#define PSP_ACPI_CMDID_SHIFT 16 +#define PSP_ACPI_CMDID_MASK GENMASK(25, 16) +#define PSP_ACPI_STATUS_SHIFT 26 +#define PSP_ACPI_STATUS_MASK GENMASK(30, 26) +#define PSP_ACPI_RESPONSE_BIT BIT(31) + +#define PSP_ACPI_VECTOR_SHIFT 0 +#define PSP_ACPI_VECTOR_MASK GENMASK(7, 0) +#define PSP_ACPI_MBOX_IRQID_SHIFT 10 +#define PSP_ACPI_MBOX_IRQID_MASK GENMASK(15, 10) + +#define PSP_ACPI_IRQ_EN_BIT BIT(0) +#define PSP_ACPI_IRQ_EN_MBOX_IRQID_SHIFT 10 +#define PSP_ACPI_IRQ_EN_MBOX_IRQID_MASK GENMASK(15, 10) + +// AMD Secure Processor +enum ASP_CMDID { + ASP_CMDID_PART1 =3D 0x82, + ASP_CMDID_PART2 =3D 0x83, + ASP_CMDID_PART3 =3D 0x84, + ASP_CMDID_IRQ_EN =3D 0x85, +}; + +enum ASP_CMD_STATUS { + ASP_CMD_STATUS_SUCCESS =3D 0x0, + ASP_CMD_STATUS_INVALID_CMD =3D 0x1, + ASP_CMD_STATUS_INVALID_PARAM =3D 0x2, + ASP_CMD_STATUS_INVALID_FW_STATE =3D 0x3, + ASP_CMD_STATUS_FAILURE =3D 0x1F, +}; + +struct psp_irq_data { + void __iomem *base; + int mbox_irq_id; + int acpi_cmd_resp_reg; +}; + +static int psp_sync_cmd(void __iomem *reg, u8 cmd, u16 data) +{ + u32 val =3D 0; + int err; + + val |=3D data & PSP_ACPI_DATA_MASK; + val |=3D (cmd << PSP_ACPI_CMDID_SHIFT) & PSP_ACPI_CMDID_MASK; + writel(val, reg); + err =3D readl_poll_timeout_atomic(reg, val, val & PSP_ACPI_RESPONSE_BIT, = 2, 10000); + if (err < 0) + return err; + return (val & PSP_ACPI_STATUS_MASK) >> PSP_ACPI_STATUS_SHIFT; +} + +static int psp_set_irq_enable(struct psp_irq_data *data, bool irq_en) +{ + void __iomem *reg =3D data->base + data->acpi_cmd_resp_reg; + u8 mbox_irq_id =3D data->mbox_irq_id; + u16 val =3D 0; + int err; + + val |=3D irq_en ? PSP_ACPI_IRQ_EN_BIT : 0; + val |=3D (mbox_irq_id << PSP_ACPI_IRQ_EN_MBOX_IRQID_SHIFT) & PSP_ACPI_IRQ= _EN_MBOX_IRQID_MASK; + err =3D psp_sync_cmd(reg, ASP_CMDID_IRQ_EN, val); + if (err !=3D ASP_CMD_STATUS_SUCCESS) { + pr_err("ASP_CMDID_IRQ_EN failed: %d\n", err); + return -EIO; + } + return 0; +} + +static int psp_configure_irq(struct psp_irq_data *data, int vector, unsign= ed int cpu) +{ + void __iomem *reg =3D data->base + data->acpi_cmd_resp_reg; + unsigned int dest_cpu =3D cpu_physical_id(cpu); + u8 mbox_irq_id =3D data->mbox_irq_id; + u16 part1, part2, part3; + int err; + + part1 =3D dest_cpu; + part2 =3D dest_cpu >> 16; + part3 =3D vector & PSP_ACPI_VECTOR_MASK; + part3 |=3D (mbox_irq_id << PSP_ACPI_MBOX_IRQID_SHIFT) & PSP_ACPI_MBOX_IRQ= ID_MASK; + + err =3D psp_sync_cmd(reg, ASP_CMDID_PART1, part1); + if (err !=3D ASP_CMD_STATUS_SUCCESS) { + pr_err("ASP_CMDID_PART1 failed: %d\n", err); + return -EIO; + } + err =3D psp_sync_cmd(reg, ASP_CMDID_PART2, part2); + if (err !=3D ASP_CMD_STATUS_SUCCESS) { + pr_err("ASP_CMDID_PART2 failed: %d\n", err); + return -EIO; + } + err =3D psp_sync_cmd(reg, ASP_CMDID_PART3, part3); + if (err !=3D ASP_CMD_STATUS_SUCCESS) { + pr_err("ASP_CMDID_PART3 failed: %d\n", err); + return -EIO; + } + + return 0; +} + + +static int psp_init_irq(const struct psp_platform_data *pdata, + const struct resource *reg, struct resource *irq) +{ + struct psp_irq_data pspirqd; + struct irq_alloc_info info; + struct irq_data *data =3D NULL; + struct irq_cfg *cfg =3D NULL; + void __iomem *base =3D NULL; + int virq; + int err; + + base =3D ioremap(reg->start, resource_size(reg)); + if (IS_ERR(base)) + return PTR_ERR(base); + if (!base) + return -ENOMEM; + pspirqd.mbox_irq_id =3D pdata->mbox_irq_id; + pspirqd.acpi_cmd_resp_reg =3D pdata->acpi_cmd_resp_reg; + pspirqd.base =3D base; + init_irq_alloc_info(&info, cpumask_of(0)); + virq =3D irq_domain_alloc_irqs(NULL, 1, NUMA_NO_NODE, &info); + if (virq <=3D 0) { + pr_err("failed to allocate vector: %d\n", virq); + err =3D -ENOMEM; + goto unmap; + } + irq_set_handler(virq, handle_edge_irq); + data =3D irq_get_irq_data(virq); + if (!data) { + pr_err("no irq data\n"); + err =3D -ENODEV; + goto freeirq; + + } + cfg =3D irqd_cfg(data); + if (!data) { + pr_err("no irq cfg\n"); + err =3D -ENODEV; + goto freeirq; + } + err =3D psp_configure_irq(&pspirqd, cfg->vector, 0); + if (err) { + pr_err("failed to configure irq: %d\n", err); + goto freeirq; + } + err =3D psp_set_irq_enable(&pspirqd, true); + if (err) { + pr_err("failed to enable irq: %d\n", err); + goto freeirq; + } + + *irq =3D (struct resource)DEFINE_RES_IRQ(virq); + iounmap(base); + return 0; + +freeirq: + irq_domain_free_irqs(virq, 1); +unmap: + iounmap(base); + return err; +} =20 static struct platform_device psp_device =3D { .name =3D "psp", @@ -12,7 +180,7 @@ static struct platform_device psp_device =3D { static int __init psp_init_platform_device(void) { struct psp_platform_data pdata =3D {}; - struct resource res[1]; + struct resource res[2]; int err; =20 /* @@ -24,10 +192,13 @@ static int __init psp_init_platform_device(void) if (!hypervisor_is_type(X86_HYPER_MS_HYPERV)) return -ENODEV; =20 - err =3D acpi_parse_aspt(res, &pdata); + err =3D acpi_parse_aspt(&res[0], &pdata); + if (err) + return err; + err =3D psp_init_irq(&pdata, &res[0], &res[1]); if (err) return err; - err =3D platform_device_add_resources(&psp_device, res, 1); + err =3D platform_device_add_resources(&psp_device, res, 2); if (err) return err; =20 --=20 2.25.1