From patchwork Fri Feb 26 14:03:02 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: 387814 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.7 required=3.0 tests=BAYES_00, 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 B1085C433DB for ; Fri, 26 Feb 2021 14:05:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6449D64F03 for ; Fri, 26 Feb 2021 14:05:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230132AbhBZOF3 (ORCPT ); Fri, 26 Feb 2021 09:05:29 -0500 Received: from mx2.suse.de ([195.135.220.15]:55052 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbhBZOFB (ORCPT ); Fri, 26 Feb 2021 09:05:01 -0500 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 8613FB03F; Fri, 26 Feb 2021 14:03:22 +0000 (UTC) From: Nicolas Saenz Julienne To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: f.fainelli@gmail.com, robh+dt@kernel.org, robin.murphy@arm.com, ardb@kernel.org, hch@infradead.org, narmstrong@baylibre.com, dwmw2@infradead.org, linux@armlinux.org.uk, catalin.marinas@arm.com, arnd@arndb.de, will@kernel.org, Nicolas Saenz Julienne Subject: [RFC 10/13] iommu/arm-smmu-impl: Get rid of Marvell's implementation details Date: Fri, 26 Feb 2021 15:03:02 +0100 Message-Id: <20210226140305.26356-11-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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org arm-smmu can now deal with integrations on buses that don't support 64bit MMIO accesses. No need to create a special case for that on Marvell's integration. Signed-off-by: Nicolas Saenz Julienne --- drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c index 136872e77195..55d40e37e144 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c @@ -145,25 +145,6 @@ static const struct arm_smmu_impl arm_mmu500_impl = { .reset = arm_mmu500_reset, }; -static u64 mrvl_mmu500_readq(struct arm_smmu_device *smmu, int page, int off) -{ - /* - * Marvell Armada-AP806 erratum #582743. - * Split all the readq to double readl - */ - return hi_lo_readq_relaxed(arm_smmu_page(smmu, page) + off); -} - -static void mrvl_mmu500_writeq(struct arm_smmu_device *smmu, int page, int off, - u64 val) -{ - /* - * Marvell Armada-AP806 erratum #582743. - * Split all the writeq to double writel - */ - hi_lo_writeq_relaxed(val, arm_smmu_page(smmu, page) + off); -} - static int mrvl_mmu500_cfg_probe(struct arm_smmu_device *smmu) { @@ -181,8 +162,6 @@ static int mrvl_mmu500_cfg_probe(struct arm_smmu_device *smmu) } static const struct arm_smmu_impl mrvl_mmu500_impl = { - .read_reg64 = mrvl_mmu500_readq, - .write_reg64 = mrvl_mmu500_writeq, .cfg_probe = mrvl_mmu500_cfg_probe, .reset = arm_mmu500_reset, };