From patchwork Fri Feb 26 14:03:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Saenz Julienne X-Patchwork-Id: 12106719 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E0BAC433DB for ; Fri, 26 Feb 2021 14:06:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0527264E54 for ; Fri, 26 Feb 2021 14:06:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0527264E54 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FSPINC4Xr91JFnqk7AVhWOrHANMeS9GKmaAPvjtg8C0=; b=tUJN1HwPblgJgCTj4ivoHVate qTr18d9G40zuYxwKsnhM0uv2G2pe5dn1F8e3NhMtqUzTYCL/9ktF7Ez0Spy0njgy4Z5IzFZGg/39B VO2D+xjpHvOBBEcENcy0oJmKRCrUhB5evJaqkXssnjj8wGs/EuPNhOzc8qg54yH9TTv8JtYBv9Ovd +1Q6hhfijoUH3bbA29UIYF5x1rXBhMTCKem3IeEDorOOptzrpK/xCbVED67MxVnDp59exvKsuqxHx CzxJJAumN0NL82CdtqXFHOw4QduIZVIhWivivaC0v0Yp4r2xHH3Vz5mv9nBxMaqUfTHpJqP/HhbIG 6uYwf0WZw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFdkA-0004dT-RV; Fri, 26 Feb 2021 14:05:22 +0000 Received: from mx2.suse.de ([195.135.220.15]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFdiJ-0003sW-Fl for linux-arm-kernel@lists.infradead.org; Fri, 26 Feb 2021 14:03:38 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 87AABAFE2; Fri, 26 Feb 2021 14:03:24 +0000 (UTC) From: Nicolas Saenz Julienne To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC 13/13] scsi: megaraid: Make use of dev_64bit_mmio_supported() Date: Fri, 26 Feb 2021 15:03:05 +0100 Message-Id: <20210226140305.26356-14-nsaenzjulienne@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210226140305.26356-1-nsaenzjulienne@suse.de> References: <20210226140305.26356-1-nsaenzjulienne@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210226_090327_753346_445E5CCF X-CRM114-Status: GOOD ( 13.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: f.fainelli@gmail.com, arnd@arndb.de, narmstrong@baylibre.com, dwmw2@infradead.org, linux@armlinux.org.uk, hch@infradead.org, will@kernel.org, robh+dt@kernel.org, catalin.marinas@arm.com, robin.murphy@arm.com, ardb@kernel.org, Nicolas Saenz Julienne Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 #include #include +#include #include #include @@ -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); + } } /**