From patchwork Mon Nov 18 11:22:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 11249543 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A8AD930 for ; Mon, 18 Nov 2019 11:24:02 +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 63C402089D for ; Mon, 18 Nov 2019 11:24:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VP4caeFW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="ieP0Hhy7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63C402089D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=rasmusvillemoes.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ddc9ZHywa7zecHH4bMZmkja47I/kU5PrDxjpbDfdWOM=; b=VP4caeFWolZlfG cDIKjB3DlwNDAPqFEv0IhlEWBwcCqKUSl8zEWMEeTJ61S3TRbbeXVBG1vAbKsZn8t3DZzFAj05A+F yPjucXT/qyUlS1vgCR8/ChMhyh3xsZ28C9EolmPFtFgtLRhA+SF0RiotX/kT7zwU4vy0nfD2wWLAe rG1P7nHQKBdzKa9TDDZJLVpkBPh8gDyTvGKOkcMK+w9pmlq2K5cNbEG8Aw0szep5ZaesEcj/rFi0G SH2I9x8FmQZJGkRmKramlW3Pcu/p/rIYCNcYlrKM9NIY6M0tiP4i73HlHefYcrLi/14SkutbSU4Ll RW2JxKHNpoKayOkxbeqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iWf8P-0001C3-4x; Mon, 18 Nov 2019 11:23:57 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iWf80-0000rc-M6 for linux-arm-kernel@lists.infradead.org; Mon, 18 Nov 2019 11:23:34 +0000 Received: by mail-wm1-x341.google.com with SMTP id b17so18331952wmj.2 for ; Mon, 18 Nov 2019 03:23:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TBWX3w17Hmja6UWfhFzaP+5JtBcf7FvgYQ6BEI9JfQ4=; b=ieP0Hhy7vzq3rc0tMajMq1S39mOFDs4o5gWkgjAa/tx+haws8QRzKoR7BwIvPfFz0Z XwP86WYCZvqYWqHXhxB+sVDlsRwlNxqfs9fb+4BbJ3joxfdaQcACC9z8i6S+PSmP/fwE JO84LoRL8EtVLb/4HeJfPYBb9pwnusVLCg3/8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TBWX3w17Hmja6UWfhFzaP+5JtBcf7FvgYQ6BEI9JfQ4=; b=ozRHAbl1PacGHKM6A/7nQfMoiSqXyorYRH8Z4OsJHbeTP+S0Fyv/f3y4SHHHrBZTgK n1bOiWuvXtxSQaVL/3HslTO2Oa+Do6ETOJA/CNT2kssgbre1ejwZ/GzjGcmBk2uhcZhP XWnC1S+P2bixgE3tLeW779dSE/eB3cvXCBhOucAtRGuXensYehK0nViTYLrCn5JuBU2h PGwWiF7w6eJ1yXn9w5kVaCE8SxGpZJyPT9aXjIMAv+Zj8KOK9BAx8JX8au5eSeKG3nqN 9kwU6wMTE5pEK38rMl2iZ6DTKmSH3plvtVUYfDfyquScKlxlHJUqY5TD76gOJSZxFw8k VjGg== X-Gm-Message-State: APjAAAXGCZqeEs+oBt5gEoTIUN9gF3Y9mKAtAcVTTlFdAmSxZBLPV8Yz 4TWPJvBiyd9WWTBzwCu1+EUN+A== X-Google-Smtp-Source: APXvYqzKE4Io66KMC69PfyvoTe8ZMR8eJVp24eLnGOg4DtZTaBwAtj/3PySxN0MPhCrUsTPirXnWNQ== X-Received: by 2002:a7b:ce08:: with SMTP id m8mr29287901wmc.68.1574076209937; Mon, 18 Nov 2019 03:23:29 -0800 (PST) Received: from prevas-ravi.prevas.se (ip-5-186-115-54.cgn.fibianet.dk. [5.186.115.54]) by smtp.gmail.com with ESMTPSA id y2sm21140815wmy.2.2019.11.18.03.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 03:23:29 -0800 (PST) From: Rasmus Villemoes To: Qiang Zhao , Li Yang , Christophe Leroy Subject: [PATCH v5 00/48] QUICC Engine support on ARM, ARM64, PPC64 Date: Mon, 18 Nov 2019 12:22:36 +0100 Message-Id: <20191118112324.22725-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191118_032332_736552_DCAC346F X-CRM114-Status: GOOD ( 16.74 ) X-Spam-Score: 3.4 (+++) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (3.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [5.186.115.54 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Timur Tabi , Rasmus Villemoes , linux-kernel@vger.kernel.org, Scott Wood , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org There have been several attempts in the past few years to allow building the QUICC engine drivers for platforms other than PPC32. This is yet another attempt. v4 can be found here: https://lore.kernel.org/lkml/20191108130123.6839-1-linux@rasmusvillemoes.dk/ Changes in v5: - add patch (33/48) to not carry over the brg-frequency workaround in ucc_uart to the new platforms the code can now be built for (Timur, Scott) - style fix in 32/48 (Timur) - expand commit log of 47/48 (Timur, Li Yang) - s/long/s32/ in 35/48 (Qiang) - also include PPC64 in the set of architectures where QE can be built (Li Yang) 1-5 are about replacing in_be32 etc. in the core QE code (drivers/soc/fsl/qe). 6-8 handle miscellaneous other ppcisms. 9-21 deal with qe_ic: Simplifying the driver significantly by removing unused code, and removing the platform-specific initialization from arch/powerpc/. 22-25 deal with raw access to devicetree properties in native endianness. 26-34 makes drivers/tty/serial/ucc_uart.c (CONFIG_SERIAL_QE) ready to build on non-ppc. 35-46 deal with IS_ERR_VALUE() and some other things found while digging around that part of the code. 47 adds a PPC32 dependency to UCC_GETH - it has some of the same issues that have been fixed in the ucc_uart and ucc_hdlc cases. Nobody has requested that I allow that driver to be built for arm{,64} and reportedly, the hardware has only ever shipped on PPC SOCs. So instead of growing this series even bigger, I kept that addition. It's trivial to remove if somebody cares enough to fix the build errors/warnings and actually has a platform to test the result on. Finally patch 48 lifts the PPC32 restriction from QUICC_ENGINE. At the request of Li Yang, it doesn't remove the PPC32 dependency but instead changes it to PPC|| ARM || ARM64 (or COMPILE_TEST), i.e. listing the platforms that may have a QE. The series has been built and booted on both an mpc8309-based platform (ppc) as well as an ls1021a-based platform (arm). The core QE code is exercised on both, while I could only test the ucc_uart on arm, since the uarts are not wired up on our mpc8309 board. Qiang Zhao reports that the ucc_hdlc driver does indeed work on a ls1043ardb (arm64) board. Rasmus Villemoes (48): soc: fsl: qe: remove space-before-tab soc: fsl: qe: drop volatile qualifier of struct qe_ic::regs soc: fsl: qe: rename qe_(clr/set/clrset)bit* helpers soc: fsl: qe: introduce qe_io{read,write}* wrappers soc: fsl: qe: avoid ppc-specific io accessors soc: fsl: qe: replace spin_event_timeout by readx_poll_timeout_atomic soc: fsl: qe: qe.c: guard use of pvr_version_is() with CONFIG_PPC32 soc: fsl: qe: drop unneeded #includes soc: fsl: qe: drop assign-only high_active in qe_ic_init soc: fsl: qe: remove pointless sysfs registration in qe_ic.c soc: fsl: qe: use qe_ic_cascade_{low,high}_mpic also on 83xx soc: fsl: qe: move calls of qe_ic_init out of arch/powerpc/ powerpc/83xx: remove mpc83xx_ipic_and_qe_init_IRQ powerpc/85xx: remove mostly pointless mpc85xx_qe_init() soc: fsl: qe: move qe_ic_cascade_* functions to qe_ic.c soc: fsl: qe: rename qe_ic_cascade_low_mpic -> qe_ic_cascade_low soc: fsl: qe: remove unused qe_ic_set_* functions soc: fsl: qe: don't use NO_IRQ in qe_ic.c soc: fsl: qe: make qe_ic_get_{low,high}_irq static soc: fsl: qe: simplify qe_ic_init() soc: fsl: qe: merge qe_ic.h headers into qe_ic.c soc: fsl: qe: qe.c: use of_property_read_* helpers soc: fsl: qe: qe_io.c: don't open-code of_parse_phandle() soc: fsl: qe: qe_io.c: access device tree property using be32_to_cpu soc: fsl: qe: qe_io.c: use of_property_read_u32() in par_io_init() soc: fsl: move cpm.h from powerpc/include/asm to include/soc/fsl soc/fsl/qe/qe.h: update include path for cpm.h serial: ucc_uart: explicitly include soc/fsl/cpm.h serial: ucc_uart: replace ppc-specific IO accessors serial: ucc_uart: factor out soft_uart initialization serial: ucc_uart: stub out soft_uart_init for !CONFIG_PPC32 serial: ucc_uart: use of_property_read_u32() in ucc_uart_probe() serial: ucc_uart: limit brg-frequency workaround to PPC32 serial: ucc_uart: access __be32 field using be32_to_cpu soc: fsl: qe: change return type of cpm_muram_alloc() to s32 soc: fsl: qe: make cpm_muram_free() return void soc: fsl: qe: make cpm_muram_free() ignore a negative offset soc: fsl: qe: drop broken lazy call of cpm_muram_init() soc: fsl: qe: refactor cpm_muram_alloc_common to prevent BUG on error path soc: fsl: qe: avoid IS_ERR_VALUE in ucc_slow.c soc: fsl: qe: drop use of IS_ERR_VALUE in qe_sdma_init() soc: fsl: qe: drop pointless check in qe_sdma_init() soc: fsl: qe: avoid IS_ERR_VALUE in ucc_fast.c net/wan/fsl_ucc_hdlc: avoid use of IS_ERR_VALUE() net/wan/fsl_ucc_hdlc: fix reading of __be16 registers net/wan/fsl_ucc_hdlc: reject muram offsets above 64K net: ethernet: freescale: make UCC_GETH explicitly depend on PPC32 soc: fsl: qe: remove PPC32 dependency from CONFIG_QUICC_ENGINE arch/powerpc/include/asm/cpm.h | 172 +------- arch/powerpc/platforms/83xx/km83xx.c | 3 +- arch/powerpc/platforms/83xx/misc.c | 23 -- arch/powerpc/platforms/83xx/mpc832x_mds.c | 3 +- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 3 +- arch/powerpc/platforms/83xx/mpc836x_mds.c | 3 +- arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 +- arch/powerpc/platforms/83xx/mpc83xx.h | 7 - arch/powerpc/platforms/85xx/common.c | 23 -- arch/powerpc/platforms/85xx/corenet_generic.c | 12 - arch/powerpc/platforms/85xx/mpc85xx.h | 2 - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 28 -- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 18 - arch/powerpc/platforms/85xx/twr_p102x.c | 16 - drivers/net/ethernet/freescale/Kconfig | 2 +- drivers/net/wan/fsl_ucc_hdlc.c | 23 +- drivers/net/wan/fsl_ucc_hdlc.h | 2 +- drivers/soc/fsl/qe/Kconfig | 3 +- drivers/soc/fsl/qe/gpio.c | 34 +- drivers/soc/fsl/qe/qe.c | 104 ++--- drivers/soc/fsl/qe/qe_common.c | 50 +-- drivers/soc/fsl/qe/qe_ic.c | 285 ++++++------- drivers/soc/fsl/qe/qe_ic.h | 99 ----- drivers/soc/fsl/qe/qe_io.c | 70 ++-- drivers/soc/fsl/qe/qe_tdm.c | 8 +- drivers/soc/fsl/qe/ucc.c | 26 +- drivers/soc/fsl/qe/ucc_fast.c | 86 ++-- drivers/soc/fsl/qe/ucc_slow.c | 60 ++- drivers/soc/fsl/qe/usb.c | 2 +- drivers/tty/serial/ucc_uart.c | 385 +++++++++--------- include/soc/fsl/cpm.h | 171 ++++++++ include/soc/fsl/qe/qe.h | 59 ++- include/soc/fsl/qe/qe_ic.h | 135 ------ include/soc/fsl/qe/ucc_fast.h | 4 +- include/soc/fsl/qe/ucc_slow.h | 6 +- 35 files changed, 775 insertions(+), 1155 deletions(-) delete mode 100644 drivers/soc/fsl/qe/qe_ic.h create mode 100644 include/soc/fsl/cpm.h delete mode 100644 include/soc/fsl/qe/qe_ic.h Reviewed-by: Timur Tabi Acked-by: Timur Tabi