From patchwork Tue Sep 19 01:29:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mody, Rasesh" X-Patchwork-Id: 28880 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 682771B19C; Tue, 19 Sep 2017 03:31:21 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0061.outbound.protection.outlook.com [104.47.37.61]) by dpdk.org (Postfix) with ESMTP id 3F625199B3 for ; Tue, 19 Sep 2017 03:31:13 +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=JVaoycdwpVVDm39jJ++isdQkwvjmjlQQZkoHtOky/Io=; b=otbrNKP1oNZ5rdB5nMURY3utrif6BmuP+DCDol6EmfmXhvWG9Pf5J6zwHbTqdM7G+MjNoRHvhzx/mDB7tC5sqmIrum4QynwPGCpGACGovGL8vuq+SG0jSRGMSB/QaZ3eK3Vx9XSAr4/Vab+ZGUAycGjpXbQUseCQ3spbHqaTx1k= 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:11 +0000 From: Rasesh Mody To: dev@dpdk.org, ferruh.yigit@intel.com Cc: Rasesh Mody , Dept-EngDPDKDev@cavium.com Date: Mon, 18 Sep 2017 18:29:45 -0700 Message-Id: <1505784633-1171-6-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: abeef1f2-7c3a-4dc4-2b2b-08d4fefe1c3a 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:Z0cFU/mM9JE6E2vMjwZ7TwFAaejtjpUrq2IIkbK3nAmoOVIxW+sDcNqOi1In2gGMnTRCQpTqKssOqIDRt9ju4ftZ/vw44eLYUFnDR1j9BxWFGOFKJyXWn3Pgkut4gt64GYy4oopHUJQCCFh9zaAGfwa3KZGqQy3HkQr15Sr9yR99IM0cDH/KvEXR9OfPXEr05RhQ71d1W8Ku6zeCNmZNQi7d3xt3QvpFbxghsBtiNwdZQRfki2pZwfUYjJ7mqGZ2; 25:Xa8UYFNr4OwJxDDaz9cqjCA9U1RRIaDNirsETKkHHoRX3D5MW32BeKY+M64Wl928EXtm61L2uLsgngwweYiX492H3pca1+Glb1qLQkpO1pyRbbME1LS3WnPA26pEai1WZOT6cT+f5TxgKsXOsS/Sf00Zm4npITd0PvLw8ogRpHkiJ5WNOWNvrp79QSAgRrXyaQvTVJy3T9UAw2d27Aiua/zPZVwdvl/UPK0YUoTsPMjxqEY3G7raaQTKdHeVTKQ5pdjE29aNTQ4TJhz3rmxwJb/yDj2ikK9kURncndJTfUiCFpgLRTom0gAX/U4R0XAjG9AUCZswtcViKJHSAP475w==; 31:QxNGTG8PYLFTfhp/McvOWaFQYVEro3ffNay+ReKTp04p4QjRFcvCvTIV0CHeCKwWXdf6cOF3dT7IsyxMZ3AzhV68l8+esTypwCMuAuu5kLC5YoPGFbkZhHrmtcQipztYsjvJQhtGovW/jnfi1bCxq3BYlBLGQotNunOlVNHSbZhrEgrus+6E9XFW7JjICJWJTAorEi6xOJElWeTU2fXYnSPzwGzGrk3YGzUFqsXsH4U= X-MS-TrafficTypeDiagnostic: SN4PR0701MB3838: X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 20:cNjgLWBocB4mmeec+6hpOrxEEX+H89efz1fw8BFT7NgJVRixttACCBtBsj7FVKoGr1u38HcxiJdYUogYRh3ogYm5QhsneVLXf+T5TkFNh1JnlTdzxK3RESb1wHoSTf4g0xx4gee050C9jJDd9oA6HyutTss8p2bWMnDankg6g9/34fBuP92Kac0F9oDeqLu9dhzCjelP8votYgSXnv0f8/Ctt2mmdCvfOLHKsrnbTSXOXAaqsKUfnxE7aTQFvPMTmentJLCr228M3NtBwPgaXyF8PCyO5cy5RNfQt9XNvSCEY0+VD7tBQtot55HHQlOVblFCBxuGHZ/MC1iX8lgX4CXJKiFxNYjgNxEa4etHFjTbWIbN7VBZciRHg9xTo/s1RW9vg4KsDrcfpf6lerfiRPQOF92tMds9LKziV8VJPequ0f0OqfKQJEUVbagUOn9g0DOX0yeziOy/HOC0pw0E7MJf6F45joh1EL8XOm/1LLKRJ0qXVDNxIWnSyYzJkDPz; 4:kuZiP+5n9hrrg0sCONycQMc/Nk5p2kZ+h/qrmpwmG4SiUhG9gZIVeKeouILdYbb9TCYC1MrJCf8c8FGOjohtdMcFFh/8Y91mRqNnm+SypD/Xjnxb198yIg8sJGXnBBZiATTkt4wmTnJ9CxKTR7+LxFHu8IGVlqQ4ecgECJxO3IEfM9hYXeCTNI+gI44RO9QnPRIts8cn6vXluR8I5kZ0nGpavWFmEEF/h7jOYf5mf6BipkgbdLqWY/y5Lz3PNhPf 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)(107886003)(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:2ZQzsGLUQOAFZKvGLwkBCyvoJaegxnCUG/GjaLz?= rauwP4b+CMOAWmsFnzLryZ78+clKSWRS8vgeoAVYYSBehMJ1XD3q35IKRBF0en9jxrhP0KY80G4L3eRe7aDnS0sV6hHzUXzm56HjvMuSmXKdPRdcw33/cMEuavxWAIdeWyPaV0QKw4sRInJdLrTgNQ91Itff9qzzKoJ5Re8X8jt1qfoCd0FQzU3bR+cwReTqYgPeWR+S4QYH4scTyH/mbVpsWF0oQX6YgQsSwaJYnszkgAZdeCU/AnpXPwH7S/0Y38dsmT9bR9KORIGWW2mQ0f/usiHINNKu6x51lm3sk1xAKKFaG1ZNQvtlM3Tll8wDpmqam83pOaKHem5b2AyJwOe3UTO2P5OIVXZAc9+vhJyfArW6yZn63lXVHHjCFDCFvVpW3Y93O5cM4pM68Rh93DJv28H7PYUsmF698jub2O/u9IUxDgymzF+CQp5zqFhJ04Wzv8gOzVCXORvDgvVPENgCkySizvr2Oxy44Y2x8hH/T1tlI5WQiWypjmSjRdDM3WJlmwVCwT3dccJUbAsrS//AcPcHMYWtoVSdP0lRhIzpBSLw7z8QEzUElBLKEDoSuMdDTipB6mTd5bZMQjef8HZF8ksHO+qOzW70meGdU7SzttQW9/DfuhtJ3emxTSY1U3tMSyKry+uxSceZRBa0kR60UhT5yOF4YuDha6FRQbfzXZXVpwcbqyggf+fBc2XTHg/wqDfjZ8AWuXLWhhmE8y9PaZe6XDcBNF20EgzQDhOMJp0sVccXm1ZXChlxo1VI+s5VBhQZDGYQqeg1Ff0mfVq0j9BAguPvOBj6xSaux9dnJa9R9UBKHXwtRtkOwzNpn3N3Ju67aRjOBUYGhzCPu2+8wRUah/dk6/myfjjv/HvFEj5pq7GkujCzfzZkIGoWrjQAZgBs4p6H112q+8MbQHQwxxZGKMACxakNDu7wrzN3QMjL0K4njTve1hCySFsF6dkmCoSZioD0kDu6effQMLa4qhYLLCJuv4GRwAOeXIh+Tu/KEH9xBlglRwK58d4mrXPXnZ8SB9wwRbdSTVoxh9uIYJYyDEdX+457prO37ZdgEytqnZo2m7knEo/Mb4lX53on+CvbpVUjN5NZ9djTOBAT/ X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 6:bQjmjnE/pmsIybqnNCTymb8pklQfQoLYKf5WuZy4PAqXFFST8Irf/NOrKYquUfF6WeBsYODP7dvGwoSY+7amv5CDKda0mk2Pn1bHl3EZGf3IPnEhbqTMj/CfToTpKmTzNihC62gmT6K+Os4hsYCi4g0BNoQHVvRIxbWj/sWJgCVGUdathBWlFBxTFPBKIRI43KzRAWN7W8RyHp6biHqS5jfkUh1DA81ESCoKKHSBZ2FRZwzpZ3uiy87myDrt9HoiRKdoC5sqcXQIqS41ZrKM+0jE3854l3bzJRndQ2dXFaidnaSXVrVPKgQyZda1gwLBbbD1tMG0kt7tvN7piNiM7Q==; 5:0c611zpIbV9T2u14aJ8H3DrRPApjanOedFdlzOM8twrUuHxxQ1+wsIlT7Z3P37jJlVDdTuV12L74erd4/L/5bt6ljA8szf0QREJt4iRWsAe4h8LMpvcvAHoeoHZ2RdxVPi3NvKjVKoes6P5sxePKuA==; 24:JeWM+CSf8JZfFxBCMBZJtVOgrDPlEf22+pihO+MWnTIjDM061WhfLXeDIn9mmM71s856w47lgnLRiempus+kRaxnEmjjwOhsVoM8ECKm1Mc=; 7:jp0JZfL4z2k2vbIxT0Bhiq1kayM3nXfv3VczS8duu1mx+9LqHjHtdlxx6P8GiVPNAGyFJuuw+FmwD+bQgsxTfnp62/wASqpw3UZfhFNJD01jmiuj96tVCANbtK+KJ0I092NntcI1Dqzms71siz6F1Maugox1EdCAwPDhl5P6/LDPa3wb11z3rfnvHiudo+VqfTVbc6cFeobE4qoPHtEZ1b86PREOURa7Sdia+rpLHXQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2017 01:31:11.1992 (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 05/53] net/qede/base: convert device type to enum 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" Add a new enum for device type and device type details to device info. Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore.h | 14 ++++++++------ drivers/net/qede/base/ecore_dev.c | 16 +++++++++++++--- drivers/net/qede/qede_if.h | 2 ++ drivers/net/qede/qede_main.c | 1 + 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h index 0d68a9b..10fb16a 100644 --- a/drivers/net/qede/base/ecore.h +++ b/drivers/net/qede/base/ecore.h @@ -632,15 +632,18 @@ enum qed_dbg_features { DBG_FEATURE_NUM }; +enum ecore_dev_type { + ECORE_DEV_TYPE_BB, + ECORE_DEV_TYPE_AH, +}; + struct ecore_dev { u32 dp_module; u8 dp_level; char name[NAME_SIZE]; void *dp_ctx; - u8 type; -#define ECORE_DEV_TYPE_BB (0 << 0) -#define ECORE_DEV_TYPE_AH (1 << 0) + enum ecore_dev_type type; /* Translate type/revision combo into the proper conditions */ #define ECORE_IS_BB(dev) ((dev)->type == ECORE_DEV_TYPE_BB) #define ECORE_IS_BB_A0(dev) (ECORE_IS_BB(dev) && CHIP_REV_IS_A0(dev)) @@ -653,13 +656,12 @@ struct ecore_dev { #define ECORE_IS_AH(dev) ((dev)->type == ECORE_DEV_TYPE_AH) #define ECORE_IS_K2(dev) ECORE_IS_AH(dev) + u16 vendor_id; + u16 device_id; #define ECORE_DEV_ID_MASK 0xff00 #define ECORE_DEV_ID_MASK_BB 0x1600 #define ECORE_DEV_ID_MASK_AH 0x8000 - u16 vendor_id; - u16 device_id; - u16 chip_num; #define CHIP_NUM_MASK 0xffff #define CHIP_NUM_SHIFT 16 diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c index 6e40088..4a31d67 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -3352,6 +3352,7 @@ static void ecore_hw_info_port_num(struct ecore_hwfn *p_hwfn, static enum _ecore_status_t ecore_get_dev_info(struct ecore_dev *p_dev) { struct ecore_hwfn *p_hwfn = ECORE_LEADING_HWFN(p_dev); + u16 device_id_mask; u32 tmp; /* Read Vendor Id / Device Id */ @@ -3361,10 +3362,19 @@ static enum _ecore_status_t ecore_get_dev_info(struct ecore_dev *p_dev) &p_dev->device_id); /* Determine type */ - if ((p_dev->device_id & ECORE_DEV_ID_MASK) == ECORE_DEV_ID_MASK_AH) - p_dev->type = ECORE_DEV_TYPE_AH; - else + device_id_mask = p_dev->device_id & ECORE_DEV_ID_MASK; + switch (device_id_mask) { + case ECORE_DEV_ID_MASK_BB: p_dev->type = ECORE_DEV_TYPE_BB; + break; + case ECORE_DEV_ID_MASK_AH: + p_dev->type = ECORE_DEV_TYPE_AH; + break; + default: + DP_NOTICE(p_hwfn, true, "Unknown device id 0x%x\n", + p_dev->device_id); + return ECORE_ABORTED; + } p_dev->chip_num = (u16)ecore_rd(p_hwfn, p_hwfn->p_main_ptt, MISCS_REG_CHIP_NUM); diff --git a/drivers/net/qede/qede_if.h b/drivers/net/qede/qede_if.h index 9864bb4..8e0c999 100644 --- a/drivers/net/qede/qede_if.h +++ b/drivers/net/qede/qede_if.h @@ -48,6 +48,8 @@ struct qed_dev_info { bool vxlan_enable; bool gre_enable; bool geneve_enable; + + enum ecore_dev_type dev_type; }; struct qed_dev_eth_info { diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c index a6ff7af..2447ffb 100644 --- a/drivers/net/qede/qede_main.c +++ b/drivers/net/qede/qede_main.c @@ -357,6 +357,7 @@ static int qed_slowpath_start(struct ecore_dev *edev, dev_info->num_hwfns = edev->num_hwfns; dev_info->is_mf_default = IS_MF_DEFAULT(&edev->hwfns[0]); dev_info->mtu = ECORE_LEADING_HWFN(edev)->hw_info.mtu; + dev_info->dev_type = edev->type; rte_memcpy(&dev_info->hw_mac, &edev->hwfns[0].hw_info.hw_mac_addr, ETHER_ADDR_LEN);