mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 05:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-04-23 15:13:32 -07:00
parent a3a4a1c425 102797b00b
commit d483590da4
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qla2x00t-32gbit/qla_nvme.c
View File

@@ -621,7 +621,8 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)
}
static struct nvme_fc_port_template qla_nvme_fc_transport = {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && \
LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0)
/*
* See also commit 863fbae929c7 ("nvme_fc: add module to ops template
* to allow module references").

2
qla2x00t/qla_os.c
View File

@@ -4775,7 +4775,9 @@ qla2xxx_pci_resume(struct pci_dev *pdev)
"The device failed to resume I/O from slot/link_reset.\n");
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0)
pci_cleanup_aer_uncorrect_error_status(pdev);
#endif
ha->flags.eeh_busy = 0;
}

15
scst/include/backport.h
View File

@@ -1600,6 +1600,21 @@ static inline void put_unaligned_be64(uint64_t i, void *p)
}
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0)
/* Only use get_unaligned_be24() if reading p - 1 is allowed. */
static inline uint32_t get_unaligned_be24(const uint8_t *const p)
{
return get_unaligned_be32(p - 1) & 0xffffffU;
}
static inline void put_unaligned_be24(const uint32_t v, uint8_t *const p)
{
p[0] = v >> 16;
p[1] = v >> 8;
p[2] = v >> 0;
}
#endif
/* <linux/vmalloc.h> */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) && \

13
scst/include/scst.h
View File

@@ -5406,19 +5406,6 @@ if (!(condition)) { \
} \
} while (0)
/* Only use get_unaligned_be24() if reading p - 1 is allowed. */
static inline uint32_t get_unaligned_be24(const uint8_t *const p)
{
return get_unaligned_be32(p - 1) & 0xffffffU;
}
static inline void put_unaligned_be24(const uint32_t v, uint8_t *const p)
{
p[0] = v >> 16;
p[1] = v >> 8;
p[2] = v >> 0;
}
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
const char *scst_get_opcode_name(struct scst_cmd *cmd);
#else