diff mbox

[1/9] brcmfmac: Add support for the BCM4359 11ac RSDB PCIE device.

Message ID 1446147199-21671-2-git-send-email-arend@broadcom.com (mailing list archive)
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Arend van Spriel Oct. 29, 2015, 7:33 p.m. UTC 
From: Hante Meuleman <meuleman@broadcom.com>

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 drivers/net/wireless/brcm80211/brcmfmac/chip.c       | 1 +
 drivers/net/wireless/brcm80211/brcmfmac/pcie.c       | 9 +++++++++
 drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 ++
 3 files changed, 12 insertions(+)

Comments

Kalle Valo Nov. 26, 2015, 11:57 a.m. UTC | #1 
> From: Hante Meuleman <meuleman@broadcom.com>
> 
> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>

Thanks, 9 patches applied to wireless-drivers-next.git:

2aff030355b5 brcmfmac: Add support for the BCM4359 11ac RSDB PCIE device.
c9c0043894cf brcmfmac: Simplify and fix usage of brcmf_ifname.
31fa86cb342b brcmfmac: Remove unnecessary check from start_xmit.
da402c56bc91 brcmfmac: Remove unncessary variable irq_requested.
dc1a272ec440 brcmfmac: Disable runtime pm for USB.
8abffd8173a1 brcmfmac: Add RSDB support.
37a869ec8593 brcmfmac: Use consistent naming for bsscfgidx.
c2a43a6ba5e5 brcmfmac: Use new methods for pcie Power Management.
aeb64225aa8e brcmfmac: Add wowl wake indication report.

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arend van Spriel Nov. 27, 2015, 8:59 a.m. UTC | #2 
On 11/26/2015 12:57 PM, Kalle Valo wrote:
>
>> From: Hante Meuleman <meuleman@broadcom.com>
>>
>> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>
> Thanks, 9 patches applied to wireless-drivers-next.git:
>
> 2aff030355b5 brcmfmac: Add support for the BCM4359 11ac RSDB PCIE device.
> c9c0043894cf brcmfmac: Simplify and fix usage of brcmf_ifname.
> 31fa86cb342b brcmfmac: Remove unnecessary check from start_xmit.
> da402c56bc91 brcmfmac: Remove unncessary variable irq_requested.
> dc1a272ec440 brcmfmac: Disable runtime pm for USB.
> 8abffd8173a1 brcmfmac: Add RSDB support.
> 37a869ec8593 brcmfmac: Use consistent naming for bsscfgidx.
> c2a43a6ba5e5 brcmfmac: Use new methods for pcie Power Management.

Hi Kalle,

Actually, the patch above should have been submitted to wireless-drivers 
as it solves a suspend/hibernate issue with 4350 device which we added 
in 4.4. How should I handle that? This is what I was thinking:

1. submit revert for wireless-drivers-next.
2. submit patch of c2a43a6ba5e5 for wireless-drivers.

Regards,
Arend

> aeb64225aa8e brcmfmac: Add wowl wake indication report.
>
> Kalle Valo
>

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Nov. 30, 2015, 11:17 a.m. UTC | #3 
Arend van Spriel <arend@broadcom.com> writes:

> Actually, the patch above should have been submitted to
> wireless-drivers as it solves a suspend/hibernate issue with 4350
> device which we added in 4.4. 

Just to avoid any confusion you are meaning this commit:

c2a43a6ba5e5 brcmfmac: Use new methods for pcie Power Management.

> How should I handle that? This is what I was thinking:
>
> 1. submit revert for wireless-drivers-next.
> 2. submit patch of c2a43a6ba5e5 for wireless-drivers.

That's just messy and would prefer to avoid that. I think the best would
be that you send the patch to 4.4-stable queue once the commit goes to
Linus' tree during the next merge window. That way you get the fix to
first 4.4.x stable releases. But not sure if it's eligible for a stable
fix.

BTW, I recommend sending patches to -rc release separately from the rest
and marking them with intended the release number like "[PATCH 4.4]".
That way it's clear for me to which tree you would like me to apply the
patch.
Arend van Spriel Nov. 30, 2015, 11:59 a.m. UTC | #4 
On 11/30/2015 12:17 PM, Kalle Valo wrote:
> Arend van Spriel <arend@broadcom.com> writes:
>
>> Actually, the patch above should have been submitted to
>> wireless-drivers as it solves a suspend/hibernate issue with 4350
>> device which we added in 4.4.
>
> Just to avoid any confusion you are meaning this commit:
>
> c2a43a6ba5e5 brcmfmac: Use new methods for pcie Power Management.
>
>> How should I handle that? This is what I was thinking:
>>
>> 1. submit revert for wireless-drivers-next.
>> 2. submit patch of c2a43a6ba5e5 for wireless-drivers.
>
> That's just messy and would prefer to avoid that. I think the best would
> be that you send the patch to 4.4-stable queue once the commit goes to
> Linus' tree during the next merge window. That way you get the fix to
> first 4.4.x stable releases. But not sure if it's eligible for a stable
> fix.
>
> BTW, I recommend sending patches to -rc release separately from the rest
> and marking them with intended the release number like "[PATCH 4.4]".
> That way it's clear for me to which tree you would like me to apply the
> patch.

We do that but not very often so probably did not happen in your 
maintainer period (yet).

Regards,
Arend
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
index f04833d..82e4382 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
@@ -681,6 +681,7 @@  static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
 	case BRCM_CC_43569_CHIP_ID:
 	case BRCM_CC_43570_CHIP_ID:
 	case BRCM_CC_4358_CHIP_ID:
+	case BRCM_CC_4359_CHIP_ID:
 	case BRCM_CC_43602_CHIP_ID:
 	case BRCM_CC_4371_CHIP_ID:
 		return 0x180000;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
index 83d8042..7982d4d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
@@ -55,6 +55,8 @@  enum brcmf_pcie_state {
 #define BRCMF_PCIE_43570_NVRAM_NAME		"brcm/brcmfmac43570-pcie.txt"
 #define BRCMF_PCIE_4358_FW_NAME			"brcm/brcmfmac4358-pcie.bin"
 #define BRCMF_PCIE_4358_NVRAM_NAME		"brcm/brcmfmac4358-pcie.txt"
+#define BRCMF_PCIE_4359_FW_NAME			"brcm/brcmfmac4359-pcie.bin"
+#define BRCMF_PCIE_4359_NVRAM_NAME		"brcm/brcmfmac4359-pcie.txt"
 #define BRCMF_PCIE_4365_FW_NAME			"brcm/brcmfmac4365b-pcie.bin"
 #define BRCMF_PCIE_4365_NVRAM_NAME		"brcm/brcmfmac4365b-pcie.txt"
 #define BRCMF_PCIE_4366_FW_NAME			"brcm/brcmfmac4366b-pcie.bin"
@@ -210,6 +212,8 @@  MODULE_FIRMWARE(BRCMF_PCIE_43570_FW_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_43570_NVRAM_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4358_FW_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4358_NVRAM_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4359_FW_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4359_NVRAM_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4365_FW_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4365_NVRAM_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4366_FW_NAME);
@@ -1517,6 +1521,10 @@  static int brcmf_pcie_get_fwnames(struct brcmf_pciedev_info *devinfo)
 		fw_name = BRCMF_PCIE_4358_FW_NAME;
 		nvram_name = BRCMF_PCIE_4358_NVRAM_NAME;
 		break;
+	case BRCM_CC_4359_CHIP_ID:
+		fw_name = BRCMF_PCIE_4359_FW_NAME;
+		nvram_name = BRCMF_PCIE_4359_NVRAM_NAME;
+		break;
 	case BRCM_CC_4365_CHIP_ID:
 		fw_name = BRCMF_PCIE_4365_FW_NAME;
 		nvram_name = BRCMF_PCIE_4365_NVRAM_NAME;
@@ -2058,6 +2066,7 @@  static struct pci_device_id brcmf_pcie_devid_table[] = {
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID),
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID),
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4358_DEVICE_ID),
+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4359_DEVICE_ID),
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_DEVICE_ID),
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID),
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID),
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index aa06ea2..4092d27 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -47,6 +47,7 @@ 
 #define BRCM_CC_43569_CHIP_ID		43569
 #define BRCM_CC_43570_CHIP_ID		43570
 #define BRCM_CC_4358_CHIP_ID		0x4358
+#define BRCM_CC_4359_CHIP_ID		0x4359
 #define BRCM_CC_43602_CHIP_ID		43602
 #define BRCM_CC_4365_CHIP_ID		0x4365
 #define BRCM_CC_4366_CHIP_ID		0x4366
@@ -66,6 +67,7 @@ 
 #define BRCM_PCIE_43567_DEVICE_ID	0x43d3
 #define BRCM_PCIE_43570_DEVICE_ID	0x43d9
 #define BRCM_PCIE_4358_DEVICE_ID	0x43e9
+#define BRCM_PCIE_4359_DEVICE_ID	0x43ef
 #define BRCM_PCIE_43602_DEVICE_ID	0x43ba
 #define BRCM_PCIE_43602_2G_DEVICE_ID	0x43bb
 #define BRCM_PCIE_43602_5G_DEVICE_ID	0x43bc