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 DE5DCA0093 for ; Tue, 19 May 2020 15:14:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D08E11D702; Tue, 19 May 2020 15:14:14 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id EBD4A1D910 for ; Tue, 19 May 2020 15:14:12 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id z4so3019082wmi.2 for ; Tue, 19 May 2020 06:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NjafBLptfsw64rXS/lPBoFawE6XG9+KYbug/uDvJnBE=; b=iwGIn5SNSbHNb0NQZbQbuzyGyJ/tWU2X3zHAI4P+HEA0/EAiXkwXc/gxgIsT6MQuXd XgXXCsr1du0MFUdOTTdoQMvsK/yKay995K3/BTYTi2cIpVBdA9WltFlgWaGonyOtXhQn n4R9jA2XAJU6LVC9cqUlhvMKQtgXKof7dKYpPoshDtONIidOIinFhwMGNVpB7IrOwmWU m8czrpdEfq+MLLPlV/JZ4GhuuHq2FW0EOz5FG9FJCepsWolx23QKcCPZGiQbIzePCN0J 9zhz3+HFZj/SrSzx6YO+dbmCQJfv5mfKklVqGiqdARNsPZry62yqA0bz3dt4dYqVbO5I Tnfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NjafBLptfsw64rXS/lPBoFawE6XG9+KYbug/uDvJnBE=; b=iTVE6/A1YDuUrwt/hPUyU4pncdysBoRj8vywgb4qzh6ljUgSb0CjEHFWe1KPFMHo1w iaAZBAohyZTBDQ4rcA1EkGIktEwccE/bhujQoqOiuJgYx/mVSFxMcL+2+3qsCOITZwrJ Ok/6a+JWKA91P0hZb6fG/yincqQIvyGRNAjqRRxFO9UhwGWqbUakA2VwCLfYjENszVgK Zrp81y9mMCN9gTb4iSdAJkHqAFCjkrsDv2O3bYycTrt1RK9ycj7Zr/sE+U4OA1mhMyae FV3w0HYlvSaRkhTzk4pnWtmmd739jrGFAWpjWraEk/BHOuIa9qRMLkagJoOPhZqCfS+f BkuQ== X-Gm-Message-State: AOAM5335Gtg/Ta0EZtMQBkQ9Bp/WuTwYX3vyoD8rC0x/zwuZBmO4X0Xv +4rDqnYZB18m9S/Iq59ZNGtdJQV9MF79Np46 X-Google-Smtp-Source: ABdhPJxLbp+GWthWnRbbAo2W9qf5h7XcTlf1vHp+jXMfM2LXIx2/48ZpGyHJCQjmKD/vef7AJzc19Q== X-Received: by 2002:a1c:2943:: with SMTP id p64mr5335736wmp.42.1589894052684; Tue, 19 May 2020 06:14:12 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z7sm21036502wrl.88.2020.05.19.06.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:14:12 -0700 (PDT) From: luca.boccassi@gmail.com To: Pavan Nikhilesh Cc: Harman Kalra , Ferruh Yigit , dpdk stable Date: Tue, 19 May 2020 14:04:55 +0100 Message-Id: <20200519130549.112823-160-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/octeontx: fix gcc 9.1 ABI break' has been queued to stable release 19.11.3 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" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From d104eb2c03edfb1eb2caaa0a2efeac10e00c8564 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Sat, 2 May 2020 21:40:31 +0530 Subject: [PATCH] common/octeontx: fix gcc 9.1 ABI break MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 838d94399b18f26beb1a39998bb9503b38c4a093 ] GCC 9.1 fixes a bug with passing bitfields as pass by value in function parameters and generates a warning for the same as below: drivers/common/octeontx/octeontx_mbox.c:282:1: note: parameter passing for argument of type ‘struct mbox_intf_ver’ changed in GCC 9.1 Fix the warning generated by passing bitfield as pass by reference. Fixes: b4134b2d31cc ("common/octeontx: update mbox to version 1.1.3") Signed-off-by: Pavan Nikhilesh Acked-by: Harman Kalra Tested-by: Ferruh Yigit --- drivers/common/octeontx/octeontx_mbox.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/common/octeontx/octeontx_mbox.c b/drivers/common/octeontx/octeontx_mbox.c index 2fd2531072..effe0b267e 100644 --- a/drivers/common/octeontx/octeontx_mbox.c +++ b/drivers/common/octeontx/octeontx_mbox.c @@ -279,7 +279,7 @@ octeontx_start_domain(void) } static int -octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver, +octeontx_check_mbox_version(struct mbox_intf_ver *app_intf_ver, struct mbox_intf_ver *intf_ver) { struct mbox_intf_ver kernel_intf_ver = {0}; @@ -290,8 +290,9 @@ octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver, hdr.coproc = NO_COPROC; hdr.msg = RM_INTERFACE_VERSION; - result = octeontx_mbox_send(&hdr, &app_intf_ver, sizeof(app_intf_ver), - &kernel_intf_ver, sizeof(kernel_intf_ver)); + result = octeontx_mbox_send(&hdr, app_intf_ver, + sizeof(struct mbox_intf_ver), + &kernel_intf_ver, sizeof(kernel_intf_ver)); if (result != sizeof(kernel_intf_ver)) { mbox_log_err("Could not send interface version. Err=%d. FuncErr=%d\n", result, hdr.res_code); @@ -301,9 +302,9 @@ octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver, if (intf_ver) *intf_ver = kernel_intf_ver; - if (app_intf_ver.platform != kernel_intf_ver.platform || - app_intf_ver.major != kernel_intf_ver.major || - app_intf_ver.minor != kernel_intf_ver.minor) + if (app_intf_ver->platform != kernel_intf_ver.platform || + app_intf_ver->major != kernel_intf_ver.major || + app_intf_ver->minor != kernel_intf_ver.minor) result = -EINVAL; return result; @@ -312,7 +313,7 @@ octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver, int octeontx_mbox_init(void) { - const struct mbox_intf_ver MBOX_INTERFACE_VERSION = { + struct mbox_intf_ver MBOX_INTERFACE_VERSION = { .platform = 0x01, .major = 0x01, .minor = 0x03 @@ -330,7 +331,7 @@ octeontx_mbox_init(void) return ret; } - ret = octeontx_check_mbox_version(MBOX_INTERFACE_VERSION, + ret = octeontx_check_mbox_version(&MBOX_INTERFACE_VERSION, &rm_intf_ver); if (ret < 0) { mbox_log_err("MBOX version: Kernel(%d.%d.%d) != DPDK(%d.%d.%d)", -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:51.011822064 +0100 +++ 0160-common-octeontx-fix-gcc-9.1-ABI-break.patch 2020-05-19 14:04:44.500653521 +0100 @@ -1,4 +1,4 @@ -From 838d94399b18f26beb1a39998bb9503b38c4a093 Mon Sep 17 00:00:00 2001 +From d104eb2c03edfb1eb2caaa0a2efeac10e00c8564 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Sat, 2 May 2020 21:40:31 +0530 Subject: [PATCH] common/octeontx: fix gcc 9.1 ABI break @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit 838d94399b18f26beb1a39998bb9503b38c4a093 ] + GCC 9.1 fixes a bug with passing bitfields as pass by value in function parameters and generates a warning for the same as below: @@ -15,7 +17,6 @@ Fix the warning generated by passing bitfield as pass by reference. Fixes: b4134b2d31cc ("common/octeontx: update mbox to version 1.1.3") -Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh Acked-by: Harman Kalra