From patchwork Wed Dec 23 08:47:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1419802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D16fL1qKCz9sVJ; Wed, 23 Dec 2020 20:02:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ks026-0002FR-Pb; Wed, 23 Dec 2020 09:02:10 +0000 Received: from mail-pj1-f46.google.com ([209.85.216.46]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1krzy7-00080h-75 for kernel-team@lists.ubuntu.com; Wed, 23 Dec 2020 08:58:03 +0000 Received: by mail-pj1-f46.google.com with SMTP id z12so2688827pjn.1 for ; Wed, 23 Dec 2020 00:57:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q1yCIWC65vFlmz0PNi7HqcegrY62Wl5SHDNZrQB9BXk=; b=o44JiR5wrleIJ/unVSieAAtjJ8YrIB9fi3JTs5D4wmpoE19EFG3L0y7mdXO6Cirzsq ctW8SzzHDHwyGaR2ERMr7krVEJwDwo6cYRZtzMpyfKXlvyP/AlJvo0oa1q27WhflskF1 TvnrRJ0yQJt2dU26RX+7Urgq+1uDzq46QAYDTIMD9sZ3X9O59W780C+ufKAeKm1AszvP 7DWb8qm6BPO2+sYlx2BCqtPVxwPR3on7WZeqfKVGg/7NelgzxG2BFCuJqaHnSbYKiJ2e a/EFU4vuPKV8Rqbzhoh6AiRE6lcuXXwalbZvnMv+86O6R6wu/DXLiOvrTvmcTH/yjoh9 2nfA== X-Gm-Message-State: AOAM530PdgCsLuJOtusw3mSk0IZTYiHZ3vuCybyADkmbcOnQ2Y9WqDky YZ+F0+1QXZKdEVTL7tTXehDp2fBtOGoQbdX4 X-Google-Smtp-Source: ABdhPJw6MEzJFwmVlustZu5XP2J/ep6/mvIFrJ74Ds9ScqQdLuE8rnluoyDJ26u6chRy9vWjzhcupw== X-Received: by 2002:a17:902:c517:b029:d6:e179:2097 with SMTP id o23-20020a170902c517b02900d6e1792097mr3650098plx.70.1608713863347; Wed, 23 Dec 2020 00:57:43 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id gj1sm20947678pjb.11.2020.12.23.00.57.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 00:57:42 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 134/379][SRU][OEM-5.6] bus: mhi: core: Do not process SYS_ERROR if RDDM is supported Date: Wed, 23 Dec 2020 16:47:47 +0800 Message-Id: <20201223085152.554896-135-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201223085152.554896-1-vicamo.yang@canonical.com> References: <20201223085152.554896-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.46; envelope-from=vicamo@gmail.com; helo=mail-pj1-f46.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Hemant Kumar BugLink: https://bugs.launchpad.net/bugs/1879633 Devices that support RDDM do not require processing SYS_ERROR as it is deemed redundant. Avoid SYS_ERROR processing if RDDM is supported by the device. Signed-off-by: Hemant Kumar Reviewed-by: Jeffrey Hugo Reviewed-by: Manivannan Sadhasivam Signed-off-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20200521170249.21795-13-manivannan.sadhasivam@linaro.org Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 30b7892417c50a05bf4a2ad56c2e1355d4d1404a) Signed-off-by: You-Sheng Yang --- drivers/bus/mhi/core/main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c index 467c0ba87ac3..1f622ce6be8b 100644 --- a/drivers/bus/mhi/core/main.c +++ b/drivers/bus/mhi/core/main.c @@ -397,9 +397,9 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv) } write_unlock_irq(&mhi_cntrl->pm_lock); - /* If device in RDDM don't bother processing SYS error */ - if (mhi_cntrl->ee == MHI_EE_RDDM) { - if (mhi_cntrl->ee != ee) { + /* If device supports RDDM don't bother processing SYS error */ + if (mhi_cntrl->rddm_image) { + if (mhi_cntrl->ee == MHI_EE_RDDM && mhi_cntrl->ee != ee) { mhi_cntrl->status_cb(mhi_cntrl, MHI_CB_EE_RDDM); wake_up_all(&mhi_cntrl->state_event); } @@ -735,6 +735,11 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, { enum mhi_pm_state new_state; + /* skip SYS_ERROR handling if RDDM supported */ + if (mhi_cntrl->ee == MHI_EE_RDDM || + mhi_cntrl->rddm_image) + break; + dev_dbg(dev, "System error detected\n"); write_lock_irq(&mhi_cntrl->pm_lock); new_state = mhi_tryset_pm_state(mhi_cntrl,