Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/212/?format=api
{ "id": 212, "url": "http://patchwork.ozlabs.org/api/patches/212/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1220900995-11928-4-git-send-email-becky.bruce@freescale.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<1220900995-11928-4-git-send-email-becky.bruce@freescale.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/1220900995-11928-4-git-send-email-becky.bruce@freescale.com/", "date": "2008-09-08T19:09:54", "name": "POWERPC: Drop archdata numa_node", "commit_ref": "8fae0353247530d2124b2419052fa6120462fa99", "pull_url": null, "state": "accepted", "archived": true, "hash": "c87276f14ecfacedad7e50ad6e910d02f068555b", "submitter": { "id": 12, "url": "http://patchwork.ozlabs.org/api/people/12/?format=api", "name": "Becky Bruce", "email": "becky.bruce@freescale.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1220900995-11928-4-git-send-email-becky.bruce@freescale.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/212/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/212/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linuxppc-dev-bounces+patchwork=ozlabs.org@ozlabs.org>", "X-Original-To": [ "patchwork@ozlabs.org", "linuxppc-dev@ozlabs.org" ], "Delivered-To": [ "patchwork@ozlabs.org", "linuxppc-dev@ozlabs.org" ], "Received": [ "from ozlabs.org (localhost [127.0.0.1])\n\tby ozlabs.org (Postfix) with ESMTP id 7F74DDE406\n\tfor <patchwork@ozlabs.org>; Tue, 9 Sep 2008 05:11:22 +1000 (EST)", "from az33egw02.freescale.net (az33egw02.freescale.net\n\t[192.88.158.103])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(Client CN \"az33egw02.freescale.net\",\n\tIssuer \"Thawte Premium Server CA\" (verified OK))\n\tby ozlabs.org (Postfix) with ESMTPS id 5670FDDF4C\n\tfor <linuxppc-dev@ozlabs.org>; Tue, 9 Sep 2008 05:10:05 +1000 (EST)", "from az33smr01.freescale.net (az33smr01.freescale.net\n\t[10.64.34.199])\n\tby az33egw02.freescale.net (8.12.11/az33egw02) with ESMTP id\n\tm88J9u25002770\n\tfor <linuxppc-dev@ozlabs.org>; Mon, 8 Sep 2008 12:09:59 -0700 (MST)", "from blarg.am.freescale.net (blarg.am.freescale.net [10.82.19.176])\n\tby az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id\n\tm88J9u8V020115\n\tfor <linuxppc-dev@ozlabs.org>; Mon, 8 Sep 2008 14:09:57 -0500 (CDT)", "from blarg.am.freescale.net (localhost.localdomain [127.0.0.1])\n\tby blarg.am.freescale.net (8.14.2/8.14.2) with ESMTP id\n\tm88J9u2G012239; Mon, 8 Sep 2008 14:09:56 -0500", "(from bgill@localhost)\n\tby blarg.am.freescale.net (8.14.2/8.14.2/Submit) id m88J9uhS012238;\n\tMon, 8 Sep 2008 14:09:56 -0500" ], "From": "Becky Bruce <becky.bruce@freescale.com>", "To": "linuxppc-dev@ozlabs.org", "Subject": "[PATCH 3/4] POWERPC: Drop archdata numa_node", "Date": "Mon, 8 Sep 2008 14:09:54 -0500", "Message-Id": "<1220900995-11928-4-git-send-email-becky.bruce@freescale.com>", "X-Mailer": "git-send-email 1.5.5.1", "In-Reply-To": "<1220900995-11928-3-git-send-email-becky.bruce@freescale.com>", "References": "<1220900995-11928-1-git-send-email-becky.bruce@freescale.com>\n\t<1220900995-11928-2-git-send-email-becky.bruce@freescale.com>\n\t<1220900995-11928-3-git-send-email-becky.bruce@freescale.com>", "X-BeenThere": "linuxppc-dev@ozlabs.org", "X-Mailman-Version": "2.1.11", "Precedence": "list", "List-Id": "Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>", "List-Unsubscribe": "<https://ozlabs.org/mailman/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://ozlabs.org/pipermail/linuxppc-dev>", "List-Post": "<mailto:linuxppc-dev@ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@ozlabs.org?subject=help>", "List-Subscribe": "<https://ozlabs.org/mailman/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@ozlabs.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "linuxppc-dev-bounces+patchwork=ozlabs.org@ozlabs.org", "Errors-To": "linuxppc-dev-bounces+patchwork=ozlabs.org@ozlabs.org" }, "content": "Use the struct device's numa_node instead; use accessor functions\nto get/set numa_node.\n\nSigned-off-by: Becky Bruce <becky.bruce@freescale.com>", "diff": "diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h\nindex 228ab2a..dfd504c 100644\n--- a/arch/powerpc/include/asm/device.h\n+++ b/arch/powerpc/include/asm/device.h\n@@ -16,9 +16,6 @@ struct dev_archdata {\n \t/* DMA operations on that device */\n \tstruct dma_mapping_ops\t*dma_ops;\n \tvoid\t\t\t*dma_data;\n-\n-\t/* NUMA node if applicable */\n-\tint\t\t\tnuma_node;\n };\n \n #endif /* _ASM_POWERPC_DEVICE_H */\ndiff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c\nindex 01091f1..49248f8 100644\n--- a/arch/powerpc/kernel/dma-iommu.c\n+++ b/arch/powerpc/kernel/dma-iommu.c\n@@ -20,7 +20,7 @@ static void *dma_iommu_alloc_coherent(struct device *dev, size_t size,\n {\n \treturn iommu_alloc_coherent(dev, dev->archdata.dma_data, size,\n \t\t\t\t dma_handle, device_to_mask(dev), flag,\n-\t\t\t\t dev->archdata.numa_node);\n+\t\t\t\t dev_to_node(dev));\n }\n \n static void dma_iommu_free_coherent(struct device *dev, size_t size,\ndiff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c\nindex 44e3486..124f867 100644\n--- a/arch/powerpc/kernel/dma.c\n+++ b/arch/powerpc/kernel/dma.c\n@@ -29,7 +29,7 @@ static void *dma_direct_alloc_coherent(struct device *dev, size_t size,\n {\n \tstruct page *page;\n \tvoid *ret;\n-\tint node = dev->archdata.numa_node;\n+\tint node = dev_to_node(dev);\n \n \tpage = alloc_pages_node(node, flag, get_order(size));\n \tif (page == NULL)\ndiff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c\nindex e9be908..93ae5b1 100644\n--- a/arch/powerpc/kernel/of_device.c\n+++ b/arch/powerpc/kernel/of_device.c\n@@ -78,7 +78,7 @@ struct of_device *of_device_alloc(struct device_node *np,\n \tdev->dev.parent = parent;\n \tdev->dev.release = of_release_dev;\n \tdev->dev.archdata.of_node = np;\n-\tdev->dev.archdata.numa_node = of_node_to_nid(np);\n+\tset_dev_node(&dev->dev, of_node_to_nid(np));\n \n \tif (bus_id)\n \t\tstrlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);\ndiff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c\nindex 30eedfc..1f75bf0 100644\n--- a/arch/powerpc/kernel/pci_64.c\n+++ b/arch/powerpc/kernel/pci_64.c\n@@ -558,11 +558,8 @@ void __devinit pcibios_setup_new_device(struct pci_dev *dev)\n \t sd->of_node ? sd->of_node->full_name : \"<none>\");\n \n \tsd->dma_ops = pci_dma_ops;\n-#ifdef CONFIG_NUMA\n-\tsd->numa_node = pcibus_to_node(dev->bus);\n-#else\n-\tsd->numa_node = -1;\n-#endif\n+\tset_dev_node(&dev->dev, pcibus_to_node(dev->bus));\n+\n \tif (ppc_md.pci_dma_dev_setup)\n \t\tppc_md.pci_dma_dev_setup(dev);\n }\ndiff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c\nindex 2750fba..434c92a 100644\n--- a/arch/powerpc/kernel/vio.c\n+++ b/arch/powerpc/kernel/vio.c\n@@ -1232,7 +1232,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)\n \telse\n \t\tviodev->dev.archdata.dma_ops = &dma_iommu_ops;\n \tviodev->dev.archdata.dma_data = vio_build_iommu_table(viodev);\n-\tviodev->dev.archdata.numa_node = of_node_to_nid(of_node);\n+\tset_dev_node(&viodev->dev, of_node_to_nid(of_node));\n \n \t/* init generic 'struct device' fields: */\n \tviodev->dev.parent = &vio_bus_device.dev;\ndiff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c\nindex e06420a..ef92e71 100644\n--- a/arch/powerpc/platforms/cell/iommu.c\n+++ b/arch/powerpc/platforms/cell/iommu.c\n@@ -556,11 +556,11 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)\n \t * node's iommu. We -might- do something smarter later though it may\n \t * never be necessary\n \t */\n-\tiommu = cell_iommu_for_node(archdata->numa_node);\n+\tiommu = cell_iommu_for_node(dev_to_node(dev));\n \tif (iommu == NULL || list_empty(&iommu->windows)) {\n \t\tprintk(KERN_ERR \"iommu: missing iommu for %s (node %d)\\n\",\n \t\t archdata->of_node ? archdata->of_node->full_name : \"?\",\n-\t\t archdata->numa_node);\n+\t\t dev_to_node(dev));\n \t\treturn NULL;\n \t}\n \twindow = list_entry(iommu->windows.next, struct iommu_window, list);\n@@ -577,7 +577,7 @@ static void *dma_fixed_alloc_coherent(struct device *dev, size_t size,\n \t\treturn iommu_alloc_coherent(dev, cell_get_iommu_table(dev),\n \t\t\t\t\t size, dma_handle,\n \t\t\t\t\t device_to_mask(dev), flag,\n-\t\t\t\t\t dev->archdata.numa_node);\n+\t\t\t\t\t dev_to_node(dev));\n \telse\n \t\treturn dma_direct_ops.alloc_coherent(dev, size, dma_handle,\n \t\t\t\t\t\t flag);\ndiff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c\nindex 280ee88..a789bf5 100644\n--- a/arch/powerpc/platforms/ps3/system-bus.c\n+++ b/arch/powerpc/platforms/ps3/system-bus.c\n@@ -762,7 +762,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)\n \t};\n \n \tdev->core.archdata.of_node = NULL;\n-\tdev->core.archdata.numa_node = 0;\n+\tset_dev_node(&dev->core, 0);\n \n \tpr_debug(\"%s:%d add %s\\n\", __func__, __LINE__, dev->core.bus_id);\n \n", "prefixes": [] }