{"id":816146,"url":"http://patchwork.ozlabs.org/api/patches/816146/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505904778-53217-4-git-send-email-linyunsheng@huawei.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","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":"<1505904778-53217-4-git-send-email-linyunsheng@huawei.com>","list_archive_url":null,"date":"2017-09-20T10:52:52","name":"[net,3/9] net: hns3: Fix for DEFAULT_DV when dev doesn't support DCB","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"e71af8e9353086f176a13a6b9146df590f3b921c","submitter":{"id":71804,"url":"http://patchwork.ozlabs.org/api/people/71804/?format=json","name":"Yunsheng Lin","email":"linyunsheng@huawei.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505904778-53217-4-git-send-email-linyunsheng@huawei.com/mbox/","series":[{"id":4080,"url":"http://patchwork.ozlabs.org/api/series/4080/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4080","date":"2017-09-20T10:52:53","name":"TM related bugfixes for the HNS3 Ethernet Driver","version":1,"mbox":"http://patchwork.ozlabs.org/series/4080/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816146/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816146/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxxVS2Zqvz9s7c\n\tfor ;\n\tWed, 20 Sep 2017 20:55:44 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751915AbdITKxZ (ORCPT );\n\tWed, 20 Sep 2017 06:53:25 -0400","from szxga05-in.huawei.com ([45.249.212.191]:6530 \"EHLO\n\tszxga05-in.huawei.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751868AbdITKxX (ORCPT\n\t); Wed, 20 Sep 2017 06:53:23 -0400","from 172.30.72.60 (EHLO DGGEMS407-HUB.china.huawei.com)\n\t([172.30.72.60])\n\tby dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued)\n\twith ESMTP id DHR76344; Wed, 20 Sep 2017 18:53:19 +0800 (CST)","from localhost.localdomain (10.67.212.75) by\n\tDGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP\n\tServer id 14.3.301.0; Wed, 20 Sep 2017 18:53:13 +0800"],"From":"Yunsheng Lin ","To":"","CC":", ,\n\t, ,\n\t, ,\n\t, ,\n\t, ,\n\t, ","Subject":"[PATCH net 3/9] net: hns3: Fix for DEFAULT_DV when dev doesn't\n\tsupport DCB","Date":"Wed, 20 Sep 2017 18:52:52 +0800","Message-ID":"<1505904778-53217-4-git-send-email-linyunsheng@huawei.com>","X-Mailer":"git-send-email 1.9.1","In-Reply-To":"<1505904778-53217-1-git-send-email-linyunsheng@huawei.com>","References":"<1505904778-53217-1-git-send-email-linyunsheng@huawei.com>","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[10.67.212.75]","X-CFilter-Loop":"Reflected","X-Mirapoint-Virus-RAPID-Raw":"score=unknown(0),\n\trefid=str=0001.0A010204.59C248A0.000A, ss=1, re=0.000, recu=0.000,\n\treip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0,\n\tso=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32","X-Mirapoint-Loop-Id":"72f666958172e13344519796d5536d08","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"When ae_dev doesn't support DCB, DEFAULT_DV must be set to\na lower value, otherwise the buffer allocation process will\nfail.\nThis patch fix it by setting it to 30K bytes.\n\nFixes: 46a3df9f9718 (\"net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support\")\nSigned-off-by: Yunsheng Lin \n---\n drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 1 +\n drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++++-\n 2 files changed, 6 insertions(+), 1 deletion(-)","diff":"diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h\nindex c2b613b..30e2ad5 100644\n--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h\n+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h\n@@ -688,6 +688,7 @@ struct hclge_reset_tqp_queue {\n #define HCLGE_DEFAULT_TX_BUF\t\t0x4000\t /* 16k bytes */\n #define HCLGE_TOTAL_PKT_BUF\t\t0x108000 /* 1.03125M bytes */\n #define HCLGE_DEFAULT_DV\t\t0xA000\t /* 40k byte */\n+#define HCLGE_DEFAULT_NON_DCB_DV\t0x7800\t/* 30K byte */\n \n #define HCLGE_TYPE_CRQ\t\t\t0\n #define HCLGE_TYPE_CSQ\t\t\t1\ndiff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c\nindex c515b84..1876418 100644\n--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c\n+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c\n@@ -1444,7 +1444,11 @@ static bool hclge_is_rx_buf_ok(struct hclge_dev *hdev, u32 rx_all)\n \ttc_num = hclge_get_tc_num(hdev);\n \tpfc_enable_num = hclge_get_pfc_enalbe_num(hdev);\n \n-\tshared_buf_min = 2 * hdev->mps + HCLGE_DEFAULT_DV;\n+\tif (hnae3_dev_dcb_supported(hdev))\n+\t\tshared_buf_min = 2 * hdev->mps + HCLGE_DEFAULT_DV;\n+\telse\n+\t\tshared_buf_min = 2 * hdev->mps + HCLGE_DEFAULT_NON_DCB_DV;\n+\n \tshared_buf_tc = pfc_enable_num * hdev->mps +\n \t\t\t(tc_num - pfc_enable_num) * hdev->mps / 2 +\n \t\t\thdev->mps;\n","prefixes":["net","3/9"]}