From patchwork Sat Mar 2 12:10:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 50765 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 229084C9F; Sat, 2 Mar 2019 13:10:55 +0100 (CET) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-eopbgr820049.outbound.protection.outlook.com [40.107.82.49]) by dpdk.org (Postfix) with ESMTP id 865F34C94 for ; Sat, 2 Mar 2019 13:10:52 +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=ignEHWoxguKlCQV+/L+FFHv5+ZfaQmlaunF92gwBXaI=; b=c/8uHMqCpR2t9NRhVo4LysALmu2lhY8ANg8Z5JnVOzOR5U/UVekhZSDw5Ax+wlaQP97XzZjMffnL745OZ+JPgi3jBjxNfQpdiYfPAhw4bBt4+bMC7QqweSmDnOj0OM6+7OF06gkpASkpHnSMarXMpiX0g2sJhOxuVuGvIY1y+1Q= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB3867.namprd11.prod.outlook.com (10.255.61.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.16; Sat, 2 Mar 2019 12:10:51 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::319e:4e9b:b376:5588]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::319e:4e9b:b376:5588%4]) with mapi id 15.20.1643.019; Sat, 2 Mar 2019 12:10:51 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh Thread-Topic: [PATCH 05/10] net/atlantic: use eeprom magic as a device address Thread-Index: AQHU0PD6P5RGQLcsvEqHcpgj+4yNjQ== Date: Sat, 2 Mar 2019 12:10:51 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1P190CA0057.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::46) 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: 41e640dd-823a-43fd-d7d6-08d69f081c9c x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB3867; x-ms-traffictypediagnostic: DM6PR11MB3867: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB3867; 23:jbtkiglSkTVAq/oWe18oV/Jm0B7blVB4uPap5kI?= =?iso-8859-1?q?mYNS7i6XJAsmC7erhdBZvPkcF?= =?iso-8859-1?q?bFjWgCmTaGIeqNnMXJHIKcQjrOMQaAC+J1oFjpSLakCWNK0Q4Nl?= =?iso-8859-1?q?aFW2wXW3czBrZ/0t91k09FbkY0eyy4usUt/0YBt+QBqGPv0tLvt?= =?iso-8859-1?q?mdALjCiOdLujx76de8Y9+ujTmnBqV2StCGhwU1xnAJVeQ6LQ7wb?= =?iso-8859-1?q?ZRzKT//orQ4V2SbA9u16rADbFcEYqDlO/qje4siATAXlIRSr9n4?= =?iso-8859-1?q?XkmUfaJobdprnJBtOf2Zo8dQYSI2OJNxBqZVwY05fiwTz3PCLj2?= =?iso-8859-1?q?xHV7DrI6Sk38zclOS2FAtsyKa+DQAly1RHqRXSRE3I8IqBKCpIF?= =?iso-8859-1?q?YslHtiqZPGsfCtLBLqmXmqZWmvdAI93y/pZw63rVt60yb/6kkkw?= =?iso-8859-1?q?E4WolhNbIBBDhsKj3mjs3h9DWKU3/d4Bgs3X7S1JznthGzx/aTW?= =?iso-8859-1?q?SPwthKW0WyetFjCw8AAWXKWw36lgzS+b7wOTfTWGXZ8Tcz4gjvY?= =?iso-8859-1?q?lqDhhOGD2YROSpJFoD05vow5j0CikbXj+cwGUls55QUO2E2EMj4?= =?iso-8859-1?q?cX0GLPndxUHT0ttOnO3GmgwkiYxJw7deUADsQKTaCTNtS05MK+G?= =?iso-8859-1?q?nNcTKgrXCjh379l5d4bLhy9eATWMEws9jf/lIMJKbih4RoGpFDF?= =?iso-8859-1?q?jObiDIKPu6QdfCeNH8xYdcp20hOBaOZH9eaL6MMvsZpddCXZa7W?= =?iso-8859-1?q?YDaGyeyHy86+HNb1yeGH9xZf95eg/hOFSeDejqiYQLZQj/vJZoA?= =?iso-8859-1?q?jZLIEzdU4E/KXpYv6Qd6hg1Ouo9DU9Xgb89g2uuqT3M1pDPp4Pn?= =?iso-8859-1?q?uKjdufV8qaCi2rfPufy+wxeKy40z691+SRiX44Agdj2itSK2ugQ?= =?iso-8859-1?q?XNYCrTIapJD7KI/ir4/Ogk/kLS6rvRhtZoMLYVNgc4EJL1Xnux3?= =?iso-8859-1?q?nHHnIbUmZjNLLA74TgzEK67pOBxQPrK8xxm5qAehNmyg9i+ySOM?= =?iso-8859-1?q?H/UGs6r9rgyOFlol/Z2R/XIURgwRIxBitfwvSLFDO/6XfrMk7Qd?= =?iso-8859-1?q?dmGE+oQ3Y8hHICpOXOy9RlxS7Qa8/0FVoaD8+1es5lQ34FMKg8T?= =?iso-8859-1?q?ZaeAfaBJILArPO3pw5kugCynIJQHx3kkKyj55SvpMSrVzByckNN?= =?iso-8859-1?q?d5PIdXl938mzHRJaDzkZzMPGubOY0oQumfgdxolb6yCIDN5yQ/a?= =?iso-8859-1?q?FqTsypv+c/d08+X26JGxbV9MSgqYsYWfSdr7xaM+15My69q/QCb?= =?iso-8859-1?q?K56B6z5zkCvjU4IcuOGzOEb8gfEl74p35Fq4AmCBT4u5kIdIS8q?= =?iso-8859-1?q?ZCOfdnsmPJ8pfcnVXwbjiNr/GrLtwndpp2M31txqLakvynZc+qa?= =?iso-8859-1?q?bsEyw1bJ52TJTcmHvMI0ItnL8ZPbNl8/2oiN1McNmdN1GfTo=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09645BAC66 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(366004)(346002)(136003)(396003)(39850400004)(199004)(189003)(7736002)(8936002)(36756003)(256004)(1730700003)(71200400001)(6916009)(71190400001)(14444005)(8676002)(54906003)(106356001)(186003)(105586002)(4326008)(2501003)(26005)(305945005)(316002)(5660300002)(86362001)(97736004)(2906002)(102836004)(81156014)(81166006)(53936002)(52116002)(76176011)(3846002)(6506007)(386003)(6116002)(72206003)(6512007)(6436002)(14454004)(5640700003)(66066001)(6486002)(478600001)(25786009)(68736007)(99286004)(107886003)(11346002)(476003)(2616005)(446003)(486006)(2351001)(118296001)(50226002)(44832011); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB3867; 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: EjLpfFKP6DRpDncTeDcGa5QTeTy1WDyb+XcwlvzxQVkzqm5M1H+jQB965XQP6+6wS6Yq7Zca4Nxkn6huDtlzSPva+4xkoZCX5p66K7LpmOiNByrZx7n0jCia0iSefLogXrbmewnQqz8DuanHFfKBTZureH3cWN2upPgN19eOrW7SB9mb978fzXKsE/TVF99iwhwYYqrYGWuLwOquDPUxJmvKlu4jejIScK2fWqifaVGfFBcVfdul+S5i3VEkSmlJ/fTLxttdwvoQHDwZ662ufMB7hhDyTv9b1BcXtQRtlWgYR0l6RHHawbD9FlgyrZ69ydTiS0n8LXChFboVhwVnVvchK6gG+uWQqQcbh4B6jnAwDg+qDlU4ekw/D7biWq9JfjDRd1SIhH8btUlFKEmc6Aep/mKCF5PIkVdcIkkRF/w= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41e640dd-823a-43fd-d7d6-08d69f081c9c X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Mar 2019 12:10:49.6851 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3867 Subject: [dpdk-dev] [PATCH 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 | 20 ++++++++++------ drivers/net/atlantic/atl_types.h | 5 ++-- 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 | 24 ++++++++++--------- 5 files changed, 46 insertions(+), 30 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 5bc04f55c..ae1babacf 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -1102,24 +1102,27 @@ 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 > 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); } -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 +1130,10 @@ 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 3d90f6cae..ecc515e43 100644 --- a/drivers/net/atlantic/atl_types.h +++ b/drivers/net/atlantic/atl_types.h @@ -137,9 +137,10 @@ 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); + + 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 13f02b9f9..4299b7016 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 5f3f70847..f2a87826c 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 a155d4aab..d0eb9f5e9 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,9 @@ 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 +486,7 @@ 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) { int err = 0; struct smbus_read_request request; @@ -494,7 +496,7 @@ 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.device_id = dev_addr; request.address = 0; request.length = len; @@ -506,16 +508,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 +544,7 @@ 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 +553,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 +574,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)