From patchwork Tue Jun 23 19:56:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191603 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1368326ecs; Tue, 23 Jun 2020 14:26:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxyJTJAe5HnOPAjcfOlcJ8c9bKRDxtXi+sT+Zw8IxHM8Gz5NT0+oZcFP9jR+Beqggg7BYA X-Received: by 2002:a05:6402:1604:: with SMTP id f4mr24642398edv.379.1592947586805; Tue, 23 Jun 2020 14:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592947586; cv=none; d=google.com; s=arc-20160816; b=tyr4PUJgSh10zSzbFqidf82vQP4Oy2Tax6QMVeMwzGcxzr79K13YlL0HDGBSTl01J4 sxX2+yYT0dvp08ehabT0e5D0hLIcdmTmEvXTpBPVqP6SiugPS8NHKtNgzP5cLt1LnU+q Peu/cKmY3k34DFkax5b24bu6TsR1dfyOo60KoYAjkPouSau+5t6ncS95pu00Mvj38pMl 7fwyfIYWTJyKSU2aUnvK2qdtjnJZB+J2ALvdCB/NBBo2C5Hs3Ca1olN0zW9jrTUspmZu sWTTU7BbUh1gp9JIi9HDeKG+UU5GfIsxc2OpoRAUZoKAoHxaswLoYpg4NcpejqU6F9NP OpVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cL+fzdVkide17EEfH/cOjiQGCEHu6hP1Z90ZVoZHwoE=; b=Qh2/1sNmr89jA0jzq1xPgk2zNdG+gMIsiyLVMds6tmiDsu8Tg5CX9Uplqql9kG+DOw JOnsKUgQYmRS5eHC5yKY498lgUVz9fL5I8Ep7KGtv5+z2zXIzPxWdDh2+qpZHh7oVojF eTVVBbyAw1EJJfhR6HidV1/7/jD5UunO3GGt6gCUX3tX9UOAci3RyeHYB6L3+Sarx6fZ 2UTfQhOjmo6X7HYgvUVC54Xxw+/xMcSSuyzVmfzH8Wn0F0rccRjaLCCVJZr2Z1UMXBDp KJNZojtGMFREotR+6UdrPQfVf/3HSnNPk1V4HwRIOvD46vQxT0lM6Pyp1c7AMc2kY731 4CtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gmftUoK1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t5si4336749ejf.433.2020.06.23.14.26.26; Tue, 23 Jun 2020 14:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gmftUoK1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389350AbgFWUR5 (ORCPT + 15 others); Tue, 23 Jun 2020 16:17:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:34450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389608AbgFWURz (ORCPT ); Tue, 23 Jun 2020 16:17:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1B822064B; Tue, 23 Jun 2020 20:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943475; bh=tWflFMXlPV/4i3zVv13EFFvXyfx9GgbxDS6WuLXF5YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gmftUoK1nrEi9/NZbcGb/j+KUfb8SDPc+Pqsbg6vaQuG+8cfzBWSYitcyxVAHASO/ te1XkmjcNuKF+hdgOUIwSLDugQPhCzIJbZ46NyTeR5hBTtLVLHUabyZzcoBfepOnYn lGKzaFq11fey6/N7hODJIzOCAeXFO7D7AO10LlNw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 376/477] net: ipa: program upper nibbles of sequencer type Date: Tue, 23 Jun 2020 21:56:13 +0200 Message-Id: <20200623195425.303413691@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Elder [ Upstream commit 636edeaad5577b6023f0de2b98a010d1cea73607 ] The upper two nibbles of the sequencer type were not used for SDM845, and were assumed to be 0. But for SC7180 they are used, and so they must be programmed by ipa_endpoint_init_seq(). Fix this bug. IPA_SEQ_PKT_PROCESS_NO_DEC_NO_UCP_DMAP doesn't have a descriptive comment, so add one. Signed-off-by: Alex Elder Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipa/ipa_endpoint.c | 6 ++++-- drivers/net/ipa/ipa_reg.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c index a21534f1462fa..1d823ac0f6d61 100644 --- a/drivers/net/ipa/ipa_endpoint.c +++ b/drivers/net/ipa/ipa_endpoint.c @@ -669,10 +669,12 @@ static void ipa_endpoint_init_seq(struct ipa_endpoint *endpoint) u32 seq_type = endpoint->seq_type; u32 val = 0; + /* Sequencer type is made up of four nibbles */ val |= u32_encode_bits(seq_type & 0xf, HPS_SEQ_TYPE_FMASK); val |= u32_encode_bits((seq_type >> 4) & 0xf, DPS_SEQ_TYPE_FMASK); - /* HPS_REP_SEQ_TYPE is 0 */ - /* DPS_REP_SEQ_TYPE is 0 */ + /* The second two apply to replicated packets */ + val |= u32_encode_bits((seq_type >> 8) & 0xf, HPS_REP_SEQ_TYPE_FMASK); + val |= u32_encode_bits((seq_type >> 12) & 0xf, DPS_REP_SEQ_TYPE_FMASK); iowrite32(val, endpoint->ipa->reg_virt + offset); } diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h index 3b8106aa277a0..0a688d8c1d7cf 100644 --- a/drivers/net/ipa/ipa_reg.h +++ b/drivers/net/ipa/ipa_reg.h @@ -455,6 +455,8 @@ enum ipa_mode { * second packet processing pass + no decipher + microcontroller * @IPA_SEQ_DMA_DEC: DMA + cipher/decipher * @IPA_SEQ_DMA_COMP_DECOMP: DMA + compression/decompression + * @IPA_SEQ_PKT_PROCESS_NO_DEC_NO_UCP_DMAP: + * packet processing + no decipher + no uCP + HPS REP DMA parser * @IPA_SEQ_INVALID: invalid sequencer type * * The values defined here are broken into 4-bit nibbles that are written