Skip to contentSkip to conversation

ipxe fix for gcc5

PATCH In review Mark Pryor 3 participants 3 messages Oct 8, 2015 – Oct 9, 2015

lore
Share & tools
lore

Mark Pryor

author
#0 lore raw

PATCH 1/1 ipxe fix for gcc5

Signed-off-by Mark Pryor <[email protected]>
---
 .../firmware/etherboot/patches/ipxe-ath9k-gcc5.patch | 20 ++++++++++++++++++++
 .../etherboot/patches/ipxe-ath9k2-gcc5.patch         | 20 ++++++++++++++++++++
 tools/firmware/etherboot/patches/series              |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch
 create mode 100644 tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch
tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch new file +20 -0
new file mode 100644
index 0000000..722f5e1
@@ -0,0 +1,20 @@
+--- ipxe.orig/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c	2011-12-10 18:28:04.000000000 -0800
++++ ipxe/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c	2015-09-18 14:42:38.618507334 -0700
+@@ -859,7 +859,7 @@
+ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+ 
+-		if (!on != aniState->ofdmWeakSigDetectOff) {
++		if ((!on) != aniState->ofdmWeakSigDetectOff) {
+ 			DBG2("ath9k: "
+ 				"** ch %d: ofdm weak signal: %s=>%s\n",
+ 				chan->channel,
+@@ -1013,7 +1013,7 @@
+ 			      AR_PHY_MRC_CCK_ENABLE, is_on);
+ 		REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
+ 			      AR_PHY_MRC_CCK_MUX_REG, is_on);
+-		if (!is_on != aniState->mrcCCKOff) {
++		if ((!is_on) != aniState->mrcCCKOff) {
+ 			DBG2("ath9k: "
+ 				"** ch %d: MRC CCK: %s=>%s\n",
+ 				chan->channel,
tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch new file +20 -0
new file mode 100644
index 0000000..a96bb51
@@ -0,0 +1,20 @@
+--- ipxe.orig/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c	2011-12-10 18:28:04.000000000 -0800
++++ ipxe/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c	2015-09-18 14:48:17.493922456 -0700
+@@ -1141,7 +1141,7 @@
+ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+ 
+-		if (!on != aniState->ofdmWeakSigDetectOff) {
++		if ((!on) != aniState->ofdmWeakSigDetectOff) {
+ 			if (on)
+ 				ah->stats.ast_ani_ofdmon++;
+ 			else
+@@ -1307,7 +1307,7 @@
+ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+ 
+-		if (!on != aniState->ofdmWeakSigDetectOff) {
++		if ((!on) != aniState->ofdmWeakSigDetectOff) {
+ 			DBG2("ath9k: "
+ 				"** ch %d: ofdm weak signal: %s=>%s\n",
+ 				chan->channel,
tools/firmware/etherboot/patches/series +2 -0
index 2c39853..679e0f9 100644
@@ -4,3 +4,5 @@ build_fix_2.patch
 build_fix_3.patch
 build-compare.patch
 build_fix_4.patch
+ipxe-ath9k-gcc5.patch 
+ipxe-ath9k2-gcc5.patch
Signature · 1 line
2.1.4
#1 lore raw
Quoted 2 lines
Quoted 1 line
Quoted 1 line · On 08.10.15 at 19:25, <[email protected]> wrote:
Signed-off-by Mark Pryor <[email protected]>

To be honest I'd prefer to take the upstream fix for this, i.e. what we also have in 4.6. Plus for submissions against stable releases, please see ./MAINTAINERS of the respective tree.

Jan

Quoted 86 lines
---
 .../firmware/etherboot/patches/ipxe-ath9k-gcc5.patch | 20 ++++++++++++++++++++
 .../etherboot/patches/ipxe-ath9k2-gcc5.patch         | 20 ++++++++++++++++++++
 tools/firmware/etherboot/patches/series              |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch
 create mode 100644 tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch
tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch new file +1 -0
new file mode 100644
index 0000000..722f5e1
@@ -0,0 +1,20 @@
+--- ipxe.orig/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c	2011-12-10

18:28:04.000000000 -0800
++++ ipxe/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c 2015-09-18
14:42:38.618507334 -0700
+@@ -859,7 +859,7 @@

tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch new file +17 -0
+ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+ 
+-		if (!on != aniState->ofdmWeakSigDetectOff) {
++		if ((!on) != aniState->ofdmWeakSigDetectOff) {
+ 			DBG2("ath9k: "
+ 				"** ch %d: ofdm weak signal: %s=>%s\n",
+ 				chan->channel,
+@@ -1013,7 +1013,7 @@
+ 			      AR_PHY_MRC_CCK_ENABLE, is_on);
+ 		REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
+ 			      AR_PHY_MRC_CCK_MUX_REG, is_on);
+-		if (!is_on != aniState->mrcCCKOff) {
++		if ((!is_on) != aniState->mrcCCKOff) {
+ 			DBG2("ath9k: "
+ 				"** ch %d: MRC CCK: %s=>%s\n",
+ 				chan->channel,
tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch new file +1 -0
new file mode 100644
index 0000000..a96bb51
@@ -0,0 +1,20 @@
+--- ipxe.orig/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c	2011-12-10

18:28:04.000000000 -0800
++++ ipxe/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c 2015-09-18
14:48:17.493922456 -0700
+@@ -1141,7 +1141,7 @@

tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch new file +17 -0
+ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+ 
+-		if (!on != aniState->ofdmWeakSigDetectOff) {
++		if ((!on) != aniState->ofdmWeakSigDetectOff) {
+ 			if (on)
+ 				ah->stats.ast_ani_ofdmon++;
+ 			else
+@@ -1307,7 +1307,7 @@
+ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+ 
+-		if (!on != aniState->ofdmWeakSigDetectOff) {
++		if ((!on) != aniState->ofdmWeakSigDetectOff) {
+ 			DBG2("ath9k: "
+ 				"** ch %d: ofdm weak signal: %s=>%s\n",
+ 				chan->channel,
tools/firmware/etherboot/patches/series +2 -0
index 2c39853..679e0f9 100644
@@ -4,3 +4,5 @@ build_fix_2.patch
 build_fix_3.patch
 build-compare.patch
 build_fix_4.patch
+ipxe-ath9k-gcc5.patch 
+ipxe-ath9k2-gcc5.patch
Signature · 8 lines
2.1.4



_______________________________________________
Xen-devel mailing list
[email protected] 
http://lists.xen.org/xen-devel
Acked-by on v1 1/1
#2 lore raw
In reply to Mark Pryor
Quoted 1 line · Mark Pryor
Signed-off-by Mark Pryor <[email protected]>

There is already a fix in tree for 4.6. You can request backporting

commit 6596412d59bcde3d1a2473f341851f4c476fc9df

Author: Konrad Rzeszutek Wilk <[email protected]>
Date:   Mon Aug 24 15:48:58 2015 -0400

etherboot: Build fix for GCC 5.1.1

Specificially we are pulling in the upstream patch (commit 1b56452121672e6408c38ac8926bdd6998a39004)):
[ath9k] Remove confusing logic inversion in an ANI variable

Signed-off-by Konrad Rzeszutek Wilk <[email protected]>
Acked-by Wei Liu <[email protected]>