From patchwork Tue Apr 10 15:37:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 896775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40LBBn5hFrz9s28; Wed, 11 Apr 2018 01:37:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1f5vL8-0007SW-Mu; Tue, 10 Apr 2018 15:37:46 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1f5vL6-0007SL-Dd for kernel-team@lists.ubuntu.com; Tue, 10 Apr 2018 15:37:44 +0000 Received: from localhost (c-73-78-137-212.hsd1.co.comcast.net [73.78.137.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 8F5C233E0165 for ; Tue, 10 Apr 2018 09:37:42 -0600 (MDT) Date: Tue, 10 Apr 2018 09:37:41 -0600 From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PULL v2][Bionic] Replace LPC patchset with upstream version Message-ID: <20180410153741.GA21814@xps13.dannf> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Virus-Scanned: clamav-milter 0.99.2 at complete.lackof.org X-Virus-Status: Clean X-Spam-Status: No, score=0.3 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on complete.lackof.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1762758 The LPC patchset for HiSilicon boards landed upstream in the v4.17 merge window. We're currently carrying an earlier version (v14) of the patches as SAUCE, while v17 + a bug fix is what was eventually merged. There is at least one notable bug fix in the upstream version (a Coverity-discovered dereference-before-null-check), along with quite a bit of coding style clean-up. Replacing our patches w/ upstream cherry-picks will increase the odds that future upstream bug fixes will apply cleanly. Let's fix that bug and reduce our technical debt by syncing with the upstream patches. v2: Use a new bug instead of reusing the original LPC support bug ID. The following changes since commit e11f6df5108b12a63480686da6428e3fe1d9ccfa: cxl: Check if PSL data-cache is available before issue flush request (2018-04-09 11:40:29 -0300) are available in the Git repository at: git://git.launchpad.net/~dannf/ubuntu/+source/linux/+git/linux upstream-lpc-bionic-v2 for you to fetch changes up to c9a1885ae22c2e4cd197ee88dc83afa37547753e: MAINTAINERS: Add John Garry as maintainer for HiSilicon LPC driver (2018-04-10 09:32:35 -0600) ---------------------------------------------------------------- Gabriele Paoloni (2): PCI: Remove __weak tag from pci_register_io_range() PCI: Add fwnode handler as input param of pci_register_io_range() John Garry (4): ACPI / scan: Rename acpi_is_serial_bus_slave() for more general use ACPI / scan: Do not enumerate Indirect IO host children HISI LPC: Add ACPI support MAINTAINERS: Add John Garry as maintainer for HiSilicon LPC driver Zhichang Yuan (4): lib: Add generic PIO mapping method PCI: Apply the new generic I/O management on PCI IO hosts of: Add missing I/O range exception for indirect-IO devices HISI LPC: Support the LPC host on Hip06/Hip07 with DT bindings dann frazier (9): Revert "UBUNTU: SAUCE: MAINTAINERS: Add maintainer for HiSilicon LPC driver" Revert "UBUNTU: SAUCE: HISI LPC: Add ACPI support" Revert "UBUNTU: SAUCE: ACPI / scan: do not enumerate Indirect IO host children" Revert "UBUNTU: SAUCE: HISI LPC: Support the LPC host on Hip06/Hip07 with DT bindings" Revert "UBUNTU: SAUCE: OF: Add missing I/O range exception for indirect-IO devices" Revert "UBUNTU: SAUCE: PCI: Apply the new generic I/O management on PCI IO hosts" Revert "UBUNTU: SAUCE: PCI: Add fwnode handler as input param of pci_register_io_range()" Revert "UBUNTU: SAUCE: PCI: Remove unused __weak attribute in pci_register_io_range()" Revert "UBUNTU: SAUCE: LIB: Introduce a generic PIO mapping method" .../arm/hisilicon/hisilicon-low-pin-count.txt | 4 +- drivers/acpi/scan.c | 19 +- drivers/bus/Kconfig | 8 +- drivers/bus/Makefile | 2 +- drivers/bus/hisi_lpc.c | 297 +++++++++------------ drivers/of/address.c | 10 +- drivers/pci/pci.c | 2 +- include/acpi/acpi_bus.h | 2 +- include/linux/logic_pio.h | 26 +- lib/Kconfig | 5 +- lib/logic_pio.c | 113 ++++---- 11 files changed, 223 insertions(+), 265 deletions(-)