From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2699C43381 for ; Wed, 27 Feb 2019 12:10:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4E2E2075B for ; Wed, 27 Feb 2019 12:10:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="CjyD4Jml" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730013AbfB0MK3 (ORCPT ); Wed, 27 Feb 2019 07:10:29 -0500 Received: from mail-eopbgr710087.outbound.protection.outlook.com ([40.107.71.87]:41728 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729986AbfB0MKX (ORCPT ); Wed, 27 Feb 2019 07:10:23 -0500 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=k/MrFUinIa7K+3KfU2upRo3TDLjl27EmSfclczmXBtY=; b=CjyD4Jml3KorttVs7PfzsQCsq9pzVALqCYuxmG3ywiThu2KWRFtOHo8UC1nXDoYBGBl9FyEw7Jo8LOaMpci2ZDHHDkv18dOh48GBk1Vy9bxEt8a9nMJd/NWLU7bxOwszrv8HKYBSegLx+/B95ETndcgSqLgP54z+GLME/JU+Yys= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB4009.namprd11.prod.outlook.com (20.176.125.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.15; Wed, 27 Feb 2019 12:10:13 +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; Wed, 27 Feb 2019 12:10:13 +0000 From: Igor Russkikh To: "David S . Miller" CC: "netdev@vger.kernel.org" , Igor Russkikh , Nikita Danilov Subject: [PATCH v2 net-next 6/6] net: aquantia: use better wrappers for state registers Thread-Topic: [PATCH v2 net-next 6/6] net: aquantia: use better wrappers for state registers Thread-Index: AQHUzpVkxFmuf+Kwo02WMg36XVtz5A== Date: Wed, 27 Feb 2019 12:10:13 +0000 Message-ID: <7063b9060d08176255b6564ce0cca8f1f68b5277.1551269343.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: BYAPR01CA0032.prod.exchangelabs.com (2603:10b6:a02:80::45) 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: 67a0bed4-e138-40dc-bd98-08d69cac86f1 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020);SRVR:DM6PR11MB4009; x-ms-traffictypediagnostic: DM6PR11MB4009: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;DM6PR11MB4009;23:lS1nIRYbomYh0qhqYKx8gwwr0GoP+/LPjzKoZAq?= =?iso-8859-1?Q?TZEgiyOyk2pMln2Yr30zDseFAYANpsmldmPPS0kHuGw8hF6vq3lc+twglv?= =?iso-8859-1?Q?UgZFyRh9hXP/JhI+0Vyg3efydTXjg3CqTHFuB4MpijcwC+pJOmM+DfkETb?= =?iso-8859-1?Q?kmp87Cn8npXD9pwc12o+RS3jo+DLEEpnMF1y/+oC+Nj6NkihJ6zTjK3fgI?= =?iso-8859-1?Q?m6gNTWnbZwALwyCGwzt43Qgh9OPowFPRo1SQKTZjnIACQUQn9Q5QU+Kkx3?= =?iso-8859-1?Q?zXyVcvTZKpFqVBESVDPO+uWwMg48gqTXEQ6BhRdAPMmklrYoaSfiKioqql?= =?iso-8859-1?Q?SfMH7Fs2okWTJpLNR/8fJ0iyHb/dj4rBy6q5P2dP2nrCcgRCJXdNwSv8A4?= =?iso-8859-1?Q?C5vREJIxh4SvxOK1m9f2bZLJa3udxNjn9ZAtUHXKybFJbb3wTxVkLbSAWg?= =?iso-8859-1?Q?bThimr7t9/8caOThZ62BtQ9Q9Yr0LKZMBUz+gs5gw+prIIrH64r5maakwq?= =?iso-8859-1?Q?P4Bf+LV3qsq2JWB5by9t6auqNw3LMgdWDjZ85AyBVaxy2S5xX3z8CpTM4L?= =?iso-8859-1?Q?zCv41v+AtvEE9ibBIZ8Qps2k15+ZKxgV+VpFebRMZlXBWxO2bRilljMgAv?= =?iso-8859-1?Q?Fw/DxDlNeW44Xy0DP8lTKXE8lvzc2EACldRzGcW0WT3wIEPYxPUM9lUi3H?= =?iso-8859-1?Q?cMrmChJHC0cBABflySTmePEw+s74s4EgnbvhnvEUsISFY2FOtvy5I8q+s1?= =?iso-8859-1?Q?vluWJcyifNr9IkRinM4bRyLi584tR4zlbv27f5PNtvxvb6mFYg1D1azzIn?= =?iso-8859-1?Q?Ad6zQPCbMn/oAc/szm47RlTpOYODCnE2MOHEM0LRrf9uemFoLgngRoNimG?= =?iso-8859-1?Q?jP0gitGI9YpdbssSO9I1Xpldxp1Hp5Y9N8stSA3rN1FzD6PfI5uqKCNMEx?= =?iso-8859-1?Q?y1OngWWNvxlqUtBiIveHKfXKOBWi9KeF3F7MYR9u6YT+l582TLjB96n3mK?= =?iso-8859-1?Q?mKe6D2O4YWdyPFCvFHU/J3qzgiI0zv/fdDD4bPPi6R+3PleMk72KAsmnpK?= =?iso-8859-1?Q?+d07PXFxDPUnR414/sUlHtU9PsVDW3/zpxD/T7IKFiz9Voze/7vqjx4BSR?= =?iso-8859-1?Q?hpHjErUoK8aDYdWHFRJ69NWOoR3nuBdL7iLDm9NoZHf7Oxf7KuWULvNYta?= =?iso-8859-1?Q?mV1pQk1/Huqt4GKU9ojIJqxjDOhjPvSa2gUhB9DLVIYDfNKSnnUrf+3IeZ?= =?iso-8859-1?Q?Np+eq9cJwCHfI1OinhQ1sZVcddOJ115igzVqrN4/aje3pfN4b0dI/tPt7U?= =?iso-8859-1?Q?+zKnNpAsC1/Q1QW2Sk5Y5aFPV3EFJNmx00g3S83WrkVbg=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0961DF5286 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(396003)(39850400004)(346002)(376002)(366004)(189003)(199004)(25786009)(2616005)(316002)(118296001)(54906003)(2906002)(476003)(44832011)(446003)(11346002)(66066001)(6916009)(478600001)(102836004)(53936002)(486006)(105586002)(72206003)(106356001)(6512007)(4326008)(71190400001)(71200400001)(107886003)(81156014)(81166006)(76176011)(52116002)(305945005)(7736002)(5660300002)(99286004)(6116002)(3846002)(8936002)(50226002)(68736007)(186003)(6506007)(386003)(86362001)(256004)(14444005)(14454004)(6486002)(26005)(6436002)(8676002)(36756003)(97736004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR11MB4009;H:DM6PR11MB3625.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A: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: XnxsA578jiLYYG4f2uGMqoXZr4nG8CtLOpjwwpDVwzJiEi516iupdDHLNuI2DXaeh66ahGBkwyjk4g0VVRrVSWGhHXhrHQYvvHNXW/qNs/2VFJOKNAucHKoSP54DDRTNramOu/Sa5e3JTFJI7BnVJzY2F5ZJ7VxIiLS5NukS4Xpkm9mvTFETpnL4nHmsWsN3XK6bQbXd+10W+ZCZjax+GkhJLRSIfAu7ylfVybwrZThRA+h6GWI6WhL2lhrnC+B/7S3DjeumCrPWspBLqjHw/+rZ2gZfE30rNZrnWyiDcGTgblVCnlze+8qfXkK8cN+GT27Q0q95iBOGeqjdi0elr8jF2ncGjxGt8AKfumUYTp/fn51jJwYbRrCqsZCXiAoJijVkC5xfFUhmrouMGRDKKIF/4woH3p64Qcd773NkbaM= 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: 67a0bed4-e138-40dc-bd98-08d69cac86f1 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2019 12:10:11.7661 (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: DM6PR11MB4009 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nikita Danilov Replace some direct registers reads with better online functions. Signed-off-by: Nikita Danilov Signed-off-by: Igor Russkikh --- .../net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 6 +++--- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b= /drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c index e5df40b00afd..eb4b99d56081 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c @@ -298,7 +298,7 @@ int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self,= u32 a, bool is_locked; =20 hw_atl_reg_glb_cpu_sem_set(self, 1U, HW_ATL_FW_SM_RAM); - is_locked =3D hw_atl_reg_glb_cpu_sem_get(self, HW_ATL_FW_SM_RAM); + is_locked =3D hw_atl_sem_ram_get(self); if (!is_locked) { err =3D -ETIME; goto err_exit; @@ -337,7 +337,7 @@ static int hw_atl_utils_fw_upload_dwords(struct aq_hw_s= *self, u32 a, u32 *p, int err =3D 0; bool is_locked; =20 - is_locked =3D hw_atl_reg_glb_cpu_sem_get(self, HW_ATL_FW_SM_RAM); + is_locked =3D hw_atl_sem_ram_get(self); if (!is_locked) { err =3D -ETIME; goto err_exit; @@ -602,7 +602,7 @@ static int hw_atl_utils_mpi_set_state(struct aq_hw_s *s= elf, =20 int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self) { - u32 cp0x036C =3D aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR); + u32 cp0x036C =3D hw_atl_utils_mpi_get_state(self); u32 link_speed_mask =3D cp0x036C >> HW_ATL_MPI_SPEED_SHIFT; struct aq_hw_link_status_s *link_status =3D &self->aq_link_status; =20 diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2= x.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c index c628290d7546..fe6c5658e016 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c @@ -438,7 +438,7 @@ static int aq_fw2x_get_eee_rate(struct aq_hw_s *self, u= 32 *rate, =20 *supported_rates =3D fw2x_to_eee_mask(caps_hi); =20 - mpi_state =3D aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE2_ADDR); + mpi_state =3D aq_fw2x_state2_get(self); *rate =3D fw2x_to_eee_mask(mpi_state); =20 return err; @@ -468,7 +468,7 @@ static int aq_fw2x_set_flow_control(struct aq_hw_s *sel= f) =20 static u32 aq_fw2x_get_flow_control(struct aq_hw_s *self, u32 *fcmode) { - u32 mpi_state =3D aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE2_ADDR); + u32 mpi_state =3D aq_fw2x_state2_get(self); =20 if (mpi_state & HW_ATL_FW2X_CAP_PAUSE) if (mpi_state & HW_ATL_FW2X_CAP_ASYM_PAUSE) --=20 2.17.1