Re: [Xen-devel] [PATCH 4.5] ipxe fix for gcc5

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 08.10.15 at 19:25, <pryorm09@xxxxxxxxx> wrote:
> Signed-off-by: Mark Pryor <pryorm09@xxxxxxxxx>

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

> ---
>  .../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
> 
> diff --git a/tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch 
> b/tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch
> new file mode 100644
> index 0000000..722f5e1
> --- /dev/null
> +++ b/tools/firmware/etherboot/patches/ipxe-ath9k-gcc5.patch
> @@ -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,
> diff --git a/tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch 
> b/tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch
> new file mode 100644
> index 0000000..a96bb51
> --- /dev/null
> +++ b/tools/firmware/etherboot/patches/ipxe-ath9k2-gcc5.patch
> @@ -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,
> diff --git a/tools/firmware/etherboot/patches/series 
> b/tools/firmware/etherboot/patches/series
> index 2c39853..679e0f9 100644
> --- a/tools/firmware/etherboot/patches/series
> +++ b/tools/firmware/etherboot/patches/series
> @@ -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
> -- 
> 2.1.4
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx 
> http://lists.xen.org/xen-devel 




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel