From patchwork Fri Oct 30 06:53:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rayagonda Kokatanur X-Patchwork-Id: 314931 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MIME_HEADER_CTYPE_ONLY, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, T_TVD_MIME_NO_HEADERS, URIBL_BLOCKED, 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 C4857C56201 for ; Fri, 30 Oct 2020 06:54:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AA4A22206 for ; Fri, 30 Oct 2020 06:54:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Nu7L8FHj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725838AbgJ3GyE (ORCPT ); Fri, 30 Oct 2020 02:54:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725355AbgJ3GyE (ORCPT ); Fri, 30 Oct 2020 02:54:04 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D2B9C0613CF for ; Thu, 29 Oct 2020 23:54:04 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id 15so4381640pgd.12 for ; Thu, 29 Oct 2020 23:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3D7C6lvkSxGGJeIa3XJBvmbloIWB9HX9Yj9MOnaBSM4=; b=Nu7L8FHjvrC4zq20j6bgS2k2y1/gMPnAIf0P0QD62t59RvgLyZLkckAeqS3pyS6TqN 3aF4SyY55O/nusEtIH6VLFP4L3DxBvui7x8FflmkDTHSOuHJEEgt8j0ah6u/SGatAhFn 3NAGA7MEDIbV+ujg3JZCgMTr2XsO+/9VR2PDE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3D7C6lvkSxGGJeIa3XJBvmbloIWB9HX9Yj9MOnaBSM4=; b=XBwW4ssMYwszm+cNSz6iwZBJExTyOXsEAA32/PjCCF2Elxbkhg5ew3q6ppkIv3Aomu oH4oKmAg/cK4qtjzwnsslrEY79owtMbGoOrfuKRt2ZTVvZEVP6BVrjiCSZP+LcnIwwWS DHlHG84zeGU1L3xyy2wICg7aBM9x5PI/8iPSwvfh/wwjtdEs3yt+/5hoqrnCa/dPCLn/ 7vtm3rvB7IYrwXQtS9FC0AC9s9/YpcEd3j9vCG7F+CdIJIuCADs2jDErGFCa4/m9rY5V Xbno+Yne8TjA0AkhXMG4clWlkSHXW4m2Oirg+1SchSanWv217Vi+8+b4R8KzHBEM+Psj oXIQ== X-Gm-Message-State: AOAM532/wDI97vZSGjKMVRISfGRSN2wRd2ERL0undqSH+8jgaBNDoVEt HID1WTYVB/oZYeaNLdiG6lM7AQ== X-Google-Smtp-Source: ABdhPJxdS9/aIeQB6jOaeDfbVW+kXRz6W/Etxf4U+vB7XrHdtQgqNyPLHBURISVDPSqz9FtqzyirNA== X-Received: by 2002:a17:90a:a48c:: with SMTP id z12mr1133870pjp.108.1604040843875; Thu, 29 Oct 2020 23:54:03 -0700 (PDT) Received: from rayagonda.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id n1sm4561547pgl.31.2020.10.29.23.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 23:54:02 -0700 (PDT) From: Rayagonda Kokatanur To: Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Wolfram Sang , Florian Fainelli , Brendan Higgins , Andy Shevchenko , Lori Hikichi , Dhananjay Phadke , linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Rayagonda Kokatanur Subject: [PATCH v2 1/6] i2c: iproc: handle Master aborted error Date: Fri, 30 Oct 2020 12:23:34 +0530 Message-Id: <20201030065339.955-2-rayagonda.kokatanur@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201030065339.955-1-rayagonda.kokatanur@broadcom.com> References: <20201030065339.955-1-rayagonda.kokatanur@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Handle Master aborted error by flushing tx and rx fifo and reinitializing the hw. Signed-off-by: Rayagonda Kokatanur --- drivers/i2c/busses/i2c-bcm-iproc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index d8295b1c379d..834a98caeada 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -93,6 +93,7 @@ #define S_CMD_STATUS_MASK 0x07 #define S_CMD_STATUS_SUCCESS 0x0 #define S_CMD_STATUS_TIMEOUT 0x5 +#define S_CMD_STATUS_MASTER_ABORT 0x7 #define IE_OFFSET 0x38 #define IE_M_RX_FIFO_FULL_SHIFT 31 @@ -311,9 +312,10 @@ static void bcm_iproc_i2c_check_slave_status( return; val = (val >> S_CMD_STATUS_SHIFT) & S_CMD_STATUS_MASK; - if (val == S_CMD_STATUS_TIMEOUT) { - dev_err(iproc_i2c->device, "slave random stretch time timeout\n"); - + if (val == S_CMD_STATUS_TIMEOUT || val == S_CMD_STATUS_MASTER_ABORT) { + dev_err(iproc_i2c->device, (val == S_CMD_STATUS_TIMEOUT) ? + "slave random stretch time timeout\n" : + "Master aborted read transaction\n"); /* re-initialize i2c for recovery */ bcm_iproc_i2c_enable_disable(iproc_i2c, false); bcm_iproc_i2c_slave_init(iproc_i2c, true);