From patchwork Tue Mar 12 15:24:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51127 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 5A64C5592; Tue, 12 Mar 2019 16:25:03 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-eopbgr780087.outbound.protection.outlook.com [40.107.78.87]) by dpdk.org (Postfix) with ESMTP id 5D2B64F93 for ; Tue, 12 Mar 2019 16:25:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4E/sLDIyoShPPI0v0ri6IFqjBml1650h70sAeRsnN2I=; b=rySAzpM6t9EcWcSw31RS/K9jajIDWlwbDLttitXW64W/P7xeBF/AKVmZOFbXGxHcW3C5jey7EIilHP8oo/kdEdT1TiWp/QYpZGIntSh8NR1lb6xn1Z2hrPnTbjDifETNjV3258dfazbSnP8vg8m4MxpCrp2FlHKT0ZUGDz3A5Lc= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2747.namprd11.prod.outlook.com (20.176.100.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Tue, 12 Mar 2019 15:24:59 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1686.021; Tue, 12 Mar 2019 15:24:59 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , Pavel Belous Thread-Topic: [PATCH v3 05/10] net/atlantic: use EEPROM magic as a device address Thread-Index: AQHU2OfBHYDDICbFE0mHbxUJxXx3LQ== Date: Tue, 12 Mar 2019 15:24:59 +0000 Message-ID: <13dc16dc55b42d6ba0df358ad727308938fde8cf.1552402263.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 553eefff-3191-4a17-0b10-08d6a6fee3da x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2747; x-ms-traffictypediagnostic: DM6PR11MB2747: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2747; 23:u+s+ey6apKtOo++nbDvJ+Y02ozeTORqOnCexfUG?= =?iso-8859-1?q?8nL9gLTsZcCAnCxkdOVBpv6G9?= =?iso-8859-1?q?wrp7kMEaCR9lAKA/ujDul/FDr9nQzN/aay/fu3BM//isniqs/B5?= =?iso-8859-1?q?y5VC75p2GIOTVL/FbG+zER1p9vzwWYcdfKjTfbuT0e/uA2uJ7G2?= =?iso-8859-1?q?kzmpKEQqS3He4TLVGV+1RaaS/NciOa++XUFZk/hHcKnWALhFYW0?= =?iso-8859-1?q?LwGaftaQvJTj0stRvGeWzof2+uPaWn8GPUfpB5D+1FvfTBUd6Gd?= =?iso-8859-1?q?RYxBvhEkXmnEYy4UW4t2ko0bRGdS0rDATDUWTnX4AHOnJjR6sdU?= =?iso-8859-1?q?2JXORRpw72xCXu+rbOn0dn7ZPV+gBvcIs/21EDeI/p7lw8vQDoH?= =?iso-8859-1?q?1E6bWT9EIN3kXUAusgh1fljRE+fS2gLC+q/RU+HRD6uvn7Et4eX?= =?iso-8859-1?q?9VYekvAFB6C/tE6vYBbtUobGWJbKcMIVwegSHG0/pIxmrqi28L+?= =?iso-8859-1?q?fYJTHQi8tdvjBM/lSWTPunagIhlcyOpmg+dc1qt9IFFLcgArA7Y?= =?iso-8859-1?q?e7RCYT6y7oNsvQGYN/6PSQTSH7VFjucWg4RiGZXwaXaYZQAghLa?= =?iso-8859-1?q?jSaKX1H875M0foHUA0apOz5CddUeMqtW/nqcDmeHd0ImOdzTBCe?= =?iso-8859-1?q?sLBMvmPys2lMBIsg1dFILJJU+3mIKVhtOxKxdRHnJB0tM0A7eYP?= =?iso-8859-1?q?SwaSIy3tnJEKb4hZe8ssDsg6ijFb4r6s9BQj9Y0jt7/uwaGJ7pG?= =?iso-8859-1?q?2JQ4kBV/EldBVDEyBl73LrKyIyY9fTaFhWBTWlyYZrdMrEl3S0+?= =?iso-8859-1?q?p8ugt7Tla3YLW2uSW09SJjofFbDeKOfbfmXAhrNO7+SOUy87Y40?= =?iso-8859-1?q?7IgRROPD/WHFbFytTXfGvxlJ/fpr0EgObLY9ZsiEoQ4Ahd7EzRw?= =?iso-8859-1?q?mILOZtdY/E/MgSELwHXYUOU+nlFSZSK4qBWt5eZJfD+sE7YbP6Z?= =?iso-8859-1?q?Lo/ulLN63Vy5F2HJd6AGVMcUlstrffslnObZTh7PlQdq2UnNMw6?= =?iso-8859-1?q?KETC0WyWkNOs9cBclDBG/mt8WkUQSIU4LTywhzCUe1/NgAciPIP?= =?iso-8859-1?q?QFsVFWyOhGqNVdlX9+7a/6MMV+rkbecidwQ8B8waiZOgq0cHnzB?= =?iso-8859-1?q?ar2LnC0lecWTFigs0NHFIOsl3sui1Khq9QF9uP1w9sC2h+QnMy8?= =?iso-8859-1?q?O2b07s6UmsIZxG+a2VrBVp+rZ1WgBCwkznW4m1iu9YwNdGecqra?= =?iso-8859-1?q?NwT2wRdIBwRiucEGVIjYXzqWVyK7ZUaKkenaHOfmBGont276vQn?= =?iso-8859-1?q?xY7cMpTBOPgm1FNaNUMu+XgoWHHJ75bvA1NQF9QDngXfLBV/cej?= =?iso-8859-1?q?mx8WX3osa7Y4nP+NlS+AAl8AkmE09XpbH0wBqJYiEPpEhtfR5dw?= =?iso-8859-1?q?LOx0AD9m/xGneWwLqZr9pJxTPs9ZY/x3ns0hZqduLQ5o1ZVs=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39850400004)(136003)(366004)(376002)(199004)(189003)(53936002)(2501003)(106356001)(86362001)(81166006)(5660300002)(99286004)(81156014)(6116002)(44832011)(2351001)(105586002)(4326008)(66066001)(2616005)(71200400001)(486006)(72206003)(478600001)(446003)(476003)(186003)(118296001)(14454004)(26005)(54906003)(71190400001)(11346002)(386003)(6506007)(305945005)(102836004)(25786009)(7736002)(14444005)(50226002)(3846002)(256004)(107886003)(316002)(36756003)(6916009)(6486002)(52116002)(1730700003)(8676002)(76176011)(6512007)(97736004)(8936002)(68736007)(6436002)(2906002)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2747; H:DM6PR11MB3625.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: R3wtSP+XkTvOWUC7B2LdCXxrhAZkktt1/i/ID+rAgUDl0/zy3Uz0sXAHXfC8gl82IxhKsXYo+7YWvxT80T6Igf2bv3lUSYqSxWh4anb1GcmbpyroTYknp5OG//QJVXQDRLKZCXZ6P6GO1rSf9tm7sJtceRvTNRuY+XYIi34VFpRReZFZDffzpCwsGFIdChVWNHGxmotu1g0JYCgmx4fZrMGP+pPpFvdYmKSiqifdxTs2VVXFS6PQxW8Y9M4BbelSA44dHtML3yCIp+fCrSlNzwDUbBS+FLdqdg8PAJubkPPDeXhq540zSy6TiZlrLqsG66dltAZF1xCVz0zWeAwIk//aWWpLjqu1gqSDGgvgPkWxN63xkWnCNQLWJC3Ynf9BGHsmIC+Z1QdCB66n/ARNZTV7Mm5jlC32nvd8geF0Dls= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 553eefff-3191-4a17-0b10-08d6a6fee3da X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:24:59.7898 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2747 Subject: [dpdk-dev] [PATCH v3 05/10] net/atlantic: use EEPROM magic as a device address 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: Pavel Belous Default dev addr is replaced with magic field from the request. Length is allowed to be less than maximum. SMBUS access bit definitions also better organised now. Signed-off-by: Igor Russkikh Signed-off-by: Pavel Belous --- drivers/net/atlantic/atl_ethdev.c | 25 +++++++++++----- drivers/net/atlantic/atl_types.h | 7 +++-- drivers/net/atlantic/hw_atl/hw_atl_utils.c | 4 +++ drivers/net/atlantic/hw_atl/hw_atl_utils.h | 23 +++++++------- .../net/atlantic/hw_atl/hw_atl_utils_fw2x.c | 30 +++++++++++-------- 5 files changed, 58 insertions(+), 31 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 5bc04f55cc21..a510646a5f7e 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -1102,24 +1102,31 @@ atl_dev_get_eeprom_length(struct rte_eth_dev *dev __rte_unused) return SFP_EEPROM_SIZE; } -static int -atl_dev_get_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom) +int atl_dev_get_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *eeprom) { struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t dev_addr = SMBUS_DEVICE_ID; if (hw->aq_fw_ops->get_eeprom == NULL) return -ENOTSUP; - if (eeprom->length != SFP_EEPROM_SIZE || eeprom->data == NULL) + if (eeprom->length + eeprom->offset > SFP_EEPROM_SIZE || + eeprom->data == NULL) return -EINVAL; - return hw->aq_fw_ops->get_eeprom(hw, eeprom->data, eeprom->length); + if (eeprom->magic) + dev_addr = eeprom->magic; + + return hw->aq_fw_ops->get_eeprom(hw, dev_addr, eeprom->data, + eeprom->length, eeprom->offset); } -static int -atl_dev_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom) +int atl_dev_set_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *eeprom) { struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t dev_addr = SMBUS_DEVICE_ID; if (hw->aq_fw_ops->set_eeprom == NULL) return -ENOTSUP; @@ -1127,7 +1134,11 @@ atl_dev_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom) if (eeprom->length != SFP_EEPROM_SIZE || eeprom->data == NULL) return -EINVAL; - return hw->aq_fw_ops->set_eeprom(hw, eeprom->data, eeprom->length); + if (eeprom->magic) + dev_addr = eeprom->magic; + + return hw->aq_fw_ops->set_eeprom(hw, dev_addr, + eeprom->data, eeprom->length); } static int diff --git a/drivers/net/atlantic/atl_types.h b/drivers/net/atlantic/atl_types.h index 3d90f6caefc2..3edaf0c7c047 100644 --- a/drivers/net/atlantic/atl_types.h +++ b/drivers/net/atlantic/atl_types.h @@ -137,9 +137,12 @@ struct aq_fw_ops { int (*led_control)(struct aq_hw_s *self, u32 mode); - int (*get_eeprom)(struct aq_hw_s *self, u32 *data, u32 len); + int (*get_eeprom)(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len, u32 offset); + + int (*set_eeprom)(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len); - int (*set_eeprom)(struct aq_hw_s *self, u32 *data, u32 len); }; struct atl_sw_stats { diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/atlantic/hw_atl/hw_atl_utils.c index 13f02b9f99c5..4299b7016e2f 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils.c @@ -305,6 +305,10 @@ int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a, AQ_HW_WAIT_FOR(!(0x100 & aq_hw_read_reg(self, HW_ATL_MIF_CMD)), 1, 1000U); + if (err) { + err = -ETIMEDOUT; + goto err_exit; + } *(p++) = aq_hw_read_reg(self, HW_ATL_MIF_VAL); a += 4; diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/atlantic/hw_atl/hw_atl_utils.h index 5f3f70847310..f2a87826c0d1 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils.h +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils.h @@ -8,6 +8,7 @@ #ifndef HW_ATL_UTILS_H #define HW_ATL_UTILS_H +#define BIT(x) (1UL << (x)) #define HW_ATL_FLUSH() { (void)aq_hw_read_reg(self, 0x10); } /* Hardware tx descriptor */ @@ -389,18 +390,8 @@ enum hal_atl_utils_fw_state_e { #define HAL_ATLANTIC_UTILS_FW_MSG_OFFLOAD_DEL 10U #define HAL_ATLANTIC_UTILS_FW_MSG_CABLE_DIAG 13U // 0xd -#define SMBUS_READ_REQUEST BIT(13) -#define SMBUS_WRITE_REQUEST BIT(14) #define SMBUS_DEVICE_ID 0x50 -enum hw_atl_fw2x_rate { - FW2X_RATE_100M = 0x20, - FW2X_RATE_1G = 0x100, - FW2X_RATE_2G5 = 0x200, - FW2X_RATE_5G = 0x400, - FW2X_RATE_10G = 0x800, -}; - enum hw_atl_fw2x_caps_lo { CAPS_LO_10BASET_HD = 0x00, CAPS_LO_10BASET_FD, @@ -414,6 +405,10 @@ enum hw_atl_fw2x_caps_lo { CAPS_LO_2P5GBASET_FD, CAPS_LO_5GBASET_FD, CAPS_LO_10GBASET_FD, + CAPS_LO_AUTONEG, + CAPS_LO_SMBUS_READ, + CAPS_LO_SMBUS_WRITE, + CAPS_LO_MACSEC }; enum hw_atl_fw2x_caps_hi { @@ -451,6 +446,14 @@ enum hw_atl_fw2x_caps_hi { CAPS_HI_TRANSACTION_ID, }; +enum hw_atl_fw2x_rate { + FW2X_RATE_100M = BIT(CAPS_LO_100BASETX_FD), + FW2X_RATE_1G = BIT(CAPS_LO_1000BASET_FD), + FW2X_RATE_2G5 = BIT(CAPS_LO_2P5GBASET_FD), + FW2X_RATE_5G = BIT(CAPS_LO_5GBASET_FD), + FW2X_RATE_10G = BIT(CAPS_LO_10GBASET_FD), +}; + struct aq_hw_s; struct aq_fw_ops; struct aq_hw_link_status_s; diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c index f90ccfe9e010..1d9190155421 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c @@ -129,7 +129,11 @@ static u32 fw2x_to_eee_mask(u32 speed) static int aq_fw2x_set_link_speed(struct aq_hw_s *self, u32 speed) { - u32 val = link_speed_mask_2fw2x_ratemask(speed); + u32 rate_mask = link_speed_mask_2fw2x_ratemask(speed); + u32 reg_val = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); + u32 val = rate_mask | ((BIT(CAPS_LO_SMBUS_READ) | + BIT(CAPS_LO_SMBUS_WRITE) | + BIT(CAPS_LO_MACSEC)) & reg_val); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, val); @@ -484,7 +488,8 @@ static int aq_fw2x_led_control(struct aq_hw_s *self, u32 mode) return 0; } -static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) +static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len, u32 offset) { int err = 0; struct smbus_read_request request; @@ -494,8 +499,8 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM) return -EOPNOTSUPP; - request.device_id = SMBUS_DEVICE_ID; - request.address = 0; + request.device_id = dev_addr; + request.address = offset; request.length = len; /* Write SMBUS request to cfg memory */ @@ -506,16 +511,16 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (err < 0) return err; - /* Toggle 0x368.SMBUS_READ_REQUEST bit */ + /* Toggle 0x368.CAPS_LO_SMBUS_READ bit */ mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); - mpi_opts ^= SMBUS_READ_REQUEST; + mpi_opts ^= BIT(CAPS_LO_SMBUS_READ); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, mpi_opts); /* Wait until REQUEST_BIT matched in 0x370 */ AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR) & - SMBUS_READ_REQUEST) == (mpi_opts & SMBUS_READ_REQUEST), + BIT(CAPS_LO_SMBUS_READ)) == (mpi_opts & BIT(CAPS_LO_SMBUS_READ)), 10U, 10000U); if (err < 0) @@ -542,7 +547,8 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) } -static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) +static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len) { struct smbus_write_request request; u32 mpi_opts, result = 0; @@ -551,7 +557,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM) return -EOPNOTSUPP; - request.device_id = SMBUS_DEVICE_ID; + request.device_id = dev_addr; request.address = 0; request.length = len; @@ -572,15 +578,15 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (err < 0) return err; - /* Toggle 0x368.SMBUS_WRITE_REQUEST bit */ + /* Toggle 0x368.CAPS_LO_SMBUS_WRITE bit */ mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); - mpi_opts ^= SMBUS_WRITE_REQUEST; + mpi_opts ^= BIT(CAPS_LO_SMBUS_WRITE); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, mpi_opts); /* Wait until REQUEST_BIT matched in 0x370 */ AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR) & - SMBUS_WRITE_REQUEST) == (mpi_opts & SMBUS_WRITE_REQUEST), + BIT(CAPS_LO_SMBUS_WRITE)) == (mpi_opts & BIT(CAPS_LO_SMBUS_WRITE)), 10U, 10000U); if (err < 0)