From patchwork Mon Mar 20 14:10:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 22004 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 [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 14E83377A; Mon, 20 Mar 2017 15:11:06 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0079.outbound.protection.outlook.com [104.47.42.79]) by dpdk.org (Postfix) with ESMTP id CE06C2C29 for ; Mon, 20 Mar 2017 15:11:02 +0100 (CET) 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=WuvFgSJLzolLcoMDgqJ/oJkLA2D6GRFFTdmYZ805uGY=; b=hCXAblKV33ThQ2VWw7pXGSFZIlocXSe0U7csgCP7FAtwvfFZMBj+9eZy2pYv8HB7TimKQjnBM2jGUqUkgYgUDPMaTfPHdoqC+BIoptJPrvddPl3QmEASFL4/E/+lwf5TXb660gBNauHW2YgUCLwphrO6EOIp54bobtPHU1TaTrM= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost.localdomain.localdomain (223.227.10.34) by BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.977.11; Mon, 20 Mar 2017 14:10:59 +0000 From: Jerin Jacob To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Jerin Jacob Date: Mon, 20 Mar 2017 19:40:40 +0530 Message-Id: <1490019040-6268-1-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 X-Originating-IP: [223.227.10.34] X-ClientProxiedBy: PN1PR01CA0102.INDPRD01.PROD.OUTLOOK.COM (10.174.144.18) To BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143) X-MS-Office365-Filtering-Correlation-Id: a9b26570-3190-4c06-da1e-08d46f9aefeb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY1PR0701MB1724; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 3:etY/fQxu8xMtZbAi2z55xPEcd0lLcL8qvUzNTuQJ+apSDtWY8HWVZnBQAumBRuDrcifnTKvg14KVWlrewlbYSJvARtxfMwlA6i9whSaX+1ip39okp/Y+TJfLCGIcE2oPgbR4Vdo/gb2SleR2i/yqJqygnmO9WYIurjP4aZacqGVb2Yz9aaHME4GsDqYDEhMBrmGZTVJCMVIQYJryICGb8F0czE5yVdf2sCFumVcSAbLjRmbt7DvwfCZ2ZMcf4L2E8ri4ORq3nBTjGpa31zi8Bg==; 25:Mp6GzMqLp3itM68XkgGSIUUZcKH0l/q47uQbfnl9+3qqsGFfWgiJIaFtcG07e6y+dMD+/pg4d6jaxFFLHVAF+9j/qfVo5lMsaRJeV5TiL9lHjnawT7AJ89QjYpZAF5BCxGEsS0LjIQqA1hRNntHhyFFx29i8VPsKdC1mHxwpWV4twDShczdmJsULOt1PU3rlFy3FsGfyN0IzzALuxmtklGHv+qvOUyQjVKbUH6+A7rkcXRa1d6hmOMxV72wAkCDpvKS5BDYy7mxqdFm4zgIajaddKBrGHKu0aUK2udRReJuGbq+eVEiZB0IPbVVDHD9n8tBLQZejPqzXiISazXFlaYNXg4f9M2AirC4KNatFkRc7xA9SgJbWqgH1pse4Vlo+REM+InsxHTtObACqsErV1Y1HBcjvT8Z3vRAltBDttV2MXf0RhPa6C+htg5eKrrCfFYBGs/fC84xQLWI+NOAkJA== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 31:gs66M1ZfU/W+xv3oodE2OYO5DeBtWRqhjFdOQ9s50r9ejbuq5zxyEfdQnPkvnJ7KotJ3X8oIMtXwEHZHzlXTF24J+0vK+p5AZe+X8hxgFbrqE1tkuuohjBjuW8rzEaJVxNHo71BtcngW5mJxCUV3QpE6pm8/rdya3SVbKz6stnI01a/yd8Gkvkz48HvCPIgFJXZSp2DsBS2ZVwQUADBdN0LAeyHW9ku4y3SaZxsUfMs=; 20:eNS54Rugafeskvpvbpkcmp4r5RFfSAy6cQjbpJsKEpJknWFhc/1TEoa/vmEJfB2miGeIwCvx8EKH7mlN9EAA/+22qBqlv3h3qBcS2IPLNVBTUGAx0OLfOdhstyWx/mxD5tJAaF0u3AEDh8nHG31kn3kMbzqz8gfUxN9amczRx8c1lOohZgfnO0wQq63OZ1u1X7C7cA6FXX7INheo7zlKALYynoRy5F0um3OkpYu3qp4GKcWSpoAHKKhh+qPt3HDHSthMArKkGM/SyuxTH5j2L/v3gEe0bp/wZBoSIUwWmLBVFbTouowz+1ln+UkM9GohVIJJJ4N3Q1aCajpOYFldKrIMGUKUKVjnypklfXVb5gXuE9HQ/uTjX0/Sw/lmjlFJ0bJMCVaNDtv0rxDXit/JR+d+h5cYETlcJLugq5aOafqEpnzJktWYkw8KawO+XkElyqpYVxcz6Zw6AAw7uPpP0gNZJfGC5FhgpLEsnKHjdaZZLENaqzL1JM6eO3xsGo9ghXttur95r1A9iRgtTLoNBJr6UgJkIjOwMeL82hhqwo2xGsZWjAAxohA18pdjZm32kd0nmbBcY9OkdqC/RVmekkK2KWDweFAGnAqHO/wQibo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123564025)(20161123562025)(20161123560025)(20161123558025)(20161123555025)(6072148); SRVR:BY1PR0701MB1724; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1724; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 4:5B9EbkJmIPVqrW30uflJ8zZj2kLMCm2Wjs4HXcUU4SLkV3rgcaYDlP14QPiBd49bc2wtZJEzC6wkPr9SpbigIFHZItNYEL2JcsMjcz6IdTeNFQ3tzqwFfuB9T2qoct0JaDonkgaI62Qx/lq3oavBmcaLrWzG5jqoGSrTmjBm48spUH5pouTm004mmXQrwR2mC0Om/P0ob/Z1rwpPVooio0OkpqLumJjylQovbdZP972DOmDOYIq8SXBPxr9IL0bLfR7vDjhPSBImd6CkpPwwfvYHOismrbRqdAjpm+A8uwZ9LVBeMXKTGXP4BDVVpqHBcOEQ2pSNNssZ5JIZbr+fTa9UcCJdJtICNRS8DFM7wH9vTMeu5atqnzM3uMu6SzO10CH2oe3NMLf+zl+n9Gsq27IKLpmw9HnzJpZfX7x1QfLnhTw6W5yUvV+2PoPtGMHZBJlOWN8vd9/HnLxfsu1tBuncMMVvyOd6B77LdMGqMjDWTY/NKwWdAjPkXmfk77xxwCVgMBeOkF+cAKj3+5YmH1OZQgv/ztf5+QVc6Dz3y39dT5B6l4sEgzrK5odEJ3uJ47fz4UXMynWK8CPfqEJvkwbfY4qnoZvym1lXEq6sqj0= X-Forefront-PRVS: 02524402D6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(39830400002)(39450400003)(4326008)(25786008)(6506006)(6512007)(2361001)(2906002)(7736002)(33646002)(53936002)(15650500001)(110136004)(6116002)(38730400002)(3846002)(107886003)(6486002)(50226002)(50986999)(8676002)(81166006)(36756003)(5003940100001)(42186005)(6666003)(5660300001)(2351001)(189998001)(42882006)(305945005)(6916009)(47776003)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1724; H:localhost.localdomain.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 23:GEzaZVyt6lyBENoIj7VSX1K2CKNmUTIF9p+BK6VKVBNT88NGmsOmhHK84zJGg8ZuMlJUHfFUl9ABaYDDQo6r2l8IUwRy/9t2v5TA0xXyCrz5n1vwOCxy6r6hx6MXJvuZzSlJZ2UVdDUsbCUGVwf0v8C9E+I3/Eb+3O4HZBQWHT0TdUIHhKdaCKHpVM7dNzrnpoPfo7g7b6J/Or/D8Z7RsxPa8CeljnGymAn7DVQaPlR7kcFMdNcvlkqElQAPYIsGlJ/gMjWNdJIxEwlLfPtL/a7wdaHlzsL717zpB18DvKrGVp+OnnMmL8Jd7uUkaqgo3OK2ST3yADAqh/3g0s08SOfX7f+IPwtYu15Mm3bKW7pWlPksQ/l8ui3eLxxzkwjvVwP+z3vhNr9DVPUGCawuY653XG98cTDcKDDn/OCUdtl+wadJsiy8Op0aYytzA0piiMIGIoO7+2UiJNkPTvJg3k8ziveLJI8JTnlbm75OL0vcJgo7P02jsLNNBJRpYsQyx4xN/F1O1OgJTH0mOI/yDcyFEUFW1asN1umBiuJyPO1RknHDkMXCE6VJ2ezart1ojRe95Y6n51XxqbJpx7KZ24NjyLXY8CvoKi+SpQURgXO+835cgRx+TUKIZtUEOjSiIkkBpMdpnvmXzTxSmMGRmCpUE/t/zFQVnuxoFxO5mmepGoxM8ienS7n2+zg0y7y3Xmo15WmUlUErTBAZEmE+CAHzJ3edBTAQZdiv82gSGpLy2zSewwcoBmnPtMg5OEScXagADkZwKjqkSqr+ioUTWppEeuKJ5bDneIjGSDuWwr79tylbRrZvFMq8od/rEnVdvxvdkZPgFQFE7KY9Yule6Td57OVSOYUhf8CvPKmTHzNunDMHWdw5g/jRcWE10UemgZBRzy2arzs/AfqWsjUi6EamSp6i+SGy7RN8qVQA+77qlqzjFpY+5JNSgK/wbpvQ X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 6:djVBgsDpIhJ2pv8iTN4pearwxgnGFvGNPQypGSSQv+wQK8uhhAz6VHXPYDwevHyjWVwM+9f9E/REzics7rYuB9kDVup/m83v+m9hzkGInmh4zkyuYc5E5hZG7IpSP9UCdXRNaq3FqKEV+aIkfBAV5UPSE52mD3gFT1dUtgPc4WmC3EkZh+/d0Qa5AC6ChYSj+55g6t/Xv91+iaHBJW6TZFOi0DEmQON5rQjf447isF4ChRMbrOpQDUcXn8uiQAvxjYEwifKPTq6BqpyJs/aAANxB9bglptYGgHEIhaaKbtW6exHgugWqTm/a98xvv7SH1GNzRaAijVV0nde1tt8FE/BUr4WykqX9r0EgfQsQfyyEm5sd2zGk20r+0G0cHXBLHgRobYcaBFNOi28mDzLJ1g==; 5:FFgcwSsbenCFj+TioKZCP2kbv9fRlZ04Mo/ebowI5A0V+fSjHQWMzuzOaYe9YqghaJ5oA/y8ChQXg/B+Wmzr5KboBJHyHIcBnteB2x8X0uZXTVq9g+3Wrw6FI5H2shEd+G2kl6mgT9sl2FbZye4Bqg==; 24:btIJL2eR/XNBsAC6tgDc6iS7JUd5/XRgyybOB3xvqffQzwWL20RKweKINA7un1DBl8u6xxFqojmA3yTC7UkH134wWVry2b7T+hLUCfnvaXM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 7:NbpjyAKNMzqtoGfSEKkAXZuTHjKZ1b7QXG14Ff/QHB2EQRpKR5GRzriil9PygIS1q9P3qH7FjTVDMVuV78R37a6KrbL/FWAYdAyrGHNUiGFh+W7Mfi550snG2NwpJmNI+glKG0Vk7hXb5zdugKf7vOtCwzq9kd7S3ZU6blDc3Jgc/U7LeK1pdMK5DOR/3c2lkMf2n4HBoh4sBCQ4PpOy6GJNcaMGPmah5xq6IYlgR9FKUh7uaU+66a8IqW1PB3pVTL++JNfbJAzx2uaIATxLCLVnYF2NwDqIfdNltsqFdH8Jbk5FtkCPqgNUc6zt/RE8NL/6uCy7Ji1ffkBrN5XjfQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2017 14:10:59.1159 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1724 Subject: [dpdk-dev] [PATCH] net/thunderx: sync mailbox definitions with Linux PF driver 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" - bgx_link_status mbox definition was changed in Linux commit 1cc702591bae ("net: thunderx: Add ethtool support") - NIC_MBOX_MSG_RES_BIT related changes were never part of Linux PF driver Signed-off-by: Jerin Jacob --- drivers/net/thunderx/base/nicvf_mbox.c | 7 ++----- drivers/net/thunderx/base/nicvf_mbox.h | 11 +++-------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/net/thunderx/base/nicvf_mbox.c b/drivers/net/thunderx/base/nicvf_mbox.c index 3b7b8a5..8b3477d 100644 --- a/drivers/net/thunderx/base/nicvf_mbox.c +++ b/drivers/net/thunderx/base/nicvf_mbox.c @@ -62,9 +62,6 @@ static const char *mbox_message[NIC_MBOX_MSG_MAX] = { [NIC_MBOX_MSG_RESET_STAT_COUNTER] = "NIC_MBOX_MSG_RESET_STAT_COUNTER", [NIC_MBOX_MSG_CFG_DONE] = "NIC_MBOX_MSG_CFG_DONE", [NIC_MBOX_MSG_SHUTDOWN] = "NIC_MBOX_MSG_SHUTDOWN", - [NIC_MBOX_MSG_RES_BIT] = "NIC_MBOX_MSG_RES_BIT", - [NIC_MBOX_MSG_RSS_SIZE_RES_BIT] = "NIC_MBOX_MSG_RSS_SIZE", - [NIC_MBOX_MSG_ALLOC_SQS_RES_BIT] = "NIC_MBOX_MSG_ALLOC_SQS", }; static inline const char * __attribute__((unused)) @@ -176,7 +173,7 @@ nicvf_handle_mbx_intr(struct nicvf *nic) case NIC_MBOX_MSG_NACK: nic->pf_nacked = true; break; - case NIC_MBOX_MSG_RSS_SIZE_RES_BIT: + case NIC_MBOX_MSG_RSS_SIZE: nic->rss_info.rss_size = mbx.rss_size.ind_tbl_size; nic->pf_acked = true; break; @@ -186,7 +183,7 @@ nicvf_handle_mbx_intr(struct nicvf *nic) nic->speed = mbx.link_status.speed; nic->pf_acked = true; break; - case NIC_MBOX_MSG_ALLOC_SQS_RES_BIT: + case NIC_MBOX_MSG_ALLOC_SQS: assert_primary(nic); if (mbx.sqs_alloc.qs_count != nic->sqs_count) { nicvf_log_error("Received %" PRIu8 "/%" PRIu8 diff --git a/drivers/net/thunderx/base/nicvf_mbox.h b/drivers/net/thunderx/base/nicvf_mbox.h index 084f3a7..8675fe8 100644 --- a/drivers/net/thunderx/base/nicvf_mbox.h +++ b/drivers/net/thunderx/base/nicvf_mbox.h @@ -68,16 +68,10 @@ #define NIC_MBOX_MSG_ALLOC_SQS 0x12 /* Allocate secondary Qset */ #define NIC_MBOX_MSG_LOOPBACK 0x16 /* Set interface in loopback */ #define NIC_MBOX_MSG_RESET_STAT_COUNTER 0x17 /* Reset statistics counters */ -#define NIC_MBOX_MSG_CFG_DONE 0x7E /* VF configuration done */ -#define NIC_MBOX_MSG_SHUTDOWN 0x7F /* VF is being shutdown */ -#define NIC_MBOX_MSG_RES_BIT 0x80 /* Reset bit from PF */ +#define NIC_MBOX_MSG_CFG_DONE 0xF0 /* VF configuration done */ +#define NIC_MBOX_MSG_SHUTDOWN 0xF1 /* VF is being shutdown */ #define NIC_MBOX_MSG_MAX 0x100 /* Maximum number of messages */ -#define NIC_MBOX_MSG_RSS_SIZE_RES_BIT \ - (NIC_MBOX_MSG_RSS_SIZE | NIC_MBOX_MSG_RES_BIT) -#define NIC_MBOX_MSG_ALLOC_SQS_RES_BIT \ - (NIC_MBOX_MSG_ALLOC_SQS | NIC_MBOX_MSG_RES_BIT) - /* Get vNIC VF configuration */ struct nic_cfg_msg { uint8_t msg; @@ -157,6 +151,7 @@ struct rss_cfg_msg { /* Physical interface link status */ struct bgx_link_status { uint8_t msg; + uint8_t mac_type; uint8_t link_up; uint8_t duplex; uint32_t speed;