From patchwork Thu Aug 24 07:28:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 805282 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xdGDf2Sxlz9sRm for ; Thu, 24 Aug 2017 17:30:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612AbdHXHap (ORCPT ); Thu, 24 Aug 2017 03:30:45 -0400 Received: from mail-sn1nam02on0047.outbound.protection.outlook.com ([104.47.36.47]:47136 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751135AbdHXH2f (ORCPT ); Thu, 24 Aug 2017 03:28:35 -0400 Received: from BN6PR03CA0023.namprd03.prod.outlook.com (10.168.230.161) by CO2PR03MB2264.namprd03.prod.outlook.com (10.166.92.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Thu, 24 Aug 2017 07:28:33 +0000 Received: from BN1BFFO11FD006.protection.gbl (2a01:111:f400:7c10::1:112) by BN6PR03CA0023.outlook.office365.com (2603:10b6:404:23::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Thu, 24 Aug 2017 07:28:33 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD006.mail.protection.outlook.com (10.58.144.69) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Thu, 24 Aug 2017 07:28:32 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7O7STqb005094; Thu, 24 Aug 2017 00:28:31 -0700 From: Madalin Bucur To: , CC: , Subject: [PATCH v3 1/7] fsl/fman: move struct fman to header file Date: Thu, 24 Aug 2017 10:28:22 +0300 Message-ID: <1503559708-13405-2-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1503559708-13405-1-git-send-email-madalin.bucur@nxp.com> References: <1503559708-13405-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131480333131399820; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(2906002)(53936002)(54906002)(43066003)(36756003)(33646002)(47776003)(106466001)(104016004)(305945005)(105606002)(50466002)(68736007)(48376002)(626005)(85426001)(86362001)(6666003)(189998001)(76176999)(50986999)(5003940100001)(97736004)(8936002)(5660300001)(81166006)(3450700001)(356003)(498600001)(2950100002)(4326008)(50226002)(77096006)(81156014)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2264; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD006; 1:+d5Hw/y36QfDTcTs0MLmSsJEsVb8z+0IxWq11yWkBaTL1J9JdAyVolvknJHyd9IEIweHlBum+/mPOY52qJ/6ZHKaKq55gIHKNXN0wslCOWvtlFwhvpCaffe/19BEOXJo MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f714466-9746-4b08-e12c-08d4eac1b9b3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603196)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR03MB2264; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 3:4N8iokgHyc0I5iTwZcyGX2QMCVvuBsZsk6zRgCLCmeYAa7z+BhoY4tXbX8LAR7pvhiW03/Agx3ldszw/WmI6c8ahIxIvGj9CauS/85W1S2BHYQNGJYL18q0NY2d5qZFVmMTi3FuK1hd0R8cvRbMH7wyyw50O20zI98K6tgPshaRF/7vyvDH+/ORsrP8AQRLloQC0PX89SvZcAbyDsh8gEhc7l8gyflLDSfpDjoaXo6Hy+iQdDGaL/rdPS6zcIYFMwQRBn2cy+bLrJPpywxHCLZmaougokbewW9a47SVg2CnLrYpF9k1gqVBaf7zzXf8JUNZg2+b8YscmkZN433D8ism9UK2oN7N1t3uhWlrtahk=; 25:t+pnikP2hWz8sT98bxaZTmKZ6/xNijIHbYGzzYVz2Wrr2i2e16tKMJHG5DViICHym9ZlmBkBykR33jssOu/G9EvhyW9QEA7S3r12FWBXn038qtd6CFyfz56HEcKFJUxqNb3NqctuRXa3kERBv+MYjafwEFQrcIfO/xlzXOIpi4LIkAQQQbwK7BmnTGtJk+1FH28XLoNro3DGCRkxbOsK7oUIdLS6fWYZ299oWTnnu6HT6PA1LQisKPaR0Xi1vk3CyNuXCpmzqRE963C/GepnVu8grWkofqaKs+wH/3M/bqLMPfUBUDl9Yy4XiJxvkKiEI/nuRjbVLibGSesAA4fPeA== X-MS-TrafficTypeDiagnostic: CO2PR03MB2264: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 31:NZrBpXkO2o1Mxn7phH1khmhAlzxb5jrjXXPcA4J4D75C9v3Q34hjf1zb9otiu0JzRbDpgvfIUad0u0NXo+Nxz2rFsajH+jDCYThAoNLnWha+2Pdtxvboh54sGWTZOeSjdDQeghf5nSFywFtLiahpiWNo50P5tMCiHbMlNxEqPthy3xB+jDV+wAsxJ9gbBOZ7F4S6nkPqODzY1rEqNcgxRoehuQyYchd7jF3FQWokHeY=; 4:bRkhMWTa7ynv2eE45eMaIUZkUmNW+TfFcXMnokPbU77cs/ojRS6Ok8SL4bjfaDwQ5VyJDH+kseSoNONpzfPPNNzr113ZW3Yqzf/M0Z9m44sH5IOb4UOWfIv4qLlZoxM1LrDJ5cYdbKshg7PqsSGIr2XUa6U1BVdQ7DWBcvh7C+wYOodr/oFgBv+O1YnaFihfrO6GKpU+SX9x4sj2eKp0wfabFlytD5zwSPlYrWBE5tUTTK3KiyIjoenUIQcRE6MlCaGzribtlATe76ZzIUNuNzYsNM4JHtURLVQ2J/ATiYU= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(5005006)(13016025)(8121501046)(13018025)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123556025)(20161123563025)(20161123565025)(20161123559100)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2264; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2264; X-Forefront-PRVS: 04097B7F7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2264; 23:WV76gA1MnMazCOS/FMxp4N+BB30LymqO1KcU0+An5?= =?us-ascii?Q?3AgnFj/25M2qVjEX6ePs6z68Ri0q5xQ3CnA2sK3YFMR9TiIBEng3BPisBdUf?= =?us-ascii?Q?NXXJ3/mL0kd09LoChBXiHQtnPfiRErtZ3g+mi7Zfi+qQmKaHTtWd1P4XgIO3?= =?us-ascii?Q?89jHiG8BM5VNKuZ6tZq3zxdiK/z5TUHCTsHQzieo7hb/k5/m2oVk5TgRXBQE?= =?us-ascii?Q?fLG3ZqlTFvdxJm1DhIoBHSNsSyH10Oscb3Blj29iBlTLHxeFqQmZE3GwfYt9?= =?us-ascii?Q?qLeoJFyUi6DWz9XFDQrJ9V91k7zVFRl6ua94hohVrzwwEi5jZhK8lmEz8Fu0?= =?us-ascii?Q?lfSbOGaoiOI7cBXh5eaq1VShj4t80ZrQ3Dv++YPqZuNbPdl3WFlxoMKQXF9j?= =?us-ascii?Q?vhEjFO/rDWYBckJhWyP1t1X3Q8jUbG9FdnkE0pwiZ25lA3SJbPhzAHCNpO2s?= =?us-ascii?Q?cnNAMlNfuyoilUr6yF1kUrmQ1BM53Q/rM6EfLASMNEYq670xfWwGDT4jNL6G?= =?us-ascii?Q?ecinioJgbHetyFxX89Rninxy3J8eatAz+tJBEDkMyQIANquLaapHtOBusgWX?= =?us-ascii?Q?EKzuAycC00isr83RoaSFQ81bdN1Xchw//Wq7In5iRoHqUlylDwfsSAYTYP2k?= =?us-ascii?Q?y5Tw69wJ5Gm/Plc6yvTqRRVSqiRq2rKVrb1ZoFWP12xeuGN0W7R1sLPuWavV?= =?us-ascii?Q?Rga7wV58o8Ocpi9AHb9KibXq2ybI5ic3WcTxCMrbALItzr+zhC2HAQEz/GZw?= =?us-ascii?Q?5RFySNeMuvT87c/kcVXxAI1X8zyT9LdioupBAwYHd61emPTXsDgErGd2iprc?= =?us-ascii?Q?SOsXnBWWAq0K2Zug39FL0WXDv1hjm7zVJNI4/ApIIZ5oxyRsjWWOtaLFrJQ5?= =?us-ascii?Q?7M7tQfRDPUtp/ysoXs+pluGvo5BOSOrzwIQAR5DuZZICFpOXtdWJFsBYpxf6?= =?us-ascii?Q?1MXntvMWW+RPPYXkJ67/L2SgWsi0nDim7IRma2JARBBEfi8rn2BUOS8+OkO8?= =?us-ascii?Q?chtm8CdbJndelCAkmRonNJ4pFYAhDTalagmvQEMfYSK6u7L+/wP3O18xw5Le?= =?us-ascii?Q?rYr27dICAGylzQp7lwF4B45In9cySJrYORm2W0Y7IAtmcHXIw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2264; 6:JYuUAJaTZ94JKwyF68Cyf8UjxItF6kr4WTjfd9grfWdYIKCTZzApwsbL8fMY5x/rzHh/DC7HHgH7HnD22q63Q8DVJgZ/86p9UqAXHEqqDdy3H62zX7HrNcDwZwnDwawFKujM/sOtvng+nIdbstO2y1bDQB86h50BTP2NNcZ48jr6zgBIdvaxW/bflxMzaKNops5hMenvCCGH/USsKkzjBqfKpbnix/rs5+6NvWplxWfRSHoI77EvwLEsqvXsArUzMv6wq1JVU9mD0SGrko9C0R9Z0i/yPi8lgAeJF5iVo5x46PENfDdDCyYF298iBH0d5AT1PsdFI0I8zsP1eyGSSw==; 5:mctWfUFmEdr9wPEnBv5dHzl7kjvYW00nlr+u6ZYOdzIxifi4ivkZxhS/cZou6cB9TZxHGodQg9J/zRCedaVO11BNIWm+l1rufT/7feAwccupoabZz0on/HzrXty971j6E5fis+XMjpOgWfm1tWTRQw==; 24:FKtFVPw2pr93++DSb9VuGYhb589mxwYNt+/qGTS1VY/MIBD6+vSoT9PNQc5w5pcoRa9V4vswr8FzZGt9zcWqwr5SvDS08vdne1FqxsfPLcI=; 7:IUuqhqpAZfXqKhoclW70e7tM9xUitr64pQ2OMq8YILU7/BInzMjL17vM6UhvlMbg4UKHcpvNURvQL0j0BMwJPpNXZNFP4+fnEeDx2rN7RzVNwiZ/yz6G9YV9KjWu0kUOHaWwq0cKCh7eN5X5M9jQqF3Mtx90h1tF0VOISBpm/jjXPBCIJQtBfpVJ2+tvPvYIEUa07MO/1URH6jSQ0KtLOuHBEAbUCuqFGWb5ByEppFI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2017 07:28:32.9527 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2264 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/fman/fman.c | 74 ------------------------------ drivers/net/ethernet/freescale/fman/fman.h | 73 +++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 74 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index e714b8f..6ed383f 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -564,80 +564,6 @@ struct fman_cfg { u32 qmi_def_tnums_thresh; }; -/* Structure that holds information received from device tree */ -struct fman_dts_params { - void __iomem *base_addr; /* FMan virtual address */ - struct resource *res; /* FMan memory resource */ - u8 id; /* FMan ID */ - - int err_irq; /* FMan Error IRQ */ - - u16 clk_freq; /* FMan clock freq (In Mhz) */ - - u32 qman_channel_base; /* QMan channels base */ - u32 num_of_qman_channels; /* Number of QMan channels */ - - struct resource muram_res; /* MURAM resource */ -}; - -/** fman_exceptions_cb - * fman - Pointer to FMan - * exception - The exception. - * - * Exceptions user callback routine, will be called upon an exception - * passing the exception identification. - * - * Return: irq status - */ -typedef irqreturn_t (fman_exceptions_cb)(struct fman *fman, - enum fman_exceptions exception); - -/** fman_bus_error_cb - * fman - Pointer to FMan - * port_id - Port id - * addr - Address that caused the error - * tnum - Owner of error - * liodn - Logical IO device number - * - * Bus error user callback routine, will be called upon bus error, - * passing parameters describing the errors and the owner. - * - * Return: IRQ status - */ -typedef irqreturn_t (fman_bus_error_cb)(struct fman *fman, u8 port_id, - u64 addr, u8 tnum, u16 liodn); - -struct fman { - struct device *dev; - void __iomem *base_addr; - struct fman_intr_src intr_mng[FMAN_EV_CNT]; - - struct fman_fpm_regs __iomem *fpm_regs; - struct fman_bmi_regs __iomem *bmi_regs; - struct fman_qmi_regs __iomem *qmi_regs; - struct fman_dma_regs __iomem *dma_regs; - struct fman_hwp_regs __iomem *hwp_regs; - fman_exceptions_cb *exception_cb; - fman_bus_error_cb *bus_error_cb; - /* Spinlock for FMan use */ - spinlock_t spinlock; - struct fman_state_struct *state; - - struct fman_cfg *cfg; - struct muram_info *muram; - /* cam section in muram */ - unsigned long cam_offset; - size_t cam_size; - /* Fifo in MURAM */ - unsigned long fifo_offset; - size_t fifo_size; - - u32 liodn_base[64]; - u32 liodn_offset[64]; - - struct fman_dts_params dts_params; -}; - static irqreturn_t fman_exceptions(struct fman *fman, enum fman_exceptions exception) { diff --git a/drivers/net/ethernet/freescale/fman/fman.h b/drivers/net/ethernet/freescale/fman/fman.h index f53e147..6745065 100644 --- a/drivers/net/ethernet/freescale/fman/fman.h +++ b/drivers/net/ethernet/freescale/fman/fman.h @@ -274,6 +274,79 @@ struct fman_intr_src { void *src_handle; }; +/** fman_exceptions_cb + * fman - Pointer to FMan + * exception - The exception. + * + * Exceptions user callback routine, will be called upon an exception + * passing the exception identification. + * + * Return: irq status + */ +typedef irqreturn_t (fman_exceptions_cb)(struct fman *fman, + enum fman_exceptions exception); +/** fman_bus_error_cb + * fman - Pointer to FMan + * port_id - Port id + * addr - Address that caused the error + * tnum - Owner of error + * liodn - Logical IO device number + * + * Bus error user callback routine, will be called upon bus error, + * passing parameters describing the errors and the owner. + * + * Return: IRQ status + */ +typedef irqreturn_t (fman_bus_error_cb)(struct fman *fman, u8 port_id, + u64 addr, u8 tnum, u16 liodn); + +/* Structure that holds information received from device tree */ +struct fman_dts_params { + void __iomem *base_addr; /* FMan virtual address */ + struct resource *res; /* FMan memory resource */ + u8 id; /* FMan ID */ + + int err_irq; /* FMan Error IRQ */ + + u16 clk_freq; /* FMan clock freq (In Mhz) */ + + u32 qman_channel_base; /* QMan channels base */ + u32 num_of_qman_channels; /* Number of QMan channels */ + + struct resource muram_res; /* MURAM resource */ +}; + +struct fman { + struct device *dev; + void __iomem *base_addr; + struct fman_intr_src intr_mng[FMAN_EV_CNT]; + + struct fman_fpm_regs __iomem *fpm_regs; + struct fman_bmi_regs __iomem *bmi_regs; + struct fman_qmi_regs __iomem *qmi_regs; + struct fman_dma_regs __iomem *dma_regs; + struct fman_hwp_regs __iomem *hwp_regs; + fman_exceptions_cb *exception_cb; + fman_bus_error_cb *bus_error_cb; + /* Spinlock for FMan use */ + spinlock_t spinlock; + struct fman_state_struct *state; + + struct fman_cfg *cfg; + struct muram_info *muram; + /* cam section in muram */ + unsigned long cam_offset; + size_t cam_size; + /* Fifo in MURAM */ + unsigned long fifo_offset; + size_t fifo_size; + + u32 liodn_base[64]; + u32 liodn_offset[64]; + + struct fman_dts_params dts_params; +}; + /* Structure for port-FM communication during fman_port_init. */ struct fman_port_init_params { u8 port_id; /* port Id */