From patchwork Mon Apr 12 08:40:49 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: 419506 Delivered-To: patch@linaro.org Received: by 2002:a02:c4d2:0:0:0:0:0 with SMTP id h18csp1553186jaj; Mon, 12 Apr 2021 01:43:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRQwsJSEuY48RIBARIQdjVnzgheK9VxPh+9UMSYoJCJYNL/bMyykDZbAOE6IPSOph6zId9 X-Received: by 2002:a17:902:d506:b029:e9:a6e9:b48b with SMTP id b6-20020a170902d506b02900e9a6e9b48bmr17414222plg.71.1618217036407; Mon, 12 Apr 2021 01:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618217036; cv=none; d=google.com; s=arc-20160816; b=Um2thhWlu4IWmncCSB53misk4NA/u8+sL8NP4iUwMgA2iOeHvlvxFE5myJrm3q18NA Eu9JkFlv4qcx4XLcn3zdBzyY9YgBDptCpierETMSaM2N2QHoTzTnv2VusXzTA/2gkIzL PtaDmNQRAN1NN2p4ikzjVeaV0613VNwlhjsQnNALouvCu6SNaATC+xNM/c4R+C2wfO3Z iWSFeRfcurUJCnNddlARcE0EzO23PiHFacedDIyBDfkhLEJa5eP1eag1tBT0ajyMt6ga XuC3rF52gu1HDdyhYLsoH5dmieMb+6yhUm5YAcM0JKxnIo6nK9Jj5c+adVuc6J6s9OAj 5CCg== 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=L3T8bOwraGHDq3Cd6T4+569/zyWalvE0BWVqecKJ20Y=; b=wq/eJNJ2NAgtlkCAMn6IhQJf70DRc0MSCMhvl9sP65w227fiJVAGR0r6F5Eo6hohyG SZdYOGXPkRxhzl5ciop5bN1niLEV+/98hy/IYqX4p+CydSdUh5Hocnmb5kER9JXgo0s/ dDUEXzTMcdqFqfRqqtiBLdZ6LVtiBSVFChtluOSKVTqhwLpwAaeuNe8CdZQAjyfTn4i1 5wlR9nbmKwQnMJUzygI7nManwjXxFH1ui9i1eiHdLmGpSp2ZOETko90lGajobbi6K7Ma SXxZnSQp04a764nCwwliEdc/pFIjfxgS0SVIf1rD4Es4j0mV7yIFZY1bFSZeI0RPL7mA JUSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F06B+pKW; 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 s13si12820024pjp.59.2021.04.12.01.43.56; Mon, 12 Apr 2021 01:43:56 -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=F06B+pKW; 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 S237583AbhDLIoL (ORCPT + 12 others); Mon, 12 Apr 2021 04:44:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:35958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237596AbhDLIoE (ORCPT ); Mon, 12 Apr 2021 04:44:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FF4261244; Mon, 12 Apr 2021 08:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618217026; bh=sB/h/eSQ2458ajgcns8IhhsiKdJecRZ6yQxCkgNJHw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F06B+pKWzSkh5B8i3eExBMvbPdtHxtWr3ARiQUq92EnNfNTLk02/AjzCutXFPY+QD Kk3UL2ehlPALvVs6jEPNOP+CjzBH5+vBDJlgLagXYG9IqPmw/MiLdEkfqODtTr8lJE e4iexN4FXFpHaTbG0dcXfbykquqF08woGCK3Ppgk= 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.19 43/66] soc/fsl: qbman: fix conflicting alignment attributes Date: Mon, 12 Apr 2021 10:40:49 +0200 Message-Id: <20210412083959.512517999@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210412083958.129944265@linuxfoundation.org> References: <20210412083958.129944265@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 a4ac6073c555..d7bf456fd10e 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -184,7 +184,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