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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 4170AC282CA for ; Wed, 13 Feb 2019 03:02:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1113D21B68 for ; Wed, 13 Feb 2019 03:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550026920; bh=RUaBm/YMp9M1Sw70QcSa4ukqGdLSql/KuV1pzCFlsWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HsAheuVKsU7UQlMcY2UDLfp5uFALNYNn0KzMCgjGFFfCnM2GNBzrsPMrQyVXfImh0 p783KIAe2hb3E9E0ou9OqikgmzDJXKWuKjphH9ci09G/N0HPx63fMptVlXiaEYLxhv sibpuWKfXLBXhakzSxUq/djhV+UoGinMQMyMWHF4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389264AbfBMDB4 (ORCPT ); Tue, 12 Feb 2019 22:01:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:38622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387879AbfBMCfC (ORCPT ); Tue, 12 Feb 2019 21:35:02 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5F363222CA; Wed, 13 Feb 2019 02:35:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025301; bh=RUaBm/YMp9M1Sw70QcSa4ukqGdLSql/KuV1pzCFlsWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IiOF7h/aP1OlYlUUXvCmSkvIT8veNLhfoxynBUsF9CrB4rCEUufbulENHJuWPAEzv Zsjl5TF8LQNuGTDDoqAUhXebWVA8WNoYHhVrFuP+avduoDYQBimISiX2clb7Lxi5mK KmaQxo7NUPIpnXmhUY674QlzUATpNqmiNiBkBjy4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jose Abreu , Joao Pinto , "David S . Miller" , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 055/105] net: stmmac: Check if CBS is supported before configuring Date: Tue, 12 Feb 2019 21:32:46 -0500 Message-Id: <20190213023336.19019-55-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023336.19019-1-sashal@kernel.org> References: <20190213023336.19019-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jose Abreu [ 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 531294f4978b..58ea18af9813 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