UPSTREAM: mwifiex: Change default firmware for PCIe8997 chip... [chromiumos/third_party/kernel : factory-gru-8557.B-chromeos-4.4]
41 views
Skip to first unread message
ChromeOS Commit Bot (Gerrit)
Jul 19, 2016, 1:55:20 PM7/19/16
to Wei-Ning Huang, Amitkumar Karwar, Brian Norris
ChromeOS Commit Bot has submitted this change and it was merged.
Change subject: UPSTREAM: mwifiex: Change default firmware for PCIe8997
chipset
......................................................................
UPSTREAM: mwifiex: Change default firmware for PCIe8997 chipset
PCIe-USB8997 variant is being used in the product. Let's change default
firmware from PCIe-UART to PCIe-USB. So by default PCIe-USB firmware would
be downloaded if version register doesn't give any information.
Signed-off-by: Amitkumar Karwar <aka...@marvell.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
(cherry picked from
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
master
commit 473dfbfa09934cea0d08cc9023c749a5fce10cb0)
BUG=chrome-os-partner:52835
TEST=wifi still works on kevin/gru; also BT w/ USB
Change-Id: I5f1281f22e3486e791c401e20a613c35c35fed03
Signed-off-by: Brian Norris <brian...@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/361734
Commit-Queue: Wei-Ning Huang <wnh...@chromium.org>
Tested-by: Wei-Ning Huang <wnh...@chromium.org>
---
M drivers/net/wireless/marvell/mwifiex/pcie.c
M drivers/net/wireless/marvell/mwifiex/pcie.h
2 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Wei-Ning Huang: Ready; Verified
Brian Norris: Looks good to me, approved
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c
b/drivers/net/wireless/marvell/mwifiex/pcie.c
index af98371..f380882 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2846,20 +2846,20 @@
version &= 0x7;
switch (revision_id) {
case PCIE8997_V2:
- if (version == CHIP_VER_PCIEUSB)
- strcpy(adapter->fw_name,
- PCIEUSB8997_FW_NAME_V2);
- else
+ if (version == CHIP_VER_PCIEUART)
strcpy(adapter->fw_name,
PCIEUART8997_FW_NAME_V2);
- break;
- case PCIE8997_Z:
- if (version == CHIP_VER_PCIEUSB)
- strcpy(adapter->fw_name,
- PCIEUSB8997_FW_NAME_Z);
else
strcpy(adapter->fw_name,
+ PCIEUSB8997_FW_NAME_V2);
+ break;
+ case PCIE8997_Z:
+ if (version == CHIP_VER_PCIEUART)
+ strcpy(adapter->fw_name,
PCIEUART8997_FW_NAME_Z);
+ else
+ strcpy(adapter->fw_name,
+ PCIEUSB8997_FW_NAME_Z);
break;
default:
strcpy(adapter->fw_name, PCIE8997_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h
b/drivers/net/wireless/marvell/mwifiex/pcie.h
index 5e4208e..532c3c4 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -33,7 +33,7 @@
#define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
#define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
#define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
-#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieuart8997_combo_v2.bin"
+#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
@@ -49,7 +49,7 @@
#define PCIE8897_B0 0x1200
#define PCIE8997_Z 0x0
#define PCIE8997_V2 0x471
-#define CHIP_VER_PCIEUSB 0x2
+#define CHIP_VER_PCIEUART 0x3
/* Constants for Buffer Descriptor (BD) rings */
#define MWIFIEX_MAX_TXRX_BD 0x20
--
To view, visit https://chromium-review.googlesource.com/361734
To unsubscribe, visit https://chromium-review.googlesource.com/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f1281f22e3486e791c401e20a613c35c35fed03
Gerrit-PatchSet: 2
Gerrit-Project: chromiumos/third_party/kernel
Gerrit-Branch: factory-gru-8557.B-chromeos-4.4
Gerrit-Owner: Wei-Ning Huang <wnh...@chromium.org>
Gerrit-Reviewer: Amitkumar Karwar <aka...@marvell.com>
Gerrit-Reviewer: Brian Norris <brian...@chromium.org>
Gerrit-Reviewer: ChromeOS Commit Bot <chromeos-...@chromium.org>
Gerrit-Reviewer: Wei-Ning Huang <wnh...@chromium.org>
Change subject: UPSTREAM: mwifiex: Change default firmware for PCIe8997
chipset
......................................................................
UPSTREAM: mwifiex: Change default firmware for PCIe8997 chipset
PCIe-USB8997 variant is being used in the product. Let's change default
firmware from PCIe-UART to PCIe-USB. So by default PCIe-USB firmware would
be downloaded if version register doesn't give any information.
Signed-off-by: Amitkumar Karwar <aka...@marvell.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
(cherry picked from
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
master
commit 473dfbfa09934cea0d08cc9023c749a5fce10cb0)
BUG=chrome-os-partner:52835
TEST=wifi still works on kevin/gru; also BT w/ USB
Change-Id: I5f1281f22e3486e791c401e20a613c35c35fed03
Signed-off-by: Brian Norris <brian...@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/361734
Commit-Queue: Wei-Ning Huang <wnh...@chromium.org>
Tested-by: Wei-Ning Huang <wnh...@chromium.org>
---
M drivers/net/wireless/marvell/mwifiex/pcie.c
M drivers/net/wireless/marvell/mwifiex/pcie.h
2 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Wei-Ning Huang: Ready; Verified
Brian Norris: Looks good to me, approved
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c
b/drivers/net/wireless/marvell/mwifiex/pcie.c
index af98371..f380882 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2846,20 +2846,20 @@
version &= 0x7;
switch (revision_id) {
case PCIE8997_V2:
- if (version == CHIP_VER_PCIEUSB)
- strcpy(adapter->fw_name,
- PCIEUSB8997_FW_NAME_V2);
- else
+ if (version == CHIP_VER_PCIEUART)
strcpy(adapter->fw_name,
PCIEUART8997_FW_NAME_V2);
- break;
- case PCIE8997_Z:
- if (version == CHIP_VER_PCIEUSB)
- strcpy(adapter->fw_name,
- PCIEUSB8997_FW_NAME_Z);
else
strcpy(adapter->fw_name,
+ PCIEUSB8997_FW_NAME_V2);
+ break;
+ case PCIE8997_Z:
+ if (version == CHIP_VER_PCIEUART)
+ strcpy(adapter->fw_name,
PCIEUART8997_FW_NAME_Z);
+ else
+ strcpy(adapter->fw_name,
+ PCIEUSB8997_FW_NAME_Z);
break;
default:
strcpy(adapter->fw_name, PCIE8997_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h
b/drivers/net/wireless/marvell/mwifiex/pcie.h
index 5e4208e..532c3c4 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -33,7 +33,7 @@
#define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
#define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
#define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
-#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieuart8997_combo_v2.bin"
+#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
@@ -49,7 +49,7 @@
#define PCIE8897_B0 0x1200
#define PCIE8997_Z 0x0
#define PCIE8997_V2 0x471
-#define CHIP_VER_PCIEUSB 0x2
+#define CHIP_VER_PCIEUART 0x3
/* Constants for Buffer Descriptor (BD) rings */
#define MWIFIEX_MAX_TXRX_BD 0x20
--
To view, visit https://chromium-review.googlesource.com/361734
To unsubscribe, visit https://chromium-review.googlesource.com/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f1281f22e3486e791c401e20a613c35c35fed03
Gerrit-PatchSet: 2
Gerrit-Project: chromiumos/third_party/kernel
Gerrit-Branch: factory-gru-8557.B-chromeos-4.4
Gerrit-Owner: Wei-Ning Huang <wnh...@chromium.org>
Gerrit-Reviewer: Amitkumar Karwar <aka...@marvell.com>
Gerrit-Reviewer: Brian Norris <brian...@chromium.org>
Gerrit-Reviewer: ChromeOS Commit Bot <chromeos-...@chromium.org>
Gerrit-Reviewer: Wei-Ning Huang <wnh...@chromium.org>
Douglas Anderson (Gerrit)
Jul 21, 2016, 3:48:54 PM7/21/16
to Amitkumar Karwar, Wei-Ning Huang, Brian Norris
Douglas Anderson has submitted this change and it was merged.
Change subject: UPSTREAM: mwifiex: Change default firmware for PCIe8997
chipset
......................................................................
UPSTREAM: mwifiex: Change default firmware for PCIe8997 chipset
PCIe-USB8997 variant is being used in the product. Let's change default
firmware from PCIe-UART to PCIe-USB. So by default PCIe-USB firmware would
be downloaded if version register doesn't give any information.
Signed-off-by: Amitkumar Karwar <aka...@marvell.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
(cherry picked from
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
master
commit 473dfbfa09934cea0d08cc9023c749a5fce10cb0)
BUG=chrome-os-partner:52835
TEST=wifi still works on kevin/gru; also BT w/ USB
Change-Id: I7c171a0842864f79bba6d85e9f6b69af3e9f9b5b
Reviewed-by: Douglas Anderson <dian...@chromium.org>
Tested-by: Douglas Anderson <dian...@chromium.org>
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c
b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 59ac6d7..05b21a0 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2893,20 +2893,20 @@
index 04da2d2..fb13f5e 100644
Gerrit-Change-Id: I7c171a0842864f79bba6d85e9f6b69af3e9f9b5b
Gerrit-Reviewer: Wei-Ning Huang <wnh...@chromium.org>
Change subject: UPSTREAM: mwifiex: Change default firmware for PCIe8997
chipset
......................................................................
UPSTREAM: mwifiex: Change default firmware for PCIe8997 chipset
PCIe-USB8997 variant is being used in the product. Let's change default
firmware from PCIe-UART to PCIe-USB. So by default PCIe-USB firmware would
be downloaded if version register doesn't give any information.
Signed-off-by: Amitkumar Karwar <aka...@marvell.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
(cherry picked from
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
master
commit 473dfbfa09934cea0d08cc9023c749a5fce10cb0)
BUG=chrome-os-partner:52835
TEST=wifi still works on kevin/gru; also BT w/ USB
Signed-off-by: Brian Norris <brian...@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/361734
Commit-Queue: Wei-Ning Huang <wnh...@chromium.org>
Tested-by: Wei-Ning Huang <wnh...@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/362349
Reviewed-on: https://chromium-review.googlesource.com/361734
Commit-Queue: Wei-Ning Huang <wnh...@chromium.org>
Tested-by: Wei-Ning Huang <wnh...@chromium.org>
Reviewed-by: Douglas Anderson <dian...@chromium.org>
Tested-by: Douglas Anderson <dian...@chromium.org>
---
M drivers/net/wireless/marvell/mwifiex/pcie.c
M drivers/net/wireless/marvell/mwifiex/pcie.h
2 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Douglas Anderson: Looks good to me, approved; Verified
M drivers/net/wireless/marvell/mwifiex/pcie.c
M drivers/net/wireless/marvell/mwifiex/pcie.h
2 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c
b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 59ac6d7..05b21a0 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2893,20 +2893,20 @@
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -33,7 +33,7 @@
#define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
#define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
#define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
-#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieuart8997_combo_v2.bin"
+#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
@@ -49,7 +49,7 @@
#define PCIE8897_B0 0x1200
#define PCIE8997_Z 0x0
#define PCIE8997_V2 0x471
-#define CHIP_VER_PCIEUSB 0x2
+#define CHIP_VER_PCIEUART 0x3
/* Constants for Buffer Descriptor (BD) rings */
#define MWIFIEX_MAX_TXRX_BD 0x20
--
To view, visit https://chromium-review.googlesource.com/362349
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -33,7 +33,7 @@
#define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
#define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
#define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
-#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieuart8997_combo_v2.bin"
+#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
@@ -49,7 +49,7 @@
#define PCIE8897_B0 0x1200
#define PCIE8997_Z 0x0
#define PCIE8997_V2 0x471
-#define CHIP_VER_PCIEUSB 0x2
+#define CHIP_VER_PCIEUART 0x3
/* Constants for Buffer Descriptor (BD) rings */
#define MWIFIEX_MAX_TXRX_BD 0x20
--
Gerrit-Change-Id: I7c171a0842864f79bba6d85e9f6b69af3e9f9b5b
Gerrit-PatchSet: 2
Gerrit-Project: chromiumos/third_party/kernel
Gerrit-Branch: factory-gru-8557.B-chromeos-4.4
Gerrit-Owner: Douglas Anderson <dian...@chromium.org>
Gerrit-Project: chromiumos/third_party/kernel
Gerrit-Branch: factory-gru-8557.B-chromeos-4.4
Gerrit-Reviewer: Amitkumar Karwar <aka...@marvell.com>
Gerrit-Reviewer: Brian Norris <brian...@chromium.org>
Gerrit-Reviewer: Douglas Anderson <dian...@chromium.org>
Gerrit-Reviewer: Brian Norris <brian...@chromium.org>
Gerrit-Reviewer: Wei-Ning Huang <wnh...@chromium.org>
Reply all
Reply to author
Forward
0 new messages