Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp5005375rwn; Mon, 12 Sep 2022 02:54:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR7OLyK0b8AnLptocWxEcT8YW6XZffyTq6HEOsUKXYTuQoQTyJvbBv/Dn23dQVp7q2c6QOpt X-Received: by 2002:a05:6a00:27a0:b0:540:f0c2:6c7f with SMTP id bd32-20020a056a0027a000b00540f0c26c7fmr14511374pfb.42.1662976476979; Mon, 12 Sep 2022 02:54:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662976476; cv=none; d=google.com; s=arc-20160816; b=tTDRDZ+fndFjGb2sgDDXBy6yNmRzTCwy+r5Ot+h0hD7zKGlBS22lk5T4NLkH5youSn w5XtRb6qh7WA499Lnjdd94NvM5uycAn5ons/q8SGfSVCr4OUXtECVv29gxTDpv7rIrW+ 9SiIzcke4mWWj3x6gtpDsfyZr3mN5ZpfIe3XayGV43d10omUqpxorzQ9U7bg4/a4zXX0 FGLjVtW3hNCHh2mieDyGjLBjk1mN6uFOGCS4KJ627Fc+TLwlt7DoTYr8EnqY5rlV7MqH +CGUf11tTAxw8RCMhagmpwA7p2+cZUKEjhoAObJVRTESZRyDSsUDajW2l1Ajz37JstWt VK3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:sender:message-id:content-transfer-encoding :content-disposition:mime-version:subject:cc:to:from:references :in-reply-to:dkim-signature; bh=Iqv2ZNon/0V6qOMjnZaExwEfo5N/cA+0Vtwvr2YuKdI=; b=PHXjd7L6f9cyfkl7sbLG7MPDailqzp3edHquZNgRnXEX5xrFJS8q8Zb8Hmk+1Lptbu xG+LOMkRlJJ2MlMi6T6rU1jcngv1J90eMZfJnst+GxS5N0zBKEuRqR5VZkaWCmQxEx8k ADJylDr+G7Vw9XONaR5lTeRcFrM2qpy/9lUrRS+ns2yvY5IiNiDqTW9glKaWXraj/Mhn 26qoMfhXKNacFHKiQrbWUN6s5N+RqDVtlPlSbYp/W0ufyMmAmKu9GMj/LhSFQFePosIA OZjDt+B/4wr4w8q6D4u4kDOEBfnSwsRYzmMIbwltepFTa+0MumxorfJlvS0V5upEUumZ H2PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b=0VYJqPGX; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l71-20020a63914a000000b0041a4f4a2afesi7907872pge.411.2022.09.12.02.54.28; Mon, 12 Sep 2022 02:54:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b=0VYJqPGX; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230106AbiILJyN (ORCPT + 64 others); Mon, 12 Sep 2022 05:54:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230017AbiILJxm (ORCPT ); Mon, 12 Sep 2022 05:53:42 -0400 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:32c8:5054:ff:fe00:142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FC9A3844E; Mon, 12 Sep 2022 02:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Iqv2ZNon/0V6qOMjnZaExwEfo5N/cA+0Vtwvr2YuKdI=; b=0VYJqPGXPmPKrgaFNBFpS44RNq 1kQEUZcU80lxKls6t5QmZldkQ3desg4NAWXZlNS0Pz06+kUihjmeP/ZKuoKgYoe34s9EsAbibvt1G wQETFsvTRGrbmAfytJO/0bmcUF1FLpoprGOz4iMaDRxPKApW3v3xbaTX8SaSqu2QyvMlZdegRomGg itnIIWNJJ2McjIX7F9QazyoC1pTART3Mp6MjxMh+pG7CasHdZKOpn1P4WR4CKF08g/hxaPwL5QDcE X3MzPD1jtX6wqcIs74DPEnb1BgHlXRnjs3uTMSt5PAPexDs8Q+UeMjLgqulMT+YOj64DFr+LarnNE UutnG+/w==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:60536 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXg83-0001UD-7a; Mon, 12 Sep 2022 10:53:23 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1oXg82-0064vT-HX; Mon, 12 Sep 2022 10:53:22 +0100 In-Reply-To: References: From: Russell King (Oracle) To: Arend van Spriel , Franky Lin , Hante Meuleman Cc: Alyssa Rosenzweig , asahi@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, "David S. Miller" , devicetree@vger.kernel.org, Eric Dumazet , Hector Martin , Jakub Kicinski , Kalle Valo , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Paolo Abeni , "Rafa__ Mi__ecki" , Rob Herring , SHA-cyfmac-dev-list@infineon.com, Sven Peter Subject: [PATCH wireless-next v2 09/12] brcmfmac: msgbuf: Increase RX ring sizes to 1024 MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Sender: Russell King Date: Mon, 12 Sep 2022 10:53:22 +0100 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Hector Martin Newer chips used on Apple platforms have a max_rxbufpost greater than 512, which causes warnings when brcmf_msgbuf_rxbuf_data_fill tries to put more entries in the ring than will fit. Increase the ring sizes to 1024. Reviewed-by: Linus Walleij Signed-off-by: Hector Martin Signed-off-by: Russell King (Oracle) --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h index 2e322edbb907..6a849f4a94dd 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h @@ -8,10 +8,10 @@ #ifdef CONFIG_BRCMFMAC_PROTO_MSGBUF #define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_MAX_ITEM 64 -#define BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM 512 +#define BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM 1024 #define BRCMF_D2H_MSGRING_CONTROL_COMPLETE_MAX_ITEM 64 #define BRCMF_D2H_MSGRING_TX_COMPLETE_MAX_ITEM 1024 -#define BRCMF_D2H_MSGRING_RX_COMPLETE_MAX_ITEM 512 +#define BRCMF_D2H_MSGRING_RX_COMPLETE_MAX_ITEM 1024 #define BRCMF_H2D_TXFLOWRING_MAX_ITEM 512 #define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_ITEMSIZE 40 -- 2.30.2