From patchwork Tue Feb 14 08:00:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Martin X-Patchwork-Id: 56745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2830267wrn; Tue, 14 Feb 2023 00:04:16 -0800 (PST) X-Google-Smtp-Source: AK7set/5ou1ASzecRxSW6EJchjv/r3zktcQUYxrbxDNYlpQNyWNJ3Uuha6sj+tEpNJwxSKdqRjcZ X-Received: by 2002:a62:2983:0:b0:5a8:b6ab:49c2 with SMTP id p125-20020a622983000000b005a8b6ab49c2mr1060805pfp.22.1676361856519; Tue, 14 Feb 2023 00:04:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676361856; cv=none; d=google.com; s=arc-20160816; b=brWYBXJWzuplyd9ECVi68zEhxlxyjP41xQlovzrK63Z/KQuWeiceeH+dGrEgvZIKNG SVT8vQwj5xi2SyIQkU52CpnGjlVBOgC3EbdkGw4Q9QqYHefyzdANOzEvwiVN2wwuXboS Dx5KVoiZkP7MyfukPMWvRrijqGPuwa64NzglrqvfHSYvITylKyyQgkIlVj2/anSHSsWP uwD6tYZVicA8IBRqC5AwydJmyGscd8DiRKUvCo28lZr2yGrtSSOgArZKSzvqhxXER1cO hC7qDfCYcx9wzhd9+NdzqW1tLo88L6BRJ78sOpuVB1FysLepBeCIfcQC9NFnSWDQfZGu RtcQ== 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=uIWCJ/sGcZppFmq2t0Skkfubz1HiQKrhSMPeAezHX2g=; b=eK1/zyxQB22C5JLXykYbZ+WfEoIxDHatZfPZwEdJLZnTGwLA2FoTShT+YF9QJvBY8X +NDqeoyTisDU9YPY+ziqK28GjxbxJe88OOUuCwg/M5Bmg6bTLuyRsmZ74SaZl/YwOxS3 z6S/orIk79E1Hgcv19VA/fMOpSX6KbHUoB89qIhzpNpX8DmFvGXcVoynbX9Y7wVLIN9z sIgs6UGQJog2JFIp1NCXHuS9lhTrbtHPOnKlfvh/e7y2qDhQs24YDCzIVAkB4d4gg4eE G0u6GDu/LJ9aQmbtKjXY3UgaEOCQqewmD7AbAmQAR+7WYk6R3kwMycyc7qdBjQQXKM4J dIMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=fMeRXy3c; 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 d133-20020a621d8b000000b005a8a9bfdee1si7206239pfd.38.2023.02.14.00.04.03; Tue, 14 Feb 2023 00:04:16 -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=fMeRXy3c; 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 S231599AbjBNIC2 (ORCPT + 99 others); Tue, 14 Feb 2023 03:02:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229575AbjBNIBp (ORCPT ); Tue, 14 Feb 2023 03:01:45 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0819273E; Tue, 14 Feb 2023 00:01:43 -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 B0F874267B; Tue, 14 Feb 2023 08:01:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1676361702; bh=p6L/0L78DJAiXa0tWZGy/+KT5i43QkswVQmSdbLw7W0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fMeRXy3c57zRowzLprZV33IK3KYYODRGXmi7VeH2aOtOdskSfAIrcAhBfKcrBEjI+ VvJg09GZv4wRPEn9RfU01DWTjXV2j69eYKXyUBHpVTaGRP6IF3fE49Wr8X4+1KNiGK IbiXAZe8nZhE4pjRfSFLxhMMQiHYyYQPQ5GWE1HbiCGl0xb6dA5KO5Dy7aMICJJ+Zh jCOCg1UKZdhjmVZ/pMhyNdZeDhypDDUES4IommwlmAGy3iSYdF+krAecGhULMD4kiL 4PnOxQJb6tK4WYZ5HRQi83u+skkYXNiMKByJeBmctDV8FrAAJOwn5OLD+wQc1fvNE4 7H2QqyFnXGT0Q== 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 Subject: [PATCH 1/2] brcmfmac: acpi: Add support for fetching Apple ACPI properties Date: Tue, 14 Feb 2023 17:00:33 +0900 Message-Id: <20230214080034.3828-2-marcan@marcan.st> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230214080034.3828-1-marcan@marcan.st> References: <20230214080034.3828-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?1757792809968743126?= X-GMAIL-MSGID: =?utf-8?q?1757792809968743126?= On DT platforms, the module-instance and antenna-sku-info properties are passed in the DT. On ACPI platforms, module-instance is passed via the analogous Apple device property mechanism, while the antenna SKU info is instead obtained via an ACPI method that grabs it from non-volatile storage. Add support for this, to allow proper firmware selection on Apple platforms. Signed-off-by: Hector Martin Reviewed-by: Julian Calaby Acked-by: Linus Walleij --- .../broadcom/brcm80211/brcmfmac/Makefile | 2 + .../broadcom/brcm80211/brcmfmac/acpi.c | 51 +++++++++++++++++++ .../broadcom/brcm80211/brcmfmac/common.c | 1 + .../broadcom/brcm80211/brcmfmac/common.h | 9 ++++ 4 files changed, 63 insertions(+) create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile index 0e996cf24f88..dc6d27a36faa 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile @@ -48,6 +48,8 @@ brcmfmac-$(CONFIG_OF) += \ of.o brcmfmac-$(CONFIG_DMI) += \ dmi.o +brcmfmac-$(CONFIG_ACPI) += \ + acpi.o ifeq ($(CONFIG_BRCMFMAC),m) obj-m += wcc/ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c new file mode 100644 index 000000000000..c4a54861bfb4 --- /dev/null +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: ISC +/* + * Copyright The Asahi Linux Contributors + */ + +#include +#include "debug.h" +#include "core.h" +#include "common.h" + +void brcmf_acpi_probe(struct device *dev, enum brcmf_bus_type bus_type, + struct brcmf_mp_device *settings) +{ + acpi_status status; + const union acpi_object *o; + struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL}; + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (!adev) + return; + + if (!ACPI_FAILURE(acpi_dev_get_property(adev, "module-instance", + ACPI_TYPE_STRING, &o))) { + brcmf_dbg(INFO, "ACPI module-instance=%s\n", o->string.pointer); + settings->board_type = devm_kasprintf(dev, GFP_KERNEL, + "apple,%s", + o->string.pointer); + } else { + brcmf_dbg(INFO, "No ACPI module-instance\n"); + return; + } + + status = acpi_evaluate_object(adev->handle, "RWCV", NULL, &buf); + o = buf.pointer; + if (!ACPI_FAILURE(status) && o && o->type == ACPI_TYPE_BUFFER && + o->buffer.length >= 2) { + char *antenna_sku = devm_kzalloc(dev, 3, GFP_KERNEL); + + if (antenna_sku) { + memcpy(antenna_sku, o->buffer.pointer, 2); + brcmf_dbg(INFO, "ACPI RWCV data=%*phN antenna-sku=%s\n", + (int)o->buffer.length, o->buffer.pointer, + antenna_sku); + settings->antenna_sku = antenna_sku; + } + + kfree(buf.pointer); + } else { + brcmf_dbg(INFO, "No ACPI antenna-sku\n"); + } +} diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 4a309e5a5707..b977e50137bb 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -484,6 +484,7 @@ struct brcmf_mp_device *brcmf_get_module_param(struct device *dev, /* No platform data for this device, try OF and DMI data */ brcmf_dmi_probe(settings, chip, chiprev); brcmf_of_probe(dev, bus_type, settings); + brcmf_acpi_probe(dev, bus_type, settings); } return settings; } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h index aa25abffcc7d..7167fd4f8c63 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h @@ -77,6 +77,15 @@ static inline void brcmf_dmi_probe(struct brcmf_mp_device *settings, u32 chip, u32 chiprev) {} #endif +#ifdef CONFIG_ACPI +void brcmf_acpi_probe(struct device *dev, enum brcmf_bus_type bus_type, + struct brcmf_mp_device *settings); +#else +static inline void brcmf_acpi_probe(struct device *dev, + enum brcmf_bus_type bus_type, + struct brcmf_mp_device *settings) {} +#endif + u8 brcmf_map_prio_to_prec(void *cfg, u8 prio); u8 brcmf_map_prio_to_aci(void *cfg, u8 prio);