From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2616910F9965 for ; Wed, 8 Apr 2026 17:29:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06A3C6B0089; Wed, 8 Apr 2026 13:29:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3F356B009B; Wed, 8 Apr 2026 13:29:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4F5A6B0089; Wed, 8 Apr 2026 13:29:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A9D776B0089 for ; Wed, 8 Apr 2026 13:29:46 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 75D7289C68 for ; Wed, 8 Apr 2026 17:29:46 +0000 (UTC) X-FDA: 84636075972.27.CBC7503 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by imf02.hostedemail.com (Postfix) with ESMTP id 5853480004 for ; Wed, 8 Apr 2026 17:29:43 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of shiju.jose@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=shiju.jose@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1775669384; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VQHA5026ANmBnWrSMZc54bLUKjUWvogr38qyBJQUAVo=; b=6Ss9lLAs0QBV5RuTPp90fUX+3NrDPjERUXB2K8+RUbNzoMSHvxlwuTBXoY4/eDfSTSVepp cjUIfGrhKnQJL16Y005fCPue0KjPRH7y13fQPPrEsez9hq7rljoLl3zG3oBVvmn6X2Xddg PqWQpjH9fJhFYhOswi3d9tX9HEK8jpE= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of shiju.jose@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=shiju.jose@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1775669384; a=rsa-sha256; cv=none; b=2ohOvY6jzRW+SP8jBH2U4GyQg8VteoxS+rblYv7XvUk5kCehM7Ty1RSm3oAlfIw7mV0GU8 dOPi7WgilKHlfo6ZKZHWONJPIx5pqnVlL9hlPXdtigQSY8sByfpxHN8Uyffyr5uCnV7Sw2 wulJPE+Meiyi/CR8JlKx1n5sht3aa8U= Received: from mail.maildlp.com (unknown [172.18.224.107]) by frasgout.his.huawei.com (SkyGuard) with ESMTPS id 4frVS240BZzHnGhv; Thu, 9 Apr 2026 01:29:38 +0800 (CST) Received: from dubpeml500008.china.huawei.com (unknown [7.214.146.94]) by mail.maildlp.com (Postfix) with ESMTPS id 289CA40587; Thu, 9 Apr 2026 01:29:41 +0800 (CST) Received: from P_UKIT01-A7bmah.china.huawei.com (10.126.175.151) by dubpeml500008.china.huawei.com (7.214.146.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 8 Apr 2026 18:29:39 +0100 From: To: , , , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v19 1/2] ACPI:RAS2: Add driver for the ACPI RAS2 feature table Date: Wed, 8 Apr 2026 18:28:48 +0100 Message-ID: <20260408172850.183-2-shiju.jose@huawei.com> X-Mailer: git-send-email 2.43.0.windows.1 In-Reply-To: <20260408172850.183-1-shiju.jose@huawei.com> References: <20260408172850.183-1-shiju.jose@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.175.151] X-ClientProxiedBy: lhrpeml500010.china.huawei.com (7.191.174.240) To dubpeml500008.china.huawei.com (7.214.146.94) X-Rspam-User: X-Rspamd-Queue-Id: 5853480004 X-Stat-Signature: hd7f7fndrban774bjg59gr7ja8fx9qbh X-Rspamd-Server: rspam06 X-HE-Tag: 1775669383-612230 X-HE-Meta: U2FsdGVkX19rtGAG2DxKHmzRX0WEq/CjwkfpvMDtRsc4p9tRM1yiN96orcVcwi9zt/HBL1YIK7ECWPkslbyrVYX5V6G6AWCMeIlQglydBTKTIQuXfMUXnOGrkbkgRWZRaLREuoRtSwLMSo7SAR8HnNnBj3Is/Lroa/AOdJWERsqN878eV6PmCT0Yylk2fARL5QzvlJBWguBPhIJ7y0zXceicOnjPWsM1x18N4C9tddc54rfVAoWdgFlG+l7Egx1z5lt/IRAgog7PHFjRSt/MxRpjjq1A0RN0kdvc0C3Z9X3yFdG8LzhGLMq5OBeYR2iytfAzZvOs7DqdAU58k/qTdpENh6gnmhLuFu6XK0AT8lfy7x+moFAauM14U9AWQt6mbqVGeNJ3D2KV9zIhrwnTuBva23CSND3zjCdZDNY5ZAqS6fqJmZV7vDpTaLlodoEFihYT7fhEhrR/FFlC11YhhR+tMj+E3fLkeoIBP2kD2hp8Ic6n1vb6R3+dHZQGruxcg0l8bpXiJGq4pa/X9aPo6v7NOJRS4hmurzcVxa/g2gW9VL0HJOEtkEMe3nzGd6XcXHgmqzkYg3/wj+0hvpbqSKUYgxA75rECe99q1WNiZZ6wXzoLIZo2HyUTXYw/oOAUspQO5BS5e3X06ZTrJfeKXNOn8O3oECGRe1Tz/RTXhcblSGjL5FqwfU78PtowQrAGLZe1F/EJjUdkh+uFOLHM5QsJ0sTV8ufd5+zL7ZbQdqpztYZpyaW8fcJ5gsfhn21l1vTeDCjJDlL2Af6OGdF5niw3+lqJuRMiRhzf3CH58UZIAyeBSgpPqGwalTJVKtucW93cs95pOp3wzwqN7lBvD1fcsGIJLK7gM1osQBX9fNLAzkYJp5otcWu/HA2Ue1SaPGAYiiFMTpYFq0nxwbU2ORtIZ1GA92E7RF1olxrZls7mdeR9XlOyc9XI3b3z8kYgygx9dwXYEtybZGDLGY7 YizFKgHe y90D78InEhY+/HHsdpOMi2Eng01Wv0zhK8kdzjkV3iSRIEO5xHeA6jl+hazOnEyTRhgQsP+NRMokCrGqUQ2C3XdqSddNA7u7kmTffmRyHZ+NKFu9RMFBLPkCLHeuM7nDn+sTRJo/5BrLU5KC6CtVJ6hCwppBibje4/QTOmTO2ZAbDpHd2h7z6LsU4WVqxdloKy4n7+alriDTIhh1MlOwijQoAGzordAyr6TpM9I2zyeCKSTDL/XOZalmZ8zz1EiHjsbS/ZgeFlA/vh5kMUkyow7LGY8T+gsSGy7q/9ouy9szBfwukvPJY5ZShfXGCr7+15tlVfK3dkMuRha6Q/rTIeUCFnA== Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Shiju Jose ACPI 6.5 Specification, section 5.2.21, defined RAS2 feature table (RAS2). Driver adds support for RAS2 feature table, which provides interfaces for platform RAS features, e.g., for HW-based memory scrubbing, and logical to PA translation service. RAS2 uses PCC channel subspace for communicating with the ACPI compliant HW platform. Co-developed-by: A Somasundaram Signed-off-by: A Somasundaram Co-developed-by: Jonathan Cameron Signed-off-by: Jonathan Cameron Tested-by: Daniel Ferguson Signed-off-by: Shiju Jose --- drivers/acpi/Kconfig | 11 ++ drivers/acpi/Makefile | 1 + drivers/acpi/bus.c | 3 + drivers/acpi/ras2.c | 441 ++++++++++++++++++++++++++++++++++++++++++ include/acpi/ras2.h | 57 ++++++ 5 files changed, 513 insertions(+) create mode 100644 drivers/acpi/ras2.c create mode 100644 include/acpi/ras2.h diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 6f4b545f7377..bc5ca7281f9f 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -294,6 +294,17 @@ config ACPI_CPPC_LIB If your platform does not support CPPC in firmware, leave this option disabled. +config ACPI_RAS2 + bool "ACPI RAS2 driver" + select AUXILIARY_BUS + depends on MAILBOX + depends on PCC + help + Add support for the RAS2 feature table and provide interfaces for + platform RAS features, such as hardware-based memory scrubbing. + + If unsure, select N. + config ACPI_PROCESSOR tristate "Processor" depends on X86 || ARM64 || LOONGARCH || RISCV diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index d1b0affb844f..abfec6745724 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -105,6 +105,7 @@ obj-$(CONFIG_ACPI_EC_DEBUGFS) += ec_sys.o obj-$(CONFIG_ACPI_BGRT) += bgrt.o obj-$(CONFIG_ACPI_CPPC_LIB) += cppc_acpi.o obj-$(CONFIG_ACPI_SPCR_TABLE) += spcr.o +obj-$(CONFIG_ACPI_RAS2) += ras2.o obj-$(CONFIG_ACPI_DEBUGGER_USER) += acpi_dbg.o obj-$(CONFIG_ACPI_PPTT) += pptt.o obj-$(CONFIG_ACPI_PFRUT) += pfr_update.o pfr_telemetry.o diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 2ec095e2009e..b1f614416c9a 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "internal.h" @@ -1528,6 +1529,8 @@ static int __init acpi_init(void) acpi_debugger_init(); acpi_setup_sb_notify_handler(); acpi_viot_init(); + acpi_ras2_init(); + return 0; } diff --git a/drivers/acpi/ras2.c b/drivers/acpi/ras2.c new file mode 100644 index 000000000000..2513b597e0f8 --- /dev/null +++ b/drivers/acpi/ras2.c @@ -0,0 +1,441 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ACPI RAS2 feature table driver. + * + * Copyright (c) 2024-2026 HiSilicon Limited. + * + * Support for RAS2 table - ACPI 6.5 Specification, section 5.2.21, which + * provides interfaces for platform RAS features, e.g., for HW-based memory + * scrubbing, and logical to physical address translation service. RAS2 uses + * PCC channel subspace for communicating with the ACPI compliant HW platform. + */ + +#undef pr_fmt +#define pr_fmt(fmt) "ACPI RAS2: " fmt + +#include +#include +#include +#include +#include +#include + +/** + * struct ras2_sspcc - Data structure for PCC communication + * @mbox_client: struct mbox_client object + * @pcc_chan: Pointer to struct pcc_mbox_chan + * @comm_addr: Pointer to RAS2 PCC shared memory region + * @pcc_lock: PCC lock to provide mutually exclusive access + * to PCC channel subspace + * @deadline_us: Poll PCC status register timeout in microsecs + * for PCC command completion + * @pcc_mpar: Maximum Periodic Access Rate (MPAR) for PCC channel + * @pcc_mrtt: Minimum Request Turnaround Time (MRTT) in microsecs + * OS must wait after completion of a PCC command before + * issuing next command + * @last_cmd_cmpl_time: Completion time of last PCC command + * @last_mpar_reset: Time of last MPAR count reset + * @mpar_count: MPAR count + * @pcc_id: Identifier of the RAS2 platform communication channel + * @last_cmd: Last PCC command + * @pcc_chnl_acq: Status of PCC channel acquired + */ +struct ras2_sspcc { + struct mbox_client mbox_client; + struct pcc_mbox_chan *pcc_chan; + struct acpi_ras2_shmem __iomem *comm_addr; + struct mutex pcc_lock; + unsigned int deadline_us; + unsigned int pcc_mpar; + unsigned int pcc_mrtt; + ktime_t last_cmd_cmpl_time; + ktime_t last_mpar_reset; + int mpar_count; + int pcc_id; + u16 last_cmd; + bool pcc_chnl_acq; +}; + +/* + * Arbitrary retries for PCC commands because the remote processor could be + * much slower to reply. Keep it high enough to cover emulators where the + * processors run painfully slow. + */ +#define PCC_NUM_RETRIES 600ULL +#define PCC_CHNL_DEFAULT_LATENCY 1000 +#define PCC_MIN_POLL_USECS 3 + +#define RAS2_MAX_NUM_PCC_DESCS 100 +#define RAS2_FEAT_TYPE_MEMORY 0x00 + +static int check_pcc_chan(struct ras2_sspcc *sspcc) +{ + struct acpi_ras2_shmem __iomem *gen_comm_base = sspcc->comm_addr; + u32 cap_status; + u16 status; + int rc; + + /* + * As per ACPI spec, the PCC space will be initialized by the + * platform and should have set the command completion bit when + * PCC can be used by OSPM. + * + * Poll PCC status register every PCC_MIN_POLL_USECS for maximum of + * PCC_NUM_RETRIES * PCC channel latency until PCC command complete + * bit is set. + */ + rc = readw_relaxed_poll_timeout(&gen_comm_base->status, status, + status & PCC_STATUS_CMD_COMPLETE, + PCC_MIN_POLL_USECS, sspcc->deadline_us); + if (rc) { + pr_warn("PCC ID: 0x%x: PCC check channel timeout for last command: 0x%x rc=%d\n", + sspcc->pcc_id, sspcc->last_cmd, rc); + + return rc; + } + + if (status & PCC_STATUS_ERROR) { + pr_warn("PCC ID: 0x%x: Error in executing last command: 0x%x\n", + sspcc->pcc_id, sspcc->last_cmd); + status &= ~PCC_STATUS_ERROR; + iowrite16(status, &gen_comm_base->status); + return -EIO; + } + + cap_status = ioread32(&gen_comm_base->set_caps_status); + switch (cap_status) { + case ACPI_RAS2_NOT_VALID: + case ACPI_RAS2_NOT_SUPPORTED: + rc = -EPERM; + break; + case ACPI_RAS2_BUSY: + rc = -EBUSY; + break; + case ACPI_RAS2_FAILED: + case ACPI_RAS2_ABORTED: + case ACPI_RAS2_INVALID_DATA: + rc = -EINVAL; + break; + default: + rc = 0; + } + + iowrite32(0x0, &gen_comm_base->set_caps_status); + + return rc; +} + +/** + * ras2_send_pcc_cmd() - Send RAS2 command via PCC channel + * @ras2_ctx: pointer to the RAS2 context structure + * @cmd: RAS2 command to send + * + * Returns: 0 on success, an error otherwise + */ +int ras2_send_pcc_cmd(struct ras2_mem_ctx *ras2_ctx, u16 cmd) +{ + struct acpi_ras2_shmem __iomem *gen_comm_base; + struct mbox_chan *pcc_channel; + struct ras2_sspcc *sspcc; + s64 time_delta; + int rc; + + if (!ras2_ctx) + return -EINVAL; + + lockdep_assert_held(ras2_ctx->pcc_lock); + sspcc = ras2_ctx->sspcc; + gen_comm_base = sspcc->comm_addr; + + rc = check_pcc_chan(sspcc); + if (rc < 0) + return rc; + + pcc_channel = sspcc->pcc_chan->mchan; + + /* + * Handle the Minimum Request Turnaround Time (MRTT): the minimum + * amount of time that OSPM must wait after the completion of + * a command before issuing the next command, in microseconds. + */ + if (sspcc->pcc_mrtt) { + time_delta = ktime_us_delta(ktime_get(), sspcc->last_cmd_cmpl_time); + if (sspcc->pcc_mrtt > time_delta) + udelay(sspcc->pcc_mrtt - time_delta); + } + + /* + * Handle the non-zero Maximum Periodic Access Rate (MPAR): the + * maximum number of periodic requests that the subspace channel can + * support, reported in commands per minute. 0 indicates no + * limitation. + * + * This parameter should be ideally zero or large enough so that it + * can handle maximum number of requests that all the cores in the + * system can collectively generate. If it is not, follow the spec and + * just not send the request to the platform after hitting the MPAR + * limit in any 60s window. + */ + if (sspcc->pcc_mpar) { + if (!sspcc->mpar_count) { + time_delta = ktime_ms_delta(ktime_get(), sspcc->last_mpar_reset); + if ((time_delta < 60 * MSEC_PER_SEC) && sspcc->last_mpar_reset) { + dev_dbg(ras2_ctx->dev, + "PCC command 0x%x not sent due to MPAR limit", cmd); + return -EIO; + } + sspcc->last_mpar_reset = ktime_get(); + sspcc->mpar_count = sspcc->pcc_mpar; + } + sspcc->mpar_count--; + } + + /* Write to the shared comm region */ + iowrite16(cmd, &gen_comm_base->command); + + /* Flip CMD COMPLETE bit */ + iowrite16(0, &gen_comm_base->status); + + /* Ring doorbell */ + rc = mbox_send_message(pcc_channel, &cmd); + /* + * mbox_send_message() returns a non-negative integer for successful submission + * and a negative value on failure. + */ + if (rc < 0) { + dev_warn(ras2_ctx->dev, + "Error sending PCC mbox message command: 0x%x, rc:%d\n", cmd, rc); + return rc; + } else { + rc = 0; + } + + sspcc->last_cmd = cmd; + + /* + * If Minimum Request Turnaround Time is non-zero, need to record the + * completion time of both READ and WRITE commands for proper handling + * of MRTT, so need to check for pcc_mrtt in addition to PCC_CMD_EXEC_RAS2. + */ + if (cmd == PCC_CMD_EXEC_RAS2 || sspcc->pcc_mrtt) { + rc = check_pcc_chan(sspcc); + if (sspcc->pcc_mrtt) + sspcc->last_cmd_cmpl_time = ktime_get(); + } + + /* + * Both mbox_chan_txdone() and mbox_client_txdone() require the status + * of the last transmission as the second argument. + */ + if (pcc_channel->mbox->txdone_irq) + mbox_chan_txdone(pcc_channel, rc); + else + mbox_client_txdone(pcc_channel, rc); + + return rc; +} +EXPORT_SYMBOL_FOR_MODULES(ras2_send_pcc_cmd, "acpi_ras2"); + +static int register_pcc_channel(struct ras2_mem_ctx *ras2_ctx, int pcc_id) +{ + struct pcc_mbox_chan *pcc_chan; + struct ras2_sspcc *sspcc; + + if (pcc_id < 0) + return -EINVAL; + + sspcc = kzalloc(sizeof(*sspcc), GFP_KERNEL); + if (!sspcc) + return -ENOMEM; + + pcc_chan = pcc_mbox_request_channel(&sspcc->mbox_client, pcc_id); + if (IS_ERR(pcc_chan)) { + kfree(sspcc); + return PTR_ERR(pcc_chan); + } + + sspcc->pcc_id = pcc_id; + sspcc->pcc_chan = pcc_chan; + sspcc->comm_addr = pcc_chan->shmem; + if (pcc_chan->latency) + sspcc->deadline_us = PCC_NUM_RETRIES * pcc_chan->latency; + else + sspcc->deadline_us = PCC_NUM_RETRIES * PCC_CHNL_DEFAULT_LATENCY; + sspcc->pcc_mrtt = pcc_chan->min_turnaround_time; + sspcc->pcc_mpar = pcc_chan->max_access_rate; + sspcc->mbox_client.knows_txdone = true; + + ras2_ctx->sspcc = sspcc; + ras2_ctx->comm_addr = sspcc->comm_addr; + ras2_ctx->dev = pcc_chan->mchan->mbox->dev; + + mutex_init(&sspcc->pcc_lock); + ras2_ctx->pcc_lock = &sspcc->pcc_lock; + + return 0; +} + +static DEFINE_IDA(ras2_ida); +static void ras2_release(struct device *device) +{ + struct auxiliary_device *auxdev = to_auxiliary_dev(device); + struct ras2_mem_ctx *ras2_ctx = container_of(auxdev, struct ras2_mem_ctx, adev); + struct ras2_sspcc *sspcc; + + ida_free(&ras2_ida, auxdev->id); + sspcc = ras2_ctx->sspcc; + pcc_mbox_free_channel(sspcc->pcc_chan); + kfree(sspcc); + kfree(ras2_ctx); +} + +static struct ras2_mem_ctx *add_aux_device(char *name, int channel, u32 pxm_inst) +{ + struct ras2_mem_ctx *ras2_ctx; + struct ras2_sspcc *sspcc; + u32 comp_nid; + int id, rc; + + comp_nid = pxm_to_node(pxm_inst); + if (comp_nid == NUMA_NO_NODE) { + pr_debug("Invalid NUMA node, channel=%d pxm_inst=%d\n", channel, pxm_inst); + return ERR_PTR(-EINVAL); + } + + ras2_ctx = kzalloc(sizeof(*ras2_ctx), GFP_KERNEL); + if (!ras2_ctx) + return ERR_PTR(-ENOMEM); + + ras2_ctx->sys_comp_nid = comp_nid; + + rc = register_pcc_channel(ras2_ctx, channel); + if (rc < 0) { + pr_debug("Failed to register PCC channel=%d pxm_inst=%d rc=%d\n", channel, + pxm_inst, rc); + goto ctx_free; + } + + id = ida_alloc(&ras2_ida, GFP_KERNEL); + if (id < 0) { + rc = id; + goto pcc_free; + } + + ras2_ctx->adev.id = id; + ras2_ctx->adev.name = name; + ras2_ctx->adev.dev.release = ras2_release; + ras2_ctx->adev.dev.parent = ras2_ctx->dev; + + rc = auxiliary_device_init(&ras2_ctx->adev); + if (rc) + goto ida_free; + + rc = auxiliary_device_add(&ras2_ctx->adev); + if (rc) { + auxiliary_device_uninit(&ras2_ctx->adev); + return ERR_PTR(rc); + } + + return ras2_ctx; + +ida_free: + ida_free(&ras2_ida, id); +pcc_free: + sspcc = ras2_ctx->sspcc; + pcc_mbox_free_channel(sspcc->pcc_chan); + kfree(sspcc); +ctx_free: + kfree(ras2_ctx); + + return ERR_PTR(rc); +} + +static void remove_aux_device(struct ras2_mem_ctx *ras2_ctx) +{ + if (!ras2_ctx) + return; + + auxiliary_device_delete(&ras2_ctx->adev); + auxiliary_device_uninit(&ras2_ctx->adev); +} + +static int parse_ras2_table(struct acpi_table_ras2 *ras2_tab) +{ + struct acpi_ras2_pcc_desc *pcc_desc_list; + struct ras2_mem_ctx **pctx_list; + struct ras2_mem_ctx *ras2_ctx; + u16 tot_tbl_len; + u16 i; + + if (ras2_tab->header.length < sizeof(*ras2_tab)) { + pr_warn(FW_WARN "ACPI RAS2 table present but broken (too short, size=%u)\n", + ras2_tab->header.length); + return -EINVAL; + } + + if (!ras2_tab->num_pcc_descs || ras2_tab->num_pcc_descs > RAS2_MAX_NUM_PCC_DESCS) { + pr_warn(FW_WARN "No/Invalid number of PCC descs(%d) in ACPI RAS2 table\n", + ras2_tab->num_pcc_descs); + return -EINVAL; + } + + tot_tbl_len = sizeof(*ras2_tab) + ras2_tab->num_pcc_descs * sizeof(*pcc_desc_list); + if (ras2_tab->header.length < tot_tbl_len) { + pr_warn(FW_WARN "RAS2 table is not large enough to contain PCC descs=%d size=%u)\n", + ras2_tab->num_pcc_descs, ras2_tab->header.length); + return -EINVAL; + } + + pctx_list = kcalloc(ras2_tab->num_pcc_descs, sizeof(*pctx_list), GFP_KERNEL); + if (!pctx_list) + return -ENOMEM; + + pcc_desc_list = (struct acpi_ras2_pcc_desc *)(ras2_tab + 1); + for (i = 0; i < ras2_tab->num_pcc_descs; i++, pcc_desc_list++) { + if (pcc_desc_list->feature_type != RAS2_FEAT_TYPE_MEMORY) + continue; + + ras2_ctx = add_aux_device(RAS2_MEM_DEV_ID_NAME, pcc_desc_list->channel_id, + pcc_desc_list->instance); + if (IS_ERR(ras2_ctx)) { + pr_warn("Failed to add RAS2 auxiliary device rc=%ld\n", PTR_ERR(ras2_ctx)); + for (; i > 0; i--) { + if (pctx_list[i - 1]) + remove_aux_device(pctx_list[i - 1]); + } + kfree(pctx_list); + return PTR_ERR(ras2_ctx); + } + pctx_list[i] = ras2_ctx; + } + kfree(pctx_list); + + return 0; +} + +/** + * acpi_ras2_init - RAS2 driver initialization function. + * + * Extracts the ACPI RAS2 table and retrieves ID for the PCC channel subspace + * for communicating with the ACPI compliant HW platform. Driver adds an + * auxiliary device, which binds to the memory ACPI RAS2 driver, for each RAS2 + * memory feature. + * + * Returns: none. + */ +void __init acpi_ras2_init(void) +{ + struct acpi_table_ras2 *ras2_tab; + acpi_status status; + + status = acpi_get_table(ACPI_SIG_RAS2, 0, (struct acpi_table_header **)&ras2_tab); + if (ACPI_FAILURE(status)) { + pr_debug("Failed to get table, %s\n", acpi_format_exception(status)); + return; + } + + if (parse_ras2_table(ras2_tab)) + pr_debug("Failed to parse RAS2 table\n"); + + acpi_put_table((struct acpi_table_header *)ras2_tab); +} diff --git a/include/acpi/ras2.h b/include/acpi/ras2.h new file mode 100644 index 000000000000..f4574e8e0a12 --- /dev/null +++ b/include/acpi/ras2.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * ACPI RAS2 (RAS Feature Table) methods. + * + * Copyright (c) 2024-2026 HiSilicon Limited + */ + +#ifndef _ACPI_RAS2_H +#define _ACPI_RAS2_H + +#include +#include +#include +#include +#include + +struct device; + +/* + * ACPI spec 6.5 Table 5.82: PCC command codes used by + * RAS2 platform communication channel. + */ +#define PCC_CMD_EXEC_RAS2 0x01 + +#define RAS2_AUX_DEV_NAME "ras2" +#define RAS2_MEM_DEV_ID_NAME "acpi_ras2_mem" + +/** + * struct ras2_mem_ctx - Context for RAS2 memory features + * @adev: Auxiliary device object + * @comm_addr: Pointer to RAS2 PCC shared memory region + * @dev: Pointer to device backing struct mbox_controller for PCC + * @sspcc: Pointer to local data structure for PCC communication + * @pcc_lock: Pointer to PCC lock to provide mutually exclusive access + * to PCC channel subspace + * @sys_comp_nid: Node ID of the system component that the RAS feature + * is associated with. See ACPI spec 6.5 Table 5.80: RAS2 + * Platform Communication Channel Descriptor format, + * Field: Instance + */ +struct ras2_mem_ctx { + struct auxiliary_device adev; + struct acpi_ras2_shmem __iomem *comm_addr; + struct device *dev; + void *sspcc; + struct mutex *pcc_lock; + u32 sys_comp_nid; +}; + +#ifdef CONFIG_ACPI_RAS2 +void __init acpi_ras2_init(void); +int ras2_send_pcc_cmd(struct ras2_mem_ctx *ras2_ctx, u16 cmd); +#else +static inline void acpi_ras2_init(void) { } +#endif + +#endif /* _ACPI_RAS2_H */ -- 2.43.0