From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09F75C43381 for ; Fri, 29 Mar 2019 21:50:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D486521773 for ; Fri, 29 Mar 2019 21:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730466AbfC2Vuh (ORCPT ); Fri, 29 Mar 2019 17:50:37 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:33979 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730438AbfC2Vug (ORCPT ); Fri, 29 Mar 2019 17:50:36 -0400 Received: by mail-oi1-f196.google.com with SMTP id v10so2875015oib.1; Fri, 29 Mar 2019 14:50:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Rs7S2foonqwWEFVwaHGYfcLOLiZaazzWH2lQCi+hjMA=; b=sygLuyCAJ0lYuF1fnjoqobyKERvh2F3QZmDCZY7aTJeIz9PJUHjseKEYR3f+25RFRe rDgrFuqZskMtGswsm70rqDVZVZ6xWVkydCsrnjjvRjGOM4HgFrpPjBY9+/8kGqoK3ews sgpzC+Gf/7+iw9no5Ln2BkuUqI3FVVrJiKlmLvrpSO0YYsDVwqG9MV7OztJOnNK1CrIO Tn6cDPB7ZfDzqOvffKGu/sJ45WWQpy6CD6i7P1f1OOaVHeJ7oowMeja61/8Ol8R3sCzY 7H2KXACAlkx/5Te4nHAQUTrHSKu7Q7PvKNYP2i6QCeEsY3/X2sF5pIuzY8/Zp92dAlko efxQ== X-Gm-Message-State: APjAAAVOkz+4qDvkvU5ZnE+KZWOMxc88iE8LMPNdUpH2G09iQ7/NkJcM ExNA0xQ2ZXNjz5ppQGxDYKSeEvZaJ8g= X-Google-Smtp-Source: APXvYqwkVQgvKESgMO8tQ/CZ8tYJNWaiUxGGab5htJF5uIjO3AvZU5JLP5voYdVpflaGgkF0T8cP7A== X-Received: by 2002:aca:d8c5:: with SMTP id p188mr4910723oig.144.1553896235992; Fri, 29 Mar 2019 14:50:35 -0700 (PDT) Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com. [209.85.210.51]) by smtp.gmail.com with ESMTPSA id 2sm857884ots.22.2019.03.29.14.50.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 14:50:35 -0700 (PDT) Received: by mail-ot1-f51.google.com with SMTP id u15so3372317otq.10; Fri, 29 Mar 2019 14:50:34 -0700 (PDT) X-Received: by 2002:a9d:6d92:: with SMTP id x18mr20780140otp.112.1553896234713; Fri, 29 Mar 2019 14:50:34 -0700 (PDT) MIME-Version: 1.0 References: <20190329140014.8126-1-laurentiu.tudor@nxp.com> <20190329140014.8126-2-laurentiu.tudor@nxp.com> In-Reply-To: <20190329140014.8126-2-laurentiu.tudor@nxp.com> From: Li Yang Date: Fri, 29 Mar 2019 16:50:23 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 01/13] soc/fsl/qman: fixup liodns only on ppc targets To: Laurentiu Tudor Cc: Netdev , madalin.bucur@nxp.com, Roy Pledge , camelia.groza@nxp.com, David Miller , Linux IOMMU , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , linuxppc-dev , lkml Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 29, 2019 at 9:01 AM wrote: > > 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 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c > index 109b38de3176..12e414ca3b03 100644 > --- a/drivers/soc/fsl/qbman/qman_ccsr.c > +++ b/drivers/soc/fsl/qbman/qman_ccsr.c > @@ -598,6 +598,7 @@ static int qman_init_ccsr(struct device *dev) > #define LIO_CFG_LIODN_MASK 0x0fff0000 > void qman_liodn_fixup(u16 channel) > { > +#ifdef CONFIG_PPC > static int done; > static u32 liodn_offset; > u32 before, after; > @@ -617,6 +618,7 @@ void qman_liodn_fixup(u16 channel) > qm_ccsr_out(REG_REV3_QCSP_LIO_CFG(idx), after); > else > qm_ccsr_out(REG_QCSP_LIO_CFG(idx), after); > +#endif According to the Linux coding style recommendation, it would be better to put the #ifdef into the header files "drivers/soc/fsl/qbman/qman_priv.h". And I'm not sure if this is needed on PPC when IOMMU(PAMU) driver is not compiled, if not, probably using CONFIG_PAMU as condition would be even better. > } > > #define IO_CFG_SDEST_MASK 0x00ff0000 > -- > 2.17.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31AD9C43381 for ; Fri, 29 Mar 2019 21:52:34 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A94421773 for ; Fri, 29 Mar 2019 21:52:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A94421773 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 44WFp70YBNzDqKL for ; Sat, 30 Mar 2019 08:52:31 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=209.85.167.194; helo=mail-oi1-f194.google.com; envelope-from=pku.leo@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 44WFly721hzDqV6 for ; Sat, 30 Mar 2019 08:50:38 +1100 (AEDT) Received: by mail-oi1-f194.google.com with SMTP id 3so2849595oir.7 for ; Fri, 29 Mar 2019 14:50:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Rs7S2foonqwWEFVwaHGYfcLOLiZaazzWH2lQCi+hjMA=; b=po5U2DgSM702oLmPS4vmD2Z3Whm+pjRYVEiu2TyiT8hjnUbEE9qr/7EEpx+PWsyZys Mq5AKdjjn1fZujwFF4elpkjjcHhU5cE6asNSeyc0wByLHni5AAa2SRvWtf8GFoY1TzZK jEZPDp9T4m4oc3MDqSKK5Jgz4mtEI954v3vCEfxyPGKLDBUySsQIl79yQCRPLdEa9DBo dCEwkPkU5M+iW+BQnItRVdS03n+pT43yQczgP3txsIu5iEFQRqeBL/sj8J2I1eyDQL4Q Ag1R0V1vNpe+PPpj9gi9pkyzWSOAsUTMbZr1ZahSGy8D0SMV+3tzaRYyrw2PELPcr1ml TLbQ== X-Gm-Message-State: APjAAAVg9DaPPIAGAVO95oDy58MuGVx48uhJt2mEh5EM8ZvddxSjs4AT Vkxxq3Oho03eZEO5TsZJwDmQIrWyoQo= X-Google-Smtp-Source: APXvYqx7du6KySI+ozM2w+LZskDtOVAPDVHA8uNyzEyuwcpPtkRshNSPbcL6lR41/+eifhqFKBubuQ== X-Received: by 2002:a54:4390:: with SMTP id u16mr5246170oiv.32.1553896235374; Fri, 29 Mar 2019 14:50:35 -0700 (PDT) Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com. [209.85.210.52]) by smtp.gmail.com with ESMTPSA id j14sm1338364oih.28.2019.03.29.14.50.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 14:50:34 -0700 (PDT) Received: by mail-ot1-f52.google.com with SMTP id k21so3509266otf.1 for ; Fri, 29 Mar 2019 14:50:34 -0700 (PDT) X-Received: by 2002:a9d:6d92:: with SMTP id x18mr20780140otp.112.1553896234713; Fri, 29 Mar 2019 14:50:34 -0700 (PDT) MIME-Version: 1.0 References: <20190329140014.8126-1-laurentiu.tudor@nxp.com> <20190329140014.8126-2-laurentiu.tudor@nxp.com> In-Reply-To: <20190329140014.8126-2-laurentiu.tudor@nxp.com> From: Li Yang Date: Fri, 29 Mar 2019 16:50:23 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 01/13] soc/fsl/qman: fixup liodns only on ppc targets To: Laurentiu Tudor Content-Type: text/plain; charset="UTF-8" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: madalin.bucur@nxp.com, Netdev , Roy Pledge , lkml , Linux IOMMU , camelia.groza@nxp.com, linuxppc-dev , David Miller , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Fri, Mar 29, 2019 at 9:01 AM wrote: > > 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 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c > index 109b38de3176..12e414ca3b03 100644 > --- a/drivers/soc/fsl/qbman/qman_ccsr.c > +++ b/drivers/soc/fsl/qbman/qman_ccsr.c > @@ -598,6 +598,7 @@ static int qman_init_ccsr(struct device *dev) > #define LIO_CFG_LIODN_MASK 0x0fff0000 > void qman_liodn_fixup(u16 channel) > { > +#ifdef CONFIG_PPC > static int done; > static u32 liodn_offset; > u32 before, after; > @@ -617,6 +618,7 @@ void qman_liodn_fixup(u16 channel) > qm_ccsr_out(REG_REV3_QCSP_LIO_CFG(idx), after); > else > qm_ccsr_out(REG_QCSP_LIO_CFG(idx), after); > +#endif According to the Linux coding style recommendation, it would be better to put the #ifdef into the header files "drivers/soc/fsl/qbman/qman_priv.h". And I'm not sure if this is needed on PPC when IOMMU(PAMU) driver is not compiled, if not, probably using CONFIG_PAMU as condition would be even better. > } > > #define IO_CFG_SDEST_MASK 0x00ff0000 > -- > 2.17.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Li Yang Subject: Re: [PATCH 01/13] soc/fsl/qman: fixup liodns only on ppc targets Date: Fri, 29 Mar 2019 16:50:23 -0500 Message-ID: References: <20190329140014.8126-1-laurentiu.tudor@nxp.com> <20190329140014.8126-2-laurentiu.tudor@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20190329140014.8126-2-laurentiu.tudor@nxp.com> Sender: linux-kernel-owner@vger.kernel.org To: Laurentiu Tudor Cc: Netdev , madalin.bucur@nxp.com, Roy Pledge , camelia.groza@nxp.com, David Miller , Linux IOMMU , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , linuxppc-dev , lkml List-Id: iommu@lists.linux-foundation.org On Fri, Mar 29, 2019 at 9:01 AM wrote: > > 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 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c > index 109b38de3176..12e414ca3b03 100644 > --- a/drivers/soc/fsl/qbman/qman_ccsr.c > +++ b/drivers/soc/fsl/qbman/qman_ccsr.c > @@ -598,6 +598,7 @@ static int qman_init_ccsr(struct device *dev) > #define LIO_CFG_LIODN_MASK 0x0fff0000 > void qman_liodn_fixup(u16 channel) > { > +#ifdef CONFIG_PPC > static int done; > static u32 liodn_offset; > u32 before, after; > @@ -617,6 +618,7 @@ void qman_liodn_fixup(u16 channel) > qm_ccsr_out(REG_REV3_QCSP_LIO_CFG(idx), after); > else > qm_ccsr_out(REG_QCSP_LIO_CFG(idx), after); > +#endif According to the Linux coding style recommendation, it would be better to put the #ifdef into the header files "drivers/soc/fsl/qbman/qman_priv.h". And I'm not sure if this is needed on PPC when IOMMU(PAMU) driver is not compiled, if not, probably using CONFIG_PAMU as condition would be even better. > } > > #define IO_CFG_SDEST_MASK 0x00ff0000 > -- > 2.17.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5324EC43381 for ; Fri, 29 Mar 2019 21:50:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C70B21773 for ; Fri, 29 Mar 2019 21:50:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hamZuiBg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C70B21773 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O0aeevT7Ov9ZoqhAYYcXaoIrKjPfH6KbNIlLegFmNJs=; b=hamZuiBgztiy7m pqItwleu1xSxrg9OY2yI2p/+xPosPITDiLOJ0WWFfhCs53Z5OA7wV6JArq121dXA3WkHH52GU29K4 8YFM+L6pBcNBunfZdIlojFqaOq9JdMImfxJAXbKg5JGpCTmAPfEPS4oXxQ9+r3zH5xY/fMZZlbhb1 6uH9GqvoXsD0lBTMU14zb6fHlHuaJKZgmshqcYgk0k1bvU5ka1Aq/L/+0M8A843yGc2DiUFRGlzdp 7lVXVCr57sSedE12OpzCldo9wLSk9AKXiDOYrUqiYp37woHS1SH0T6ImSeQBphPbM8owYvKQRuPC3 SMkpIPLtQMLqbIU/V0qQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9zOc-0008M3-7L; Fri, 29 Mar 2019 21:50:42 +0000 Received: from mail-oi1-f195.google.com ([209.85.167.195]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9zOX-0008Kr-NQ for linux-arm-kernel@lists.infradead.org; Fri, 29 Mar 2019 21:50:39 +0000 Received: by mail-oi1-f195.google.com with SMTP id 3so2849597oir.7 for ; Fri, 29 Mar 2019 14:50:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Rs7S2foonqwWEFVwaHGYfcLOLiZaazzWH2lQCi+hjMA=; b=NYf6BtKPb+nAw/vxWJ/oKyS3+laKGogAbYYF+JBTuRmCvlngGh5cMv7uJP5liczddF 5l0I5lYce6tX/P0t/qLghfmcQaHh/o/9RqBlI4XvKoDF3E9eY4j6/nuXRN6fhQ6onGLH N7ASB9kLW8eN+rNR+Ui1Z+yuCHOifRX86CGzm/feOS08I1+J4btXi/SuFbsHGjn5RRrS xswVjqyU/rNlhlxk0dtv7AorUWOTyzVBeTOq8Bm+wTL2rfoZG654WHXZseFr2KLu90aB ZEdqY7lWuqs7jOIpdmy77DzBJSa62et4A5xQeSfK5lsXK0BptysTpfQ/YHP982UploWy +z5w== X-Gm-Message-State: APjAAAUGMUW/cV0XxX4dlLQHpOnrbK96tKEO65hSRZhWam5ANCMHugVf dZlL3YvYoPoeVKqPEOQ9zV9F21jgKIc= X-Google-Smtp-Source: APXvYqysIAZYXKtr3Vpfbe650CT3JgIbfeePLMgq1OVd5FNgDQ0N3mly7q5Y/0SPWX+9NGXrGd7+Og== X-Received: by 2002:aca:4e50:: with SMTP id c77mr5228482oib.109.1553896235516; Fri, 29 Mar 2019 14:50:35 -0700 (PDT) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com. [209.85.210.53]) by smtp.gmail.com with ESMTPSA id h68sm1297307otb.1.2019.03.29.14.50.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 14:50:34 -0700 (PDT) Received: by mail-ot1-f53.google.com with SMTP id o74so3493765ota.3 for ; Fri, 29 Mar 2019 14:50:34 -0700 (PDT) X-Received: by 2002:a9d:6d92:: with SMTP id x18mr20780140otp.112.1553896234713; Fri, 29 Mar 2019 14:50:34 -0700 (PDT) MIME-Version: 1.0 References: <20190329140014.8126-1-laurentiu.tudor@nxp.com> <20190329140014.8126-2-laurentiu.tudor@nxp.com> In-Reply-To: <20190329140014.8126-2-laurentiu.tudor@nxp.com> From: Li Yang Date: Fri, 29 Mar 2019 16:50:23 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 01/13] soc/fsl/qman: fixup liodns only on ppc targets To: Laurentiu Tudor X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190329_145037_763870_15556C56 X-CRM114-Status: GOOD ( 16.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: madalin.bucur@nxp.com, Netdev , Roy Pledge , lkml , Linux IOMMU , camelia.groza@nxp.com, linuxppc-dev , David Miller , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 29, 2019 at 9:01 AM wrote: > > 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 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c > index 109b38de3176..12e414ca3b03 100644 > --- a/drivers/soc/fsl/qbman/qman_ccsr.c > +++ b/drivers/soc/fsl/qbman/qman_ccsr.c > @@ -598,6 +598,7 @@ static int qman_init_ccsr(struct device *dev) > #define LIO_CFG_LIODN_MASK 0x0fff0000 > void qman_liodn_fixup(u16 channel) > { > +#ifdef CONFIG_PPC > static int done; > static u32 liodn_offset; > u32 before, after; > @@ -617,6 +618,7 @@ void qman_liodn_fixup(u16 channel) > qm_ccsr_out(REG_REV3_QCSP_LIO_CFG(idx), after); > else > qm_ccsr_out(REG_QCSP_LIO_CFG(idx), after); > +#endif According to the Linux coding style recommendation, it would be better to put the #ifdef into the header files "drivers/soc/fsl/qbman/qman_priv.h". And I'm not sure if this is needed on PPC when IOMMU(PAMU) driver is not compiled, if not, probably using CONFIG_PAMU as condition would be even better. > } > > #define IO_CFG_SDEST_MASK 0x00ff0000 > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel