From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 E3375C4320E for ; Tue, 24 Aug 2021 14:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C109761246 for ; Tue, 24 Aug 2021 14:57:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238103AbhHXO6Q (ORCPT ); Tue, 24 Aug 2021 10:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238083AbhHXO6O (ORCPT ); Tue, 24 Aug 2021 10:58:14 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CC99C0617AF for ; Tue, 24 Aug 2021 07:57:30 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id j4so11280160lfg.9 for ; Tue, 24 Aug 2021 07:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tFuAhHRvSBhDz+fiasoL7jf1i1KSqv23Xjdy8dyIAuM=; b=mhEK3xD5kfM/MMWdqfiXtqpFYXTaguDWW0o7KXfSaguSDL6W+DN8rYV5nlh2e0uSuv gU8R0CFXWwEdyDWgVS+mP34Z25JeZYBkWgcIkWkg2q9r59ojChEVC8BI15W8ax3sYEKh o6OkjoIF/FvUhQjXQHa9JEnNHSUPK7i4+OO9Mxmu7JJ1yOpzMKH9+8n3Pr3FoXNLgGQN MvJ8CqBPORqEJ2XFQYPVorB06suFtuZXEl4yBpRKYH34jCbhsydcFlSNSi46xEBkO0cK OSBErhFDEcjtQCKYtym4RX4h8ly33sjVON9/LCFaT5Z8FPPWWS41b7QzX5I13h8tUL63 o2Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tFuAhHRvSBhDz+fiasoL7jf1i1KSqv23Xjdy8dyIAuM=; b=J4BartG/qiJhGMuRhTCfcMBQmCN6Tmzcnhfntw3Kn+TRlcOwMwcNYeZHC/WI3TNd/2 cPk9+GDKMLWd94xbycskKHl7bAztxlA6062HdjKdhvESKKm9SWe0Xl8WFMcORydkkt8s wsy7sScUaD91PFthjkNVxrDpIjKwmHhZ544DmbFNbRLQVoT5DBzBWIrEk/sPRW3RNGQk 1Rd95tZIDoA9kyThPwlu0luPaKPLphFVxbQ0iIBysp0/Nu5xdF0ZJt/yXcpHFBAt2n1p 5U7Msg9l+YJwzTfX9P2egqeoij1FL+nF6iFSp8BlLvqXyPcN0q1O3jlX2Mr2I7cVbnT0 Hiuw== X-Gm-Message-State: AOAM531OrtYHyOCI8+M7D4AuvutfIKzMDfGDO/ZhTJ/t6S0ZBbhhP6m7 XxrJ91E7nQtxleq+2fZl82S7bOBnQSkoMyj5J0l8jA== X-Google-Smtp-Source: ABdhPJzBtOEeU09sJuUqAdfTBw1y5ZBxo0r+z7rrGFgSd3VtlxoiEk+AzaqMmuQlh5WB1UfpJMTen1+JY+z+bHMaK+c= X-Received: by 2002:ac2:5b9e:: with SMTP id o30mr3762491lfn.400.1629817048379; Tue, 24 Aug 2021 07:57:28 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ulf Hansson Date: Tue, 24 Aug 2021 16:56:52 +0200 Message-ID: Subject: Re: [PATCH] mmc: switch from 'pci_' to 'dma_' API To: Christophe JAILLET Cc: Alex Dubov , Bruce Chang , Harald Welte , linux-mmc , Linux Kernel Mailing List , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org On Sun, 22 Aug 2021 at 15:48, Christophe JAILLET wrote: > > The wrappers in include/linux/pci-dma-compat.h should go away. > > The patch has been generated with the coccinelle script below. > > It has been compile tested. > > > @@ > @@ > - PCI_DMA_BIDIRECTIONAL > + DMA_BIDIRECTIONAL > > @@ > @@ > - PCI_DMA_TODEVICE > + DMA_TO_DEVICE > > @@ > @@ > - PCI_DMA_FROMDEVICE > + DMA_FROM_DEVICE > > @@ > @@ > - PCI_DMA_NONE > + DMA_NONE > > @@ > expression e1, e2, e3; > @@ > - pci_alloc_consistent(e1, e2, e3) > + dma_alloc_coherent(&e1->dev, e2, e3, GFP_) > > @@ > expression e1, e2, e3; > @@ > - pci_zalloc_consistent(e1, e2, e3) > + dma_alloc_coherent(&e1->dev, e2, e3, GFP_) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_free_consistent(e1, e2, e3, e4) > + dma_free_coherent(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_map_single(e1, e2, e3, e4) > + dma_map_single(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_unmap_single(e1, e2, e3, e4) > + dma_unmap_single(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4, e5; > @@ > - pci_map_page(e1, e2, e3, e4, e5) > + dma_map_page(&e1->dev, e2, e3, e4, e5) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_unmap_page(e1, e2, e3, e4) > + dma_unmap_page(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_map_sg(e1, e2, e3, e4) > + dma_map_sg(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_unmap_sg(e1, e2, e3, e4) > + dma_unmap_sg(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_dma_sync_single_for_cpu(e1, e2, e3, e4) > + dma_sync_single_for_cpu(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_dma_sync_single_for_device(e1, e2, e3, e4) > + dma_sync_single_for_device(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_dma_sync_sg_for_cpu(e1, e2, e3, e4) > + dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2, e3, e4; > @@ > - pci_dma_sync_sg_for_device(e1, e2, e3, e4) > + dma_sync_sg_for_device(&e1->dev, e2, e3, e4) > > @@ > expression e1, e2; > @@ > - pci_dma_mapping_error(e1, e2) > + dma_mapping_error(&e1->dev, e2) > > @@ > expression e1, e2; > @@ > - pci_set_dma_mask(e1, e2) > + dma_set_mask(&e1->dev, e2) > > @@ > expression e1, e2; > @@ > - pci_set_consistent_dma_mask(e1, e2) > + dma_set_coherent_mask(&e1->dev, e2) > > Signed-off-by: Christophe JAILLET Applied for next, thanks! Kind regards Uffe > --- > If needed, see post from Christoph Hellwig on the kernel-janitors ML: > https://marc.info/?l=kernel-janitors&m=158745678307186&w=4 > --- > drivers/mmc/host/tifm_sd.c | 16 ++++++++-------- > drivers/mmc/host/via-sdmmc.c | 4 ++-- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c > index 9fdf7ea06e3f..63917070b1a7 100644 > --- a/drivers/mmc/host/tifm_sd.c > +++ b/drivers/mmc/host/tifm_sd.c > @@ -669,8 +669,8 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq) > > if(1 != tifm_map_sg(sock, &host->bounce_buf, 1, > r_data->flags & MMC_DATA_WRITE > - ? PCI_DMA_TODEVICE > - : PCI_DMA_FROMDEVICE)) { > + ? DMA_TO_DEVICE > + : DMA_FROM_DEVICE)) { > pr_err("%s : scatterlist map failed\n", > dev_name(&sock->dev)); > mrq->cmd->error = -ENOMEM; > @@ -680,15 +680,15 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq) > r_data->sg_len, > r_data->flags > & MMC_DATA_WRITE > - ? PCI_DMA_TODEVICE > - : PCI_DMA_FROMDEVICE); > + ? DMA_TO_DEVICE > + : DMA_FROM_DEVICE); > if (host->sg_len < 1) { > pr_err("%s : scatterlist map failed\n", > dev_name(&sock->dev)); > tifm_unmap_sg(sock, &host->bounce_buf, 1, > r_data->flags & MMC_DATA_WRITE > - ? PCI_DMA_TODEVICE > - : PCI_DMA_FROMDEVICE); > + ? DMA_TO_DEVICE > + : DMA_FROM_DEVICE); > mrq->cmd->error = -ENOMEM; > goto err_out; > } > @@ -762,10 +762,10 @@ static void tifm_sd_end_cmd(struct tasklet_struct *t) > } else { > tifm_unmap_sg(sock, &host->bounce_buf, 1, > (r_data->flags & MMC_DATA_WRITE) > - ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); > + ? DMA_TO_DEVICE : DMA_FROM_DEVICE); > tifm_unmap_sg(sock, r_data->sg, r_data->sg_len, > (r_data->flags & MMC_DATA_WRITE) > - ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); > + ? DMA_TO_DEVICE : DMA_FROM_DEVICE); > } > > r_data->bytes_xfered = r_data->blocks > diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c > index c32df5530b94..88662a90ed96 100644 > --- a/drivers/mmc/host/via-sdmmc.c > +++ b/drivers/mmc/host/via-sdmmc.c > @@ -491,7 +491,7 @@ static void via_sdc_preparedata(struct via_crdr_mmc_host *host, > > count = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, > ((data->flags & MMC_DATA_READ) ? > - PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE)); > + DMA_FROM_DEVICE : DMA_TO_DEVICE)); > BUG_ON(count != 1); > > via_set_ddma(host, sg_dma_address(data->sg), sg_dma_len(data->sg), > @@ -638,7 +638,7 @@ static void via_sdc_finish_data(struct via_crdr_mmc_host *host) > > dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len, > ((data->flags & MMC_DATA_READ) ? > - PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE)); > + DMA_FROM_DEVICE : DMA_TO_DEVICE)); > > if (data->stop) > via_sdc_send_command(host, data->stop); > -- > 2.30.2 >