[PULL,Bionic] Replace LPC patchset with upstream version

Message ID 20180409222538.GA29776@xps13.dannf
State New
Headers show
Series
  • [PULL,Bionic] Replace LPC patchset with upstream version
Related show

Pull-request

git://git.launchpad.net/~dannf/ubuntu/+source/linux/+git/linux upstream-lpc-bionic

Message

dann frazier April 9, 2018, 10:25 p.m.
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.

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

for you to fetch changes up to 580316d23432995530f57e90210d418b96d72179:

  MAINTAINERS: Add John Garry as maintainer for HiSilicon LPC driver (2018-04-09 16:06:33 -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(-)

Comments

Seth Forshee April 10, 2018, 2:41 p.m. | #1
On Mon, Apr 09, 2018 at 04:25:38PM -0600, dann frazier wrote:
> 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.
> 
> 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
> 
> for you to fetch changes up to 580316d23432995530f57e90210d418b96d72179:
> 
>   MAINTAINERS: Add John Garry as maintainer for HiSilicon LPC driver (2018-04-09 16:06:33 -0600)

The changes themselves look good, but let's not reuse the old bug
number. Can you open a new bug for updating the patches and change the
buglinks?  Thanks!
dann frazier April 10, 2018, 3:02 p.m. | #2
On Tue, Apr 10, 2018 at 8:41 AM, Seth Forshee
<seth.forshee@canonical.com> wrote:
> On Mon, Apr 09, 2018 at 04:25:38PM -0600, dann frazier wrote:
>> 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.
>>
>> 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
>>
>> for you to fetch changes up to 580316d23432995530f57e90210d418b96d72179:
>>
>>   MAINTAINERS: Add John Garry as maintainer for HiSilicon LPC driver (2018-04-09 16:06:33 -0600)
>
> The changes themselves look good, but let's not reuse the old bug
> number. Can you open a new bug for updating the patches and change the
> buglinks?  Thanks!

You bet - I'll send a v2 PULL when done.