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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 B0004C43381 for ; Mon, 25 Feb 2019 21:31:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7515921848 for ; Mon, 25 Feb 2019 21:31:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130287; bh=gq0Oi9dpBb95GHO+PIQ9WbH7wlt021Rvv4MROolwgEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1s7ZSeE1Rn5D8qz1meGd427QWGtFJc8gysq2wvZ833AZfN9UhOZrGpfoz54OFTGpg H6fAQIX/tNhul912WBsqzinybDTiGzlbQ9EKiJ0PPzriX/bts/kPakW89075QUwJVo cAAUZEmK45gWLB9dFSxnK4aECyqXBlX4MfUYQBC0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732309AbfBYVbZ (ORCPT ); Mon, 25 Feb 2019 16:31:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:36992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732298AbfBYVbY (ORCPT ); Mon, 25 Feb 2019 16:31:24 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 7D25021841; Mon, 25 Feb 2019 21:31:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130284; bh=gq0Oi9dpBb95GHO+PIQ9WbH7wlt021Rvv4MROolwgEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1C2altXINAt5NC+yt4loLnC7YW+HXCWC1jK4HpPhILnXiwy4NLhjIKqsWngCExXZs jir0FsoGtoVvFnDXjf3bK8hCVzhIxLr2RXBU5h+47wmOeF5Med453kSIwHOdupQA/b AQMJiXs4n9GkSkNly/ZU0FlA77CR8ddvE+mxpaJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joao Pinto , "David S. Miller" , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Sasha Levin Subject: [PATCH 4.20 073/183] net: stmmac: Check if CBS is supported before configuring Date: Mon, 25 Feb 2019 22:10:46 +0100 Message-Id: <20190225195106.768318391@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 0650d4017f4d2eee67230a02285a7ae5204240c2 ] Check if CBS is currently supported before trying to configure it in HW. Cc: Joao Pinto Cc: David S. Miller Cc: Giuseppe Cavallaro Cc: Alexandre Torgue Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 531294f4978bc..58ea18af9813a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -301,6 +301,8 @@ static int tc_setup_cbs(struct stmmac_priv *priv, /* Queue 0 is not AVB capable */ if (queue <= 0 || queue >= tx_queues_count) return -EINVAL; + if (!priv->dma_cap.av) + return -EOPNOTSUPP; if (priv->speed != SPEED_100 && priv->speed != SPEED_1000) return -EOPNOTSUPP; -- 2.19.1