aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/files
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-09-11 02:31:21 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-09-11 02:49:28 +0100
commita9dda40fe21be2890fd864c6b70810c2042ddb7f (patch)
treee2a580b5521e2b7ef6ea947fc40029aaca8ef0d5 /target/linux/oxnas/files
parentef59da866982b4891f64d01c15967877c2898e26 (diff)
downloadupstream-a9dda40fe21be2890fd864c6b70810c2042ddb7f.tar.gz
upstream-a9dda40fe21be2890fd864c6b70810c2042ddb7f.tar.bz2
upstream-a9dda40fe21be2890fd864c6b70810c2042ddb7f.zip
oxnas: add testing support for Linux 5.15
Rebase patches and port SATA driver to work with Linux > 5.13. Tested on Shuttle KD-20. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/oxnas/files')
-rw-r--r--target/linux/oxnas/files/drivers/ata/sata_oxnas.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
index b55995ccad..a5d7b3de72 100644
--- a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
+++ b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
@@ -31,6 +31,7 @@
#include <linux/io.h>
#include <linux/sizes.h>
+#include <linux/version.h>
static inline void oxnas_register_clear_mask(void __iomem *p, unsigned mask)
{
@@ -2231,7 +2232,9 @@ static struct scsi_host_template sata_oxnas_sht = {
.can_queue = SATA_OXNAS_QUEUE_DEPTH,
.sg_tablesize = SATA_OXNAS_MAX_PRD,
.dma_boundary = ATA_DMA_BOUNDARY,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0)
.unchecked_isa_dma = 0,
+#endif
};