From patchwork Mon Apr 12 08:40:55 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: 419520 Delivered-To: patch@linaro.org Received: by 2002:a02:c4d2:0:0:0:0:0 with SMTP id h18csp1569833jaj; Mon, 12 Apr 2021 02:13:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztjkKwCcTdMGUUcgHs8CZBIEkZarmhdtMZY3FSA37jkk3JuvcjGELbPCbo2snVjhUoGghE X-Received: by 2002:a62:8856:0:b029:24c:5f3:98db with SMTP id l83-20020a6288560000b029024c05f398dbmr5362634pfd.17.1618218830042; Mon, 12 Apr 2021 02:13:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618218830; cv=none; d=google.com; s=arc-20160816; b=o4+xL4eEB/x5lZJgCVtYZqnTPyPb2ms2vIC+eNtR/DeU9CERy74TWY5+TE7IpPPINv XeZK9RSfVzsyhksbYFOKTg+VeytqOOLowHK6+b5HWVjPcPtqH8P9fotOXTmY1//xj0et uKM6qZVbimuIlDOH5mxhu6U3xqd5HPAIxCpGY/0D2PYQWJW7fl1tcSRk81GSJFamLGZY Gsg8Bi3vyr+aYNU72iTTpBJsInXSk/RuHEnR8bv/GNIw45V8PX/XbXPN0OhEXaw1GQGs Yxj4nCtvdVnsC9w1sQ4mkrLBbm5njgpH6J8rB23ZHDPfJ5JZMqQHgdAemRaB5epKm9Dr u3ZA== 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=qzHiJmvDtQWwAchtMuCDqfrpjFINnv5+UWJfU0TFhH4=; b=yKJM9vvLYmpCqJFQVkyzsKzNcbCyFuFXRvm+VdpT7r7cXZ7gDxX18htLiigiWVdaTv bK4yrPKOvhVQ1i3RnnPFUT0zKVn0eSsmchyz1Ir0NWXhTpHN79RshXXIEba5lsR+vh19 5rdqI90EWy51114ghHnFC8xMoRqDsP6WqC5NlPM9r8o5rEfXIw35H9dDaWrE8OxPYETG UJPrPzQeALSXPxiTGhEu0XXiPKrec84PzQaLI9DK7OUnyYEmxA3TpPgDhTp9RMasNgRU k4Jg4zC3emdsLMxL2aygnxq54GbSTTr/qI1dqCS21y2HHcTm+74e9bdcmvshpdq+w7i8 Ghbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TLiCVWaU; 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 r15si12368322pga.317.2021.04.12.02.13.49; Mon, 12 Apr 2021 02:13:50 -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=TLiCVWaU; 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 S239626AbhDLJNL (ORCPT + 12 others); Mon, 12 Apr 2021 05:13:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:35924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240288AbhDLJKL (ORCPT ); Mon, 12 Apr 2021 05:10:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E56DC61371; Mon, 12 Apr 2021 09:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618218312; bh=Jeggk29e+BX4k102ML44+EM0ZUd4BAbW8jKRvvt9JfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLiCVWaUmi0OmI2DsNSJmXNca1eh1LSHKxwW82Nn8mV59hmRTt6uN0O9LmaWWNXwk Bq/9pLh4JXFrMpD28OpNRFpXhqIsATYdBnIQydcQJ+IRtkevZahmpyQXB2aABRsSzZ +nCiU2DbXiKzL5JTCYhYI9Mo1Gx/RfCnDlZxgYLM= 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.11 150/210] soc/fsl: qbman: fix conflicting alignment attributes Date: Mon, 12 Apr 2021 10:40:55 +0200 Message-Id: <20210412084020.982510031@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210412084016.009884719@linuxfoundation.org> References: <20210412084016.009884719@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 a1b9be1d105a..fde4edd83c14 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