linux.git/drivers/net/wireless/broadcom, branch v6.1-rc4

treewide: use get_random_{u8,u16}() when possible, part 2

2022-10-11T23:42:58+00:00

Rather than truncate a 32-bit value to a 16-bit value or an 8-bit value,
simply use the get_random_{u8,u16}() functions, which are faster than
wasting the additional bytes from a 32-bit value. This was done by hand,
identifying all of the places where one of the random integer functions
was used in a non-32-bit context.

Reviewed-by: Greg Kroah-Hartman 
Reviewed-by: Kees Cook 
Reviewed-by: Yury Norov 
Acked-by: Jakub Kicinski 
Acked-by: Heiko Carstens  # for s390
Signed-off-by: Jason A. Donenfeld

treewide: use prandom_u32_max() when possible, part 1

2022-10-11T23:42:55+00:00

Rather than incurring a division or requesting too many random bytes for
the given range, use the prandom_u32_max() function, which only takes
the minimum required bytes from the RNG and avoids divisions. This was
done mechanically with this coccinelle script:

@basic@
expression E;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
typedef u64;
@@
(
- ((T)get_random_u32() % (E))
+ prandom_u32_max(E)
|
- ((T)get_random_u32() & ((E) - 1))
+ prandom_u32_max(E * XXX_MAKE_SURE_E_IS_POW2)
|
- ((u64)(E) * get_random_u32() >> 32)
+ prandom_u32_max(E)
|
- ((T)get_random_u32() & ~PAGE_MASK)
+ prandom_u32_max(PAGE_SIZE)
)

@multi_line@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
identifier RAND;
expression E;
@@

-       RAND = get_random_u32();
        ... when != RAND
-       RAND %= (E);
+       RAND = prandom_u32_max(E);

// Find a potential literal
@literal_mask@
expression LITERAL;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
position p;
@@

        ((T)get_random_u32()@p & (LITERAL))

// Add one to the literal.
@script:python add_one@
literal << literal_mask.LITERAL;
RESULT;
@@

value = None
if literal.startswith('0x'):
        value = int(literal, 16)
elif literal[0] in '123456789':
        value = int(literal, 10)
if value is None:
        print("I don't know how to handle %s" % (literal))
        cocci.include_match(False)
elif value == 2**32 - 1 or value == 2**31 - 1 or value == 2**24 - 1 or value == 2**16 - 1 or value == 2**8 - 1:
        print("Skipping 0x%x for cleanup elsewhere" % (value))
        cocci.include_match(False)
elif value & (value + 1) != 0:
        print("Skipping 0x%x because it's not a power of two minus one" % (value))
        cocci.include_match(False)
elif literal.startswith('0x'):
        coccinelle.RESULT = cocci.make_expr("0x%x" % (value + 1))
else:
        coccinelle.RESULT = cocci.make_expr("%d" % (value + 1))

// Replace the literal mask with the calculated result.
@plus_one@
expression literal_mask.LITERAL;
position literal_mask.p;
expression add_one.RESULT;
identifier FUNC;
@@

-       (FUNC()@p & (LITERAL))
+       prandom_u32_max(RESULT)

@collapse_ret@
type T;
identifier VAR;
expression E;
@@

 {
-       T VAR;
-       VAR = (E);
-       return VAR;
+       return E;
 }

@drop_var@
type T;
identifier VAR;
@@

 {
-       T VAR;
        ... when != VAR
 }

Reviewed-by: Greg Kroah-Hartman 
Reviewed-by: Kees Cook 
Reviewed-by: Yury Norov 
Reviewed-by: KP Singh 
Reviewed-by: Jan Kara  # for ext4 and sbitmap
Reviewed-by: Christoph Böhmwalder  # for drbd
Acked-by: Jakub Kicinski 
Acked-by: Heiko Carstens  # for s390
Acked-by: Ulf Hansson  # for mmc
Acked-by: Darrick J. Wong  # for xfs
Signed-off-by: Jason A. Donenfeld

brcmfmac: Remove the call to "dtim_assoc" IOVAR

2022-09-27T06:09:07+00:00

When STA roams from one AP to another, after roam is complete, host
driver tries to get TIM information from firmware. This is no longer
supported in the firmware & hence, this call will always fail.
This failure results in the below message being displayed on the
console all the time when roam is done.

ieee80211 phy0: brcmf_update_bss_info: wl dtim_assoc failed (-52)

Changes ensure that the host driver will no longer try to get TIM
information from firmware.

Signed-off-by: Ramesh Rangavittal 
Signed-off-by: Chi-hsien Lin 
Signed-off-by: Ian Lin 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/20220922104140.11889-5-ian.lin@infineon.com

brcmfmac: increase dcmd maximum buffer size

2022-09-27T06:09:07+00:00

Increase dcmd maximum buffer size to match firmware
configuration for new chips.

Signed-off-by: Lo(Double)Hsiang Lo 
Signed-off-by: Chi-Hsien Lin 
Signed-off-by: Ian Lin 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/20220922104140.11889-4-ian.lin@infineon.com

brcmfmac: Support 89459 pcie

2022-09-27T06:09:06+00:00

Adds support of 89459 chip pcie device and save restore support.

Signed-off-by: Alexander Prutskov 
Signed-off-by: Joseph chuang 
Signed-off-by: Chi-Hsien Lin 
Signed-off-by: Ian Lin 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/20220922104140.11889-3-ian.lin@infineon.com

brcmfmac: increase default max WOWL patterns to 16

2022-09-27T06:09:06+00:00

4373 has support of 16 WOWL patterns thus increasing the default value

Signed-off-by: Ryohei Kondo 
Signed-off-by: Chi-hsien Lin 
Signed-off-by: Ian Lin 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/20220922104140.11889-2-ian.lin@infineon.com

wifi: brcmfmac: pcie: Add IDs/properties for BCM4378

2022-09-19T09:59:35+00:00

This chip is present on Apple M1 (t8103) platforms:

* atlantisb (apple,j274): Mac mini (M1, 2020)
* honshu    (apple,j293): MacBook Pro (13-inch, M1, 2020)
* shikoku   (apple,j313): MacBook Air (M1, 2020)
* capri     (apple,j456): iMac (24-inch, 4x USB-C, M1, 2020)
* santorini (apple,j457): iMac (24-inch, 2x USB-C, M1, 2020)

Reviewed-by: Linus Walleij 
Signed-off-by: Hector Martin 
Reviewed-by: Alvin Šipraga 
Signed-off-by: Russell King (Oracle) 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/E1oZDoD-0077ax-AI@rmk-PC.armlinux.org.uk

wifi: brcmfmac: pcie: Support PCIe core revisions >= 64

2022-09-19T09:59:35+00:00

These newer PCIe core revisions include new sets of registers that must
be used instead of the legacy ones. Introduce a brcmf_pcie_reginfo to
hold the specific register offsets and values to use for a given
platform, and change all the register accesses to indirect through it.

Reviewed-by: Linus Walleij 
Signed-off-by: Hector Martin 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/E1oZDo8-0077aq-6I@rmk-PC.armlinux.org.uk

wifi: brcmfmac: msgbuf: Increase RX ring sizes to 1024

2022-09-19T09:59:34+00:00

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 
Reviewed-by: Alvin Šipraga 
Signed-off-by: Russell King (Oracle) 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/E1oZDo3-0077ak-2h@rmk-PC.armlinux.org.uk

wifi: brcmfmac: firmware: Allow platform to override macaddr

2022-09-19T09:59:34+00:00

On Device Tree platforms, it is customary to be able to set the MAC
address via the Device Tree, as it is often stored in system firmware.
This is particularly relevant for Apple ARM64 platforms, where this
information comes from system configuration and passed through by the
bootloader into the DT.

Implement support for this by fetching the platform MAC address and
adding or replacing the macaddr= property in nvram. This becomes the
dongle's default MAC address.

On platforms with an SROM MAC address, this overrides it. On platforms
without one, such as Apple ARM64 devices, this is required for the
firmware to boot (it will fail if it does not have a valid MAC at all).

Reviewed-by: Linus Walleij 
Signed-off-by: Hector Martin 
Reviewed-by: Alvin Šipraga 
Signed-off-by: Russell King (Oracle) 
Signed-off-by: Kalle Valo 
Link: https://lore.kernel.org/r/E1oZDnx-0077ae-VK@rmk-PC.armlinux.org.uk