Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1760909ybz; Sat, 18 Apr 2020 07:57:37 -0700 (PDT) X-Google-Smtp-Source: APiQypKVdxuuHDWAkFTBtpBoCiIUCm/TlbWhwRzLejNaMb6r+uedrRhZF8/VRPZyhVyWtYpyNM5y X-Received: by 2002:a17:906:160a:: with SMTP id m10mr7859878ejd.8.1587221857677; Sat, 18 Apr 2020 07:57:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221857; cv=none; d=google.com; s=arc-20160816; b=x/ioOcXaLNS6/kAiBoiLDXdy8hK4BHe5+I4CWjgxo6qyA24eQLiJYuWIOF4lIC8mkp TqiMnUhSh2QdXgl9VUp+rHPCUFDt/Wly0o6S3i2jNuzye+jHkeLwOYlIWcLfsG+Fmgjp 0pKb44UvM+bDah1LaPaxkHtr9So/Nxo7NpoOnKV9qYsQTMMfv19Pt813IMCmGzquE9VW nKO3CuEBSRRV0CVf7YjUPZWNGodrf35VtaSaR2K5LOGFACESCUcccuYxJDcixF6yI2YK GkMza+OE48RiuL4A03rAVMICOem1RBU1sOe3V/hDgL+gajCDbNyCUPmkF4h2RpFi+BPw 8uJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7TWu2fxAHzDEd+8mbUCYvXFaXUja5I0iSktNsY3pey4=; b=CVvV8RLwOCHl5bzg7Vyg3KCvlHbDt2G1h4ReCtf0zC8HHpqU1JKutDbr4PYP8s+tMU OsYB5FwD+bOlK1Tntszi0HNGNaOSWMw1k1a6BtFFiwKxjw1HCTsmoks7yRPd3Pv+ut7i oXgz45u6dJr9sWuNP9Ri3oyATbMylJiltYMx/KvNbnpEr334fRC6l82mTIay5+Ijm7LM YXLNnHy9a2R3sS69KbYHcNZJK+LzlmYsOBXYQ2gCShwyhpnCybIo5ugyXLp0eKNAIsxd brwcKb57swXJBuiKuefYYxqEP0e8zo0+eYapkbs4A2kbKbL6+H+Pj1jhlYxdrrygr1ot iTyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YoNOiu+x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p17si11654081ejd.260.2020.04.18.07.57.15; Sat, 18 Apr 2020 07:57:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YoNOiu+x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727875AbgDROlT (ORCPT + 99 others); Sat, 18 Apr 2020 10:41:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:50220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727840AbgDROlQ (ORCPT ); Sat, 18 Apr 2020 10:41:16 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A39722250; Sat, 18 Apr 2020 14:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220875; bh=soZ4/B2BoxZUyjWKiWy4WR/R3mJC1j2t+0ybuaAASdM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YoNOiu+xACGwklHt9oOpElAaxaVxOBXUVnu+JpDOBmtAHWL6nLH/PIr29JO30tjZw 8/YnwzM0DykQV+o3pYXfpFLvUcRogePlBfCIQtfzsPJ7kcFqgXJJJGW29264DBKjKo QGPepkdap2Sz17ylOtPWvvrNARQIZey8251rjRWk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Grygorii Strashko , Christoph Hellwig , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.4 23/78] dma-debug: fix displaying of dma allocation type Date: Sat, 18 Apr 2020 10:39:52 -0400 Message-Id: <20200418144047.9013-23-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Grygorii Strashko [ Upstream commit 9bb50ed7470944238ec8e30a94ef096caf9056ee ] The commit 2e05ea5cdc1a ("dma-mapping: implement dma_map_single_attrs using dma_map_page_attrs") removed "dma_debug_page" enum, but missed to update type2name string table. This causes incorrect displaying of dma allocation type. Fix it by removing "page" string from type2name string table and switch to use named initializers. Before (dma_alloc_coherent()): k3-ringacc 4b800000.ringacc: scather-gather idx 2208 P=d1140000 N=d114 D=d1140000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable k3-ringacc 4b800000.ringacc: scather-gather idx 2216 P=d1150000 N=d115 D=d1150000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable After: k3-ringacc 4b800000.ringacc: coherent idx 2208 P=d1140000 N=d114 D=d1140000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable k3-ringacc 4b800000.ringacc: coherent idx 2216 P=d1150000 N=d115 D=d1150000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable Fixes: 2e05ea5cdc1a ("dma-mapping: implement dma_map_single_attrs using dma_map_page_attrs") Signed-off-by: Grygorii Strashko Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- kernel/dma/debug.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 4ad74f5987ea9..cb6425e52bf7a 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -137,9 +137,12 @@ static const char *const maperr2str[] = { [MAP_ERR_CHECKED] = "dma map error checked", }; -static const char *type2name[5] = { "single", "page", - "scather-gather", "coherent", - "resource" }; +static const char *type2name[] = { + [dma_debug_single] = "single", + [dma_debug_sg] = "scather-gather", + [dma_debug_coherent] = "coherent", + [dma_debug_resource] = "resource", +}; static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE", "DMA_FROM_DEVICE", "DMA_NONE" }; -- 2.20.1