From patchwork Wed Feb 12 00:37:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Li X-Patchwork-Id: 11377265 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 60C79139A for ; Wed, 12 Feb 2020 00:37:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 3E3FA20848 for ; Wed, 12 Feb 2020 00:37:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ilvsOHpQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E3FA20848 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=ks3+txiE6UeXm+poMYG/Ke5srDTuaVxU7iKBc5GOpuk=; b=ilv sOHpQS3TcU72IisDJ1uINcon6iqtiWSdPomb987tsb0Dpf00XtTmJWIfnJ1ib5VpphFfeDfcBlBRs aa26+O1G0OrOEa83geED500b3YaOGNVO1aLrc159UK4SzzV51gcPA18QXrL52lGvEeQqjo8318wF/ gcojYLmOri/n0YtXFgCNU92DNZCR5VzEnmYij295LMdAfQAJub4QmBw2vlce+OBEwNGgovSKplx3U amomi8vTcTXujxT8X+qJXv5sYyK+ACiuwTWHuRHzpXAsWMiIOzVrWoeI34SjCCEkXK/NQdPcy33wj 2nxq77bQagZVE8yi5Yiv0h+KUe5d1lw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j1g2H-0006Nr-To; Wed, 12 Feb 2020 00:37:49 +0000 Received: from inva020.nxp.com ([92.121.34.13]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j1g2E-0006N7-Ld for linux-arm-kernel@lists.infradead.org; Wed, 12 Feb 2020 00:37:48 +0000 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 9E5881C6A9B; Wed, 12 Feb 2020 01:37:41 +0100 (CET) Received: from smtp.na-rdc02.nxp.com (usphx01srsp001v.us-phx01.nxp.com [134.27.49.11]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 628A41A00C8; Wed, 12 Feb 2020 01:37:41 +0100 (CET) Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.70]) by usphx01srsp001v.us-phx01.nxp.com (Postfix) with ESMTP id 8E69B40CB6; Tue, 11 Feb 2020 17:37:40 -0700 (MST) From: Li Yang To: Joerg Roedel , Will Deacon , Robin Murphy Subject: [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel Date: Tue, 11 Feb 2020 18:37:20 -0600 Message-Id: <1581467841-25397-1-git-send-email-leoyang.li@nxp.com> X-Mailer: git-send-email 1.9.0 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200211_163746_853218_F531B36C X-CRM114-Status: UNSURE ( 8.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [92.121.34.13 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Russell King - ARM Linux admin , linux-arm-kernel@lists.infradead.org, Li Yang MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module") introduced a side effect that changed the module name from arm-smmu to arm-smmu-mod. This breaks the users of kernel parameters for the driver (e.g. arm-smmu.disable_bypass). This patch changes the module name back to be consistent. Signed-off-by: Li Yang --- drivers/iommu/Makefile | 4 ++-- drivers/iommu/{arm-smmu.c => arm-smmu-common.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename drivers/iommu/{arm-smmu.c => arm-smmu-common.c} (100%) diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 2104fb8afc06..f39e82e68640 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -14,8 +14,8 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o -obj-$(CONFIG_ARM_SMMU) += arm-smmu-mod.o -arm-smmu-mod-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o +obj-$(CONFIG_ARM_SMMU) += arm-smmu.o +arm-smmu-objs := arm-smmu-common.o arm-smmu-impl.o arm-smmu-qcom.o obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o obj-$(CONFIG_DMAR_TABLE) += dmar.o obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu-common.c similarity index 100% rename from drivers/iommu/arm-smmu.c rename to drivers/iommu/arm-smmu-common.c