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 77CD1C6FD1C for ; Mon, 20 Mar 2023 19:29:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230264AbjCTT3G (ORCPT ); Mon, 20 Mar 2023 15:29:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229646AbjCTT2X (ORCPT ); Mon, 20 Mar 2023 15:28:23 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B0FCB4D639 for ; Mon, 20 Mar 2023 12:20:52 -0700 (PDT) Received: from vm02.corp.microsoft.com (unknown [167.220.197.27]) by linux.microsoft.com (Postfix) with ESMTPSA id F1C8A20FB1AB; Mon, 20 Mar 2023 12:20:26 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com F1C8A20FB1AB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679340028; bh=XPpcWj9XwPGuObfeTqrxZHmfuFJ0keGteN1DGS91Sf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bABrdq8yChhaL+TAl8T/zmeoHEpKXhc5iK2fots8wPlIDyZL2ahgwfCxdYvQGG1Ia BPUODW5DEF2aEBVL9SwuvqhnJKplIdH5ziG+0dOtAQqNjSDj5DJ5KD6TWJ3SlqRreB qRQ8P8hUXInN0/QVyL63rYhBPPUeXLEKQEnlbTRk= 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 v3 4/8] x86/psp: Add IRQ support Date: Mon, 20 Mar 2023 19:19:52 +0000 Message-Id: <20230320191956.1354602-5-jpiotrowski@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320191956.1354602-1-jpiotrowski@linux.microsoft.com> References: <20230320191956.1354602-1-jpiotrowski@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Acked-by: Tom Lendacky Signed-off-by: Jeremi Piotrowski --- arch/x86/kernel/psp.c | 185 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/psp.c b/arch/x86/kernel/psp.c index 64f3bfc5c9ff..fc059cf3b25c 100644 --- a/arch/x86/kernel/psp.c +++ b/arch/x86/kernel/psp.c @@ -1,8 +1,182 @@ // SPDX-License-Identifier: GPL-2.0-only - +#define pr_fmt(fmt) "psp: " fmt #include #include +#include +#include #include +#include + +#define PSP_ACPI_CMDID_SHIFT 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_MASK GENMASK(7, 0) +#define PSP_ACPI_MBOX_IRQID_SHIFT 10 +#define PSP_ACPI_IRQ_EN_BIT BIT(0) +#define PSP_ACPI_IRQ_EN_MBOX_IRQID_SHIFT 10 + +#define PSP_CMD_DELAY_US 2 +#define PSP_CMD_TIMEOUT_US 10000 + +enum ASP_CMDID { + ASP_CMDID_PART1 = 0x82, + ASP_CMDID_PART2 = 0x83, + ASP_CMDID_PART3 = 0x84, + ASP_CMDID_IRQ_EN = 0x85, +}; + +enum ASP_CMD_STATUS { + ASP_CMD_STATUS_SUCCESS = 0x0, + ASP_CMD_STATUS_INVALID_CMD = 0x1, + ASP_CMD_STATUS_INVALID_PARAM = 0x2, + ASP_CMD_STATUS_INVALID_FW_STATE = 0x3, + ASP_CMD_STATUS_FAILURE = 0x1F, +}; + +struct psp_irq_data { + void __iomem *base; + u8 mbox_irq_id; + int acpi_cmd_resp_reg; +}; + +static int psp_sync_cmd(void __iomem *reg, u8 cmd, u16 data) +{ + u32 val; + int err; + + val = data; + val |= cmd << PSP_ACPI_CMDID_SHIFT; + writel(val, reg); + err = readl_poll_timeout_atomic(reg, val, val & PSP_ACPI_RESPONSE_BIT, PSP_CMD_DELAY_US, + PSP_CMD_TIMEOUT_US); + if (err) + 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 = data->base + data->acpi_cmd_resp_reg; + u16 val = 0; + int err; + + if (data->mbox_irq_id > 63) + return -EINVAL; + + val = irq_en ? PSP_ACPI_IRQ_EN_BIT : 0; + val |= data->mbox_irq_id << PSP_ACPI_IRQ_EN_MBOX_IRQID_SHIFT; + err = psp_sync_cmd(reg, ASP_CMDID_IRQ_EN, val); + if (err != 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, unsigned int vector, unsigned int cpu) +{ + void __iomem *reg = data->base + data->acpi_cmd_resp_reg; + unsigned int dest_cpu = cpu_physical_id(cpu); + u16 part1, part2, part3; + int err; + + if (data->mbox_irq_id > 63) + return -EINVAL; + + part1 = dest_cpu; + part2 = dest_cpu >> 16; + part3 = vector & PSP_ACPI_VECTOR_MASK; + part3 |= data->mbox_irq_id << PSP_ACPI_MBOX_IRQID_SHIFT; + + err = psp_sync_cmd(reg, ASP_CMDID_PART1, part1); + if (err != ASP_CMD_STATUS_SUCCESS) { + pr_err("ASP_CMDID_PART1 failed: %d\n", err); + return -EIO; + } + err = psp_sync_cmd(reg, ASP_CMDID_PART2, part2); + if (err != ASP_CMD_STATUS_SUCCESS) { + pr_err("ASP_CMDID_PART2 failed: %d\n", err); + return -EIO; + } + err = psp_sync_cmd(reg, ASP_CMDID_PART3, part3); + if (err != 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; + struct irq_cfg *cfg; + void __iomem *base; + int virq; + int err; + + base = ioremap(reg->start, resource_size(reg)); + if (!base) + return -ENOMEM; + + pspirqd.mbox_irq_id = pdata->mbox_irq_id; + pspirqd.acpi_cmd_resp_reg = pdata->acpi_cmd_resp_reg; + pspirqd.base = base; + init_irq_alloc_info(&info, cpumask_of(0)); + virq = irq_domain_alloc_irqs(NULL, 1, NUMA_NO_NODE, &info); + if (virq <= 0) { + pr_err("failed to allocate vector: %d\n", virq); + err = -ENOMEM; + goto unmap; + } + irq_set_handler(virq, handle_edge_irq); + + data = irq_get_irq_data(virq); + if (!data) { + pr_err("no irq data\n"); + err = -ENODEV; + goto freeirq; + } + + cfg = irqd_cfg(data); + if (!cfg) { + pr_err("no irq cfg\n"); + err = -ENODEV; + goto freeirq; + } + + err = psp_configure_irq(&pspirqd, cfg->vector, 0); + if (err) { + pr_err("failed to configure irq: %d\n", err); + goto freeirq; + } + + err = psp_set_irq_enable(&pspirqd, true); + if (err) { + pr_err("failed to enable irq: %d\n", err); + goto freeirq; + } + + *irq = (struct resource)DEFINE_RES_IRQ(virq); + + iounmap(base); + + return 0; + +freeirq: + irq_domain_free_irqs(virq, 1); + +unmap: + iounmap(base); + + return err; +} static struct platform_device psp_device = { .name = "psp", @@ -12,7 +186,7 @@ static struct platform_device psp_device = { static int __init psp_init_platform_device(void) { struct psp_platform_data pdata = {}; - struct resource res[1]; + struct resource res[2]; int err; /* @@ -24,10 +198,13 @@ static int __init psp_init_platform_device(void) if (!hypervisor_is_type(X86_HYPER_MS_HYPERV)) return -ENODEV; - err = acpi_parse_aspt(res, &pdata); + err = acpi_parse_aspt(&res[0], &pdata); + if (err) + return err; + err = psp_init_irq(&pdata, &res[0], &res[1]); if (err) return err; - err = platform_device_add_resources(&psp_device, res, 1); + err = platform_device_add_resources(&psp_device, res, 2); if (err) return err; err = platform_device_add_data(&psp_device, &pdata, sizeof(pdata)); -- 2.34.1