From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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?mYNS7i6XJAsmC7erhdBZvPkcFbFjWgCmTaGIeqNnMXJHIKcQjrOMQaAC+J?= =?iso-8859-1?Q?1oFjpSLakCWNK0Q4NlaFW2wXW3czBrZ/0t91k09FbkY0eyy4usUt/0YBt+?= =?iso-8859-1?Q?QBqGPv0tLvtmdALjCiOdLujx76de8Y9+ujTmnBqV2StCGhwU1xnAJVeQ6L?= =?iso-8859-1?Q?Q7wbZRzKT//orQ4V2SbA9u16rADbFcEYqDlO/qje4siATAXlIRSr9n4Xkm?= =?iso-8859-1?Q?UfaJobdprnJBtOf2Zo8dQYSI2OJNxBqZVwY05fiwTz3PCLj2xHV7DrI6Sk?= =?iso-8859-1?Q?38zclOS2FAtsyKa+DQAly1RHqRXSRE3I8IqBKCpIFYslHtiqZPGsfCtLBL?= =?iso-8859-1?Q?qmXmqZWmvdAI93y/pZw63rVt60yb/6kkkwE4WolhNbIBBDhsKj3mjs3h9D?= =?iso-8859-1?Q?WKU3/d4Bgs3X7S1JznthGzx/aTWSPwthKW0WyetFjCw8AAWXKWw36lgzS+?= =?iso-8859-1?Q?b7wOTfTWGXZ8Tcz4gjvYlqDhhOGD2YROSpJFoD05vow5j0CikbXj+cwGUl?= =?iso-8859-1?Q?s55QUO2E2EMj4cX0GLPndxUHT0ttOnO3GmgwkiYxJw7deUADsQKTaCTNtS?= =?iso-8859-1?Q?05MK+GnNcTKgrXCjh379l5d4bLhy9eATWMEws9jf/lIMJKbih4RoGpFDFj?= =?iso-8859-1?Q?ObiDIKPu6QdfCeNH8xYdcp20hOBaOZH9eaL6MMvsZpddCXZa7WYDaGyeyH?= =?iso-8859-1?Q?y86+HNb1yeGH9xZf95eg/hOFSeDejqiYQLZQj/vJZoAjZLIEzdU4E/KXpY?= =?iso-8859-1?Q?v6Qd6hg1Ouo9DU9Xgb89g2uuqT3M1pDPp4PnuKjdufV8qaCi2rfPufy+wx?= =?iso-8859-1?Q?eKy40z691+SRiX44Agdj2itSK2ugQXNYCrTIapJD7KI/ir4/Ogk/kLS6rv?= =?iso-8859-1?Q?RhtZoMLYVNgc4EJL1Xnux3nHHnIbUmZjNLLA74TgzEK67pOBxQPrK8xxm5?= =?iso-8859-1?Q?qAehNmyg9i+ySOMH/UGs6r9rgyOFlol/Z2R/XIURgwRIxBitfwvSLFDO/6?= =?iso-8859-1?Q?XfrMk7QddmGE+oQ3Y8hHICpOXOy9RlxS7Qa8/0FVoaD8+1es5lQ34FMKg8?= =?iso-8859-1?Q?TZaeAfaBJILArPO3pw5kugCynIJQHx3kkKyj55SvpMSrVzByckNNd5PIdX?= =?iso-8859-1?Q?l938mzHRJaDzkZzMPGubOY0oQumfgdxolb6yCIDN5yQ/aFqTsypv+c/d08?= =?iso-8859-1?Q?+X26JGxbV9MSgqYsYWfSdr7xaM+15My69q/QCbK56B6z5zkCvjU4IcuOGz?= =?iso-8859-1?Q?OEb8gfEl74p35Fq4AmCBT4u5kIdIS8qZCOfdnsmPJ8pfcnVXwbjiNr/GrL?= =?iso-8859-1?Q?twndpp2M31txqLakvynZc+qabsEyw1bJ52TJTcmHvMI0ItnL8ZPbNl8/2o?= =?iso-8859-1?Q?iN1McNmdN1GfTo=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= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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: , X-List-Received-Date: Sat, 02 Mar 2019 12:10:53 -0000 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_e= thdev.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; } =20 -static int -atl_dev_get_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *ee= prom) +int atl_dev_get_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info= *eeprom) { struct aq_hw_s *hw =3D ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t dev_addr =3D SMBUS_DEVICE_ID; =20 if (hw->aq_fw_ops->get_eeprom =3D=3D NULL) return -ENOTSUP; =20 - if (eeprom->length !=3D SFP_EEPROM_SIZE || eeprom->data =3D=3D NULL) + if (eeprom->length > SFP_EEPROM_SIZE || eeprom->data =3D=3D NULL) return -EINVAL; =20 - return hw->aq_fw_ops->get_eeprom(hw, eeprom->data, eeprom->length); + if (eeprom->magic) + dev_addr =3D eeprom->magic; + + return hw->aq_fw_ops->get_eeprom(hw, dev_addr, eeprom->data, eeprom->leng= th); } =20 -static int -atl_dev_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *ee= prom) +int atl_dev_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info= *eeprom) { struct aq_hw_s *hw =3D ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t dev_addr =3D SMBUS_DEVICE_ID; =20 if (hw->aq_fw_ops->set_eeprom =3D=3D NULL) return -ENOTSUP; @@ -1127,7 +1130,10 @@ atl_dev_set_eeprom(struct rte_eth_dev *dev, struct r= te_dev_eeprom_info *eeprom) if (eeprom->length !=3D SFP_EEPROM_SIZE || eeprom->data =3D=3D NULL) return -EINVAL; =20 - return hw->aq_fw_ops->set_eeprom(hw, eeprom->data, eeprom->length); + if (eeprom->magic) + dev_addr =3D eeprom->magic; + + return hw->aq_fw_ops->set_eeprom(hw, dev_addr, eeprom->data, eeprom->leng= th); } =20 static int diff --git a/drivers/net/atlantic/atl_types.h b/drivers/net/atlantic/atl_ty= pes.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 { =20 int (*led_control)(struct aq_hw_s *self, u32 mode); =20 - 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)= ; =20 - int (*set_eeprom)(struct aq_hw_s *self, u32 *data, u32 len); }; =20 struct atl_sw_stats { diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/atlan= tic/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 =3D -ETIMEDOUT; + goto err_exit; + } =20 *(p++) =3D aq_hw_read_reg(self, HW_ATL_MIF_VAL); a +=3D 4; diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/atlan= tic/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 =20 +#define BIT(x) (1UL << (x)) #define HW_ATL_FLUSH() { (void)aq_hw_read_reg(self, 0x10); } =20 /* 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 =20 -#define SMBUS_READ_REQUEST BIT(13) -#define SMBUS_WRITE_REQUEST BIT(14) #define SMBUS_DEVICE_ID 0x50 =20 -enum hw_atl_fw2x_rate { - FW2X_RATE_100M =3D 0x20, - FW2X_RATE_1G =3D 0x100, - FW2X_RATE_2G5 =3D 0x200, - FW2X_RATE_5G =3D 0x400, - FW2X_RATE_10G =3D 0x800, -}; - enum hw_atl_fw2x_caps_lo { CAPS_LO_10BASET_HD =3D 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 }; =20 enum hw_atl_fw2x_caps_hi { @@ -451,6 +446,14 @@ enum hw_atl_fw2x_caps_hi { CAPS_HI_TRANSACTION_ID, }; =20 +enum hw_atl_fw2x_rate { + FW2X_RATE_100M =3D BIT(CAPS_LO_100BASETX_FD), + FW2X_RATE_1G =3D BIT(CAPS_LO_1000BASET_FD), + FW2X_RATE_2G5 =3D BIT(CAPS_LO_2P5GBASET_FD), + FW2X_RATE_5G =3D BIT(CAPS_LO_5GBASET_FD), + FW2X_RATE_10G =3D 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) =20 static int aq_fw2x_set_link_speed(struct aq_hw_s *self, u32 speed) { - u32 val =3D link_speed_mask_2fw2x_ratemask(speed); + u32 rate_mask =3D link_speed_mask_2fw2x_ratemask(speed); + u32 reg_val =3D aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); + u32 val =3D rate_mask | ((BIT(CAPS_LO_SMBUS_READ) | BIT(CAPS_LO_SMBUS_WRI= TE) | BIT(CAPS_LO_MACSEC)) & reg_val); =20 aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, val); =20 @@ -484,7 +486,7 @@ static int aq_fw2x_led_control(struct aq_hw_s *self, u3= 2 mode) return 0; } =20 -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 *dat= a, u32 len) { int err =3D 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; =20 - request.device_id =3D SMBUS_DEVICE_ID; + request.device_id =3D dev_addr; request.address =3D 0; request.length =3D len; =20 @@ -506,16 +508,16 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u= 32 *data, u32 len) if (err < 0) return err; =20 - /* Toggle 0x368.SMBUS_READ_REQUEST bit */ + /* Toggle 0x368.CAPS_LO_SMBUS_READ bit */ mpi_opts =3D aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); - mpi_opts ^=3D SMBUS_READ_REQUEST; + mpi_opts ^=3D BIT(CAPS_LO_SMBUS_READ); =20 aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, mpi_opts); =20 /* Wait until REQUEST_BIT matched in 0x370 */ =20 AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR) & - SMBUS_READ_REQUEST) =3D=3D (mpi_opts & SMBUS_READ_REQUEST), + BIT(CAPS_LO_SMBUS_READ)) =3D=3D (mpi_opts & BIT(CAPS_LO_SMBUS_READ)), 10U, 10000U); =20 if (err < 0) @@ -542,7 +544,7 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32= *data, u32 len) } =20 =20 -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 *dat= a, u32 len) { struct smbus_write_request request; u32 mpi_opts, result =3D 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; =20 - request.device_id =3D SMBUS_DEVICE_ID; + request.device_id =3D dev_addr; request.address =3D 0; request.length =3D len; =20 @@ -572,15 +574,15 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u= 32 *data, u32 len) if (err < 0) return err; =20 - /* Toggle 0x368.SMBUS_WRITE_REQUEST bit */ + /* Toggle 0x368.CAPS_LO_SMBUS_WRITE bit */ mpi_opts =3D aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); - mpi_opts ^=3D SMBUS_WRITE_REQUEST; + mpi_opts ^=3D BIT(CAPS_LO_SMBUS_WRITE); =20 aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, mpi_opts); =20 /* 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) =3D=3D (mpi_opts & SMBUS_WRITE_REQUEST), + BIT(CAPS_LO_SMBUS_WRITE)) =3D=3D (mpi_opts & (BIT(CAPS_LO_SMBUS_WRITE)))= , 10U, 10000U); =20 if (err < 0) --=20 2.17.1