Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/485170/?format=api
{ "id": 485170, "url": "http://patchwork.ozlabs.org/api/patches/485170/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1434487303-4833-1-git-send-email-jacob.e.keller@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1434487303-4833-1-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2015-06-16T20:41:43", "name": "[rc3] fm10k: use dma_set_mask_and_coherent in fm10k_probe", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "71ee3b0dc20c67f0aed213aaf7e41f26a74f0eca", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1434487303-4833-1-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/485170/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/485170/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 9743E14027F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Jun 2015 06:41:52 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C21BC8A9A2;\n\tTue, 16 Jun 2015 20:41:51 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id c8kOUpN06UJD; Tue, 16 Jun 2015 20:41:51 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 248B38A8BE;\n\tTue, 16 Jun 2015 20:41:51 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 055F41C0ED3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Jun 2015 20:41:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 020AC88607\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Jun 2015 20:41:50 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id DQTtyn-jdcWY for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Jun 2015 20:41:49 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 72656885CD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Jun 2015 20:41:49 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga103.fm.intel.com with ESMTP; 16 Jun 2015 13:41:50 -0700", "from jekeller-desk.amr.corp.intel.com ([134.134.3.85])\n\tby FMSMGA003.fm.intel.com with ESMTP; 16 Jun 2015 13:41:47 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,628,1427785200\"; d=\"scan'208\";a=\"509383856\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Tue, 16 Jun 2015 13:41:43 -0700", "Message-Id": "<1434487303-4833-1-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.4.2", "Subject": "[Intel-wired-lan] [PATCH rc3] fm10k: use dma_set_mask_and_coherent\n\tin fm10k_probe", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "This patch cleans up the use of dma_get_required_mask and uses the\nsimpler dma_set_mask_and_coherent function instead of doing these as\nseparate steps.\n\nI removed the dma_get_required_mask call because based on some minimal\ntesting it appears that either (a) we're not doing the right thing with\nthe call or (b) we don't need it anyways. If the value returned is\n<48bits, we'll end up trying with 48 bits anyways. If it's over 48bits,\nfm10k can't support that anyways, and we should try 48bits. If 48bits\nfails, we'll fallback to 32bits. This cleans up some very funky code.\n\n- rc2\n* add back goto err_dma\n\n- rc3\n* use %d for error code printf\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 24 ++++++------------------\n 1 file changed, 6 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex fe54c781d0bf..ce53ff25f88d 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -1741,30 +1741,18 @@ static int fm10k_probe(struct pci_dev *pdev,\n \tstruct fm10k_intfc *interface;\n \tstruct fm10k_hw *hw;\n \tint err;\n-\tu64 dma_mask;\n \n \terr = pci_enable_device_mem(pdev);\n \tif (err)\n \t\treturn err;\n \n-\t/* By default fm10k only supports a 48 bit DMA mask */\n-\tdma_mask = DMA_BIT_MASK(48) | dma_get_required_mask(&pdev->dev);\n-\n-\tif ((dma_mask <= DMA_BIT_MASK(32)) ||\n-\t dma_set_mask_and_coherent(&pdev->dev, dma_mask)) {\n-\t\tdma_mask &= DMA_BIT_MASK(32);\n-\n+\terr = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));\n+\tif (err)\n \t\terr = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));\n-\t\terr = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));\n-\t\tif (err) {\n-\t\t\terr = dma_set_coherent_mask(&pdev->dev,\n-\t\t\t\t\t\t DMA_BIT_MASK(32));\n-\t\t\tif (err) {\n-\t\t\t\tdev_err(&pdev->dev,\n-\t\t\t\t\t\"No usable DMA configuration, aborting\\n\");\n-\t\t\t\tgoto err_dma;\n-\t\t\t}\n-\t\t}\n+\tif (err) {\n+\t\tdev_err(&pdev->dev,\n+\t\t\t\"DMA configuration failed: %d\\n\", err);\n+\t\tgoto err_dma;\n \t}\n \n \terr = pci_request_selected_regions(pdev,\n", "prefixes": [ "rc3" ] }