Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1492960yba; Sat, 27 Apr 2019 00:13:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqyAeY+pqZsJOV9TBpHI3ttdWKw5qfHLymD1KWCWFM/LN7o7I7zTYST//2wov3XRohFYP6L7 X-Received: by 2002:a65:6686:: with SMTP id b6mr8305078pgw.419.1556349204320; Sat, 27 Apr 2019 00:13:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556349204; cv=none; d=google.com; s=arc-20160816; b=RRyfbIC3AXxrHCNoX4odov7o5i9RNvUTXkWhpqlYlILhHxP5MNowt16/VMdTXZANQv Zk4S6e6Gnkd3rn9OxtM2Rvsz7dBdqxKE6ffquNCGO2fsJ6DyHba4mYjcxewbeEB9r2+a N+/FAJ9O096RQAielaFz4U4cnoCDptd8f+jALQ6XURfnx+k7Pw5/+aanVIG0J4HasgBL 5u5UVpIDNKrJ7b9CYYzOdT6QOxPqlvtfcyRYjeibWrByUHeMQJYIImC5EFOsK7HZXiRm 0RTGxD1vdbMJiNsprxfR9qZTQFj/eDvEhUFKzqLqj85cR1NYAWxc/XhFKHaRBj2PpQgd 1lTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=RH+zYJuclyMe8/M2lNmtb0Rpl9ubfILC35W0+vt+/7c=; b=CrDnmwKSgDSIn9ARBsLSYlrr7r2NYFo6djqA4SxoDACjsqnGU+ZK1qxzpc+ef5E0bv ZPGMNjfZ20VpLI1p8MxzBzufaOvMPLF7z2VNQfvGwdGOp+Hp9JcaPg94itQKFlw38b9x 10x4c7aGFY1IanurQPKiUPBH6sAf7bZILL1ABXkeB61Cy+ReG03s15aN45EABx/RRmpu s22rbP2knhjdOMMif0IBOPPsCrkIfX2YyhdBf0h7p4L9zuejBMdcFfoT8/M09otY70UD ZjGUUz4JF3/wo+ySDpCdJEkqu6zmn2r869w4FdRagKzooFEaujf1vQpqEOijvlDfYVQG +GuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l33si27951327pld.58.2019.04.27.00.13.09; Sat, 27 Apr 2019 00:13:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726999AbfD0HLj (ORCPT + 99 others); Sat, 27 Apr 2019 03:11:39 -0400 Received: from inva020.nxp.com ([92.121.34.13]:35202 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726223AbfD0HKi (ORCPT ); Sat, 27 Apr 2019 03:10:38 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id DFA2A1A002F; Sat, 27 Apr 2019 09:10:35 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id D20831A000B; Sat, 27 Apr 2019 09:10:35 +0200 (CEST) Received: from fsr-ub1864-101.ea.freescale.net (fsr-ub1864-101.ea.freescale.net [10.171.82.13]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 51C2C205ED; Sat, 27 Apr 2019 09:10:35 +0200 (CEST) From: laurentiu.tudor@nxp.com To: netdev@vger.kernel.org, madalin.bucur@nxp.com, roy.pledge@nxp.com, camelia.groza@nxp.com, leoyang.li@nxp.com Cc: davem@davemloft.net, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Laurentiu Tudor Subject: [PATCH v2 1/9] soc/fsl/qman: fixup liodns only on ppc targets Date: Sat, 27 Apr 2019 10:10:23 +0300 Message-Id: <20190427071031.6563-2-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190427071031.6563-1-laurentiu.tudor@nxp.com> References: <20190427071031.6563-1-laurentiu.tudor@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurentiu Tudor ARM SoCs use SMMU so the liodn fixup done in the qman driver is no longer making sense and it also breaks the ICID settings inherited from u-boot. Do the fixups only for PPC targets. Signed-off-by: Laurentiu Tudor --- drivers/soc/fsl/qbman/qman_ccsr.c | 2 +- drivers/soc/fsl/qbman/qman_priv.h | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c index 109b38de3176..a6bb43007d03 100644 --- a/drivers/soc/fsl/qbman/qman_ccsr.c +++ b/drivers/soc/fsl/qbman/qman_ccsr.c @@ -596,7 +596,7 @@ static int qman_init_ccsr(struct device *dev) } #define LIO_CFG_LIODN_MASK 0x0fff0000 -void qman_liodn_fixup(u16 channel) +void __qman_liodn_fixup(u16 channel) { static int done; static u32 liodn_offset; diff --git a/drivers/soc/fsl/qbman/qman_priv.h b/drivers/soc/fsl/qbman/qman_priv.h index 75a8f905f8f7..04515718cfd9 100644 --- a/drivers/soc/fsl/qbman/qman_priv.h +++ b/drivers/soc/fsl/qbman/qman_priv.h @@ -193,7 +193,14 @@ extern struct gen_pool *qm_cgralloc; /* CGR ID allocator */ u32 qm_get_pools_sdqcr(void); int qman_wq_alloc(void); -void qman_liodn_fixup(u16 channel); +#ifdef CONFIG_FSL_PAMU +#define qman_liodn_fixup __qman_liodn_fixup +#else +static inline void qman_liodn_fixup(u16 channel) +{ +} +#endif +void __qman_liodn_fixup(u16 channel); void qman_set_sdest(u16 channel, unsigned int cpu_idx); struct qman_portal *qman_create_affine_portal( -- 2.17.1