Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/480317/?format=api
{ "id": 480317, "url": "http://patchwork.ozlabs.org/api/patches/480317/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1433374272-6684-10-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": "<1433374272-6684-10-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2015-06-03T23:31:06", "name": "[rc2,09/15] fm10k: use dma_set_mask_and_coherent in fm10k_probe", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1f97553ca6be803024e4d9fd8bc75546eee0ed9a", "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/1433374272-6684-10-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/480317/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/480317/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 silver.osuosl.org (silver.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 41F571401EF\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 4 Jun 2015 09:31:36 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6E45B3290A;\n\tWed, 3 Jun 2015 23:31:35 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 8tMHelILS14S; Wed, 3 Jun 2015 23:31:26 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id CB8EE3292A;\n\tWed, 3 Jun 2015 23:31:21 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id BC3581BFA20\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:20 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B9523A1EE5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:20 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id w1ct4oq0XS19 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:20 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6A84BA1EEE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Jun 2015 23:31:20 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP; 03 Jun 2015 16:31:19 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.151])\n\tby orsmga003.jf.intel.com with ESMTP; 03 Jun 2015 16:31:14 -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,549,1427785200\"; d=\"scan'208\";a=\"581683035\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Wed, 3 Jun 2015 16:31:06 -0700", "Message-Id": "<1433374272-6684-10-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1433374272-6684-1-git-send-email-jacob.e.keller@intel.com>", "References": "<1433374272-6684-1-git-send-email-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [rc2 09/15] 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\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 5269b1628ca6..0381c8d192aa 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: 0x%x\\n\", err);\n+\t\tgoto err_dma;\n \t}\n \n \terr = pci_request_selected_regions(pdev,\n", "prefixes": [ "rc2", "09/15" ] }