Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806231/?format=api
{ "id": 806231, "url": "http://patchwork.ozlabs.org/api/patches/806231/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1503839623-3906-2-git-send-email-madalin.bucur@nxp.com/", "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": "<1503839623-3906-2-git-send-email-madalin.bucur@nxp.com>", "list_archive_url": null, "date": "2017-08-27T13:13:37", "name": "[v4,1/7] fsl/fman: move struct fman to header file", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "0e1436b77b989a1c7d9292c203959f11eebb4449", "submitter": { "id": 70042, "url": "http://patchwork.ozlabs.org/api/people/70042/?format=api", "name": "Madalin Bucur", "email": "madalin.bucur@nxp.com" }, "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/1503839623-3906-2-git-send-email-madalin.bucur@nxp.com/mbox/", "series": [ { "id": 20, "url": "http://patchwork.ozlabs.org/api/series/20/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=20", "date": "2017-08-27T13:13:37", "name": "Add RSS to DPAA 1.x Ethernet driver", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/20/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806231/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806231/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>)", "spf=fail (sender IP is 192.88.168.50)\n\tsmtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed)\n\theader.d=none; vger.kernel.org;\n\tdmarc=fail action=none header.from=nxp.com; " ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xgFj309Hrz9s7f\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSun, 27 Aug 2017 23:13:59 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751478AbdH0NN5 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSun, 27 Aug 2017 09:13:57 -0400", "from mail-dm3nam03on0065.outbound.protection.outlook.com\n\t([104.47.41.65]:29696\n\t\"EHLO NAM03-DM3-obe.outbound.protection.outlook.com\"\n\trhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP\n\tid S1751274AbdH0NNu (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tSun, 27 Aug 2017 09:13:50 -0400", "from BN3PR03CA0115.namprd03.prod.outlook.com (10.174.66.33) by\n\tDM5PR03MB3323.namprd03.prod.outlook.com (10.174.241.144) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id\n\t15.1.1385.9; Sun, 27 Aug 2017 13:13:48 +0000", "from BN1AFFO11FD033.protection.gbl (2a01:111:f400:7c10::116) by\n\tBN3PR03CA0115.outlook.office365.com (2603:10b6:400:4::33) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id\n\t15.1.1362.18 via Frontend Transport; Sun, 27 Aug 2017 13:13:47 +0000", "from tx30smr01.am.freescale.net (192.88.168.50) by\n\tBN1AFFO11FD033.mail.protection.outlook.com (10.58.52.246) with\n\tMicrosoft SMTP Server (version=TLS1_0,\n\tcipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15\n\tvia Frontend Transport; Sun, 27 Aug 2017 13:13:47 +0000", "from fsr-fed2164-101.ea.freescale.net\n\t(fsr-fed2164-101.ea.freescale.net [10.171.73.197])\n\tby tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id\n\tv7RDDhJj028627; Sun, 27 Aug 2017 06:13:45 -0700" ], "Received-SPF": "Fail (protection.outlook.com: domain of nxp.com does not\n\tdesignate 192.88.168.50 as permitted sender)\n\treceiver=protection.outlook.com; \n\tclient-ip=192.88.168.50; helo=tx30smr01.am.freescale.net;", "From": "Madalin Bucur <madalin.bucur@nxp.com>", "To": "<netdev@vger.kernel.org>, <davem@davemloft.net>", "CC": "<linuxppc-dev@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>", "Subject": "[PATCH v4 1/7] fsl/fman: move struct fman to header file", "Date": "Sun, 27 Aug 2017 16:13:37 +0300", "Message-ID": "<1503839623-3906-2-git-send-email-madalin.bucur@nxp.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1503839623-3906-1-git-send-email-madalin.bucur@nxp.com>", "References": "<1503839623-3906-1-git-send-email-madalin.bucur@nxp.com>", "Reply-To": "<madalin.bucur@nxp.com>", "X-EOPAttributedMessage": "0", "X-Matching-Connectors": "131483132275448289;\n\t(91ab9b29-cfa4-454e-5278-08d120cd25b8); ()", "X-Forefront-Antispam-Report": "CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI;\n\tSFV:NSPM;\n\tSFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(8676002)(81166006)(2950100002)(626005)(356003)(4326008)(76176999)(50986999)(97736004)(498600001)(189998001)(33646002)(6666003)(105606002)(106466001)(43066003)(50226002)(68736007)(8936002)(53936002)(77096006)(2906002)(47776003)(305945005)(3450700001)(48376002)(5660300001)(86362001)(81156014)(50466002)(5003940100001)(54906002)(85426001)(104016004)(36756003);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB3323;\n\tH:tx30smr01.am.freescale.net; FPR:; SPF:Fail;\n\tPTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; ", "X-Microsoft-Exchange-Diagnostics": [ "1; BN1AFFO11FD033;\n\t1:HXZFL7c8vW2GSDRZC5webV4xQ2wTi2b24v7KDsDvs+EhoWRDyI+5v+B2U//j+Cls2bLwCEdm5U8l+3qhKBBrLg6a1YUAVc0uXmv/l9hZ0xcVtEHi9NfukhTY70MfA+tT", "1; DM5PR03MB3323;\n\t3:Sz+TNxmA9cCXnT/eXT08FQzIUSN2n52kxFYCKeIjZpcUP0c0HCpsV7s65NGYYssac+69FjkTCm1pYRkXR8nWM4k7IGdM0lVa6lJzyFHfXMNcCKWZ0g6PxIP7mR+C/E+6TvxNM5j+k+ROmSOmMyQ76GqZrc20Xz/tkSfhPTQhwCTm9eH0SNddrPByPN0m5k2mFMj9OHti4CEuWon09lp9XxuLcK+FeWOkUka6KF00DTrN9RuGY4bpNh84ewH7p/ejigDoD1WfRoxMOeoL+VLEyChfohFetOWtN3BvvJMVktYrE6ZiFXVI9Ez1jfvbTYFLdROJ0lHRJg14wGxLTStu73CgyV56eW8IQYZrfW8ZPJg=;\n\t25:le7TW+7eWGHfYxscWlZuaOOULOmS9YPwhhBvpavbGWtadUxmxMR0mTGy+PXwSu2lMFEZtMLqpSuZlvQmVV9PyTbXisvjsZfF7J+r1BqzhMARCZqaa1+4YpG8zbSRdeBPVqnx5j74Va8TVCWVCR74JIguf4pj6jjdtr00cQqK0hCTn387ZuwryzUNd/SEUgbfOm690LOZPuCUsdf/Pl4N6MhEZ2Ln+WAZ+cLmDTlJC9oXZbpkK73XLsC1uOZ1urFsfO7+ojPfwVy2Mj45zdJSblPWs64yEdSMRq5cVpg9Ocz/SAJDWBZzkCFUvHV7ZAVGdwA12Rc/TBORJh9A72o4kQ==", "1; DM5PR03MB3323;\n\t31:X51BwmUZxfj6vT7iPvn1Flr+z8sfAiewRBgIBCPUV1d+52OCturUEOZUfKzGgAGISRP9raju9JkCyi5dPGR1YN8Ywt9sDzgjQ1T7JLpQpNGLlgJ3O7n/v1Vn0FrseiHor04RfjUuStvzCCTq5gXLzoV/QYqwMsKG81PmgUQCt3BeTqDs9HAyCGufzUHr/mKISPP8E5YHyROOantWYOGFZzao1ZcoTdYqJWh7KlVwj6I=;\n\t4:/altaCIMni9aB2iblkE3G+b+eTWhvDfBxPq1yZzYEuA2xwWvHiK+mNDlxIG5x8e2aSTA3fjGDfTyAn3AdgzTvS45G7KuSn2iltQQrpfd+lY+YDuv7MQ9vAbjQRPo9nrqHjyhsnJG9e//UXNj7JspeMZE3X6u1ch4gc2xoWv2jVyND1YNq7LHsrO4GFl5+C729ddMWUNFKb8L0xOLTraG3+HZjjxarLXkjUiVJgRxWELFX9v1/1lhzthvn6ZRh041PwAFjfclmzTHXU1EGVbZPDW1C45iPfB5cEs3DvdmCks=", "1; DM5PR03MB3323;\n\t23:SGlRjBj52uUxNJPBYMyLJJsonfdQItvfrpCYrsHCXqIJ1nhapauddLUJctcJk187UsqHHCjpMVurrUfbcHjE062vBAwXZN1zur+S3L5Q1Zecrjver9ZElO2Nvya5IPpQLNbK13b2+TcBuEj0rX82hsPtFUFcNHfOmUM6BmKcFfGOjta9Bckbgk65ndZbXKI1SupbCKO15VP6MBIs4IsK7wrrK6L2qtLGTjn5CBXoiJVlTFB4FcjaJLk73vlRHzGYyXDXRAKeYU8p7ly+Dn4sMT9ISgMEKJAyfA+CWXqohtZP32+ZAs3tLvWyR78cIYfkpr1npNxrzRIur7nHbWobRJITH3JzM93M3+9AS8pg7rXX0UUlN4ln4fI8X6rgKv7tXX/beGUB9ViIcIWHV/dlHd9aHAvmwqt/NUtmDwY7QdZL/su5+rnZ2EzbG3FK2dLR887AFbRQvr2hHavTfGXbic2DZgbuFarcJ8Z+1XFSkoGnhGdwb6OLokDJkdOJdPjSSqeWdYXvvMX82zs49SZKfeUB62UMc3C/D+V1LF/p7K3fjFVU4JN5m7rQsR2CF7cI77kYEs8UcwCbqzTI6aUbf+VaWJP3lJUyR/+sQRgDIDra6HyDdhQNQXgkVEbXUj6IiBaO936Ym+dy4ojTu3B0PON9hbUWP/TB2EfXisAYqBVYGrpPuT4fnFB8so4irv+HDxg7Hmik/hpiNFXsSZZdZ3tRNMiGQvVVANJ4s1v8Shw9NaEziafV/A3F3OHy98zgNn/PUgiMbtZD2oGvUVzQx6zW4Y6bim6eUBadj+ijqpooINTM1lD93wykSLnF6+ADf1+fS57NQMecb7bcTPc46JVJRmC7RnWG1DvH9815M2+AjhdtFnU7hG+GAKzpCT5g2n399I4W6d49GyrMKYdMJfUDl5JyzIhWIUqN4kbTz/4i7rbNqMmTRseqB1ex5M0VJeb/wHyPg5ye/hopKnja0IcA7X56jJL12QzBYb3nYGtiZ8OJ0BmFAuIeDOJjdlsewrVDWbeabSEFe/rMDZZ6CZK+dnP4GKLcFP038l0qYfXU9rzmHdlGON/DEAGopwfXkwdPWt/L662HrJWWpWnlFA==", "1; DM5PR03MB3323;\n\t6:HNbj/WpJ1CKJ3T4f5oJgIVBzUi5Z/j/t78LE1+sDmLq5+rTFvD9WvCqZFPwy0EJmoUWsgurGkWnCaafOCt1iZI19P/jMlr1XLvScyE2Lb41QvFXaMjcQ0XKT9zU6etoq9xIYn5EvP9w5unzEYns7ZCkoVw+eoCX/3IoCi7q7kYFc96brp+FbDizTBAaJOO/hrrukGylpnDOzBtIyQJGWESv3AfXgF9Up74VBdnFBhWvuKivUGEVpDkBsdGLSzT1B6+LItjPZz+vEkeBKn7Ehk/oODnEbW8hufadUDO9XVb4Fc/SDNL2YvDoFY/esnZ3UnD7DnqBaXH07xUpyJUUE2g==;\n\t5:gLFncZziz27ZiNePtbphDvmyC0+xzNGbUGfWrPIdvAticWH50EAAvuONX8W4MCExkSdQRMhhww8T4K7IZF9rQLpWW1nNeqPlq+hke1Ff4pM68f9oW9VVaNUm8cL1Xg8P1dsKIngNvQwQfaFR938wjA==;\n\t24:lzJCt1BSobmvF0FrFeLTY2fTLUNKjt8GCC5EN0xYf6ZCcAM2/yc4UNupWaTQyi4F/N4DtkAdVqY9wk4s4aa/P0ZoDOaBQekTLsTJzqBmF6U=;\n\t7:PcBfghfhYfcxzuqyUmSvyWqWffFJd9jx3DkC1cZrbqi7bplpaYSbxE2O+ECKJHlbu25zGS/PngLiPTlQ1yXFLRlR6ZOgEXFnOxm4Bk7cocP0qZQ5C3um8KuajKKFDMXEqYWjRexwpNji88PNauD0lezc38JcknYteY+UCx5nzSd9SNDEhyPTrZm8WIWKRUIjgmRVo86/ZEPe0SMh34YenwSUrxA57EcTeMerjMV6kLU=" ], "MIME-Version": "1.0", "Content-Type": "text/plain", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "aa1ef732-a0e6-45e5-787f-08d4ed4d73b0", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);\n\tSRVR:DM5PR03MB3323; ", "X-MS-TrafficTypeDiagnostic": "DM5PR03MB3323:", "X-Exchange-Antispam-Report-Test": "UriScan:(185117386973197);", "X-Microsoft-Antispam-PRVS": "<DM5PR03MB33234A6A49C404094ADAF717EC990@DM5PR03MB3323.namprd03.prod.outlook.com>", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13018025)(8121501046)(13016025)(5005006)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:DM5PR03MB3323; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:DM5PR03MB3323; ", "X-Forefront-PRVS": "0412A98A59", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "27 Aug 2017 13:13:47.3576\n\t(UTC)", "X-MS-Exchange-CrossTenant-Id": "5afe0b00-7697-4969-b663-5eab37d5f47e", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;\n\tIp=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net]", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM5PR03MB3323", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>\n---\n drivers/net/ethernet/freescale/fman/fman.c | 80 +------------------------\n drivers/net/ethernet/freescale/fman/fman.h | 75 +++++++++++++++++++++++\n drivers/net/ethernet/freescale/fman/fman_port.c | 8 +--\n 3 files changed, 82 insertions(+), 81 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c\nindex e714b8f..8179cc1 100644\n--- a/drivers/net/ethernet/freescale/fman/fman.c\n+++ b/drivers/net/ethernet/freescale/fman/fman.c\n@@ -32,9 +32,6 @@\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \n-#include \"fman.h\"\n-#include \"fman_muram.h\"\n-\n #include <linux/fsl/guts.h>\n #include <linux/slab.h>\n #include <linux/delay.h>\n@@ -46,6 +43,9 @@\n #include <linux/interrupt.h>\n #include <linux/libfdt_env.h>\n \n+#include \"fman.h\"\n+#include \"fman_muram.h\"\n+\n /* General defines */\n #define FMAN_LIODN_TBL\t\t\t64\t/* size of LIODN table */\n #define MAX_NUM_OF_MACS\t\t\t10\n@@ -564,80 +564,6 @@ struct fman_cfg {\n \tu32 qmi_def_tnums_thresh;\n };\n \n-/* Structure that holds information received from device tree */\n-struct fman_dts_params {\n-\tvoid __iomem *base_addr;\t\t/* FMan virtual address */\n-\tstruct resource *res;\t\t\t/* FMan memory resource */\n-\tu8 id;\t\t\t\t\t/* FMan ID */\n-\n-\tint err_irq;\t\t\t\t/* FMan Error IRQ */\n-\n-\tu16 clk_freq;\t\t\t\t/* FMan clock freq (In Mhz) */\n-\n-\tu32 qman_channel_base;\t\t\t/* QMan channels base */\n-\tu32 num_of_qman_channels;\t\t/* Number of QMan channels */\n-\n-\tstruct resource muram_res;\t\t/* MURAM resource */\n-};\n-\n-/** fman_exceptions_cb\n- * fman\t\t- Pointer to FMan\n- * exception\t- The exception.\n- *\n- * Exceptions user callback routine, will be called upon an exception\n- * passing the exception identification.\n- *\n- * Return: irq status\n- */\n-typedef irqreturn_t (fman_exceptions_cb)(struct fman *fman,\n-\t\t\t\t\t enum fman_exceptions exception);\n-\n-/** fman_bus_error_cb\n- * fman\t\t- Pointer to FMan\n- * port_id\t- Port id\n- * addr\t\t- Address that caused the error\n- * tnum\t\t- Owner of error\n- * liodn\t- Logical IO device number\n- *\n- * Bus error user callback routine, will be called upon bus error,\n- * passing parameters describing the errors and the owner.\n- *\n- * Return: IRQ status\n- */\n-typedef irqreturn_t (fman_bus_error_cb)(struct fman *fman, u8 port_id,\n-\t\t\t\t\tu64 addr, u8 tnum, u16 liodn);\n-\n-struct fman {\n-\tstruct device *dev;\n-\tvoid __iomem *base_addr;\n-\tstruct fman_intr_src intr_mng[FMAN_EV_CNT];\n-\n-\tstruct fman_fpm_regs __iomem *fpm_regs;\n-\tstruct fman_bmi_regs __iomem *bmi_regs;\n-\tstruct fman_qmi_regs __iomem *qmi_regs;\n-\tstruct fman_dma_regs __iomem *dma_regs;\n-\tstruct fman_hwp_regs __iomem *hwp_regs;\n-\tfman_exceptions_cb *exception_cb;\n-\tfman_bus_error_cb *bus_error_cb;\n-\t/* Spinlock for FMan use */\n-\tspinlock_t spinlock;\n-\tstruct fman_state_struct *state;\n-\n-\tstruct fman_cfg *cfg;\n-\tstruct muram_info *muram;\n-\t/* cam section in muram */\n-\tunsigned long cam_offset;\n-\tsize_t cam_size;\n-\t/* Fifo in MURAM */\n-\tunsigned long fifo_offset;\n-\tsize_t fifo_size;\n-\n-\tu32 liodn_base[64];\n-\tu32 liodn_offset[64];\n-\n-\tstruct fman_dts_params dts_params;\n-};\n-\n static irqreturn_t fman_exceptions(struct fman *fman,\n \t\t\t\t enum fman_exceptions exception)\n {\ndiff --git a/drivers/net/ethernet/freescale/fman/fman.h b/drivers/net/ethernet/freescale/fman/fman.h\nindex f53e147..1015dac 100644\n--- a/drivers/net/ethernet/freescale/fman/fman.h\n+++ b/drivers/net/ethernet/freescale/fman/fman.h\n@@ -34,6 +34,8 @@\n #define __FM_H\n \n #include <linux/io.h>\n+#include <linux/interrupt.h>\n+#include <linux/of_irq.h>\n \n /* FM Frame descriptor macros */\n /* Frame queue Context Override */\n@@ -274,6 +276,79 @@ struct fman_intr_src {\n \tvoid *src_handle;\n };\n \n+/** fman_exceptions_cb\n+ * fman - Pointer to FMan\n+ * exception - The exception.\n+ *\n+ * Exceptions user callback routine, will be called upon an exception\n+ * passing the exception identification.\n+ *\n+ * Return: irq status\n+ */\n+typedef irqreturn_t (fman_exceptions_cb)(struct fman *fman,\n+\t\t\t\t\t enum fman_exceptions exception);\n+/** fman_bus_error_cb\n+ * fman - Pointer to FMan\n+ * port_id - Port id\n+ * addr - Address that caused the error\n+ * tnum - Owner of error\n+ * liodn - Logical IO device number\n+ *\n+ * Bus error user callback routine, will be called upon bus error,\n+ * passing parameters describing the errors and the owner.\n+ *\n+ * Return: IRQ status\n+ */\n+typedef irqreturn_t (fman_bus_error_cb)(struct fman *fman, u8 port_id,\n+\t\t\t\t\tu64 addr, u8 tnum, u16 liodn);\n+\n+/* Structure that holds information received from device tree */\n+struct fman_dts_params {\n+\tvoid __iomem *base_addr; /* FMan virtual address */\n+\tstruct resource *res; /* FMan memory resource */\n+\tu8 id; /* FMan ID */\n+\n+\tint err_irq; /* FMan Error IRQ */\n+\n+\tu16 clk_freq; /* FMan clock freq (In Mhz) */\n+\n+\tu32 qman_channel_base; /* QMan channels base */\n+\tu32 num_of_qman_channels; /* Number of QMan channels */\n+\n+\tstruct resource muram_res; /* MURAM resource */\n+};\n+\n+struct fman {\n+\tstruct device *dev;\n+\tvoid __iomem *base_addr;\n+\tstruct fman_intr_src intr_mng[FMAN_EV_CNT];\n+\n+\tstruct fman_fpm_regs __iomem *fpm_regs;\n+\tstruct fman_bmi_regs __iomem *bmi_regs;\n+\tstruct fman_qmi_regs __iomem *qmi_regs;\n+\tstruct fman_dma_regs __iomem *dma_regs;\n+\tstruct fman_hwp_regs __iomem *hwp_regs;\n+\tfman_exceptions_cb *exception_cb;\n+\tfman_bus_error_cb *bus_error_cb;\n+\t/* Spinlock for FMan use */\n+\tspinlock_t spinlock;\n+\tstruct fman_state_struct *state;\n+\n+\tstruct fman_cfg *cfg;\n+\tstruct muram_info *muram;\n+\t/* cam section in muram */\n+\tunsigned long cam_offset;\n+\tsize_t cam_size;\n+\t/* Fifo in MURAM */\n+\tunsigned long fifo_offset;\n+\tsize_t fifo_size;\n+\n+\tu32 liodn_base[64];\n+\tu32 liodn_offset[64];\n+\n+\tstruct fman_dts_params dts_params;\n+};\n+\n /* Structure for port-FM communication during fman_port_init. */\n struct fman_port_init_params {\n \tu8 port_id;\t\t\t/* port Id */\ndiff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c\nindex 49bfa11..d51e6aa 100644\n--- a/drivers/net/ethernet/freescale/fman/fman_port.c\n+++ b/drivers/net/ethernet/freescale/fman/fman_port.c\n@@ -32,10 +32,6 @@\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \n-#include \"fman_port.h\"\n-#include \"fman.h\"\n-#include \"fman_sp.h\"\n-\n #include <linux/io.h>\n #include <linux/slab.h>\n #include <linux/module.h>\n@@ -45,6 +41,10 @@\n #include <linux/delay.h>\n #include <linux/libfdt_env.h>\n \n+#include \"fman.h\"\n+#include \"fman_port.h\"\n+#include \"fman_sp.h\"\n+\n /* Queue ID */\n #define DFLT_FQ_ID\t\t0x00FFFFFF\n \n", "prefixes": [ "v4", "1/7" ] }