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 10737A04AF for ; Mon, 28 Sep 2020 11:05:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02FAC1C29A; Mon, 28 Sep 2020 11:05:55 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 297B21C29A for ; Mon, 28 Sep 2020 11:05:53 +0200 (CEST) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601283951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=biELXHmurjWl0RdAFGjm5ij+/BONl92qO/e/kxDRWso=; b=S9fXtM0Oi53LalzH5+PFAV2CDoAm2ICutYnur4UOYlFtEihjAGZksAocsctUbFpsdPDOcx eEfonJD7T8jTLh92ynRd1J3msu6aQ5XKPf/ooNKjlAWNLDoN0r5pvtCsXi0H9fQ9iJ+OGm y/ZLXpzl3VpMCuiKHu6HwKsw4eC/44o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-86-zVsp87IUN1GGWzk-Wy7BuA-1; Mon, 28 Sep 2020 05:05:49 -0400 X-MC-Unique: zVsp87IUN1GGWzk-Wy7BuA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27C3964080; Mon, 28 Sep 2020 09:05:48 +0000 (UTC) Received: from [10.33.36.225] (unknown [10.33.36.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 228CA78482; Mon, 28 Sep 2020 09:05:46 +0000 (UTC) To: Luca Boccassi , stable@dpdk.org Cc: Abhishek.Marathe@microsoft.com References: <20200925130113.13877-1-ktraynor@redhat.com> <56133d4ac8b307698ab6a2facbfaf18e68176582.camel@debian.org> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: Date: Mon, 28 Sep 2020 10:05:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <56133d4ac8b307698ab6a2facbfaf18e68176582.camel@debian.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 25/09/2020 14:09, Luca Boccassi wrote: > 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(). >> >> Add macros for openSUSE 15.2 and extend compatibility. >> >> 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(-) >> >> 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 >= KERNEL_VERSION(4, 4, 57)) >> +#if (LINUX_VERSION_CODE >= 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 >= 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/ethtool/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 >= KERNEL_VERSION(4, 4, 57)) >> +#if (LINUX_VERSION_CODE >= 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 >= 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, __always_unused int type) >> #endif >> >> -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)) >> +#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)) \ >> + || (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(15, 2, 0))) >> #define pci_cleanup_aer_uncorrect_error_status \ >> pci_aer_clear_nonfatal_status > > Acked-by: Luca Boccassi > Applied, thanks.