From patchwork Tue Sep 19 01:30:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mody, Rasesh" X-Patchwork-Id: 28904 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 652721B262; Tue, 19 Sep 2017 03:31:48 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0055.outbound.protection.outlook.com [104.47.37.55]) by dpdk.org (Postfix) with ESMTP id 58D9F1AEF4; Tue, 19 Sep 2017 03:31:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=t1r3PSCMbXuWGlB0kwmhDTMJ4V1GClNsVwZAWEd69BQ=; b=KO3hTTTOT8RZFTdSOpKrvrMCb9OkiAAbEMqg01TF4Spv7z+6eakGy8wV3xr5TpzWRrWUMklwulpYxmJkBFm/RQvvOutbaExl8lqjZnFDUGDd0S0BTLRINR5Vczxa7eRT4JzdMsJd9S4Kc+4aAeRI0jeZ3CxjW8ur4y0uhuoGNd4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; Received: from cavium.com (198.186.0.2) by SN4PR0701MB3838.namprd07.prod.outlook.com (2603:10b6:803:4f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Tue, 19 Sep 2017 01:31:25 +0000 From: Rasesh Mody To: dev@dpdk.org, ferruh.yigit@intel.com Cc: Rasesh Mody , Dept-EngDPDKDev@cavium.com, stable@dpdk.org Date: Mon, 18 Sep 2017 18:30:09 -0700 Message-Id: <1505784633-1171-30-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1505784633-1171-1-git-send-email-rasesh.mody@cavium.com> References: <1505784633-1171-1-git-send-email-rasesh.mody@cavium.com> MIME-Version: 1.0 X-Originating-IP: [198.186.0.2] X-ClientProxiedBy: SN4PR0501CA0015.namprd05.prod.outlook.com (2603:10b6:803:40::28) To SN4PR0701MB3838.namprd07.prod.outlook.com (2603:10b6:803:4f::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33deefc0-da3d-4c20-41f5-08d4fefe24e8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN4PR0701MB3838; X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 3:IZgJOxGau61yxfBE+nUBhjqjFGTemo9iLk3YypLCwm3mBrVnUjqiMQFRzILZbxQ/1w32tk7mxe4wj/mbomtd3OnoWJeJK1YxDJsyuIsr4Kmq5SgOHFQDLTeFEqIogTFD7sEZ3J1nNhVMmdXZT/C8VpEbImaceRI/1VSWtmO6HiaipI8fmziunLkkabYxPFe0nu9A7IPD2Ih+KSoL968WpeMXKiPHclxz3SZrmcMlc9DSaJjLzRJZC90kodfpFmag; 25:jrrp/iOGVhKnZkasVw7jZQh/stCJARWJma/b1TS8XqfHnSYnvnTjkakzsvWbxJdROmwyycSc/uo3s7+eYQcMObVVYiiySHP70/m3UqEAjodDJn0Ar5FRYi0uoYUTZ4905yip3DyFMhi6Q/csMPT2H78H2Zgqxp+VRyjLMa7w0PAJSewGUPsc/xWeXL/HEw2lSn9Dvm0NndRElJ76KnYY+lFQVWuZtdWcs397JHVqOziuL3YKmNBR+YtsuBaUAGFDNOHANlT5IcPqBcqyo2DyU1KhcZaEXygL0HDhyq8/IIg9M/GD4/0OYrtmdQ/aLyV4CVmmjSQFarLIF4B+Qq3j1A==; 31:rbWHXxcw9/fMVtWyhqbxEBXUIBXRP2jc84CWxgagFElwTxIoRmU5c3RkI26io7chU/tiMTkE6+OGnH0xuaRjSaYEf+oqKsSS+RTeqQkSkeK3qigHVcThplMFZ5bS7r+TZgJvOyV0u64jgYq6AV8mvnuqfug1HoOOpC2r1lbbwMxqhW9/M7P0dBUIYxNxfDkOQn7o5Iaec3VwYagN1fEBcHrBXRJs6Ki4ZtuG9lmRjT8= X-MS-TrafficTypeDiagnostic: SN4PR0701MB3838: X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 20:eDqnM3J1oRgls6zFAzs7kt2HkFqWTsrOG5LqSmm5pvY7vs4DSSk8bPo39ZI5bR0RfkvTqylTEzCublJ3HEEe/5oCMCh/iJHWAOGq3hRJNCj4l3VioM01JJU+MTM0LJgNzf7yPpZOXfzWb8YFebuKgr/W9VO3NGGMFxALC9uusKy7R4jUdbzcMjVn6BrJhBwK8RNr7t020Rl9UWH90qTvbDh/qWKfFYVqjFXFdgavNcY0vE9pnKa+kM+YV/pH8gVjR9Z/dDH317oufzw8QaNreQtGUjYAxRObJmU3vRIW/OxplCNi6Z2ueJ2wWqUnUgOu2UHywNDVsaZl7yLKGlPFe47tmUXE3ZKLjwYJXAuHsOdf5H96FheGVKSRRJo/SXt8AbHDmF0RrAF79es4TX+JM4MzeFZvYpPcir+7kDlzbey1gJqf5XXN5wr8Dr8m75AEDcgLmuM+GbJd7zJrfaVQb2SD8fNVXtUZYlm9dZg0TyMCM5z8m6Sa3oFW0Bmq6m1V; 4:YzHv3Lewthmv1twaS0tbPMCrL0sJOZIfNE+XYzVKRMvHxfw2L5zdg8gMkxz2qmg3ZKgftFTi+kpgzjIm8Jl6ozk4nm1jvACMXl/chZab5w0ZK4q0/UoAO9sC/d1LYvM5VYY2BkST4kYkkywv2K9EQ+G9VtNZhKc1Go9rM9mJer+SqkR1bLiUuXneg0YgEAqsrbfI4n3Ixs9VHyf6vvAWbndB3Z3qZGofq/zadnsbCUlnh1onn8ebLE+kK0ZXYyYm X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6041248)(20161123555025)(20161123562025)(20161123558100)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN4PR0701MB3838; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN4PR0701MB3838; X-Forefront-PRVS: 04359FAD81 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(199003)(189002)(48376002)(33646002)(68736007)(316002)(21086003)(16526017)(16586007)(72206003)(36756003)(575784001)(478600001)(97736004)(86362001)(66066001)(25786009)(69596002)(47776003)(50986999)(81166006)(8936002)(50226002)(8676002)(5660300001)(7736002)(53936002)(305945005)(81156014)(55016002)(50466002)(76176999)(6116002)(3846002)(2950100002)(101416001)(4326008)(4720700003)(2906002)(6666003)(189998001)(106356001)(5003940100001)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN4PR0701MB3838; H:cavium.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN4PR0701MB3838; 23:PEuKX1M6rOw/WFYawxY/83IaVIePgoQ2uodwfk9?= NOF14ipNZzb+TEPOe6HmzQFk9XbmufopahTDMs66/ZwIPsVno3A8KsCpjgIBaFOUBfNTlXkh23T5MORQz0DYcw28+dVMTDxBbxtldBH3fdgXQFmFXmEu3PCOa4raajRlRWl+XZC5NXdZCMWg3zm6MZrBDIQGxS7R2pal8F9wn9lVu9aXIwlBORRNt1GuHILcfxSMjthG0vNjYvzBGcagYlZOR/7bbeKoi6dh5yCRF1mi4CbxffXV9K7NQGEz+CPugRX62t/ppG5Zv5tP4j18VDg7cumN9CbSwxqakU4U/5yEd0es+b7tIaAuPgEBfU3JPgOt3FnPyJTJUyOvLkTywR8bLWTZzMwIr9k7wm1kEY5Rri9MCai/ZTNkLWEILYjoH5yyT9DSj4KDC/GG/wbw1B+a9jg8SFLZ/o/4yh3JUEhBVAz4G7tL0zQkEJR87ROIaeie2laXEdZPtSvXQf2J/jmhCyG7ignxZ6xcjYgTakiSgheYNJZcok3LEw6gKMoF7KrHTr5YHYxzCo3QR+544Dl9iSRH3EYrrZb4goksSAGHvEAC/lupjEwfPbReLZdXl16j1iP2gmEBeYMRBKwMnIe0MregQYILSukg7DP6k7Zt4ag+5QlLywdustTI8JFQ2OTUDB3hNz7um+vGZunnW9oeEUqMjlwIv4y36WsndwDWN6p54ahAqV+LvrMGE4M3ae9gCkquNWA4FOkG7/g8Vx7pZWtnVKWN/6I8W0C5Df/B+sJhEZr/wskBA45gZ0T4i22mADzy0QxnWYQ7RjRWhuDCrW83Xi7B8869ToOpZoa5kezRzWRJHKxPdyIz/jb4ieHKniZnGdtnMuX+w/rvMmjuJ6wdUMFCM8zQTHezqSPdBNH0C3hSHugIhjnHxbks6IFg/6GuDk/9lpQYrX9xVjnPqK5JHga6nMjIOfKgfTvrs0RNbhJirkx2eH48xxYrImFX6nxO9Vbu6ByC2FjT5BZ8BZ7ehult7ic06AJbean34jytJkr0p70Xs4/TOyKXqAlF0uDkv3qM9mf91NYP9hswXTVh4jjS8hP0PNqnVUdD427S6P+8vao5r9TPzjbrXI90= X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 6:HiEhtLnCrbbiLOTt94itbjh5JVXOhXkUswwJg5UarpzfLJtIl9CaWI5V82Fn73EjdeEbl66SinT5iWH+L6mUxR5EKcBWM+ICnK3a/wrc0VUXMP+quR2d+31yY/PbaSZV3aywJS8hHZZBjNaRaFvvcfktfmHAbPpsItMuGtPrGC5So6zlUUN44mU2obuA8vgC7tammW7taVARd3Ayb0N7/29xJlvrylSwn0rQycATqREx+DvemlVMM1El5Gqs/CxMPI2H3s6yxUeh88AifMimmUCVmnAYN72t0cmE2SfXlXwJ2SR3m9Hpe9V49hy7sRnoFeeHLHAAhKZARtObJ5Vh1A==; 5:SWg7AuiuvTddQTKWuRnWedw6wKKmMl280wUv+cSoV0HDvguQzGiBs96hQGIQ5x9YCCftT7VYiLuQD9iGrb5gBbDfgRDfcJMuygQmCnr4aZFzwcdEjLEzwBOdi3L9sVRCaVNr/V1Zs41SCBucok+7DA==; 24:h6UPhoanEvutyqGxxrh8sTH5dV6rLmAOteWsF9BjzdmoezDZbvOVDVtUubdTSkXUBibmYrwOoS0fnpgLYZ1aMfBAlHGKxQfT0lxcrjztJQM=; 7:bxID+uNvORLPBSTAcCisblA7lbc75X/3CnZV3JgrJR3z+kJt/FRWlMWaNN17sRwbyTW/AIk3rAnXgryZSgRYh+0WmsjznEZxt4QsjP5WYNgPQMd9Ewb127kkC8baosbbJrcl2EksU8xcoR/5iuKzBx2Eu5xB9fEshPp4P0ZKhfltJvdesUbbkRZPKWDzibJYt1IW+8FzzEkipvsbPO+Zgn6ccjJEa19qSs5Z2tbK3Ko= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2017 01:31:25.6994 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR0701MB3838 Subject: [dpdk-dev] [PATCH 29/53] net/qede/base: fix macros to check chip revision/metal X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fix the ECORE_IS_[AB]0() macros to check both the chip revision and the chip metal. Realign defines in the struct ecore_dev. Fixes: ec94dbc57362 ("qede: add base driver") Cc: stable@dpdk.org Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore.h | 78 ++++++++++++++++++------------------- drivers/net/qede/base/ecore_dev.c | 25 ++++++------ drivers/net/qede/base/ecore_vf.c | 2 +- 3 files changed, 51 insertions(+), 54 deletions(-) diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h index 73024da..95cc01d 100644 --- a/drivers/net/qede/base/ecore.h +++ b/drivers/net/qede/base/ecore.h @@ -680,45 +680,45 @@ struct ecore_dev { #define ECORE_DEV_ID_MASK_AH 0x8000 u16 chip_num; - #define CHIP_NUM_MASK 0xffff - #define CHIP_NUM_SHIFT 16 +#define CHIP_NUM_MASK 0xffff +#define CHIP_NUM_SHIFT 0 - u16 chip_rev; - #define CHIP_REV_MASK 0xf - #define CHIP_REV_SHIFT 12 + u8 chip_rev; +#define CHIP_REV_MASK 0xf +#define CHIP_REV_SHIFT 0 #ifndef ASIC_ONLY - #define CHIP_REV_IS_TEDIBEAR(_p_dev) ((_p_dev)->chip_rev == 0x5) - #define CHIP_REV_IS_EMUL_A0(_p_dev) ((_p_dev)->chip_rev == 0xe) - #define CHIP_REV_IS_EMUL_B0(_p_dev) ((_p_dev)->chip_rev == 0xc) - #define CHIP_REV_IS_EMUL(_p_dev) (CHIP_REV_IS_EMUL_A0(_p_dev) || \ - CHIP_REV_IS_EMUL_B0(_p_dev)) - #define CHIP_REV_IS_FPGA_A0(_p_dev) ((_p_dev)->chip_rev == 0xf) - #define CHIP_REV_IS_FPGA_B0(_p_dev) ((_p_dev)->chip_rev == 0xd) - #define CHIP_REV_IS_FPGA(_p_dev) (CHIP_REV_IS_FPGA_A0(_p_dev) || \ - CHIP_REV_IS_FPGA_B0(_p_dev)) - #define CHIP_REV_IS_SLOW(_p_dev) \ - (CHIP_REV_IS_EMUL(_p_dev) || CHIP_REV_IS_FPGA(_p_dev)) - #define CHIP_REV_IS_A0(_p_dev) \ - (CHIP_REV_IS_EMUL_A0(_p_dev) || \ - CHIP_REV_IS_FPGA_A0(_p_dev) || \ - !(_p_dev)->chip_rev) - #define CHIP_REV_IS_B0(_p_dev) \ - (CHIP_REV_IS_EMUL_B0(_p_dev) || \ - CHIP_REV_IS_FPGA_B0(_p_dev) || \ - (_p_dev)->chip_rev == 1) - #define CHIP_REV_IS_ASIC(_p_dev) !CHIP_REV_IS_SLOW(_p_dev) +#define CHIP_REV_IS_TEDIBEAR(_p_dev) ((_p_dev)->chip_rev == 0x5) +#define CHIP_REV_IS_EMUL_A0(_p_dev) ((_p_dev)->chip_rev == 0xe) +#define CHIP_REV_IS_EMUL_B0(_p_dev) ((_p_dev)->chip_rev == 0xc) +#define CHIP_REV_IS_EMUL(_p_dev) \ + (CHIP_REV_IS_EMUL_A0(_p_dev) || CHIP_REV_IS_EMUL_B0(_p_dev)) +#define CHIP_REV_IS_FPGA_A0(_p_dev) ((_p_dev)->chip_rev == 0xf) +#define CHIP_REV_IS_FPGA_B0(_p_dev) ((_p_dev)->chip_rev == 0xd) +#define CHIP_REV_IS_FPGA(_p_dev) \ + (CHIP_REV_IS_FPGA_A0(_p_dev) || CHIP_REV_IS_FPGA_B0(_p_dev)) +#define CHIP_REV_IS_SLOW(_p_dev) \ + (CHIP_REV_IS_EMUL(_p_dev) || CHIP_REV_IS_FPGA(_p_dev)) +#define CHIP_REV_IS_A0(_p_dev) \ + (CHIP_REV_IS_EMUL_A0(_p_dev) || CHIP_REV_IS_FPGA_A0(_p_dev) || \ + (!(_p_dev)->chip_rev && !(_p_dev)->chip_metal)) +#define CHIP_REV_IS_B0(_p_dev) \ + (CHIP_REV_IS_EMUL_B0(_p_dev) || CHIP_REV_IS_FPGA_B0(_p_dev) || \ + ((_p_dev)->chip_rev == 1 && !(_p_dev)->chip_metal)) +#define CHIP_REV_IS_ASIC(_p_dev) !CHIP_REV_IS_SLOW(_p_dev) #else - #define CHIP_REV_IS_A0(_p_dev) (!(_p_dev)->chip_rev) - #define CHIP_REV_IS_B0(_p_dev) ((_p_dev)->chip_rev == 1) +#define CHIP_REV_IS_A0(_p_dev) \ + (!(_p_dev)->chip_rev && !(_p_dev)->chip_metal) +#define CHIP_REV_IS_B0(_p_dev) \ + ((_p_dev)->chip_rev == 1 && !(_p_dev)->chip_metal) #endif - u16 chip_metal; - #define CHIP_METAL_MASK 0xff - #define CHIP_METAL_SHIFT 4 + u8 chip_metal; +#define CHIP_METAL_MASK 0xff +#define CHIP_METAL_SHIFT 0 - u16 chip_bond_id; - #define CHIP_BOND_ID_MASK 0xf - #define CHIP_BOND_ID_SHIFT 0 + u8 chip_bond_id; +#define CHIP_BOND_ID_MASK 0xff +#define CHIP_BOND_ID_SHIFT 0 u8 num_engines; u8 num_ports_in_engines; @@ -726,12 +726,12 @@ struct ecore_dev { u8 path_id; enum ecore_mf_mode mf_mode; - #define IS_MF_DEFAULT(_p_hwfn) \ - (((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_DEFAULT) - #define IS_MF_SI(_p_hwfn) \ - (((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_NPAR) - #define IS_MF_SD(_p_hwfn) \ - (((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_OVLAN) +#define IS_MF_DEFAULT(_p_hwfn) \ + (((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_DEFAULT) +#define IS_MF_SI(_p_hwfn) \ + (((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_NPAR) +#define IS_MF_SD(_p_hwfn) \ + (((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_OVLAN) int pcie_width; int pcie_speed; diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c index c185323..e2698ea 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -3857,12 +3857,10 @@ static enum _ecore_status_t ecore_get_dev_info(struct ecore_hwfn *p_hwfn, return ECORE_ABORTED; } - p_dev->chip_num = (u16)ecore_rd(p_hwfn, p_ptt, - MISCS_REG_CHIP_NUM); - p_dev->chip_rev = (u16)ecore_rd(p_hwfn, p_ptt, - MISCS_REG_CHIP_REV); - - MASK_FIELD(CHIP_REV, p_dev->chip_rev); + tmp = ecore_rd(p_hwfn, p_ptt, MISCS_REG_CHIP_NUM); + p_dev->chip_num = (u16)GET_FIELD(tmp, CHIP_NUM); + tmp = ecore_rd(p_hwfn, p_ptt, MISCS_REG_CHIP_REV); + p_dev->chip_rev = (u8)GET_FIELD(tmp, CHIP_REV); /* Learn number of HW-functions */ tmp = ecore_rd(p_hwfn, p_ptt, MISCS_REG_CMT_ENABLED_FOR_PAIR); @@ -3885,20 +3883,19 @@ static enum _ecore_status_t ecore_get_dev_info(struct ecore_hwfn *p_hwfn, } #endif - p_dev->chip_bond_id = ecore_rd(p_hwfn, p_ptt, - MISCS_REG_CHIP_TEST_REG) >> 4; - MASK_FIELD(CHIP_BOND_ID, p_dev->chip_bond_id); - p_dev->chip_metal = (u16)ecore_rd(p_hwfn, p_ptt, - MISCS_REG_CHIP_METAL); - MASK_FIELD(CHIP_METAL, p_dev->chip_metal); + tmp = ecore_rd(p_hwfn, p_ptt, MISCS_REG_CHIP_TEST_REG); + p_dev->chip_bond_id = (u8)GET_FIELD(tmp, CHIP_BOND_ID); + tmp = ecore_rd(p_hwfn, p_ptt, MISCS_REG_CHIP_METAL); + p_dev->chip_metal = (u8)GET_FIELD(tmp, CHIP_METAL); + DP_INFO(p_dev->hwfns, - "Chip details - %s %c%d, Num: %04x Rev: %04x Bond id: %04x Metal: %04x\n", + "Chip details - %s %c%d, Num: %04x Rev: %02x Bond id: %02x Metal: %02x\n", ECORE_IS_BB(p_dev) ? "BB" : "AH", 'A' + p_dev->chip_rev, (int)p_dev->chip_metal, p_dev->chip_num, p_dev->chip_rev, p_dev->chip_bond_id, p_dev->chip_metal); - if (ECORE_IS_BB(p_dev) && CHIP_REV_IS_A0(p_dev)) { + if (ECORE_IS_BB_A0(p_dev)) { DP_NOTICE(p_dev->hwfns, false, "The chip type/rev (BB A0) is not supported!\n"); return ECORE_ABORTED; diff --git a/drivers/net/qede/base/ecore_vf.c b/drivers/net/qede/base/ecore_vf.c index c37341e..fb5d0a7 100644 --- a/drivers/net/qede/base/ecore_vf.c +++ b/drivers/net/qede/base/ecore_vf.c @@ -350,7 +350,7 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn) /* get HW info */ p_hwfn->p_dev->type = resp->pfdev_info.dev_type; - p_hwfn->p_dev->chip_rev = resp->pfdev_info.chip_rev; + p_hwfn->p_dev->chip_rev = (u8)resp->pfdev_info.chip_rev; DP_INFO(p_hwfn, "Chip details - %s%d\n", ECORE_IS_BB(p_hwfn->p_dev) ? "BB" : "AH",