Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp957633ybb; Wed, 8 Apr 2020 13:20:32 -0700 (PDT) X-Google-Smtp-Source: APiQypJ1WcOIhiM6q+7ucnxwkQB7hC8pmRakyOsEmCbVVuJ3Z9SGwSjZHt/MUYq0x4g65LDIFs1T X-Received: by 2002:a05:6830:11d7:: with SMTP id v23mr1335725otq.216.1586377231734; Wed, 08 Apr 2020 13:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586377231; cv=none; d=google.com; s=arc-20160816; b=HfRjU4piVBO0dtw/Xj/CEsrmO/u6uY+vSka2BVlPb/ounDRN5cRslV7p2jlq4sdiG9 c5HT+MG0S96A5ucosxRAhU2Y62DA7kUV5/ba7y6bSmlQo/vlqQMDLDXT+/Wx8PZXH20S rH/iWKJDAZNafpyopYBVw5lkwyDqM1aAnlztHI4py6VYve+/AGDKRglAbxd7UWfyiBkl hNCo7ZTqc0OIY/z8jX+admtod4GLjgLlkamnSLGPPOq74HYWuMcRk6FN5YO/4FT25YF1 PINsqu0kCv+mtF9zhB61Jvd7Hc0zl9oDaVNlsjlf6LRERgvvHVNJFZkrQkftev0Eo73O 1DLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=DsPyfRVKEyi9voi4Zwmy97edlqIw9hVZXt11HBV1J84=; b=Qd0538mH+XLyZb9rwHBV9LYmcFlcboklYMpTICQdRCEfSv8xJWn9RnQKfCsUWJBxhD 6NUb40RSqXc2nPXieFHKnzggpz8rXu165hQbcA2JUD0b8WX1JUWZW1rbPE/POPL8bb4N C5+Kl8f5zb8+wOJHfn+8Fz15gQCzdU26v0tvo9/3W79EHmCkC99wemjZk5ocK2LEmDS+ 8X6a1UIDcOb991TxKxWLyGGKM3zRLMxlV88AVtlSxEw1gTuTG7tqYx9ogKJrylSm6x4V IpN0GlXMANZq97MjojPggzcYk+qWuw71/9jOB+31B50lAzMRo+8xjG57qZ4varYg5NVU kEfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=nacREc0u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w11si2706922oib.235.2020.04.08.13.20.19; Wed, 08 Apr 2020 13:20:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=nacREc0u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729431AbgDHSsX (ORCPT + 99 others); Wed, 8 Apr 2020 14:48:23 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:40568 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728208AbgDHSsX (ORCPT ); Wed, 8 Apr 2020 14:48:23 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 038ImAdv078739; Wed, 8 Apr 2020 13:48:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1586371690; bh=DsPyfRVKEyi9voi4Zwmy97edlqIw9hVZXt11HBV1J84=; h=From:To:CC:Subject:Date; b=nacREc0ukOSmMJlOSG/Ckgr7UtgdPTVb4uN5RDmLPIWo7lsBnVWbr6KjFW4MFDpZc ZoQ4Tb3wXYHMMKJNndr44YyQ4E8iHhNbL0RrTVBMnsik/ncLFiML1AMUFsg8ag8LDr +I71LmOJSX+xkXFOJ/ZFuuqk3dmf5qUTcBeyf+yI= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 038ImAhO073192; Wed, 8 Apr 2020 13:48:10 -0500 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Wed, 8 Apr 2020 13:48:10 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Wed, 8 Apr 2020 13:48:10 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 038Im9vx058938; Wed, 8 Apr 2020 13:48:09 -0500 From: Grygorii Strashko To: Christoph Hellwig , Marek Szyprowski , Robin Murphy , CC: Sekhar Nori , , Grygorii Strashko Subject: [PATCH] dma-debug: fix displaying of dma allocation type Date: Wed, 8 Apr 2020 21:48:04 +0300 Message-ID: <20200408184804.30522-1-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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 --- kernel/dma/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 2031ed1ad7fa..09b85ba0c137 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -137,7 +137,7 @@ static const char *const maperr2str[] = { [MAP_ERR_CHECKED] = "dma map error checked", }; -static const char *type2name[5] = { "single", "page", +static const char *type2name[5] = { "single", "scather-gather", "coherent", "resource" }; -- 2.17.1