251f76c1c6
Adds latest 6.6 patches from the Raspberry Pi repository. These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.6.y/ With the following command: git format-patch -N v6.6.83..HEAD (HEAD -> 08d4e8f52256bd422d8a1f876411603f627d0a82) Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
From 8a08b4ad6dbd48a826b3052e52a4fdc88c3ac36e Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 30 Jan 2025 15:26:39 +0000
|
|
Subject: [PATCH] misc: rp1-pio: SM_CONFIG_XFER32 = larger DMA bufs
|
|
|
|
Add an ioctl type - SM_CONFIG_XFER32 - that takes uints for the buf_size
|
|
and buf_count values.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/misc/rp1-pio.c | 9 +++++++++
|
|
include/uapi/misc/rp1_pio_if.h | 8 ++++++++
|
|
2 files changed, 17 insertions(+)
|
|
|
|
--- a/drivers/misc/rp1-pio.c
|
|
+++ b/drivers/misc/rp1-pio.c
|
|
@@ -710,6 +710,14 @@ static int rp1_pio_sm_config_xfer_user(s
|
|
args->buf_size, args->buf_count);
|
|
}
|
|
|
|
+static int rp1_pio_sm_config_xfer32_user(struct rp1_pio_client *client, void *param)
|
|
+{
|
|
+ struct rp1_pio_sm_config_xfer32_args *args = param;
|
|
+
|
|
+ return rp1_pio_sm_config_xfer_internal(client, args->sm, args->dir,
|
|
+ args->buf_size, args->buf_count);
|
|
+}
|
|
+
|
|
static int rp1_pio_sm_tx_user(struct rp1_pio_device *pio, struct dma_info *dma,
|
|
const void __user *userbuf, size_t bytes)
|
|
{
|
|
@@ -970,6 +978,7 @@ struct handler_info {
|
|
HANDLER(SM_CONFIG_XFER, sm_config_xfer_user),
|
|
HANDLER(SM_XFER_DATA, sm_xfer_data_user),
|
|
HANDLER(SM_XFER_DATA32, sm_xfer_data32_user),
|
|
+ HANDLER(SM_CONFIG_XFER32, sm_config_xfer32_user),
|
|
|
|
HANDLER(CAN_ADD_PROGRAM, can_add_program),
|
|
HANDLER(ADD_PROGRAM, add_program),
|
|
--- a/include/uapi/misc/rp1_pio_if.h
|
|
+++ b/include/uapi/misc/rp1_pio_if.h
|
|
@@ -160,6 +160,13 @@ struct rp1_pio_sm_config_xfer_args {
|
|
uint16_t buf_count;
|
|
};
|
|
|
|
+struct rp1_pio_sm_config_xfer32_args {
|
|
+ uint16_t sm;
|
|
+ uint16_t dir;
|
|
+ uint32_t buf_size;
|
|
+ uint32_t buf_count;
|
|
+};
|
|
+
|
|
struct rp1_pio_sm_xfer_data_args {
|
|
uint16_t sm;
|
|
uint16_t dir;
|
|
@@ -185,6 +192,7 @@ struct rp1_access_hw_args {
|
|
#define PIO_IOC_SM_CONFIG_XFER _IOW(PIO_IOC_MAGIC, 0, struct rp1_pio_sm_config_xfer_args)
|
|
#define PIO_IOC_SM_XFER_DATA _IOW(PIO_IOC_MAGIC, 1, struct rp1_pio_sm_xfer_data_args)
|
|
#define PIO_IOC_SM_XFER_DATA32 _IOW(PIO_IOC_MAGIC, 2, struct rp1_pio_sm_xfer_data32_args)
|
|
+#define PIO_IOC_SM_CONFIG_XFER32 _IOW(PIO_IOC_MAGIC, 3, struct rp1_pio_sm_config_xfer32_args)
|
|
|
|
#define PIO_IOC_READ_HW _IOW(PIO_IOC_MAGIC, 8, struct rp1_access_hw_args)
|
|
#define PIO_IOC_WRITE_HW _IOW(PIO_IOC_MAGIC, 9, struct rp1_access_hw_args)
|