Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806088/?format=api
{ "id": 806088, "url": "http://patchwork.ozlabs.org/api/patches/806088/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170826072125.9790-4-hch@lst.de/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170826072125.9790-4-hch@lst.de>", "list_archive_url": null, "date": "2017-08-26T07:21:24", "name": "[3/4] i825xx: switch to switch to dma_alloc_attrs", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "e867c36e6db70b97001b8dc465864007c7150939", "submitter": { "id": 82, "url": "http://patchwork.ozlabs.org/api/people/82/?format=api", "name": "Christoph Hellwig", "email": "hch@lst.de" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170826072125.9790-4-hch@lst.de/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/806088/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806088/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=infradead.org header.i=@infradead.org\n\theader.b=\"UHMF90xM\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xfTxk3ljZz9sRY\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat, 26 Aug 2017 17:22:18 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754486AbdHZHVt (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSat, 26 Aug 2017 03:21:49 -0400", "from bombadil.infradead.org ([65.50.211.133]:36339 \"EHLO\n\tbombadil.infradead.org\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754410AbdHZHVq (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Sat, 26 Aug 2017 03:21:46 -0400", "from 178.114.158.16.wireless.dyn.drei.com ([178.114.158.16]\n\thelo=localhost)\n\tby bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dlVPd-0003Cz-4m; Sat, 26 Aug 2017 07:21:45 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=bombadil.20170209;\n\th=References:In-Reply-To:Message-Id:\n\tDate:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type:\n\tContent-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:\n\tResent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:\n\tList-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;\n\tbh=cKbcyNUFLAeWbFgLIAUDSGikvBU3TB6xQT3cH6sBH0Y=;\n\tb=UHMF90xMFU0vUM1kSmFLFfJgv\n\txa48T86JiKfVTgLwtRSrIHOh7EjrPQpTrF0qt4U0FNu6MjcZsFMs2u8NJxOjix4s3fIxrlFK09xX2\n\tNLhr4MAJ6evN13xkw4yzzSHRWEaftxA4iPGQZjy2r7+KDpGDqC2RSG1NHo7Exj82zrAP1nvpIA1qv\n\tt577IuzTga7XenxPONv+OUMIyFsKzD8l0iF7caZfowmWvt4WVMMnBkPv3qvMaei/JPO5N+SNRPMWI\n\t5st+ADkW7CUjnskp8Zrhkvr5Opg0Xp4TW5Im8mYQthX6Ex2tcGUP/1/N7PDG9JiHbRVdxQPYOmQjU\n\tmlZ7bXaXQ==;", "From": "Christoph Hellwig <hch@lst.de>", "To": "netdev@vger.kernel.org", "Cc": "\"David S. Miller\" <davem@davemloft.net>,\n\tRalf Baechle <ralf@linux-mips.org>, linux-mips@vger.kernel.org,\n\tlinux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org", "Subject": "[PATCH 3/4] i825xx: switch to switch to dma_alloc_attrs", "Date": "Sat, 26 Aug 2017 09:21:24 +0200", "Message-Id": "<20170826072125.9790-4-hch@lst.de>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20170826072125.9790-1-hch@lst.de>", "References": "<20170826072125.9790-1-hch@lst.de>", "X-SRS-Rewrite": "SMTP reverse-path rewritten from <hch@infradead.org> by\n\tbombadil.infradead.org. See http://www.infradead.org/rpr.html", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "This way we can always pass DMA_ATTR_NON_CONSISTENT, the SNI mips version\nwill simply ignore the flag.\n\nSigned-off-by: Christoph Hellwig <hch@lst.de>\n---\n drivers/net/ethernet/i825xx/lasi_82596.c | 6 ++----\n drivers/net/ethernet/i825xx/lib82596.c | 9 +++++----\n drivers/net/ethernet/i825xx/sni_82596.c | 6 ++----\n 3 files changed, 9 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c\nindex d787fdd5db7b..d5b5021aa759 100644\n--- a/drivers/net/ethernet/i825xx/lasi_82596.c\n+++ b/drivers/net/ethernet/i825xx/lasi_82596.c\n@@ -96,8 +96,6 @@\n \n #define OPT_SWAP_PORT\t0x0001\t/* Need to wordswp on the MPU port */\n \n-#define DMA_ALLOC dma_alloc_noncoherent\n-#define DMA_FREE dma_free_noncoherent\n #define DMA_WBACK(ndev, addr, len) \\\n \tdo { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_TO_DEVICE); } while (0)\n \n@@ -200,8 +198,8 @@ static int lan_remove_chip(struct parisc_device *pdev)\n \tstruct i596_private *lp = netdev_priv(dev);\n \n \tunregister_netdev (dev);\n-\tDMA_FREE(&pdev->dev, sizeof(struct i596_private),\n-\t\t (void *)lp->dma, lp->dma_addr);\n+\tdma_free_attrs(&pdev->dev, sizeof(struct i596_private), lp->dma,\n+\t\t lp->dma_addr, DMA_ATTR_NON_CONSISTENT);\n \tfree_netdev (dev);\n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c\nindex 8449c58f01fd..f00a1dc2128c 100644\n--- a/drivers/net/ethernet/i825xx/lib82596.c\n+++ b/drivers/net/ethernet/i825xx/lib82596.c\n@@ -1063,8 +1063,9 @@ static int i82596_probe(struct net_device *dev)\n \tif (!dev->base_addr || !dev->irq)\n \t\treturn -ENODEV;\n \n-\tdma = (struct i596_dma *) DMA_ALLOC(dev->dev.parent,\n-\t\tsizeof(struct i596_dma), &lp->dma_addr, GFP_KERNEL);\n+\tdma = dma_alloc_attrs(dev->dev.parent, sizeof(struct i596_dma),\n+\t\t\t &lp->dma_addr, GFP_KERNEL,\n+\t\t\t DMA_ATTR_NON_CONSISTENT);\n \tif (!dma) {\n \t\tprintk(KERN_ERR \"%s: Couldn't get shared memory\\n\", __FILE__);\n \t\treturn -ENOMEM;\n@@ -1085,8 +1086,8 @@ static int i82596_probe(struct net_device *dev)\n \n \ti = register_netdev(dev);\n \tif (i) {\n-\t\tDMA_FREE(dev->dev.parent, sizeof(struct i596_dma),\n-\t\t\t\t (void *)dma, lp->dma_addr);\n+\t\tdma_free_attrs(dev->dev.parent, sizeof(struct i596_dma),\n+\t\t\t dma, lp->dma_addr, DMA_ATTR_NON_CONSISTENT);\n \t\treturn i;\n \t}\n \ndiff --git a/drivers/net/ethernet/i825xx/sni_82596.c b/drivers/net/ethernet/i825xx/sni_82596.c\nindex 2af7f77345fb..b2c04a789744 100644\n--- a/drivers/net/ethernet/i825xx/sni_82596.c\n+++ b/drivers/net/ethernet/i825xx/sni_82596.c\n@@ -23,8 +23,6 @@\n \n static const char sni_82596_string[] = \"snirm_82596\";\n \n-#define DMA_ALLOC dma_alloc_coherent\n-#define DMA_FREE dma_free_coherent\n #define DMA_WBACK(priv, addr, len) do { } while (0)\n #define DMA_INV(priv, addr, len) do { } while (0)\n #define DMA_WBACK_INV(priv, addr, len) do { } while (0)\n@@ -152,8 +150,8 @@ static int sni_82596_driver_remove(struct platform_device *pdev)\n \tstruct i596_private *lp = netdev_priv(dev);\n \n \tunregister_netdev(dev);\n-\tDMA_FREE(dev->dev.parent, sizeof(struct i596_private),\n-\t\t lp->dma, lp->dma_addr);\n+\tdma_free_attrs(dev->dev.parent, sizeof(struct i596_private), lp->dma,\n+\t\t lp->dma_addr, DMA_ATTR_NON_CONSISTENT);\n \tiounmap(lp->ca);\n \tiounmap(lp->mpu_port);\n \tfree_netdev (dev);\n", "prefixes": [ "3/4" ] }