Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 16 Sep 2022 15:42:48 -0700
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: Re: [PATCH v1 net-next 1/2] net: mscc: ocelot: utilize
 readx_poll_timeout() for chip reset
Message-ID: <YyT76OIgNiJBH1Dm@euler>
References: <20220916191349.1659269-1-colin.foster@in-advantage.com>
 <20220916191349.1659269-2-colin.foster@in-advantage.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220916191349.1659269-2-colin.foster@in-advantage.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?075j3uzUqf1i6kS5r1clpir/UrN5bQj4LqLjDSn82aSAkwi/Q2z4eyK1cViU?=
 =?us-ascii?Q?IfVP9yKAjVCciQ78Ii8hKMAVQmtWgkrZMidtkx3SoQE/LV95rUGbp2kC+mUu?=
 =?us-ascii?Q?7WdZQJzZXET9wg/ParxiCzmrr6k5vx+xphpsp/4ZgpgYn0vh1WANqnJV3h9y?=
 =?us-ascii?Q?d4+AGaXcBtq2X6deRA+AKaKpmlbapJ6E0VjzCqnxBizazZZ7yWInF2zbDnb6?=
 =?us-ascii?Q?2i83BeAXvK3v5VxfuHWqozHmOAJXPRc09KNGk+4fcexBiWQYFFvPn3aDQ1o7?=
 =?us-ascii?Q?fSy3wtC8SmovUR0P41lz91sQEWeW84M+Rs85hrP2d57vrFlGUw+dhAdcpy/3?=
 =?us-ascii?Q?CcCz/CFmbCDSp8rjXv95Mj8jATly3HsWL7jRlAgvKQZelN7ejjM9d+p3p6I3?=
 =?us-ascii?Q?KogcoO6bPDqPhC/AxOtxZHzL3nn+WCcWgjBg7J1YecsYBEai76uauvmGoilZ?=
 =?us-ascii?Q?f5WPovCCiWyh8NTsJnC0/w/88BKVUJYFSw+NQg8LUqmfxY63TB5oHf3ue2Wv?=
 =?us-ascii?Q?juPrqTtmU0YxX58LN56oM4TomQ8QeB1xp6xPPcRJTSruJAxiJmflYIwb1t5s?=
 =?us-ascii?Q?kDZboMbuqbL+8DOqVRUq5CCPw+7LorsQEtxdhWWG5V9LEupPxMOV24eS4erq?=
 =?us-ascii?Q?DQWgSCLtHR9XlX+i1wNxrh7/H/PA4ojuPqJmeQ//P2uv9/vCRlaiFmaLO7yU?=
 =?us-ascii?Q?yGB0D2kcJrbC1iDm9vrh3vVz64yekBrwuZ5XWxQzo8l+e9UMHhuykPd4bL0I?=
 =?us-ascii?Q?iihVTWDVr3n5fmC4Ld5bXfomXBoRaoDSIS2AZzzvrEJR5BeET5tmM8Bju2TV?=
 =?us-ascii?Q?R0qWO35PlI9DT85FSxcZTyLNlNt3mGuq3eEtI3EEgRBKxSTVU9t8OWot5I59?=
 =?us-ascii?Q?yba8gqhdIqLLn53CBm0PnPIs0iv15+ob2FtOUwmbLsP3zlUBFKP64v0WDC6g?=
 =?us-ascii?Q?AYqySBZGF6FEnDGAyCx1960Jw9A2ic4FVvOXBNmpR2Dr80ntQDvuQdNtsgQ7?=
 =?us-ascii?Q?8tgaxho/rd60hOhj+85OSnjQMYQRwSF6BqGsphjqs4UMyw8MHv8fTt6NmJme?=
 =?us-ascii?Q?QI6K+H7i579lb9MShFhkkZe0GmL1axD+nRObXAhwX/T19Pl5uqrAvRiPGOl5?=
 =?us-ascii?Q?5Bg15eov7Vp+d2jnWsnNTHY/Zv/MQCmIEfi39XOZV/Qf86RDYwnbyHpxkjwH?=
 =?us-ascii?Q?QSX0fOeIdzb5N/aXBlESF58UYvuu4kmtBnm1ISES0pLbubfTB70pzrxj4Jtr?=
 =?us-ascii?Q?rzT95tD36NuT6gZSEJoGRAD8P6ncj/zI4YzhJDVdQkl4adkB1eIPn8YdZ+oj?=
 =?us-ascii?Q?CoBvnG0gPyFWThgiqm+xOJWfz+d3iSE3y9yqQ6Zh+WzaA46eBwJ5N9lWEKLU?=
 =?us-ascii?Q?zcMfVwiAiD56gfSajPj7MTMkzYwqd7YoiOAX0aIUprUaqkcgAOXjbrD9bLlr?=
 =?us-ascii?Q?TEp4RKOiohTSJoEdwDLujBSbuuJOtjxudgo4Ga2CTzOVMnQvM39NUPWt4gqo?=
 =?us-ascii?Q?7KpDUv087x+aEI9BNCHZKg6Rw7QAzamjY7FzMBR/iMQiIrAUPHjab6meIApY?=
 =?us-ascii?Q?SxOWM039Tdx3NI1XYnvUovwlRvVgryJj8JWRCPBg80q4FTFEhjUHf5mM6o9O?=
 =?us-ascii?Q?0Q=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2515b2ad-710f-406f-971e-08da9834ca1e
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 22:42:52.7444
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xeJBx73dhCvl4NVdoD4HvX6FsR0obLNcPKY1Atm1eXoablIgNFlHx0nQnGM2fPT5d6jcWZBuRZM215Muge2Y3icgHqoDLWljjnNRr04pRmM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4282
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Sep 16, 2022 at 12:13:48PM -0700, Colin Foster wrote:
> Clean up the reset code by utilizing readx_poll_timeout instead of a custom
> loop.
> 
> Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
> ---
>  drivers/net/ethernet/mscc/ocelot_vsc7514.c | 32 ++++++++++++++++------
>  1 file changed, 23 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
> index ae42bbba5747..79b7af36b4f4 100644
> --- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
> +++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
> @@ -6,6 +6,7 @@
>   */
>  #include <linux/dsa/ocelot.h>
>  #include <linux/interrupt.h>
> +#include <linux/iopoll.h>
>  #include <linux/module.h>
>  #include <linux/of_net.h>
>  #include <linux/netdevice.h>
> @@ -25,6 +26,9 @@
>  #define VSC7514_VCAP_POLICER_BASE			128
>  #define VSC7514_VCAP_POLICER_MAX			191
>  
> +#define MEM_INIT_SLEEP_US				1000
> +#define MEM_INIT_TIMEOUT_US				100000
> +
>  static const u32 *ocelot_regmap[TARGET_MAX] = {
>  	[ANA] = vsc7514_ana_regmap,
>  	[QS] = vsc7514_qs_regmap,
> @@ -191,22 +195,32 @@ static const struct of_device_id mscc_ocelot_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, mscc_ocelot_match);
>  
> +static int ocelot_mem_init_status(struct ocelot *ocelot)
> +{
> +	unsigned int val;
> +	int err;
> +
> +	err = regmap_field_read(ocelot->regfields[SYS_RESET_CFG_MEM_INIT],
> +				&val);
> +
> +	return err ?: val;
> +}
> +
>  static int ocelot_reset(struct ocelot *ocelot)
>  {
> -	int retries = 100;
> +	int err;
>  	u32 val;
>  
>  	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_INIT], 1);
>  	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
>  
> -	do {
> -		msleep(1);
> -		regmap_field_read(ocelot->regfields[SYS_RESET_CFG_MEM_INIT],
> -				  &val);
> -	} while (val && --retries);
> -
> -	if (!retries)
> -		return -ETIMEDOUT;
> +	/* MEM_INIT is a self-clearing bit. Wait for it to be cleared (should be
> +	 * 100us) before enabling the switch core.
> +	 */
> +	err = readx_poll_timeout(ocelot_mem_init_status, ocelot, val, !val,
> +				 MEM_INIT_SLEEP_US, MEM_INIT_TIMEOUT_US);
> +	if (IS_ERR_VALUE(err))

I see patchwork is complaining about IS_ERR_VALUE. I think it should
just be if (err). I'll test before sending v2 after the weekend.

> +		return err;
>  
>  	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
>  	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_CORE_ENA], 1);
> -- 
> 2.25.1
>