[PATCH v1 08/44] dmaengine: sdxi: add core RKey table management
From: Wei Huang
Date: Thu Nov 19 2026 - 15:26:37 EST
Allocate the minimum supported function RKey table when the
capability is present, program MMIO_RKEY, and disable the table during
teardown. Keep userspace key operations for a later UAPI patch.
Signed-off-by: Wei Huang <wei.huang2@xxxxxxx>
---
drivers/dma/sdxi/Makefile | 1 +
drivers/dma/sdxi/device.c | 11 ++++--
drivers/dma/sdxi/keys.c | 70 +++++++++++++++++++++++++++++++++++++++
drivers/dma/sdxi/keys.h | 18 ++++++++++
drivers/dma/sdxi/sdxi.h | 8 +++++
5 files changed, 106 insertions(+), 2 deletions(-)
create mode 100644 drivers/dma/sdxi/keys.c
create mode 100644 drivers/dma/sdxi/keys.h
diff --git a/drivers/dma/sdxi/Makefile b/drivers/dma/sdxi/Makefile
index bddd1278096c..96d013dcbefd 100644
--- a/drivers/dma/sdxi/Makefile
+++ b/drivers/dma/sdxi/Makefile
@@ -7,6 +7,7 @@ sdxi-core-y := \
descriptor.o \
device.o \
dma.o \
+ keys.o \
ring.o
obj-$(CONFIG_SDXI_PCI) += sdxi-pci.o
diff --git a/drivers/dma/sdxi/device.c b/drivers/dma/sdxi/device.c
index 9b6a89e469ad..0e7d3711ba88 100644
--- a/drivers/dma/sdxi/device.c
+++ b/drivers/dma/sdxi/device.c
@@ -25,6 +25,7 @@
#include "context.h"
#include "dma.h"
#include "hw.h"
+#include "keys.h"
#include "mmio.h"
#include "sdxi.h"
@@ -387,6 +388,10 @@ static int sdxi_fn_activate(struct sdxi_dev *sdxi)
FIELD_GET(SDXI_MMIO_CAP1_OPB_000_CAP, cap1));
sdxi_write64(sdxi, SDXI_MMIO_CTL2, ctl2);
+ err = sdxi_keys_init(sdxi, cap1);
+ if (err)
+ return err;
+
/* SDXI 1.0 4.1.8.2 Context Level 2 Table Setup */
sdxi->L2_table = dmam_alloc_coherent(sdxi->dev,
sizeof(*sdxi->L2_table),
@@ -458,6 +463,7 @@ int sdxi_register(struct device *dev, const struct sdxi_bus_ops *ops)
xa_init_flags(&sdxi->client_cxts, XA_FLAGS_ALLOC1);
mutex_init(&sdxi->cxt_lock);
mutex_init(&sdxi->admin_lock);
+ mutex_init(&sdxi->rkey_lock);
dev_set_drvdata(dev, sdxi);
err = sdxi->bus_ops->init(sdxi);
@@ -476,9 +482,10 @@ void sdxi_unregister(struct device *dev)
{
struct sdxi_dev *sdxi = dev_get_drvdata(dev);
- /* Stop/reset is best effort if the hardware cannot be quiesced. */
- sdxi_dev_stop(sdxi);
+ if (sdxi_dev_stop(sdxi))
+ sdxi_dev_force_quiesce(sdxi);
sdxi_client_cxts_exit(sdxi);
+ sdxi_keys_exit(sdxi);
ida_destroy(&sdxi->vectors);
}
EXPORT_SYMBOL_NS_GPL(sdxi_unregister, "SDXI");
diff --git a/drivers/dma/sdxi/keys.c b/drivers/dma/sdxi/keys.c
new file mode 100644
index 000000000000..2e25a9b806e6
--- /dev/null
+++ b/drivers/dma/sdxi/keys.c
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * SDXI key table management.
+ *
+ * Copyright Advanced Micro Devices, Inc.
+ */
+
+#include <linux/bitfield.h>
+#include <linux/device/devres.h>
+#include <linux/dma-mapping.h>
+#include <linux/log2.h>
+#include <linux/sizes.h>
+#include <linux/string.h>
+
+#include "hw.h"
+#include "keys.h"
+#include "mmio.h"
+#include "sdxi.h"
+
+static void sdxi_keys_release(void *data)
+{
+ sdxi_keys_exit(data);
+}
+
+int sdxi_keys_init(struct sdxi_dev *sdxi, u64 cap1)
+{
+ size_t table_size;
+ u64 reg;
+ int ret;
+
+ sdxi->rkey_cap = FIELD_GET(SDXI_MMIO_CAP1_RKEY_CAP, cap1);
+ if (!sdxi->rkey_cap)
+ return 0;
+
+ sdxi->rkey_order = 0;
+ table_size = SZ_4K << sdxi->rkey_order;
+ sdxi->rkey_entries = table_size / sizeof(*sdxi->rkey_table);
+
+ sdxi->rkey_table = dmam_alloc_coherent(sdxi->dev, table_size,
+ &sdxi->rkey_table_dma,
+ GFP_KERNEL);
+ if (!sdxi->rkey_table)
+ return -ENOMEM;
+ memset(sdxi->rkey_table, 0, table_size);
+
+ reg = FIELD_PREP(SDXI_MMIO_RKEY_PTR,
+ sdxi->rkey_table_dma >> ilog2(SZ_4K)) |
+ FIELD_PREP(SDXI_MMIO_RKEY_SZ, sdxi->rkey_order) |
+ SDXI_MMIO_RKEY_EN;
+ sdxi_write64(sdxi, SDXI_MMIO_RKEY, reg);
+
+ ret = devm_add_action_or_reset(sdxi->dev, sdxi_keys_release, sdxi);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+void sdxi_keys_exit(struct sdxi_dev *sdxi)
+{
+ if (!sdxi->rkey_cap)
+ return;
+
+ sdxi_write64(sdxi, SDXI_MMIO_RKEY, 0);
+ sdxi->rkey_table = NULL;
+ sdxi->rkey_table_dma = 0;
+ sdxi->rkey_entries = 0;
+ sdxi->rkey_order = 0;
+ sdxi->rkey_cap = false;
+}
diff --git a/drivers/dma/sdxi/keys.h b/drivers/dma/sdxi/keys.h
new file mode 100644
index 000000000000..c479da651526
--- /dev/null
+++ b/drivers/dma/sdxi/keys.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * SDXI key table management.
+ *
+ * Copyright Advanced Micro Devices, Inc.
+ */
+
+#ifndef DMA_SDXI_KEYS_H
+#define DMA_SDXI_KEYS_H
+
+#include <linux/types.h>
+
+struct sdxi_dev;
+
+int sdxi_keys_init(struct sdxi_dev *sdxi, u64 cap1);
+void sdxi_keys_exit(struct sdxi_dev *sdxi);
+
+#endif /* DMA_SDXI_KEYS_H */
diff --git a/drivers/dma/sdxi/sdxi.h b/drivers/dma/sdxi/sdxi.h
index 7b3cad785442..48e4631c621c 100644
--- a/drivers/dma/sdxi/sdxi.h
+++ b/drivers/dma/sdxi/sdxi.h
@@ -90,6 +90,14 @@ struct sdxi_dev {
u16 L1_users[SDXI_L2_TABLE_ENTRIES];
struct mutex cxt_lock; /* context table serialization */
+ /* RKey table */
+ struct mutex rkey_lock;
+ struct sdxi_rkey_ent *rkey_table;
+ dma_addr_t rkey_table_dma;
+ u32 rkey_entries;
+ u8 rkey_order;
+ bool rkey_cap;
+
struct dma_pool *cxt_ctl_pool;
unsigned int nr_vectors;
--
2.56.1