From patchwork Thu Apr 15 14:47:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 421785 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp553244jaf; Thu, 15 Apr 2021 08:01:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+1qAKPGOsxnj4T+YiK9fANyk/R+fgFI6x2hCuDfQMi+UZ18vAz1JFVj3YxhBch1ss/u4y X-Received: by 2002:a17:906:b01:: with SMTP id u1mr3958925ejg.310.1618498881246; Thu, 15 Apr 2021 08:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618498881; cv=none; d=google.com; s=arc-20160816; b=QqS/kQmHPdVWuB6m/r3QpWh+ed/CMREGxu6tMwRcBiK/+0DxjhKj51wfnj0lurxhx4 diWwQVYyXR1RTJ6vmyyCawMvduZi+EhQiwc9z4Yol2X0t5Nl6zwS5KR52KEVQ3TsdGT1 nFswt69usnjvkZFCX9UGBvdIqEuljC97avBPl91gjwf+o7shD4jz40XK0+AEHjkeWE6V ekQvfPDOw900EVkFU7HSAgH/H5QihL2szPT0HmBHhuV0oWlqr57XfVYbnDl9KGoGo3Qh w4mZKLKw9qVkPd+fZd4az2uV5mctBZnzoWA1Y8Mo3PhoZ3RZqKJgtsSOL+FDJMPTPfoR fTRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qtUSHxx090AZD6SWL7JAxw2JtwA5cdwhcB5fzc9HoUo=; b=EyF7laqauN4xs2iCL/aZ5yiJDlBfz/yXXpk8NoTCxlK+h6NYMgzvdh9D3KMH628Zmi 7fzLcvTlH3PvttTSJY2kBhkBMFK/BDKCtM+B0eNt8EvqDBG/sor9va3Xr3SdF2Og7lAc 0Io4LyGupVGpf/JagHPGYlp1CoFyOyoAvVHZn7ShbmzS97OnfF5LVlgGgBUeIPhc9ioi kc/q7avGSPM8iOp/0oV40YSOLRfxD8STK/DbG0X9l4b4nO9/ELX2zi33rYSuM9fD6279 eOWzGH8UdHtj8SIagfhh6azemyALj1frkqWKQhuG9u3s1HAqN18o5f97FXzl+3f9aOpB fH5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=osPaB9hK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k7si2442560eji.230.2021.04.15.08.01.20; Thu, 15 Apr 2021 08:01:21 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=osPaB9hK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233595AbhDOPBl (ORCPT + 12 others); Thu, 15 Apr 2021 11:01:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:47038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234188AbhDOO6z (ORCPT ); Thu, 15 Apr 2021 10:58:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6CD26613FE; Thu, 15 Apr 2021 14:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618498512; bh=6Ro7vwzqqxZY/PWxXq5M3aRhNH45iD2+F06MDjfDxrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=osPaB9hKYsDQlmWgBC+LES7BlP72WCbjxx/rB/Uq8u3CiFclCxeV0Xt3qw7BRLZKr jZXdYapGTo9QqJ5y6ndcSJ/7iG57j5dI1fvmLWADOKxLl0pd/q6xdoqhFt/buX8LoX qafbOfkUU5F0eGvNHy4etWXhEwlQbs/pOIcV4tyo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sasha Levin Subject: [PATCH 4.14 31/68] soc/fsl: qbman: fix conflicting alignment attributes Date: Thu, 15 Apr 2021 16:47:12 +0200 Message-Id: <20210415144415.483068975@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210415144414.464797272@linuxfoundation.org> References: <20210415144414.464797272@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 040f31196e8b2609613f399793b9225271b79471 ] When building with W=1, gcc points out that the __packed attribute on struct qm_eqcr_entry conflicts with the 8-byte alignment attribute on struct qm_fd inside it: drivers/soc/fsl/qbman/qman.c:189:1: error: alignment 1 of 'struct qm_eqcr_entry' is less than 8 [-Werror=packed-not-aligned] I assume that the alignment attribute is the correct one, and that qm_eqcr_entry cannot actually be unaligned in memory, so add the same alignment on the outer struct. Fixes: c535e923bb97 ("soc/fsl: Introduce DPAA 1.x QMan device driver") Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20210323131530.2619900-1-arnd@kernel.org' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- drivers/soc/fsl/qbman/qman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index 90892a360c61..06b6d7afc567 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -146,7 +146,7 @@ struct qm_eqcr_entry { __be32 tag; struct qm_fd fd; u8 __reserved3[32]; -} __packed; +} __packed __aligned(8); #define QM_EQCR_VERB_VBIT 0x80 #define QM_EQCR_VERB_CMD_MASK 0x61 /* but only one value; */ #define QM_EQCR_VERB_CMD_ENQUEUE 0x01