| Message ID | 20190422204123.6123-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b1a0ba8f772d7a6dcb5aa3e856f5bd8274989ebe |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11 mini PCs | expand |
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
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.
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(+)