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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 C4DDEC4724C for ; Thu, 30 Apr 2020 21:35:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A099E2071C for ; Thu, 30 Apr 2020 21:35:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TUErJTMo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727894AbgD3VfZ (ORCPT ); Thu, 30 Apr 2020 17:35:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727831AbgD3VfW (ORCPT ); Thu, 30 Apr 2020 17:35:22 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CC79C08E859 for ; Thu, 30 Apr 2020 14:35:22 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id h124so7388779qke.11 for ; Thu, 30 Apr 2020 14:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qD/fVPgRRIyWs24d7bjWoi8ignYx3dFl8pvIjbbWrGU=; b=TUErJTMoV2Ef58XYi9bdjAC95qZO4uGsDuy9cDeCcFK0IeRCQ3XBsVBS3vT1mPKyYa WSG3QgGvw7KaL5Otq4jLPgL21AJtOyqW4K+lD4OSaE/JgP4aStbDKBEtSR6YIXRGCaUR R+R7eTPKYorVu5YwLeAnCVDykVjmcC3RWwSeOmGGqixwAwqwtxRowH1DxIcLPvf89puD ZnEsu25jLQa/BvMMZy0er6ViYWlhQRzLfgaREzV6AXLboEDrheW03mE1tZ7xt98INzfm tWREoSJIJX5ZdZtjc7h+jDru14emC5cumLiKSLGF1qtCVoSvUX9Gb/RIs8v2s8G4eldD 2rLA== 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:mime-version:content-transfer-encoding; bh=qD/fVPgRRIyWs24d7bjWoi8ignYx3dFl8pvIjbbWrGU=; b=Xon7k9OYqYV8JSAQpjAp/G+l1dvoIgfc4nXHLvOe+Ns/zUsuOguHDuXk46EWJsF8S2 +X+BQ6TByfj6uzba6OvSoY15LBP6xNKeH4M8fHYgqlc0siaqpaur9Sk45kJJb85lyG8T Nn4oSaLCnlQgIla5oxfUTH+jWho99ve//w8AEZOfY2hVUiGvqRue7aFGZC7Qax03ADfF JjdhfW9k4hAP9XVeGBdA6XE5x1sGxCxGPnKIISHMXL5NW8qTAEy946XxzTi0Lkmweyb9 8qi5TkuY1pOPLNxHltolrTvv5pNG8tby2ncM0wElltRMn5k/IrfIJ2Djp31mJOY26LGT U8kw== X-Gm-Message-State: AGi0PuYrN4of7yqSNijA1+R7gANhVGspopHmAGWz9qRESioKRO9/lYpU usmVCFFUdE1GbXOMKNCI7y+KAQ== X-Google-Smtp-Source: APiQypJi6p4doOBZCsZHqe8y+gXjnJQOo30NLPOjTKJ7zVOa3hlcWPk393DOxm2TvlEIiy3pxSBsRQ== X-Received: by 2002:a37:a049:: with SMTP id j70mr547040qke.193.1588282521684; Thu, 30 Apr 2020 14:35:21 -0700 (PDT) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id s190sm1112543qkh.23.2020.04.30.14.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 14:35:21 -0700 (PDT) From: Alex Elder To: davem@davemloft.net Cc: evgreen@chromium.org.net, subashab@codeaurora.org, cpratapa@codeaurora.org, bjorn.andersson@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 3/3] net: ipa: zero return code before issuing generic EE command Date: Thu, 30 Apr 2020 16:35:12 -0500 Message-Id: <20200430213512.3434-4-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430213512.3434-1-elder@linaro.org> References: <20200430213512.3434-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Zero the result code stored in a field of the scratch 0 register before issuing a generic EE command. This just guarantees that the value we read later was actually written as a result of the command. Also add the definitions of two more possible result codes that can be returned when issuing flow control enable or disable commands: INCORRECT_CHANNEL_STATE: - channel must be in started state INCORRECT_DIRECTION - flow control is only valid for TX channels Signed-off-by: Alex Elder --- drivers/net/ipa/gsi.c | 7 +++++++ drivers/net/ipa/gsi_reg.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c index b4206fda0b22..b671bea0aa7c 100644 --- a/drivers/net/ipa/gsi.c +++ b/drivers/net/ipa/gsi.c @@ -1041,6 +1041,7 @@ static void gsi_isr_gp_int1(struct gsi *gsi) complete(&gsi->completion); } + /* Inter-EE interrupt handler */ static void gsi_isr_glob_ee(struct gsi *gsi) { @@ -1493,6 +1494,12 @@ static int gsi_generic_command(struct gsi *gsi, u32 channel_id, struct completion *completion = &gsi->completion; u32 val; + /* First zero the result code field */ + val = ioread32(gsi->virt + GSI_CNTXT_SCRATCH_0_OFFSET); + val &= ~GENERIC_EE_RESULT_FMASK; + iowrite32(val, gsi->virt + GSI_CNTXT_SCRATCH_0_OFFSET); + + /* Now issue the command */ val = u32_encode_bits(opcode, GENERIC_OPCODE_FMASK); val |= u32_encode_bits(channel_id, GENERIC_CHID_FMASK); val |= u32_encode_bits(GSI_EE_MODEM, GENERIC_EE_FMASK); diff --git a/drivers/net/ipa/gsi_reg.h b/drivers/net/ipa/gsi_reg.h index 7613b9cc7cf6..acc9e744c67d 100644 --- a/drivers/net/ipa/gsi_reg.h +++ b/drivers/net/ipa/gsi_reg.h @@ -410,6 +410,8 @@ #define INTER_EE_RESULT_FMASK GENMASK(2, 0) #define GENERIC_EE_RESULT_FMASK GENMASK(7, 5) #define GENERIC_EE_SUCCESS_FVAL 1 +#define GENERIC_EE_INCORRECT_DIRECTION_FVAL 3 +#define GENERIC_EE_INCORRECT_CHANNEL_FVAL 5 #define GENERIC_EE_NO_RESOURCES_FVAL 7 #define USB_MAX_PACKET_FMASK GENMASK(15, 15) /* 0: HS; 1: SS */ #define MHI_BASE_CHANNEL_FMASK GENMASK(31, 24) -- 2.20.1