From patchwork Thu Mar 23 03:49:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cai Huoqing X-Patchwork-Id: 73770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2708136wrt; Wed, 22 Mar 2023 21:04:16 -0700 (PDT) X-Google-Smtp-Source: AK7set8a3Vghe4Ls0i6IC404vDt6alE8Hqv/3WoRbotLnxNozqCoL+GoQeG9fK5emvzolckVp+ns X-Received: by 2002:a05:6402:64e:b0:4fc:709f:7abd with SMTP id u14-20020a056402064e00b004fc709f7abdmr8793934edx.2.1679544256564; Wed, 22 Mar 2023 21:04:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679544256; cv=none; d=google.com; s=arc-20160816; b=VrMiPbztQ4r+WLhwaFuv6Ojj4zhjeBL7kcO3EkCpRlcWAw7KkZGto4AfTvcLSx9hAO oPqeg0l6YeOo5v3mXBwRyhUfPSd9dq+BApopNtYnDYySP8HT4m0+E1qsi81krmFzY9Hg X1CPVtEg37FnFMmdeHpGgj6dUb4RW80Gi7vsGrMwVc/+d3ZH1IaE5XRx4oeK80qdHxpz JOvIUs8DVdOM5VHxFb+NKlxjPQpg4gh8R6xDpuk3AcjWQ9aWu4aqERJRjmVoesxN1Dw3 EQuhmCeiLPlztR+XIM0JmGScCJgk4O19BuB5ZscQG1JGroW6L966086rWHCGUQzdwPbH 8QzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Hxk1tPXXlo5ZIXnQqwMJGDLGtwqoxWRQpN6/IOTKuqk=; b=BQ9kvok7i7kdYXvZTxHboEC9ww4BwiT7XKwQhHoTTULq78EDJ2m5RyZrjfAbs2fuwC 5tvyE3nlK39fU1zx4ivoaYcmij2q0Zg9xxe6+h3Capr1QE6k5FQtlH56i53YdXRxlpk3 NNt+Zcsod9Hx2lvmE3wiACiX4X8MaTmiY5hV0WqyGZxtRnFBMsTf8rVye/5EEKJgBLOq i2s1HYohVfRPUjPhDt4LzhnOunxaP9vQ5r5S9xcQwEC6+B7tSz3EAIQH224orHUNmFxg wEFvP8z14l+mpAH4qMnE8Ft8rQCofkIQKztahO/Xh4G9+/lOv9H0VeCD4JA163ZuGi7M hLOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=TP6UOdGx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t20-20020aa7d714000000b00501e59e6198si4435768edq.613.2023.03.22.21.03.52; Wed, 22 Mar 2023 21:04:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=TP6UOdGx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230199AbjCWDuI (ORCPT + 99 others); Wed, 22 Mar 2023 23:50:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230194AbjCWDuB (ORCPT ); Wed, 22 Mar 2023 23:50:01 -0400 Received: from out-12.mta0.migadu.com (out-12.mta0.migadu.com [91.218.175.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E28D32E812 for ; Wed, 22 Mar 2023 20:49:59 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1679543398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hxk1tPXXlo5ZIXnQqwMJGDLGtwqoxWRQpN6/IOTKuqk=; b=TP6UOdGxZJkKQLrZZ3xOz3dNMNJ+DbV9bPtAzgnUMMprYHOgqvwVo1qyUQB6BoU2PKWc+F TuseYRNhIHRc5L2L6Ic6n5iC9Ms/9o2vH796OS/ko53c9TTmqKD/NHYzO4k8diIhOqZ/JO 3FtEtZ904YnMgY/KF5TZaM890dGEumc= From: Cai Huoqing To: fancer.lancer@gmail.com Cc: Cai huoqing , Gustavo Pimentel , Vinod Koul , Jingoo Han , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v8 1/4] dmaengine: dw-edma: Rename dw_edma_core_ops structure to dw_edma_plat_ops Date: Thu, 23 Mar 2023 11:49:38 +0800 Message-Id: <20230323034944.78357-2-cai.huoqing@linux.dev> In-Reply-To: <20230323034944.78357-1-cai.huoqing@linux.dev> References: <20230323034944.78357-1-cai.huoqing@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761129798419849366?= X-GMAIL-MSGID: =?utf-8?q?1761129798419849366?= From: Cai huoqing The dw_edma_core_ops structure contains a set of the operations: device IRQ numbers getter, CPU/PCI address translation. Based on the functions semantics the structure name "dw_edma_plat_ops" looks more descriptive since indeed the operations are platform-specific. The "dw_edma_core_ops" name shall be used for a structure with the IP-core specific set of callbacks in order to abstract out DW eDMA and DW HDMA setups. Such structure will be added in one of the next commit in the framework of the set of changes adding the DW HDMA device support. Anyway the renaming was necessary to distinguish two types of the implementation callbacks: 1. DW eDMA/hDMA IP-core specific operations: device-specific CSR setups in one or another aspect of the DMA-engine initialization. 2. DW eDMA/hDMA platform specific operations: the DMA device environment configs like IRQs, address translation, etc. Signed-off-by: Cai huoqing Reviewed-by: Serge Semin --- drivers/dma/dw-edma/dw-edma-pcie.c | 4 ++-- drivers/pci/controller/dwc/pcie-designware.c | 2 +- include/linux/dma/edma.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c index 2b40f2b44f5e..1c6043751dc9 100644 --- a/drivers/dma/dw-edma/dw-edma-pcie.c +++ b/drivers/dma/dw-edma/dw-edma-pcie.c @@ -109,7 +109,7 @@ static u64 dw_edma_pcie_address(struct device *dev, phys_addr_t cpu_addr) return region.start; } -static const struct dw_edma_core_ops dw_edma_pcie_core_ops = { +static const struct dw_edma_plat_ops dw_edma_pcie_plat_ops = { .irq_vector = dw_edma_pcie_irq_vector, .pci_address = dw_edma_pcie_address, }; @@ -225,7 +225,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, chip->mf = vsec_data.mf; chip->nr_irqs = nr_irqs; - chip->ops = &dw_edma_pcie_core_ops; + chip->ops = &dw_edma_pcie_plat_ops; chip->ll_wr_cnt = vsec_data.wr_ch_cnt; chip->ll_rd_cnt = vsec_data.rd_ch_cnt; diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c index 8e33e6e59e68..1f2ee71da4da 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -828,7 +828,7 @@ static int dw_pcie_edma_irq_vector(struct device *dev, unsigned int nr) return platform_get_irq_byname_optional(pdev, name); } -static struct dw_edma_core_ops dw_pcie_edma_ops = { +static struct dw_edma_plat_ops dw_pcie_edma_ops = { .irq_vector = dw_pcie_edma_irq_vector, }; diff --git a/include/linux/dma/edma.h b/include/linux/dma/edma.h index d2638d9259dc..ed401c965a87 100644 --- a/include/linux/dma/edma.h +++ b/include/linux/dma/edma.h @@ -40,7 +40,7 @@ struct dw_edma_region { * iATU windows. That will be done by the controller * automatically. */ -struct dw_edma_core_ops { +struct dw_edma_plat_ops { int (*irq_vector)(struct device *dev, unsigned int nr); u64 (*pci_address)(struct device *dev, phys_addr_t cpu_addr); }; @@ -80,7 +80,7 @@ enum dw_edma_chip_flags { struct dw_edma_chip { struct device *dev; int nr_irqs; - const struct dw_edma_core_ops *ops; + const struct dw_edma_plat_ops *ops; u32 flags; void __iomem *reg_base;