From e25650f8724d0bbe14d7e921fc317f9b84217906 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 29 May 2020 07:34:24 +0000 Subject: [PATCH 1/5] web: users page updates git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8988 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- www/users.html | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/www/users.html b/www/users.html index a489ea39a..74caaa5e3 100644 --- a/www/users.html +++ b/www/users.html @@ -44,15 +44,17 @@ - + QLogic + Emulex + + Mellanox Technologies +
- Emulex - Cavium - Marvell Technology Group + Marvell Technology Group
- Mellanox Technologies + ATTO
@@ -71,14 +73,14 @@ - Data Domain + Data Domain Enjellic Systems Development Hewlett-Packard - + IBM InMage @@ -104,7 +106,7 @@ OS NEXUS - + Pranah Storage Technologies Proxmox From 4458868846e9fdc404c603fc43b3b7abb93e89bb Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 31 May 2020 03:28:33 +0000 Subject: [PATCH 2/5] scst_user: Fix a 32-bit compiler warning git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8989 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c index b78861fbf..e880e44ce 100644 --- a/scst/src/dev_handlers/scst_user.c +++ b/scst/src/dev_handlers/scst_user.c @@ -2311,7 +2311,7 @@ static int dev_user_reply_get_cmd(struct file *file, int res = 0, rc; struct scst_user_dev *dev; struct scst_user_reply_cmd reply; - uint64_t ureply; + uintptr_t ureply; TRACE_ENTRY(); From c6ff35fdeeb2ce1b653831adea4372242de8753a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 31 May 2020 03:29:06 +0000 Subject: [PATCH 3/5] qla2x00t: Fix a 32-bit compiler warning git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8990 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_nx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qla2x00t/qla_nx.c b/qla2x00t/qla_nx.c index 748b6891c..52da5fd3b 100644 --- a/qla2x00t/qla_nx.c +++ b/qla2x00t/qla_nx.c @@ -559,8 +559,7 @@ qla82xx_idc_unlock(struct qla_hw_data *ha) } /* PCI Windowing for DDR regions. */ -static inline bool QLA82XX_ADDR_IN_RANGE(uintptr_t addr, uintptr_t low, - uintptr_t high) +static inline bool QLA82XX_ADDR_IN_RANGE(u64 addr, u64 low, u64 high) { return addr <= high && addr >= low; } From 1adaafdab19a9dd4229b0bf5f3b7e41c16de98d3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 31 May 2020 03:29:53 +0000 Subject: [PATCH 4/5] qla2x00t-32gbit: Unbreak the 32-bit build Note: this is not an attempt to port this driver to 32-bit systems. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8991 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_nx.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qla2x00t-32gbit/qla_nx.c b/qla2x00t-32gbit/qla_nx.c index 7c7e05dbd..8b94604e0 100644 --- a/qla2x00t-32gbit/qla_nx.c +++ b/qla2x00t-32gbit/qla_nx.c @@ -746,7 +746,11 @@ static int qla82xx_pci_mem_read_direct(struct qla_hw_data *ha, *(u32 *)data = readl(addr); break; case 8: +#ifdef CONFIG_64BIT *(u64 *)data = readq(addr); +#else + WARN_ON_ONCE(true); +#endif break; default: ret = -1; @@ -817,7 +821,11 @@ qla82xx_pci_mem_write_direct(struct qla_hw_data *ha, writel(*(u32 *)data, addr); break; case 8: +#ifdef CONFIG_64BIT writeq(*(u64 *)data, addr); +#else + WARN_ON_ONCE(true); +#endif break; default: ret = -1; From fda71c077de8972783306cadf6dfd3a81b2b3231 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 31 May 2020 03:41:17 +0000 Subject: [PATCH 5/5] Include instead of According to the Single Unix Specification, the poll() function has been declared in the header file. This makes the SCST code compatible with the musl C library. See also https://en.wikipedia.org/wiki/Musl. See also https://github.com/bvanassche/scst/issues/23. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8992 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/usr/iscsi_scstd.c | 2 +- iscsi-scst/usr/iscsid.h | 2 +- usr/events/events.c | 2 +- usr/fileio/common.c | 2 +- usr/fileio/fileio.c | 2 +- usr/stpgd/stpgd_main.c | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/iscsi-scst/usr/iscsi_scstd.c b/iscsi-scst/usr/iscsi_scstd.c index bd8c51125..80df257c1 100644 --- a/iscsi-scst/usr/iscsi_scstd.c +++ b/iscsi-scst/usr/iscsi_scstd.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/iscsi-scst/usr/iscsid.h b/iscsi-scst/usr/iscsid.h index dbb911d74..278d942df 100644 --- a/iscsi-scst/usr/iscsid.h +++ b/iscsi-scst/usr/iscsid.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/usr/events/events.c b/usr/events/events.c index 5cc1ca561..5f0151e05 100644 --- a/usr/events/events.c +++ b/usr/events/events.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/usr/fileio/common.c b/usr/fileio/common.c index 830d7aa96..caea6b296 100644 --- a/usr/fileio/common.c +++ b/usr/fileio/common.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/usr/fileio/fileio.c b/usr/fileio/fileio.c index 140ba7b65..56962bcd1 100644 --- a/usr/fileio/fileio.c +++ b/usr/fileio/fileio.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/usr/stpgd/stpgd_main.c b/usr/stpgd/stpgd_main.c index 584df5bab..04027f0bb 100644 --- a/usr/stpgd/stpgd_main.c +++ b/usr/stpgd/stpgd_main.c @@ -9,9 +9,10 @@ #include #include #include -#include +#include #include #include +#include #include #include #include