From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 89FDFA04C0 for ; Fri, 25 Sep 2020 15:10:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 315201E926; Fri, 25 Sep 2020 15:10:01 +0200 (CEST) Received: from mail-wr1-f66.google.com (unknown [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 306291E536 for ; Fri, 25 Sep 2020 15:09:57 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id s12so3517357wrw.11 for ; Fri, 25 Sep 2020 06:09:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=RbEUMIZOBfnjz4HrMU3SRY60SuRgc3Q97tuLqXTsYZ8=; b=sKNSTntf5Xm2+bcwzrQRHW+IyeoqHGCxgZ0/Vpk9hePx9Vp0PgbboRjkK7fq3STEAW OXTjAZb/iheKQ2yPFZdqHQ9IRycaVtIpiGQNfiWMDR80cSJa5ZS68Ef2Xb3nADTGXMJG iOI1q4Qaa7nnN4mHvIeLGGNmoC9R4m1eScjaT9xCHS8Bv3RZcD7qLLx31/F9hyp2Zv6t 5hEez6O95TD25Z+92nS4gwu/GerH2Rm8daOu3KF8AP/oXq9B2qcx/tLKSo5IsiE+gypW awY7KbY0e3u8vM3v35HlfBHFzdF1z7Tl0QR2yfc0+xlTuBarfWN+k7HlcOatwVh5UaMn CFrw== X-Gm-Message-State: AOAM532cMmzT6bJ/oGV8sp3RG1DEeNF4aDHlV3MqIIEIfwATEYpfMwqh 0MAOh7cBIWFuLYse8ItdblI= X-Google-Smtp-Source: ABdhPJzCqxY/M/NbmaX4ipj6inUz90OGJEUNGg6JUF7QgihlxlwFFX1rrlKso+X3YLXTYlYNwebUIw== X-Received: by 2002:adf:e4c9:: with SMTP id v9mr4314604wrm.375.1601039388419; Fri, 25 Sep 2020 06:09:48 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u2sm3223282wre.7.2020.09.25.06.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 06:09:47 -0700 (PDT) Message-ID: <56133d4ac8b307698ab6a2facbfaf18e68176582.camel@debian.org> From: Luca Boccassi To: Kevin Traynor , stable@dpdk.org Cc: Abhishek.Marathe@microsoft.com Date: Fri, 25 Sep 2020 14:09:46 +0100 In-Reply-To: <20200925130113.13877-1-ktraynor@redhat.com> References: <20200925130113.13877-1-ktraynor@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH 18.11 1/2] kni: fix build error on openSUSE 15.2 - pci clearing X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Fri, 2020-09-25 at 14:01 +0100, Kevin Traynor wrote: > Similar to > commit 8c70f4af0f40 ("kni: fix ethtool build error on kernel 5.7") > openSUSE LEAP 15.2 also needs to use the new > pci_aer_clear_nonfatal_status() function instead of > pci_cleanup_aer_uncorrect_error_status(). >=20 > Add macros for openSUSE 15.2 and extend compatibility. >=20 > Reported-by: Abhishek Marathe > Signed-off-by: Kevin Traynor > --- > kernel/linux/kni/compat.h | 5 ++++- > kernel/linux/kni/ethtool/igb/kcompat.h | 8 ++++++-- > 2 files changed, 10 insertions(+), 3 deletions(-) >=20 > diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h > index 3c3855dcfa..bf5e6e2b17 100644 > --- a/kernel/linux/kni/compat.h > +++ b/kernel/linux/kni/compat.h > @@ -15,5 +15,8 @@ > #endif > #ifdef CONFIG_SUSE_KERNEL > -#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(4, 4, 57)) > +#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(5, 3, 18)) > +/* SLES15 SP2 is 5.3.18 based */ > +#define SLE_VERSION_CODE SLE_VERSION(15, 2, 0) > +#elif (LINUX_VERSION_CODE >=3D KERNEL_VERSION(4, 4, 57)) > /* SLES12SP3 is at least 4.4.57+ based */ > #define SLE_VERSION_CODE SLE_VERSION(12, 3, 0) > diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/et= htool/igb/kcompat.h > index f74038b3eb..459fda3dad 100644 > --- a/kernel/linux/kni/ethtool/igb/kcompat.h > +++ b/kernel/linux/kni/ethtool/igb/kcompat.h > @@ -685,5 +685,8 @@ struct _kc_ethtool_pauseparam { > #endif > #ifdef CONFIG_SUSE_KERNEL > -#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(4, 4, 57)) > +#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(5, 3, 18)) > +/* SLES15 SP2 is 5.3.18 based */ > +#define SLE_VERSION_CODE SLE_VERSION(15, 2, 0) > +#elif (LINUX_VERSION_CODE >=3D KERNEL_VERSION(4, 4, 57)) > /* SLES12SP3 is at least 4.4.57+ based */ > #define SLE_VERSION_CODE SLE_VERSION(12, 3, 0) > @@ -3965,5 +3968,6 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __alw= ays_unused int type) > #endif > =20 > -#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(5, 7, 0)) > +#if ((LINUX_VERSION_CODE >=3D KERNEL_VERSION(5, 7, 0)) \ > + || (SLE_VERSION_CODE && SLE_VERSION_CODE >=3D SLE_VERSION(15, 2, 0))) > #define pci_cleanup_aer_uncorrect_error_status \ > pci_aer_clear_nonfatal_status Acked-by: Luca Boccassi --=20 Kind regards, Luca Boccassi