From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9A5D2A0561; Fri, 28 Feb 2020 15:00:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 792041BFEB; Fri, 28 Feb 2020 15:00:01 +0100 (CET) Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680064.outbound.protection.outlook.com [40.107.68.64]) by dpdk.org (Postfix) with ESMTP id 9B7871BFE8 for ; Fri, 28 Feb 2020 14:59:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cu2w0tMP5XyT8GM5fBiYyADp/hMYt8EbdGS2xIpHeIHlui8i8jRnWGlMd9hnDFMjxfREeZk4BHAHp8zSjjIi5IMxZ1gPWx0X+6DKLatmpd4WEfnO4Dfb15Q0dbdSMYI2Xqx20G1xKcJ0ElnvIJY/W6+CeIlVXJTv919N4540zZJ8sq3yRVmizSp1wU77sLrkpARcz4KAdvR+jAsxIr6EscCaRS8yMHEk6fMumRFad+u0M3bcalGBU0bE6dWIxUIZhugWh2p/ue/PmtwQ9/9TfpyiYIYily6QfYk56MsIcUg81jL/N+q2V6pgfJ9vk3gVgLQ4nYPuwd7OX29AhQPXZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VcfIgW52+e7taf9m4RmqK0QrwwTJP/b/d3LUw8S4qyY=; b=UrSvVBW4vcO0qB/glKIu59yocFP5dALRCLhQ6c+r/G9RbRw5hgjAZLaFi5MmdunJV2vVNRuVOrBrNN2eKvMze+edqwZpq2VTx0uu+u/+WpyYmvCtsgsJod4sfdFS/0AgJk6s3wS6vlxCY/HVD7Bmo8GNCwb2geT5+cIW63VfLhgbxiN+IUG/b/5OjgkFqdD/VAMt7RCkAVuks7w01ZQtNv7HXEeanWUNkqityYUiQ4K98/svtqt53xlju9sQ2Pu6mI/LAdlkFVIlMntGlOpoJx3r9TsA1Xxk+8iCZHTCFDoFoSgEfI4+HwTWMMo8o07SSdjLQT04QbQ8GLKc0e29sg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VcfIgW52+e7taf9m4RmqK0QrwwTJP/b/d3LUw8S4qyY=; b=ruUrKfqRfp0+IlCETNzuDgmmHrd50HKTs2Rzn7ce+VsOPsVE3wI84zExRwrQy9U8C9qxSk2ceyulSVU47OMP22bm+C9WQiPjxtbHNxQP58al3n0jC6fsggOMUm7M4Bf7clcUUfSp0ihwuuSkSDXsiAZy2SJX2JhWuwmOhesACHY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=chandu@amd.com; Received: from MN2PR12MB3021.namprd12.prod.outlook.com (2603:10b6:208:c2::30) by MN2PR12MB4079.namprd12.prod.outlook.com (2603:10b6:208:1d5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.15; Fri, 28 Feb 2020 13:59:57 +0000 Received: from MN2PR12MB3021.namprd12.prod.outlook.com ([fe80::31ea:b07d:eb37:203]) by MN2PR12MB3021.namprd12.prod.outlook.com ([fe80::31ea:b07d:eb37:203%7]) with mapi id 15.20.2772.012; Fri, 28 Feb 2020 13:59:57 +0000 From: chandu@amd.com To: dev@dpdk.org Cc: Ravi1.Kumar@amd.com, Amaranath.Somalapuram@amd.com Date: Fri, 28 Feb 2020 19:29:35 +0530 Message-Id: <20200228135935.464-1-chandu@amd.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: MAXPR01CA0088.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:49::30) To MN2PR12MB3021.namprd12.prod.outlook.com (2603:10b6:208:c2::30) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from cae-Wallaby.amd.com (165.204.156.251) by MAXPR01CA0088.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:49::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.18 via Frontend Transport; Fri, 28 Feb 2020 13:59:55 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.156.251] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7e880582-d2bf-458d-031a-08d7bc567e1a X-MS-TrafficTypeDiagnostic: MN2PR12MB4079:|MN2PR12MB4079: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:800; X-Forefront-PRVS: 0327618309 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(376002)(346002)(136003)(396003)(39860400002)(199004)(189003)(956004)(2616005)(52116002)(6916009)(7696005)(6486002)(316002)(36756003)(66476007)(66556008)(66946007)(8936002)(186003)(26005)(16526019)(9686003)(478600001)(5660300002)(2906002)(6666004)(81166006)(4326008)(8676002)(86362001)(81156014)(1076003); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR12MB4079; H:MN2PR12MB3021.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dBWpW3YicdJJTPWQW6ernM/wxsJnF5hzdd3/n94ogKSU/QLBlSchzWHLhd9BPP0XNjWvgrmcS03B9uKr6hwTJR/kIj17ZyG4OQ9dVpq+xQGs2sch509ghYMRSKuhJBAUTgrJzzcXXEpZIsKkpdjbxhNX0rSn7R/yXcFp7zAB1vfHWBhpGkncp1EQTxre3NtWq+cwcyuDDvuMBEel4iic6PeFl9J8DPxfWr1rrTgRTtBmxcvfZZmiFC4VhR5lINqAvufWEyRvhd6HC09FRHcI4Vnw0T6GsBq/gdCBfEco6xQ+725Kqx3qv61leqE3eIvuIbxmfN6s4Z0h4TCsx52w0pJ7SwPFqHz9g433G16FFpb6R4XXEjoUiLxCZLOr0y0W7rc9Ugi2YhfaCWk1+95Z9DZzV81t4fgjSC9dj8SL53Gm8b0tVd0fTEwTlIkeewaI X-MS-Exchange-AntiSpam-MessageData: Q0acYQdl2d7BhBHqb/oPQcNZAhMtp3OisNRqA/T80DRmLkDOyXSDAyAJGpSdARBjzx6XoJ42i2jG3BmXxHG/Q7n+OR0KA7CiBjEK6gqRAOSOp/alwevMixDhzX+LJH9vUG5aQCDKoXocN45WPU6pfQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e880582-d2bf-458d-031a-08d7bc567e1a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2020 13:59:57.0814 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bkapZntbkb6jv6AYAIHjNf2gsbojo3aNHXNWt7cOiCxcCqajVp8dy9yZ0w/Gb72C2GPDDTmjVi/5wW94QRgK/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4079 Subject: [dpdk-dev] [PATCH v1 1/2] net/axgbe: add additional MAC address support 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" From: Chandu Babu N Supports adding MAC addresses to enable whitelist filtering to accept packets implement eth_dev_ops mac_addr_set, mac_addr_add, mac_addr_remove and set_mc_addr_list Signed-off-by: Chandu Babu N --- drivers/net/axgbe/axgbe_dev.c | 29 ++++++++++ drivers/net/axgbe/axgbe_ethdev.c | 94 ++++++++++++++++++++++++++++++-- drivers/net/axgbe/axgbe_ethdev.h | 4 +- 3 files changed, 121 insertions(+), 6 deletions(-) diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 2e796c0b3..f830b7230 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -1008,6 +1008,35 @@ static void axgbe_enable_mtl_interrupts(struct axgbe_port *pdata) } } +void axgbe_set_mac_addn_addr(struct axgbe_port *pdata, u8 *addr, uint32_t index) +{ + unsigned int mac_addr_hi, mac_addr_lo; + u8 *mac_addr; + + mac_addr_lo = 0; + mac_addr_hi = 0; + + if (addr) { + mac_addr = (u8 *)&mac_addr_lo; + mac_addr[0] = addr[0]; + mac_addr[1] = addr[1]; + mac_addr[2] = addr[2]; + mac_addr[3] = addr[3]; + mac_addr = (u8 *)&mac_addr_hi; + mac_addr[0] = addr[4]; + mac_addr[1] = addr[5]; + + /*Address Enable: Use this Addr for Perfect Filtering */ + AXGMAC_SET_BITS(mac_addr_hi, MAC_MACA1HR, AE, 1); + } + + PMD_DRV_LOG(DEBUG, "%s mac address at %#x\n", + addr ? "set" : "clear", index); + + AXGMAC_IOWRITE(pdata, MAC_MACAHR(index), mac_addr_hi); + AXGMAC_IOWRITE(pdata, MAC_MACALR(index), mac_addr_lo); +} + static int axgbe_set_mac_address(struct axgbe_port *pdata, u8 *addr) { unsigned int mac_addr_hi, mac_addr_lo; diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index 00974e737..34cc0fbb8 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -20,6 +20,16 @@ static int axgbe_dev_promiscuous_enable(struct rte_eth_dev *dev); static int axgbe_dev_promiscuous_disable(struct rte_eth_dev *dev); static int axgbe_dev_allmulticast_enable(struct rte_eth_dev *dev); static int axgbe_dev_allmulticast_disable(struct rte_eth_dev *dev); +static int axgbe_dev_mac_addr_set(struct rte_eth_dev *dev, + struct rte_ether_addr *mac_addr); +static int axgbe_dev_mac_addr_add(struct rte_eth_dev *dev, + struct rte_ether_addr *mac_addr, + uint32_t index, + uint32_t vmdq); +static void axgbe_dev_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index); +static int axgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev, + struct rte_ether_addr *mc_addr_set, + uint32_t nb_mc_addr); static int axgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete); static int axgbe_dev_get_regs(struct rte_eth_dev *dev, @@ -160,6 +170,10 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = { .promiscuous_disable = axgbe_dev_promiscuous_disable, .allmulticast_enable = axgbe_dev_allmulticast_enable, .allmulticast_disable = axgbe_dev_allmulticast_disable, + .mac_addr_set = axgbe_dev_mac_addr_set, + .mac_addr_add = axgbe_dev_mac_addr_add, + .mac_addr_remove = axgbe_dev_mac_addr_remove, + .set_mc_addr_list = axgbe_dev_set_mc_addr_list, .link_update = axgbe_dev_link_update, .get_reg = axgbe_dev_get_regs, .stats_get = axgbe_dev_stats_get, @@ -370,6 +384,74 @@ axgbe_dev_allmulticast_disable(struct rte_eth_dev *dev) return 0; } +static int +axgbe_dev_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) +{ + struct axgbe_port *pdata = dev->data->dev_private; + + /* Set Default MAC Addr */ + axgbe_set_mac_addn_addr(pdata, (u8 *)mac_addr, 0); + + return 0; +} + +static int +axgbe_dev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, + uint32_t index, uint32_t pool __rte_unused) +{ + struct axgbe_port *pdata = dev->data->dev_private; + struct axgbe_hw_features *hw_feat = &pdata->hw_feat; + + if (index > hw_feat->addn_mac) { + PMD_DRV_LOG(ERR, "Invalid Index %d\n", index); + return -EINVAL; + } + axgbe_set_mac_addn_addr(pdata, (u8 *)mac_addr, index); + return 0; +} + +static void +axgbe_dev_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) +{ + struct axgbe_port *pdata = dev->data->dev_private; + struct axgbe_hw_features *hw_feat = &pdata->hw_feat; + + if (index > hw_feat->addn_mac) { + PMD_DRV_LOG(ERR, "Invalid Index %d\n", index); + return; + } + axgbe_set_mac_addn_addr(pdata, NULL, index); +} + +static int +axgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev, + struct rte_ether_addr *mc_addr_set, + uint32_t nb_mc_addr) +{ + struct axgbe_port *pdata = dev->data->dev_private; + struct axgbe_hw_features *hw_feat = &pdata->hw_feat; + uint32_t index = 1; /* 0 is always default mac */ + uint32_t i; + + if (nb_mc_addr > hw_feat->addn_mac) { + PMD_DRV_LOG(ERR, "Invalid Index %d\n", nb_mc_addr); + return -EINVAL; + } + + /* clear unicast addresses */ + for (i = 1; i < hw_feat->addn_mac; i++) { + if (rte_is_zero_ether_addr(&dev->data->mac_addrs[i])) + continue; + memset(&dev->data->mac_addrs[i], 0, + sizeof(struct rte_ether_addr)); + } + + while (nb_mc_addr--) + axgbe_set_mac_addn_addr(pdata, (u8 *)mc_addr_set++, index++); + + return 0; +} + /* return 0 means link status changed, -1 means not changed */ static int axgbe_dev_link_update(struct rte_eth_dev *dev, @@ -809,7 +891,7 @@ axgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_tx_queues = pdata->tx_ring_count; dev_info->min_rx_bufsize = AXGBE_RX_MIN_BUF_SIZE; dev_info->max_rx_pktlen = AXGBE_RX_MAX_BUF_SIZE; - dev_info->max_mac_addrs = AXGBE_MAX_MAC_ADDRS; + dev_info->max_mac_addrs = pdata->hw_feat.addn_mac + 1; dev_info->speed_capa = ETH_LINK_SPEED_10G; dev_info->rx_offload_capa = @@ -1044,6 +1126,7 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) struct axgbe_port *pdata; struct rte_pci_device *pci_dev; uint32_t reg, mac_lo, mac_hi; + uint32_t len; int ret; eth_dev->dev_ops = &axgbe_eth_dev_ops; @@ -1113,12 +1196,13 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) pdata->mac_addr.addr_bytes[4] = mac_hi & 0xff; pdata->mac_addr.addr_bytes[5] = (mac_hi >> 8) & 0xff; - eth_dev->data->mac_addrs = rte_zmalloc("axgbe_mac_addr", - RTE_ETHER_ADDR_LEN, 0); + len = RTE_ETHER_ADDR_LEN * AXGBE_MAX_MAC_ADDRS; + eth_dev->data->mac_addrs = rte_zmalloc("axgbe_mac_addr", len, 0); + if (!eth_dev->data->mac_addrs) { PMD_INIT_LOG(ERR, - "Failed to alloc %u bytes needed to store MAC addr tbl", - RTE_ETHER_ADDR_LEN); + "Failed to alloc %u bytes needed to " + "store MAC addresses", len); return -ENOMEM; } diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index a1083b17b..781d170e5 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -16,7 +16,7 @@ #define AXGBE_TX_MAX_BUF_SIZE (0x3fff & ~(64 - 1)) #define AXGBE_RX_MAX_BUF_SIZE (0x3fff & ~(64 - 1)) #define AXGBE_RX_MIN_BUF_SIZE (RTE_ETHER_MAX_LEN + VLAN_HLEN) -#define AXGBE_MAX_MAC_ADDRS 1 +#define AXGBE_MAX_MAC_ADDRS 32 #define AXGBE_RX_BUF_ALIGN 64 @@ -631,5 +631,7 @@ void axgbe_init_function_ptrs_dev(struct axgbe_hw_if *hw_if); void axgbe_init_function_ptrs_phy(struct axgbe_phy_if *phy_if); void axgbe_init_function_ptrs_phy_v2(struct axgbe_phy_if *phy_if); void axgbe_init_function_ptrs_i2c(struct axgbe_i2c_if *i2c_if); +void axgbe_set_mac_addn_addr(struct axgbe_port *pdata, u8 *addr, + uint32_t index); #endif /* RTE_ETH_AXGBE_H_ */ -- 2.17.1