From patchwork Wed May 17 03:01:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cai Huoqing X-Patchwork-Id: 95025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp849148vqo; Tue, 16 May 2023 20:23:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5CglSWBKipCafBnkqERM1VcRhcNJAJdTdYImiS1Ie9FLdj5ovZVXl2o4tnk24kovMEaQ+n X-Received: by 2002:a05:6a21:7891:b0:101:73a9:1680 with SMTP id bf17-20020a056a21789100b0010173a91680mr36168841pzc.8.1684293782761; Tue, 16 May 2023 20:23:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684293782; cv=none; d=google.com; s=arc-20160816; b=iY6rDuR3mEEAjJm0iuyDCD4/9SnexsQ8jitmsN5bjSPPp7lliWZx9sOGF3KIPIPHuY bNNCgs6FgYsw66BOUEX26q7v35QH/6hgjubMorwqVhlmwVwOQdz/ydr3g2WeYvciJPJR rszN9cY49ftBWSmQKz3pF/ybt9FCFNhMfqcMwDf21hf4XCL82YOdLzHJxRDErQCopIc/ 9QIm1Yw7axhKKrFM3TTVjzZ2a+KXEnea0C/u87Td2IOya6+BZNpqHLzAbRjtiEQbyS/1 uh+xy0h0t8Cly4s1bQvIFdRudnXB8le9ZPK14AqweeaQRS4yXYJXquABPJDSaF0NElBE MFWg== 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=Vdo74RRAfPLG9YG9fYXr7zjcWn/sVCC3IvAZvcKq4mw=; b=jg3MgHP6h72MfJJmDboSXBxPqdL0/5aTeDhF3x0TuzUDNwdYg5MljDhE25GFqMLvfz qzCy2LcQm9G1839dtnbdLe3jUIzo1P8bUZVoNc3AtXUEozvbz+ZmYcRm97+La3kEfGO/ Ybys3ckrGIWgj1QBbrvDXAnCx2RNlLs4PDf/8UZNM7XKZLwqL0sVuHZdlVTr95BNyJLC QX3ZBsYRj9ZHsSoJ7tJhOmJ2Dy96NoVZXQsLeshWZAngK0UgsmNqbpc8IQZVbSdNGvpD de6j7kdeUk3zmaS6d8p40MDr8R0piZY0eJenHs4K0DiZzDdueyohjK43BrPSyreb+DLQ GZaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=EQpa8xY0; 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 j65-20020a638b44000000b0051b10b20ceasi21388575pge.893.2023.05.16.20.22.48; Tue, 16 May 2023 20:23:02 -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=EQpa8xY0; 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 S232289AbjEQDBl (ORCPT + 99 others); Tue, 16 May 2023 23:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232272AbjEQDBb (ORCPT ); Tue, 16 May 2023 23:01:31 -0400 Received: from out-47.mta1.migadu.com (out-47.mta1.migadu.com [IPv6:2001:41d0:203:375::2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C3CA183 for ; Tue, 16 May 2023 20:01:29 -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=1684292488; 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=Vdo74RRAfPLG9YG9fYXr7zjcWn/sVCC3IvAZvcKq4mw=; b=EQpa8xY0MccMUKvtTSkyuauvoF2nIdKZt2+olrneiAMSC9aZstsqA81TdymaWffIDuffKd cUUNW4aNhT4FbWxKm2628yBiA2r2OvixF9cz3by7pWKeqHRgQKkCOkrYIJ71Tt/bRblz8k vsP2duUiqWXkhXraUTx7hC/cxdkmdzk= From: Cai Huoqing To: vkoul@kernel.org Cc: Cai huoqing , Serge Semin , Manivannan Sadhasivam , Gustavo Pimentel , Jingoo Han , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v10 1/4] dmaengine: dw-edma: Rename dw_edma_core_ops structure to dw_edma_plat_ops Date: Wed, 17 May 2023 11:01:11 +0800 Message-Id: <20230517030115.21093-2-cai.huoqing@linux.dev> In-Reply-To: <20230517030115.21093-1-cai.huoqing@linux.dev> References: <20230517030115.21093-1-cai.huoqing@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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?1766110037479095893?= X-GMAIL-MSGID: =?utf-8?q?1766110037479095893?= 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 Reviewed-by: Manivannan Sadhasivam Tested-by: Serge Semin --- v9->v10: Update commit log v9 link: https://lore.kernel.org/lkml/20230413033156.93751-2-cai.huoqing@linux.dev/ 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;