From patchwork Mon Apr 12 08:40:50 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: 419521 Delivered-To: patch@linaro.org Received: by 2002:a02:c4d2:0:0:0:0:0 with SMTP id h18csp1571894jaj; Mon, 12 Apr 2021 02:17:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUXyDSZ8smxOO8tP7OA07P0gPfbbHOjEwBWnX4acRnAj1MpsCr5jnA9pbnr8tPC4/UcAUP X-Received: by 2002:a63:7e45:: with SMTP id o5mr25722219pgn.228.1618217467076; Mon, 12 Apr 2021 01:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618217467; cv=none; d=google.com; s=arc-20160816; b=VdYSo4w0qxg63t9MqeXmk0FGKW4OBmNLNPPVQYasKy/COhPdp3rVQ0dxDoBGtLp04n DDUkV7uDo/otcQ+Lq45kztCT/Fk7ekDqvd4orZ9aOZLufl8Rik3A9pggnoOZ9MVp0Ypv p5BYEE76SRjVFwvuPWAqXkOvzyf/UjtJ6KpFxZSfz7PdgbOyI6W7RgWIIh0VVUedBHQT 0wQWMZTYp03YvC0aw/2b9R072yY5d10OSyZTM+wYdTpFX7H7PMNakRJ3Zvngh1Cr/aQh XiGmoOilYRNzctL05EquIzGQU4i4eYbRDLjMe1ZHyRiWtAdW/mTrYyXlSHF4Cimn7m/y CVng== 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=qTE7lenxwEiSrKCtO3TfrCKunCN3PJkI4aITN0770us=; b=FzVGQ9WWxRdjkJ7EfQh2JavyZ9+hfwpjkCvF5F5Wnc9g5nTW99IoK7PD3hPjiUmleg vqCFypqq2UW0eZVpqyR+dp16g+F5VRkc/rjBH616T6RJiq7jEby5GNRgIBtJORL0gmIn IU9eb8TAXcPSudNeDtzS179bqSQa8t+lu5k7PKKg8LHtkYSyzBTQh1d6j8A/vl4oM3+R cBz97bahUFun9I7l0OCkFCiT77rrStU1f6krHdR8j4bkN3afTjltGty/xU8E3R3m4p8N lEg6LyscFHYhGnG4Xtbm5zd8utZ1PE3PO7lnF53VkNyZY97kPtl9s69aNMo/XJ18REUz E1yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qUjwxeRu; 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 j6si12779253pgq.283.2021.04.12.01.51.06; Mon, 12 Apr 2021 01:51:07 -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=qUjwxeRu; 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 S238100AbhDLIvT (ORCPT + 12 others); Mon, 12 Apr 2021 04:51:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:40488 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238215AbhDLItK (ORCPT ); Mon, 12 Apr 2021 04:49:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A937061288; Mon, 12 Apr 2021 08:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618217290; bh=QwS9Gr7C2v78Zoxj3SMmHfHRt3K2UaOLjyc0YV6CGT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qUjwxeRuqGfckBycHiY/geT+Ym9QuY6MkqC4RcdcX3X2gqCdCT4GfJQuL3+Kw9kIe YPDpcjq7LiBkI4hoTbqZj1gLzcTo7wDU4oStHG37QY+smVyclVknPg2FM6E/XYYPlM 9stCyas6lqTY+AdmJA0sFldITGnetsbe2TwpGxgM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sasha Levin Subject: [PATCH 5.4 072/111] soc/fsl: qbman: fix conflicting alignment attributes Date: Mon, 12 Apr 2021 10:40:50 +0200 Message-Id: <20210412084006.668534695@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210412084004.200986670@linuxfoundation.org> References: <20210412084004.200986670@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 bf68d86d80ee..95f9e4805245 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -186,7 +186,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