From patchwork Thu Apr 15 14:47:13 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: 421779 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp545784jaf; Thu, 15 Apr 2021 07:51:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKh11s71oX4zmzIfNmzcMLJpRtkB26lPXv9yhrFlOtkR361cK60aVnXPWqYIWchZ0YUl9N X-Received: by 2002:a63:c60a:: with SMTP id w10mr3733228pgg.421.1618498317047; Thu, 15 Apr 2021 07:51:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618498317; cv=none; d=google.com; s=arc-20160816; b=xHFNEv1G45rDNSNOoWTOcK+FVpOWVgL9diJCj4ou2ogWYzIwDiyFT00ezMD8FQBXFC Ozo1ZVPUJUX2zKAnPxtb9uH2qenF98JJwtgvDnGh2O7qIIDC+SUl79I9D5BNiTfcz7th A4PwyjSNcHg9n37A0vZAAXKTBvGDvWvorG9cgC3D08WkJfdL7V0xBxIDWYyZ+Eyko3D/ Xilfc1q3Zpnh/weXtCQBL5J+Qz5C3OkGqSAB0bH1upeYQuZBihxh7zBqarSaddCmBtPR wt0JPLJIbWC1LHzJNDBJNets3um0NbPS+ZD6vvaSQHrYUH6gll25iwoMRGfe4JQ9CdUm 2CiA== 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=GnewX8nXkedF3uNxbipGTVlG7AuosuDg15X347vvEdw=; b=aFzW/LV5KrGWEV2ZURzTkkvpRIXlJkWxmXFLACeqjmPeAkGd0T3gXELZ5pTeaB90JQ lXEj0ZVc+BNTDfTt8o1faIyHeli2xQcfseAL2SONI1MNjRKDMpT3vbHde5xwF0SslJWq DFukDz3DZIP3C+lo9yCprEV8RsCa0DCVIPDmpFDVBVI8GHgN/X3o/pY0g6mVRzxTw1h0 PMTuzoxSFHNPXsYrBo6YyQqYLyJIcD/QL+EuJaNgl9VWkRFeH979aSQzjKl9gXLLLnWc bxidf99u8zGtEhr/ZqQbe86/sB8q3RraUC/gXAP0bbhatEkpzF6kTLogdJTZIe5u3MLi BpOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VV+zQnLY; 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 cu8si3128702pjb.173.2021.04.15.07.51.56; Thu, 15 Apr 2021 07:51:57 -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=VV+zQnLY; 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 S233592AbhDOOwN (ORCPT + 12 others); Thu, 15 Apr 2021 10:52:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:38396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233930AbhDOOv0 (ORCPT ); Thu, 15 Apr 2021 10:51:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1CB01613D0; Thu, 15 Apr 2021 14:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618498263; bh=5iChbmaVFrwaC3V63U4+d/uRVDNWpfM0cEYzF0hTvNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VV+zQnLY2hmJNT5Kuc3hQaU8FxfJU5imV5TGLkWAoayVQmIjDthPgJk/ukHAZ5qOb MGjnyTEzT/HFgm8fg9yRx9W8F42d4URq1AqSrfsRrEQCF+IE3E2/ZpyNiSgfaDtWID dDsA/y/jGQZA4LzMsqJwEt3Mp0WU1Br5u0zkSTdI= 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.9 21/47] soc/fsl: qbman: fix conflicting alignment attributes Date: Thu, 15 Apr 2021 16:47:13 +0200 Message-Id: <20210415144414.138078411@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210415144413.487943796@linuxfoundation.org> References: <20210415144413.487943796@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 91f5c951850f..44463afb8015 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -146,7 +146,7 @@ struct qm_eqcr_entry { u32 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