From patchwork Tue Feb 14 09:24:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Martin X-Patchwork-Id: 56793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2862728wrn; Tue, 14 Feb 2023 01:28:37 -0800 (PST) X-Google-Smtp-Source: AK7set/4g7SJQ0r2FZa//K6/qv+tc3UwPf1fGPXmwkEWemOR2yQ0Wx427/stswSxPjPBq0ZzZ/B3 X-Received: by 2002:a17:90b:4acc:b0:22c:8ba1:bd73 with SMTP id mh12-20020a17090b4acc00b0022c8ba1bd73mr1655958pjb.18.1676366917064; Tue, 14 Feb 2023 01:28:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676366917; cv=none; d=google.com; s=arc-20160816; b=KlraZsphi3YYb3u77C89yiymycJ4mJS8fuXLyc8u4QhbuV8wDMy8zKi7c/Gps4LiFk Qwbd8/hl6fB2M9UQbrKa2KFyH9XzmkYa3he/G/HU/T2CK/TWMVkJHY8kR/XQIdIOu69W hBACyah5js8P7Fo9is4gVkrIL4d1qlKt352UpaDcEYZG9qAj0RkW78uXb8/Wm8dJcnrE 8sIP0CsgyLJ9ZrkUOr3o6PPdBSs6HT5zHWT0LXpltTfk7L7o1JQGOibL4GyjIIFaJjmZ OcFwvq8Ub0dX9V4v2yw0isse83N3At2C/ZlU4EOdEhCIOyrjQtdiooWWbeyiCOztbTJW W1WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D01YOgUfZHFas9wuzG554V9biMf5dRjwa1R8xGqdyXE=; b=DhUiCz7LFqzDrZJT+/e32xwFIItwSfy/zeZjxa/UUfnLWgRNZrMVHMYESn0kSp2p77 +WYJnBxs75V6wIbP61MNf4ks2qHkvBz8+TUnydl8Vi7cXVV/1z0/fwxgsVdiuAN2xDOE vj3XAG3NRgQ85+WWevTUhT5sEopWuy/5HNeIOotKGKSYX83DwExHKANvoqkiVn6macJ5 fR6WZpIR6FGa6EeFALWt1smlSomAZ0LrqXkFC1Hwgomm6y2cGVCFKRO5B4LQ4xOq5GH7 yzIdjXeJ9RTm3tZp3JZw314ZxOYaBhFQhrbTWL8Ss04Zmaa+cEiNc+Z5xl3jpj4p0HIz W72g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=BqCoyFV8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q63-20020a632a42000000b004fb7d5c5f04si10527315pgq.444.2023.02.14.01.28.24; Tue, 14 Feb 2023 01:28:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=pass header.i=@marcan.st header.s=default header.b=BqCoyFV8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232114AbjBNJZn (ORCPT + 99 others); Tue, 14 Feb 2023 04:25:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232122AbjBNJZf (ORCPT ); Tue, 14 Feb 2023 04:25:35 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39A0810433; Tue, 14 Feb 2023 01:25:35 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sendonly@marcansoft.com) by mail.marcansoft.com (Postfix) with ESMTPSA id D82F541A36; Tue, 14 Feb 2023 09:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1676366733; bh=/8Wa1xp66OasY/4qg0g0e58vj0bjHYWqCuEoT5jLVMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BqCoyFV83ol16p1hcfmWweUDMFDyQI/U1BOgHqqgS0BF8+YaNC/S0dFFfV6xr8Z+P M05LdL4zoPOluo8bua8o1yKuUgPO64tAIYewVJo5rLoxF81TNO6qrbt4278z0zUijU /AMhnhvSjiM6rR2GIw/r6eRkSvB6j/E7tNxf61r06VpA2LKgzir0FJ6audkV7cNPLs P5FQeXGEUzCvUs6v0We1Z//XumvlH7mSjjIBFoEka28ml9HcVm2Cv6LxZOy6c0irLg JbKpf2s/1kji78pym9AJO6Zoca2UVecBK14vajyxQEBRot4zkaqM0qNYFprWGhtWDi PdaR8SWee7YVw== From: Hector Martin To: Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Sven Peter , Alyssa Rosenzweig , Linus Walleij , asahi@lists.linux.dev, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hector Martin , Arend van Spriel Subject: [PATCH 02/10] brcmfmac: chip: Handle 1024-unit sizes for TCM blocks Date: Tue, 14 Feb 2023 18:24:15 +0900 Message-Id: <20230214092423.15175-2-marcan@marcan.st> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230214091651.10178-1-marcan@marcan.st> References: <20230214091651.10178-1-marcan@marcan.st> MIME-Version: 1.0 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_PASS 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757798116294553621?= X-GMAIL-MSGID: =?utf-8?q?1757798116294553621?= BCM4387 has trailing odd-sized blocks as part of TCM which have their size described as a multiple of 1024 instead of 8192. Handle this so we can compute the TCM size properly. Reviewed-by: Linus Walleij Reviewed-by: Arend van Spriel Signed-off-by: Hector Martin --- .../net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index a6239051404b..50e0c015cf43 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -212,8 +212,9 @@ struct sbsocramregs { #define ARMCR4_TCBANB_MASK 0xf #define ARMCR4_TCBANB_SHIFT 0 -#define ARMCR4_BSZ_MASK 0x3f +#define ARMCR4_BSZ_MASK 0x7f #define ARMCR4_BSZ_MULT 8192 +#define ARMCR4_BLK_1K_MASK 0x200 struct brcmf_core_priv { struct brcmf_core pub; @@ -684,6 +685,7 @@ static u32 brcmf_chip_tcm_ramsize(struct brcmf_core_priv *cr4) u32 nbb; u32 totb; u32 bxinfo; + u32 blksize; u32 idx; corecap = brcmf_chip_core_read32(cr4, ARMCR4_CAP); @@ -695,7 +697,11 @@ static u32 brcmf_chip_tcm_ramsize(struct brcmf_core_priv *cr4) for (idx = 0; idx < totb; idx++) { brcmf_chip_core_write32(cr4, ARMCR4_BANKIDX, idx); bxinfo = brcmf_chip_core_read32(cr4, ARMCR4_BANKINFO); - memsize += ((bxinfo & ARMCR4_BSZ_MASK) + 1) * ARMCR4_BSZ_MULT; + blksize = ARMCR4_BSZ_MULT; + if (bxinfo & ARMCR4_BLK_1K_MASK) + blksize >>= 3; + + memsize += ((bxinfo & ARMCR4_BSZ_MASK) + 1) * blksize; } return memsize;