Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp569303ybt; Fri, 19 Jun 2020 08:23:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjj79+5HHuZb06p/aY5pA5BFNq7F0kDqPioUEtZMwW5mgSOAjRX7H19WY+63uGO1S5+4XS X-Received: by 2002:a17:906:6b8a:: with SMTP id l10mr3899563ejr.465.1592580190040; Fri, 19 Jun 2020 08:23:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592580190; cv=none; d=google.com; s=arc-20160816; b=g1tHaV2SkSYMTwX24modqmPWVhw/lOlKbjPaNW3WCtq2gIEOMvePLYCfd7WRuBXUxd mAoMzAusS759QDEbKsIUrb1/6PTBnGwwgZRppl7HDVp8CCwuxLUSIoDrE1S1o875gfxt k9ISfOd3BEXMae9bMn1MlZFoyIiGlOVrw1m3+eycKfpnvm5ii0miPIwyDRVraoS4UNpP KxHTMcnKXKOA0d9lbkVkqDgvzv0mjVJFnjVtxGf+yaj15ULeBwdFMQjZdXe6SnGuqUEZ aX+veFoR6ylP++/eGPmAi88fcUUOgdVTsEGcMTCdOogvKdAmRGDE6OdFkbQqu1bKZeb5 1ZFA== 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=BZ1lhabGs6yXNd4Eu+WRlEUSFkc5r8glz6Tjt9L+3f8=; b=WNfJjbW9ilQkv40LucciQlCJ+2g6kP4/p/GguXYYzoNt8y7RpdtU/mXMGuTXYvbHBE xPg3cKKWvirOYVPF8eKR/gKsfQPaZ/CGB+oYCAH9Qe8aloGwH+NPWsylBrVvVQNJh0DD 3VR2KpSiBpsYE0MMCLr1Ri7Haq0ihdBvouAHRp2KPHABA4M0+jxiLkwtMqg62EkCNB9y n90MkD4xBKqmvNcw5CVVbGaQTXn2VD9547h8Ayu2mOPcCIlUPq21uyAGcmOOR1xI5k86 NGsG8iEGrN1SrlneaGXUtmYi2Iqm/1ynvbQqzUkOEGwHuP1R00T/imk4FzxgwmCFL3A3 v4KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T2TqWuCc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 v1si4210126ejd.588.2020.06.19.08.22.47; Fri, 19 Jun 2020 08:23:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=T2TqWuCc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390208AbgFSPUD (ORCPT + 99 others); Fri, 19 Jun 2020 11:20:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389660AbgFSPRv (ORCPT ); Fri, 19 Jun 2020 11:17:51 -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 7A30221919; Fri, 19 Jun 2020 15:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579871; bh=l4UrxZfPytW7PlaB2VeAq30RXCOzD1wa7DQI7P+EKhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2TqWuCcQA5I717oE19Nnps5WHEPE5XvVxEvEOph8qhPYJA48zD3upi00Arl9W3Zf 2tfeUqgJb4QYb80CEw2OzPGkyjq/umN9saZfkeOJnV4UDNBeCaDIR9B1mnQz4OMbrs Eynp9kH4boPxN2sFII8g/NrgSzmImvudl8FyuxQg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ioana Ciornei , Li Yang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 035/376] soc: fsl: dpio: properly compute the consumer index Date: Fri, 19 Jun 2020 16:29:13 +0200 Message-Id: <20200619141712.014982917@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ioana Ciornei [ Upstream commit 7596ac9d19a9df25707ecaac0675881f62dd8c18 ] Mask the consumer index before using it. Without this, we would be writing frame descriptors beyond the ring size supported by the QBMAN block. Fixes: 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring mode enqueue") Signed-off-by: Ioana Ciornei Acked-by: Li Yang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/soc/fsl/dpio/qbman-portal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soc/fsl/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c index 804b8ba9bf5c..23a1377971f4 100644 --- a/drivers/soc/fsl/dpio/qbman-portal.c +++ b/drivers/soc/fsl/dpio/qbman-portal.c @@ -669,6 +669,7 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s, eqcr_ci = s->eqcr.ci; p = s->addr_cena + QBMAN_CENA_SWP_EQCR_CI; s->eqcr.ci = qbman_read_register(s, QBMAN_CINH_SWP_EQCR_CI); + s->eqcr.ci &= full_mask; s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size, eqcr_ci, s->eqcr.ci); -- 2.25.1