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: 419514 Delivered-To: patch@linaro.org Received: by 2002:a02:c4d2:0:0:0:0:0 with SMTP id h18csp1560064jaj; Mon, 12 Apr 2021 01:58:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYsjZ7D7s/BQUEkl/AQv75ufTE5IjXzzivuGP1dc3kGeitpQuTwFQrn/fPDJe3QrFMHRU5 X-Received: by 2002:a17:90a:69a1:: with SMTP id s30mr18013080pjj.148.1618217891184; Mon, 12 Apr 2021 01:58:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618217891; cv=none; d=google.com; s=arc-20160816; b=zEw/nUnPCqRUwewrWEO7ILO/WxYch+DFk4eNvlffzQbyOB0zAfRG7f4Rf2EhQctjCE ZlVzJejy3bmVtfEJtwsNWDW5lqkBveqH6nhB4+pNxzLvClXVI2hUWU5mnfaO/ueBjfXR kl8wCkd7Nz7N2LWA1dF+oFbnqkDomdox3pnFSLzQGpMa5T6aKhYUYIbd0IwMQejFBnh0 7C9Qs4C6ObUIvEPRvjkJGRUDAt7vgrGL+g3kSFDIXP9nQgAiQ6YcqmAGrjmWduQc0u3A Tawiis8OdZnAOEcbKYz9g/vtuaJT7C+3vfdeHEJvF7/BdB3gS8Y6LzvEqEUKEvfLZ7G4 icyg== 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=ur1Sf4IsLMMD3UIb1JxKvS0NOBw39ky/brjMNGvARiY=; b=Tvc6GJ8wCEK0R3ZOhdFN70qdnmnUi6L8lcl+dTgq2WjlA9igVRVHEaA0xXwGpZX/ZD e9m+JoqK+kmEK0qtVvFzAskp1DqtyjGeLHWf7Xc2BFyXOok6RGDlJtY0tt0lF36B0qL+ ZKPiV+Zbn/m6YAXnyhOej2Pg5mBVvPj+V9Iy9W12KQuCKe4KPAGgend0SpmRYuImeQsI 4Nif/Ti2pjnqrBs+INYlcFCHbvz1HRfCuG0tGm1276TYia53rWjcOfeF7oK14tzlSoq6 uhb3PSg6aD+HrIaTHWe4TZtAf/8CfFEbRBizEY3IchCdb7pdBkLQsbQVRO7gqKbVCxOO C6mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="p3f/Weg7"; 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 h30si13511472pgl.437.2021.04.12.01.58.10; Mon, 12 Apr 2021 01:58:11 -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="p3f/Weg7"; 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 S238933AbhDLI61 (ORCPT + 12 others); Mon, 12 Apr 2021 04:58:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:48902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238108AbhDLI4w (ORCPT ); Mon, 12 Apr 2021 04:56:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7939761355; Mon, 12 Apr 2021 08:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618217783; bh=7G0J9gmIuJspoIiUIgDw7b+wRAXxVHZNTcHnRHVZlec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p3f/Weg7XYtVOYKHhRh49b+wKqeum/0KssLD8eAOsvvOKY4BArhR8nAfYiSWfRdYi RGLOQ78sIrMori97R1O0JrHJ03zww8pc0udPXkEipmanbynO1U3wZ3NcHmTHFbYafI Swwbl2r7yBthubpvR7abvYQrFKkLZD42oa3lup+8= 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.10 136/188] soc/fsl: qbman: fix conflicting alignment attributes Date: Mon, 12 Apr 2021 10:40:50 +0200 Message-Id: <20210412084018.164719291@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210412084013.643370347@linuxfoundation.org> References: <20210412084013.643370347@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 9888a7061873..feb97470699d 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