All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11 mini PCs
@ 2019-04-22 20:41 Hans de Goede
  2019-04-25 16:58 ` Kalle Valo
       [not found] ` <20190422222923.ACAF0204EC@mail.kernel.org>
  0 siblings, 2 replies; 3+ messages in thread
From: Hans de Goede @ 2019-04-22 20:41 UTC (permalink / raw)
  To: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo
  Cc: Hans de Goede, linux-wireless, brcm80211-dev-list.pdl, stable

The ACEPC T8 and T11 mini PCs contain quite generic names in the sys_vendor
and product_name DMI strings, without this patch brcmfmac will try to load:
"brcmfmac43455-sdio.Default string-Default string.txt" as nvram file which
is way too generic.

The DMI strings on which we are matching are somewhat generic too, but
"To be filled by O.E.M." is less common then "Default string" and the
system-sku and bios-version strings are pretty unique. Beside the DMI
strings we also check the wifi-module chip-id and revision. I'm confident
that the combination of all this is unique.

Both the T8 and T11 use the same wifi-module, this commit adds DMI
quirks for both mini PCs pointing to brcmfmac43455-sdio.acepc-t8.txt .

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1690852
Cc: stable@vger.kernel.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 .../broadcom/brcm80211/brcmfmac/dmi.c         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
index 7535cb0d4ac0..9f1417e00073 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
@@ -31,6 +31,10 @@ struct brcmf_dmi_data {
 
 /* NOTE: Please keep all entries sorted alphabetically */
 
+static const struct brcmf_dmi_data acepc_t8_data = {
+	BRCM_CC_4345_CHIP_ID, 6, "acepc-t8"
+};
+
 static const struct brcmf_dmi_data gpd_win_pocket_data = {
 	BRCM_CC_4356_CHIP_ID, 2, "gpd-win-pocket"
 };
@@ -48,6 +52,28 @@ static const struct brcmf_dmi_data pov_tab_p1006w_data = {
 };
 
 static const struct dmi_system_id dmi_platform_data[] = {
+	{
+		/* ACEPC T8 Cherry Trail Z8350 mini PC */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T8"),
+			/* also match on somewhat unique bios-version */
+			DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
+		},
+		.driver_data = (void *)&acepc_t8_data,
+	},
+	{
+		/* ACEPC T11 Cherry Trail Z8350 mini PC, same wifi as the T8 */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T11"),
+			/* also match on somewhat unique bios-version */
+			DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
+		},
+		.driver_data = (void *)&acepc_t8_data,
+	},
 	{
 		/* Match for the GPDwin which unfortunately uses somewhat
 		 * generic dmi strings, which is why we test for 4 strings.
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11 mini PCs
  2019-04-22 20:41 [PATCH] brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11 mini PCs Hans de Goede
@ 2019-04-25 16:58 ` Kalle Valo
       [not found] ` <20190422222923.ACAF0204EC@mail.kernel.org>
  1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2019-04-25 16:58 UTC (permalink / raw)
  To: Hans de Goede
  Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Hans de Goede,
	linux-wireless, brcm80211-dev-list.pdl, stable

Hans de Goede <hdegoede@redhat.com> wrote:

> The ACEPC T8 and T11 mini PCs contain quite generic names in the sys_vendor
> and product_name DMI strings, without this patch brcmfmac will try to load:
> "brcmfmac43455-sdio.Default string-Default string.txt" as nvram file which
> is way too generic.
> 
> The DMI strings on which we are matching are somewhat generic too, but
> "To be filled by O.E.M." is less common then "Default string" and the
> system-sku and bios-version strings are pretty unique. Beside the DMI
> strings we also check the wifi-module chip-id and revision. I'm confident
> that the combination of all this is unique.
> 
> Both the T8 and T11 use the same wifi-module, this commit adds DMI
> quirks for both mini PCs pointing to brcmfmac43455-sdio.acepc-t8.txt .
> 
> BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1690852
> Cc: stable@vger.kernel.org
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Patch applied to wireless-drivers-next.git, thanks.

b1a0ba8f772d brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11 mini PCs

-- 
https://patchwork.kernel.org/patch/10911607/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11 mini PCs
       [not found] ` <20190422222923.ACAF0204EC@mail.kernel.org>
@ 2019-04-27 19:17   ` Hans de Goede
  0 siblings, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2019-04-27 19:17 UTC (permalink / raw)
  To: Sasha Levin, Arend van Spriel; +Cc: stable

Hi,

On 23-04-19 00:29, Sasha Levin wrote:
> Hi,
> 
> [This is an automated email]
> 
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees: all
> 
> The bot has tested the following trees: v5.0.9, v4.19.36, v4.14.113, v4.9.170, v4.4.178, v3.18.138.
> 
> v5.0.9: Build OK!
> v4.19.36: Failed to apply! Possible dependencies:
>      bd1e82bb420a ("brcmfmac: Set board_type from DMI on x86 based machines")
> 
> v4.14.113: Failed to apply! Possible dependencies:
>      bd1e82bb420a ("brcmfmac: Set board_type from DMI on x86 based machines")
> 
> v4.9.170: Failed to apply! Possible dependencies:
>      bd1e82bb420a ("brcmfmac: Set board_type from DMI on x86 based machines")
>      e457a8a01a19 ("brcmfmac: make brcmf_of_probe more generic")
> 
> v4.4.178: Failed to apply! Possible dependencies:
>      1119e23edf25 ("brcmfmac: Cleanup roaming configuration.")
>      3f5893d1b30a ("brcmfmac: Add get_station support for IBSS")
>      44129ed04b2b ("brcmfmac: add arp offload ip address table configuration support")
>      46d703a77539 ("brcmfmac: Unify methods to define and map firmware files.")
>      48ed16e86b28 ("brcmfmac: Add support for scheduled scan mac randomization")
>      4d7928959832 ("brcmfmac: switch to new platform data")
>      6c404f34f2bd ("brcmfmac: Cleanup pmksa cache handling code")
>      7bf65aa9ad3f ("brcmfmac: Add beamforming support.")
>      7d34b0560567 ("brcmfmac: Move all module parameters to one place")
>      8abffd8173a1 ("brcmfmac: Add RSDB support.")
>      8ea56be0869f ("brcmfmac: move platform data retrieval code to common")
>      a41286aee42f ("brcmfmac: Move scheduled scan related interface layer structs")
>      a7b82d474171 ("brcmfmac: Make TDLS a detectable feature")
>      aeb64225aa8e ("brcmfmac: Add wowl wake indication report.")
>      bd1e82bb420a ("brcmfmac: Set board_type from DMI on x86 based machines")
>      c9c0043894cf ("brcmfmac: Simplify and fix usage of brcmf_ifname.")
>      e457a8a01a19 ("brcmfmac: make brcmf_of_probe more generic")
> 
> v3.18.138: Failed to apply! Possible dependencies:
>      063d51776bd6 ("brcmfmac: avoid runtime-pm for sdio host controller")
>      4d7928959832 ("brcmfmac: switch to new platform data")
>      888bf76e4111 ("brcmfmac: (clean) Rename sdio related files.")
>      8ea56be0869f ("brcmfmac: move platform data retrieval code to common")
>      a8e8ed3446a3 ("brcmfmac: (clean) Rename files dhd_dbg to debug")
>      bd1e82bb420a ("brcmfmac: Set board_type from DMI on x86 based machines")
>      d14f78b990ec ("brcmfmac: (clean) Rename dhd_bus.h in bus.h")
>      e457a8a01a19 ("brcmfmac: make brcmf_of_probe more generic")
> 
> 
> How should we proceed with this patch?

Just applying it to 5.0.x is fine.

Regards,

Hans

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-04-27 19:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-22 20:41 [PATCH] brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11 mini PCs Hans de Goede
2019-04-25 16:58 ` Kalle Valo
     [not found] ` <20190422222923.ACAF0204EC@mail.kernel.org>
2019-04-27 19:17   ` Hans de Goede

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.