1. 13 Jan, 2019 2 commits
    • Paul Mackerras's avatar
      powerpc: Fix COFF zImage booting on old powermacs · 1837a06a
      Paul Mackerras authored
      [ Upstream commit 5564597d ]
      
      Commit 6975a783 ("powerpc/boot: Allow building the zImage wrapper
      as a relocatable ET_DYN", 2011-04-12) changed the procedure descriptor
      at the start of crt0.S to have a hard-coded start address of 0x500000
      rather than a reference to _zimage_start, presumably because having
      a reference to a symbol introduced a relocation which is awkward to
      handle in a position-independent executable.  Unfortunately, what is
      at 0x500000 in the COFF image is not the first instruction, but the
      procedure descriptor itself, that is, a word containing 0x500000,
      which is not a valid instruction.  Hence, booting a COFF zImage
      results in a "DEFAULT CATCH!, code=FFF00700" message from Open
      Firmware.
      
      This fixes the problem by (a) putting the procedure descriptor in the
      data section and (b) adding a branch to _zimage_start as the first
      instruction in the program.
      
      Fixes: 6975a783 ("powerpc/boot: Allow building the zImage wrapper as a relocatable ET_DYN")
      Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      1837a06a
    • Jerome Brunet's avatar
      pinctrl: meson: fix pull enable register calculation · 609a4c79
      Jerome Brunet authored
      [ Upstream commit 614b1868 ]
      
      We just changed the code so we apply bias disable on the correct
      register but forgot to align the register calculation. The result
      is that we apply the change on the correct register, but possibly
      at the incorrect offset/bit
      
      This went undetected because offsets tends to be the same between
      REG_PULL and REG_PULLEN for a given pin the EE controller. This
      is not true for the AO controller.
      
      Fixes: e39f9dd8 ("pinctrl: meson: fix pinconf bias disable")
      Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
      Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
      609a4c79
  2. 09 Jan, 2019 38 commits