2018-03-18 18:43:04

by Alexey Roslyakov

Subject: [PATCH 1/2] brcmfmac: add new dt entries for SG SDIO settings

There are 3 fields in SDIO settings (quirks) to workaround some of
the SG SDIO host particularities, i.e higher align requirements for
SG items.
All coding is done the long time ago, but there is no way to change the
driver behavior without patching the kernel.
Add missing devicetree entries.

Signed-off-by: Alexey Roslyakov <[email protected]>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
index aee6e5937c41..0718ca09a40d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
@@ -31,6 +31,7 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
int irq;
u32 irqf;
u32 val;
+ u16 align;

if (!np || bus_type != BRCMF_BUSTYPE_SDIO ||
!of_device_is_compatible(np, "brcm,bcm4329-fmac"))
@@ -39,6 +40,15 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0)
sdio->drive_strength = val;

+ sdio->broken_sg_support =
+ of_property_read_bool(np, "brcm,broken-sg-support");
+
+ if (of_property_read_u16(np, "brcm,sd-head-align", &align) == 0)
+ sdio->sd_head_align = align;
+
+ if (of_property_read_u16(np, "brcm,sd-sgentry-align", &align) == 0)
+ sdio->sd_sgentry_align = align;
+
/* make sure there are interrupts defined in the node */
if (!of_find_property(np, "interrupts", NULL))
return;
--
2.16.1

2018-03-18 18:43:32

by Alexey Roslyakov

Subject: [PATCH 2/2] dt: bindings: add new dt entries for brcmfmac

In case if the host has higher align requirements for SG items, allow
setting device-specific aligns for scatterlist items.

Signed-off-by: Alexey Roslyakov <[email protected]>
---
Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt b/Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt
index 86602f264dce..187b8c1b52a7 100644
--- a/Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt
+++ b/Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt
@@ -17,6 +17,11 @@ Optional properties:
When not specified the device will use in-band SDIO interrupts.
- interrupt-names : name of the out-of-band interrupt, which must be set
to "host-wake".
+ - brcm,broken-sg-support : boolean flag to indicate that the SDIO host
+ controller has higher align requirement than 32 bytes for each
+ scatterlist item.
+ - brcm,sd-head-align : alignment requirement for start of data buffer.
+ - brcm,sd-sgentry-align : length alignment requirement for each sg entry.

Example:

--
2.16.1

2018-03-18 20:02:46

by Andrew Lunn

Subject: Re: [PATCH 1/2] brcmfmac: add new dt entries for SG SDIO settings

> + if (of_property_read_u16(np, "brcm,sd-head-align", &align) == 0)
> + sdio->sd_head_align = align;

Hi Alexey

I think you can make this:

of_property_read_u16(np, "brcm,sd-head-align", &sdio->sd_head_align);

of_property_read_u16() should not touch the destination variable if
the properties does not exist, or if there is an error.

Andrew