[RFC 13/13] scsi: megaraid: Make use of dev_64bit_mmio_supported()
From: Nicolas Saenz Julienne <hidden>
Date: 2021-02-26 14:09:49
Also in:
linux-arm-kernel, lkml
Subsystem:
megaraid scsi/sas drivers, scsi subsystem, the rest · Maintainers:
Kashyap Desai, Sumit Saxena, Shivasharan S, Chandrakanth patil, "James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
Instead of relying on defines use dev_64bit_mmio_supported(), which provides the same functionality. On top of that convert the implementation to lo_hi_writeq(), for a cleaner end result. Signed-off-by: Nicolas Saenz Julienne <redacted> --- drivers/scsi/megaraid/megaraid_sas_fusion.c | 23 ++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 38fc9467c625..d4933a591330 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c@@ -36,6 +36,7 @@ #include <linux/vmalloc.h> #include <linux/workqueue.h> #include <linux/irq_poll.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h>
@@ -259,19 +260,17 @@ static void megasas_write_64bit_req_desc(struct megasas_instance *instance, union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc) { -#if defined(writeq) && defined(CONFIG_64BIT) - u64 req_data = (((u64)le32_to_cpu(req_desc->u.high) << 32) | - le32_to_cpu(req_desc->u.low)); - writeq(req_data, &instance->reg_set->inbound_low_queue_port); -#else + u64 req_data = ((u64)le32_to_cpu(req_desc->u.high) << 32) | + le32_to_cpu(req_desc->u.low); unsigned long flags; - spin_lock_irqsave(&instance->hba_lock, flags); - writel(le32_to_cpu(req_desc->u.low), - &instance->reg_set->inbound_low_queue_port); - writel(le32_to_cpu(req_desc->u.high), - &instance->reg_set->inbound_high_queue_port); - spin_unlock_irqrestore(&instance->hba_lock, flags); -#endif + + if (dev_64bit_mmio_supported(&instance->pdev->dev)) { + writeq(req_data, &instance->reg_set->inbound_low_queue_port); + } else { + spin_lock_irqsave(&instance->hba_lock, flags); + lo_hi_writeq(req_data, &instance->reg_set->inbound_low_queue_port); + spin_unlock_irqrestore(&instance->hba_lock, flags); + } } /**
--
2.30.1