1. 21 11月, 2019 40 次提交
    • T
      arm64: tegra: I2C on Tegra194 is not compatible with Tegra114 · 70c4b0fb
      Thierry Reding 提交于
      [ Upstream commit d9fd22447ba59a9b53a202fade977e82bfba8d8d ]
      
      Tegra194 contains a version of the I2C controller that is no longer
      compatible with the version found in Tegra114.
      Signed-off-by: NThierry Reding <treding@nvidia.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      70c4b0fb
    • F
      ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string · e821b710
      Fabio Estevam 提交于
      [ Upstream commit 1c5f335f61ffb838fc3cc1cec9464067663eb8c8 ]
      
      According to Documentation/devicetree/bindings/rtc/rtc-ds1307.txt the
      original compatible "maxim,ds1341" is not a valid entry.
      
      Switch to the documented "dallas,ds1341" compatible.
      Reported-by: NChris Healy <cphealy@gmail.com>
      Signed-off-by: NFabio Estevam <festevam@gmail.com>
      Reviewed-by: NLucas Stach <l.stach@pengutronix.de>
      Tested-by: NChris Healy <cphealy@gmail.com>
      Signed-off-by: NShawn Guo <shawnguo@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      e821b710
    • R
      arm64: dts: fsl: Fix I2C and SPI bus warnings · a09b6731
      Rob Herring 提交于
      [ Upstream commit b739c177e1aeab532f355493439a1901b85be38c ]
      
      dtc has new checks for I2C and SPI buses. Fix the SPI bus node names
      and warnings in unit-addresses.
      
      arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@57: I2C bus unit address format error, expected "53"
      arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@56: I2C bus unit address format error, expected "52"
      
      Cc: Shawn Guo <shawnguo@kernel.org>
      Cc: Li Yang <leoyang.li@nxp.com>
      Signed-off-by: NRob Herring <robh@kernel.org>
      Acked-by: NLi Yang <leoyang.li@nxp.com>
      Signed-off-by: NShawn Guo <shawnguo@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      a09b6731
    • A
      ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point · c4635c27
      Anson Huang 提交于
      [ Upstream commit 245f880c25dbd8927af0f33aa5d1404370013957 ]
      
      Update VDD_SOC voltage to 1.25V for 900MHz operating point
      according to datasheet Rev. 1.3, 08/2018, 25mV is added to
      the minimum allowed values to cover power supply ripple.
      Signed-off-by: NAnson Huang <Anson.Huang@nxp.com>
      Reviewed-by: NSébastien Szymanski <sebastien.szymanski@armadeus.com>
      Signed-off-by: NShawn Guo <shawnguo@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      c4635c27
    • Z
      ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws · ff0eabfa
      zhong jiang 提交于
      [ Upstream commit 95590a6286c547b7287d01c55515fb96b904aa03 ]
      
      of_find_device_by_node takes a reference to the struct device when it
      finds a match via get_device. but it fails to put_device in
      at91_pm_config_ws, for_each_matching_node_and_match will get and put
      the node properly, there is no need to call the of_put_node. Therefore,
      just call put_device instead of of_node_put in at91_pm_config_ws.
      
      Fixes: d7484f5c ("ARM: at91: pm: configure wakeup sources for ULP1 mode")
      Suggested-by: NClaudiu Beznea <Claudiu.Beznea@microchip.com>
      Signed-off-by: Nzhong jiang <zhongjiang@huawei.com>
      Signed-off-by: NAlexandre Belloni <alexandre.belloni@bootlin.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      ff0eabfa
    • M
      ARM: dts: exynos: Correct audio subsystem parent clock on Peach Chromebooks · de287533
      Marek Szyprowski 提交于
      [ Upstream commit ff1e37c6809daab75f7b2dea1efe69330e8eb65b ]
      
      The proper parent clock for audio subsystem for Exynos5420 and Exynos5800
      SoCs is CLK_MAU_EPLL. This fixes following warning:
      
          clk: failed to reparent mout_audss to fout_epll: -22
      
      Fixes: ed7d1307: ARM: dts: exynos: Enable HDMI audio support on Peach Pit
      Fixes: bae0f445: ARM: dts: exynos: Enable HDMI audio support on Peach Pi
      Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
      Signed-off-by: NKrzysztof Kozlowski <krzk@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      de287533
    • H
      ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock · b7ffda42
      Heiko Stuebner 提交于
      [ Upstream commit a2df0984e73fd9e1dad5fc3f1c307ec3de395e30 ]
      
      It is good practice to make the setting of gpio-pinctrls explicitly in the
      devicetree, and in this case even necessary.
      Rockchip boards start with iomux settings set to gpio for most pins and
      while the linux pinctrl driver also implicitly sets the gpio function if
      a pin is requested as gpio that is not necessarily true for other drivers.
      
      The issue in question stems from uboot, where the sdmmc_pwr pin is set
      to function 1 (sdmmc-power) by the bootrom when reading the 1st-stage
      loader. The regulator controlled by the pin is active-low though, so
      when the dwmmc hw-block sets its enabled bit, it actually disables the
      regulator. By changing the pin back to gpio we fix that behaviour.
      Signed-off-by: NHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      b7ffda42
    • V
      arm64: dts: rockchip: Fix microSD in rk3399 sapphire board · 9d2ce061
      Vicente Bergas 提交于
      [ Upstream commit 88a20edf76091ee7f1bb459b89d714d53f0f8940 ]
      
      The microSD card slot in the Sapphire board is not working because of
      several issues:
       1.- The vmmc power supply is missing in the DTS. It is capable of 3.0V
       and has a GPIO-based enable control.
       2.- The vqmmc power supply can provide up to 3.3V, but it is capped in
       the DTS to just 3.0V because of the vmmc capability. This results in a
       conflict from the mmc driver requesting an unsupportable voltage range
       from 3.3V to 3.0V (min > max) as reported in dmesg. So, extend the
       range up to 3.3V. The hw should be able to stand this 0.3V tolerance.
       See mmc_regulator_set_vqmmc in drivers/mmc/core/core.c.
       3.- The card detect signal is non-working. There is a known conflict
       with jtag, but the workaround in drivers/soc/rockchip/grf.c does not
       work. Adding the broken-cd attribute to the DTS fixes the issue.
      Signed-off-by: NVicente Bergas <vicencb@gmail.com>
      Signed-off-by: NHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      9d2ce061
    • D
      MIPS: kexec: Relax memory restriction · 46a9bbe9
      Dengcheng Zhu 提交于
      [ Upstream commit a6da4d6fdf8bd512c98d3ac7f1d16bc4bb282919 ]
      
      We can rely on the system kernel and the dump capture kernel themselves in
      memory usage.
      
      Being restrictive with 512MB limit may cause kexec tool failure on some
      platforms.
      Tested-by: NRachel Mozes <rachel.mozes@intel.com>
      Reported-by: NRachel Mozes <rachel.mozes@intel.com>
      Signed-off-by: NDengcheng Zhu <dzhu@wavecomp.com>
      Signed-off-by: NPaul Burton <paul.burton@mips.com>
      Patchwork: https://patchwork.linux-mips.org/patch/20568/
      Cc: pburton@wavecomp.com
      Cc: ralf@linux-mips.org
      Cc: linux-mips@linux-mips.org
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      46a9bbe9
    • M
      x86/CPU: Change query logic so CPUID is enabled before testing · e897dd4c
      Matthew Whitehead 提交于
      [ Upstream commit 2893cc8ff892fa74972d8dc0e1d0dc65116daaa3 ]
      
      Presently we check first if CPUID is enabled. If it is not already
      enabled, then we next call identify_cpu_without_cpuid() and clear
      X86_FEATURE_CPUID.
      
      Unfortunately, identify_cpu_without_cpuid() is the function where CPUID
      becomes _enabled_ on Cyrix 6x86/6x86L CPUs.
      
      Reverse the calling sequence so that CPUID is first enabled, and then
      check a second time to see if the feature has now been activated.
      
      [ bp: Massage commit message and remove trailing whitespace. ]
      Suggested-by: NAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: NMatthew Whitehead <tedheadster@gmail.com>
      Signed-off-by: NBorislav Petkov <bp@suse.de>
      Reviewed-by: NAndy Lutomirski <luto@amacapital.net>
      Cc: David Woodhouse <dwmw@amazon.co.uk>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/20180921212041.13096-3-tedheadster@gmail.comSigned-off-by: NSasha Levin <sashal@kernel.org>
      e897dd4c
    • M
      x86/CPU: Use correct macros for Cyrix calls · d26ad73b
      Matthew Whitehead 提交于
      [ Upstream commit 03b099bdcdf7125d4a63dc9ddeefdd454e05123d ]
      
      There are comments in processor-cyrix.h advising you to _not_ make calls
      using the deprecated macros in this style:
      
        setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x80);
      
      This is because it expands the macro into a non-functioning calling
      sequence. The calling order must be:
      
        outb(CX86_CCR2, 0x22);
        inb(0x23);
      
      From the comments:
      
       * When using the old macros a line like
       *   setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);
       * gets expanded to:
       *  do {
       *    outb((CX86_CCR2), 0x22);
       *    outb((({
       *        outb((CX86_CCR2), 0x22);
       *        inb(0x23);
       *    }) | 0x88), 0x23);
       *  } while (0);
      
      The new macros fix this problem, so use them instead.
      Signed-off-by: NMatthew Whitehead <tedheadster@gmail.com>
      Signed-off-by: NBorislav Petkov <bp@suse.de>
      Reviewed-by: NAndy Lutomirski <luto@amacapital.net>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Jia Zhang <qianyue.zj@alibaba-inc.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Philippe Ombredanne <pombredanne@nexb.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/20180921212041.13096-2-tedheadster@gmail.comSigned-off-by: NSasha Levin <sashal@kernel.org>
      d26ad73b
    • R
      ARM: dts: stm32: Fix SPI controller node names · 0769f445
      Rob Herring 提交于
      [ Upstream commit 1ba23b1df0bb6eec430408614c3a11280941e112 ]
      
      SPI controller nodes should be named 'spi' rather than 'qspi'. Fixing the
      name enables dtc SPI bus checks.
      
      Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
      Cc: Alexandre Torgue <alexandre.torgue@st.com>
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NAlexandre Torgue <alexandre.torgue@st.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      0769f445
    • B
      ARM: dts: clearfog: fix sdhci supply property name · c6305dfb
      Baruch Siach 提交于
      [ Upstream commit e807f0298144c06740022a2f900d86b7f115595e ]
      
      The vmmc phandle, like all power supply property names, must have the
      '-supply' suffix.
      Signed-off-by: NBaruch Siach <baruch@tkos.co.il>
      Signed-off-by: NGregory CLEMENT <gregory.clement@bootlin.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      c6305dfb
    • Y
      ARM: dts: stm32: enable display on stm32mp157c-ev1 board · b939d8b9
      Yannick Fertré 提交于
      [ Upstream commit 67330599f93672bd351123c729e2591a460fd24c ]
      
      Enable panel raydium RM68200, DSI bridge & display controller.
      Signed-off-by: NYannick Fertré <yannick.fertre@st.com>
      Signed-off-by: NAlexandre Torgue <alexandre.torgue@st.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      b939d8b9
    • B
      x86/mce-inject: Reset injection struct after injection · 098e12f3
      Borislav Petkov 提交于
      [ Upstream commit 7401a633c34adc7aefd3edfec60074cb0475a3e8 ]
      
      Clear the MCE struct which is used for collecting the injection details
      after injection.
      
      Also, populate it with more details from the machine.
      Signed-off-by: NBorislav Petkov <bp@suse.de>
      Link: https://lkml.kernel.org/r/20180905081954.10391-1-bp@alien8.deSigned-off-by: NSasha Levin <sashal@kernel.org>
      098e12f3
    • R
      ARM: dts: marvell: Fix SPI and I2C bus warnings · aa190837
      Rob Herring 提交于
      [ Upstream commit cf680cc5251487b9a39919c3cda31a108af19cf8 ]
      
      dtc has new checks for I2C and SPI buses. Fix the warnings in node names
      and unit-addresses.
      
      arch/arm/boot/dts/dove-cubox.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60"
      arch/arm/boot/dts/dove-cubox-es.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60"
      arch/arm/boot/dts/dove-cubox.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dove-cubox-es.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dove-dove-db.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@14600: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/orion5x-kuroboxpro.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32"
      arch/arm/boot/dts/orion5x-linkstation-lschl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32"
      arch/arm/boot/dts/orion5x-linkstation-lsgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32"
      arch/arm/boot/dts/orion5x-linkstation-lswtgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32"
      
      Cc: Jason Cooper <jason@lakedaemon.net>
      Cc: Andrew Lunn <andrew@lunn.ch>
      Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Cc: Gregory Clement <gregory.clement@bootlin.com>
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NGregory CLEMENT <gregory.clement@bootlin.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      aa190837
    • S
      crypto: arm/crc32 - avoid warning when compiling with Clang · ccc8bf41
      Stefan Agner 提交于
      [ Upstream commit cd560235d8f9ddd94aa51e1c4dabdf3212b9b241 ]
      
      The table id (second) argument to MODULE_DEVICE_TABLE is often
      referenced otherwise. This is not the case for CPU features. This
      leads to a warning when building the kernel with Clang:
        arch/arm/crypto/crc32-ce-glue.c:239:33: warning: variable
          'crc32_cpu_feature' is not needed and will not be emitted
          [-Wunneeded-internal-declaration]
        static const struct cpu_feature crc32_cpu_feature[] = {
                                        ^
      
      Avoid warnings by using __maybe_unused, similar to commit 1f318a8b
      ("modules: mark __inittest/__exittest as __maybe_unused").
      
      Fixes: 2a9faf8b ("crypto: arm/crc32 - enable module autoloading based on CPU feature bits")
      Signed-off-by: NStefan Agner <stefan@agner.ch>
      Acked-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      ccc8bf41
    • R
      ARM: dts: ste: Fix SPI controller node names · c2f76a19
      Rob Herring 提交于
      [ Upstream commit 2f967f9e9fa076affb711da1a8389b5d33814fc6 ]
      
      SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the
      name enables dtc SPI bus checks.
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      c2f76a19
    • L
      ARM: dts: ux500: Fix LCDA clock line muxing · 4d22878d
      Linus Walleij 提交于
      [ Upstream commit ecde29569e3484e1d0a032bf4074449bce4d4a03 ]
      
      The "lcdaclk_b_1" group is muxed with the function "lcd"
      but needs a separate entry to be muxed in with "lcda"
      rather than "lcd".
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      4d22878d
    • G
      ARM: dts: ux500: Correct SCU unit address · 8be4d596
      Geert Uytterhoeven 提交于
      [ Upstream commit 2f217d24ecaec2012e628d21e244eef0608656a4 ]
      
      The unit address of the Cortex-A9 SCU device node contains one zero too
      many.  Remove it.
      Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      8be4d596
    • R
      ARM: dts: ti: Fix SPI and I2C bus warnings · caab324d
      Rob Herring 提交于
      [ Upstream commit cc893871f092be9ac1184a78f9ae1e76b85d5317 ]
      
      dtc has new checks for I2C and SPI buses. Fix the warnings in node names
      and unit-addresses.
      
      arch/arm/boot/dts/am437x-idk-evm.dtb: Warning (spi_bus_bridge): /ocp@44000000/qspi@47900000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/am437x-sk-evm.dtb: Warning (spi_bus_bridge): /ocp@44000000/qspi@47900000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/am43x-epos-evm.dtb: Warning (spi_bus_bridge): /ocp@44000000/qspi@47900000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/omap3-n9.dtb: Warning (i2c_bus_reg): /ocp@68000000/i2c@48060000/ak8975@0f: I2C bus unit address format error, expected "f"
      arch/arm/boot/dts/am335x-osd3358-sm-red.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/pressure@78: I2C bus unit address format error, expected "76"
      arch/arm/boot/dts/am335x-boneblack.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/tda19988: I2C bus unit address format error, expected "70"
      arch/arm/boot/dts/am335x-boneblack-wireless.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/tda19988: I2C bus unit address format error, expected "70"
      arch/arm/boot/dts/am335x-sancloud-bbe.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/tda19988: I2C bus unit address format error, expected "70"
      arch/arm/boot/dts/am571x-idk.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/am572x-idk.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/am574x-idk.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/am57xx-cl-som-am57x.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/am57xx-sbc-am57x.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dra72-evm.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dra72-evm-revc.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dra76-evm.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/dra7-evm.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/am335x-pdu001.dtb: Warning (spi_bus_reg): /ocp/spi@481a0000/cfaf240320a032t: SPI bus unit address format error, expected "0"
      arch/arm/boot/dts/keystone-k2g-evm.dtb: Warning (spi_bus_bridge): /soc@0/qspi@2940000: node name for SPI buses should be 'spi'
      arch/arm/boot/dts/keystone-k2g-ice.dtb: Warning (spi_bus_bridge): /soc@0/qspi@2940000: node name for SPI buses should be 'spi'
      
      Cc: "Benoît Cousson" <bcousson@baylibre.com>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Santosh Shilimkar <ssantosh@kernel.org>
      Cc: linux-omap@vger.kernel.org
      Signed-off-by: NRob Herring <robh@kernel.org>
      [tony@atomide.com: fixed mode to 644 for am335x-osd3358-sm-red.dts while at it]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      caab324d
    • G
      ARM: dts: am335x-evm: fix number of cpsw · 2cf6352a
      Grygorii Strashko 提交于
      [ Upstream commit dcbf6b18d81bcdc51390ca1b258c17e2e13b7d0c ]
      
      am335x-evm has only one CPSW external port physically wired, but DT defines
      2 ext. ports. As result, PHY connection failure reported for the second
      ext. port.
      
      Update DT to reflect am335x-evm board HW configuration, and, while here,
      switch to use phy-handle instead of phy_id.
      Signed-off-by: NGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      2cf6352a
    • V
      s390/vdso: correct CFI annotations of vDSO functions · 59d6e59f
      Vasily Gorbik 提交于
      [ Upstream commit 26f4414a45b808f83d42d6fd2fbf4a59ef25e84b ]
      
      Correct stack frame overhead for 31-bit vdso, which should be 96 rather
      then 160. This is done by reusing STACK_FRAME_OVERHEAD definition which
      contains correct value based on build flags. This fixes stack unwinding
      within vdso code for 31-bit processes. While at it replace all hard coded
      stack frame overhead values with the same definition in vdso64 as well.
      Reviewed-by: NHendrik Brueckner <brueckner@linux.ibm.com>
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      59d6e59f
    • V
      s390/vdso: avoid 64-bit vdso mapping for compat tasks · 84bfa034
      Vasily Gorbik 提交于
      [ Upstream commit d1befa65823e9c6d013883b8a41d081ec338c489 ]
      
      vdso_fault used is_compat_task function (on s390 it tests "current"
      thread_info flags) to distinguish compat tasks and map 31-bit vdso
      pages. But "current" task might not correspond to mm context.
      
      When 31-bit compat inferior is executed under gdb, gdb does
      PTRACE_PEEKTEXT on vdso page, causing vdso_fault with "current" being
      64-bit gdb process. So, 31-bit inferior ends up with 64-bit vdso mapped.
      
      To avoid this problem a new compat_mm flag has been introduced into
      mm context. This flag is used in vdso_fault and vdso_mremap instead
      of is_compat_task.
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      84bfa034
    • R
      libfdt: Ensure INT_MAX is defined in libfdt_env.h · 0729f87b
      Rob Herring 提交于
      [ Upstream commit 53dd9dce6979bc54d64a3a09a2fb20187a025be7 ]
      
      The next update of libfdt has a new dependency on INT_MAX. Update the
      instances of libfdt_env.h in the kernel to either include the necessary
      header with the definition or define it locally.
      
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: linuxppc-dev@lists.ozlabs.org
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      0729f87b
    • R
      ARM: dts: atmel: Fix I2C and SPI bus warnings · 51e509ca
      Rob Herring 提交于
      [ Upstream commit c890ecdbe93d482512a911b299bfb009780a29c2 ]
      
      dtc has new checks for I2C and SPI buses. Fix the warnings in node names
      and unit-addresses.
      
      arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/eeprom@87: I2C bus unit address format error, expected "57"
      arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/ft5426@56: I2C bus unit address format error, expected "38"
      arch/arm/boot/dts/at91-vinco.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f8024000/rtc@64: I2C bus unit address format error, expected "32"
      arch/arm/boot/dts/at91sam9260ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1"
      arch/arm/boot/dts/at91sam9g20ek_2mmc.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1"
      arch/arm/boot/dts/at91sam9g20ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1"
      arch/arm/boot/dts/at91sam9261ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/tsc2046@0: SPI bus unit address format error, expected "2"
      Signed-off-by: NRob Herring <robh@kernel.org>
      Acked-by: NNicolas Ferre <nicolas.ferre@microchip.com>
      Signed-off-by: NAlexandre Belloni <alexandre.belloni@bootlin.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      51e509ca
    • A
      powerpc: Fix duplicate const clang warning in user access code · eb355ccf
      Anton Blanchard 提交于
      [ Upstream commit e00d93ac9a189673028ac125a74b9bc8ae73eebc ]
      
      This re-applies commit b91c1e3e ("powerpc: Fix duplicate const
      clang warning in user access code") (Jun 2015) which was undone in
      commits:
        f2ca8090 ("powerpc/sparse: Constify the address pointer in __get_user_nosleep()") (Feb 2017)
        d466f6c5 ("powerpc/sparse: Constify the address pointer in __get_user_nocheck()") (Feb 2017)
        f84ed59a ("powerpc/sparse: Constify the address pointer in __get_user_check()") (Feb 2017)
      
      We see a large number of duplicate const errors in the user access
      code when building with llvm/clang:
      
        include/linux/pagemap.h:576:8: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
              ret = __get_user(c, uaddr);
      
      The problem is we are doing const __typeof__(*(ptr)), which will hit
      the warning if ptr is marked const.
      
      Removing const does not seem to have any effect on GCC code
      generation.
      Signed-off-by: NAnton Blanchard <anton@samba.org>
      Signed-off-by: NJoel Stanley <joel@jms.id.au>
      Reviewed-by: NNick Desaulniers <ndesaulniers@google.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      eb355ccf
    • N
      powerpc/pseries: Disable CPU hotplug across migrations · e7b37640
      Nathan Fontenot 提交于
      [ Upstream commit 85a88cabad57d26d826dd94ea34d3a785824d802 ]
      
      When performing partition migrations all present CPUs must be online
      as all present CPUs must make the H_JOIN call as part of the migration
      process. Once all present CPUs make the H_JOIN call, one CPU is returned
      to make the rtas call to perform the migration to the destination system.
      
      During testing of migration and changing the SMT state we have found
      instances where CPUs are offlined, as part of the SMT state change,
      before they make the H_JOIN call. This results in a hung system where
      every CPU is either in H_JOIN or offline.
      
      To prevent this this patch disables CPU hotplug during the migration
      process.
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Reviewed-by: NTyrel Datwyler <tyreld@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      e7b37640
    • N
      powerpc/pseries/memory-hotplug: Only update DT once per memory DLPAR request · 9271304c
      Nathan Fontenot 提交于
      [ Upstream commit 063b8b1251fd069f3740339fca56119d218f11ba ]
      
      The updates to powerpc numa and memory hotplug code now use the
      in-kernel LMB array instead of the device tree. This change allows the
      pseries memory DLPAR code to only update the device tree once after
      successfully handling a DLPAR request.
      
      Prior to the in-kernel LMB array, the numa code looked up the affinity
      for memory being added in the device tree, the code now looks this up
      in the LMB array. This change means the memory hotplug code can just
      update the affinity for an LMB in the LMB array instead of updating
      the device tree.
      
      This also provides a savings in kernel memory. When updating the
      device tree old properties are never free'ed since there is no
      usecount on properties. This behavior leads to a new copy of the
      property being allocated every time a LMB is added or removed (i.e. a
      request to add 100 LMBs creates 100 new copies of the property). With
      this update only a single new property is created when a DLPAR request
      completes successfully.
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      9271304c
    • N
      powerpc/64s/hash: Fix stab_rr off by one initialization · 0ab2545a
      Nicholas Piggin 提交于
      [ Upstream commit 09b4438db13fa83b6219aee5993711a2aa2a0c64 ]
      
      This causes SLB alloation to start 1 beyond the start of the SLB.
      There is no real problem because after it wraps it stats behaving
      properly, it's just surprisig to see when looking at SLB traces.
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      0ab2545a
    • B
      powerpc/iommu: Avoid derefence before pointer check · 089b169c
      Breno Leitao 提交于
      [ Upstream commit 984ecdd68de0fa1f63ce205d6c19ef5a7bc67b40 ]
      
      The tbl pointer is being derefenced by IOMMU_PAGE_SIZE prior the check
      if it is not NULL.
      
      Just moving the dereference code to after the check, where there will
      be guarantee that 'tbl' will not be NULL.
      Signed-off-by: NBreno Leitao <leitao@debian.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      089b169c
    • K
      arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2 · feb52253
      Kishon Vijay Abraham I 提交于
      [ Upstream commit 3bc1572068e3896b60d86f9c0fb56d1cef28201c ]
      
      AM65 has two PCIe controllers and each PCIe controller has '2' address
      spaces one within the 4GB address space of the SoC and the other above
      the 4GB address space of the SoC (cbass_main) in addition to the
      register space. The size of the address space above the 4GB SoC address
      space is 4GB. These address ranges will be used by CPU/DMA to access
      the PCIe address space. In order to represent the address space above
      the 4GB SoC address space and to represent the size of this address
      space as 4GB, change address-cells and size-cells of interconnect to 2.
      
      Since OSPI has similar need in MCU Domain Memory Map, change
      address-cells and size-cells of cbass_mcu interconnect also to 2.
      
      Fixes: ea47eed3 ("arm64: dts: ti: Add Support for AM654 SoC")
      Signed-off-by: NKishon Vijay Abraham I <kishon@ti.com>
      Acked-by: NTony Lindgren <tony@atomide.com>
      Acked-by: NVignesh R <vigneshr@ti.com>
      Acked-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NTero Kristo <t-kristo@ti.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      feb52253
    • R
      ARM: dts: xilinx: Fix I2C and SPI bus warnings · bad4e6d3
      Rob Herring 提交于
      [ Upstream commit f5054ceed420b1f38d37920a4c65446fcc5d6b90 ]
      
      dtc has new checks for I2C and SPI buses. Fix the warnings in node names
      and unit-addresses.
      
      arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@52: I2C bus unit address format error, expected "34"
      arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@53: I2C bus unit address format error, expected "35"
      arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@54: I2C bus unit address format error, expected "36"
      arch/arm/boot/dts/zynq-zc770-xm013.dtb: Warning (spi_bus_reg): /amba/spi@e0006000/eeprom@0: SPI bus unit address format error, expected "2"
      arch/arm/boot/dts/zynq-zc770-xm010.dtb: Warning (spi_bus_reg): /amba/spi@e0007000/flash@0: SPI bus unit address format error, expected "1"
      
      Cc: Michal Simek <michal.simek@xilinx.com>
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      bad4e6d3
    • R
      arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou · 75fd1aec
      Rob Herring 提交于
      [ Upstream commit 501500e65fa96f899230d66153fefd780f08dd34 ]
      
      dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
      
      arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dtb: Warning (i2c_bus_reg): /i2c@ff3d0000/codec@0a: I2C bus unit address format error, expected "a"
      
      Cc: Heiko Stuebner <heiko@sntech.de>
      Cc: linux-rockchip@lists.infradead.org
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      75fd1aec
    • R
      ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 · 5fc9af40
      Rob Herring 提交于
      [ Upstream commit 131c3eb428ccd5f0c784b9edb4f72ec296a045d2 ]
      
      dtc has new checks for SPI buses. The rk3036 dts file has a node named
      spi' which causes false positive warnings. As the node is a pinctrl child
      node, change the node name to be 'spi-pins' to fix the warnings.
      
      arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus
      arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus
      arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus
      arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus
      
      Cc: Heiko Stuebner <heiko@sntech.de>
      Cc: linux-rockchip@lists.infradead.org
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      5fc9af40
    • R
      arm64: dts: meson: Fix erroneous SPI bus warnings · c9398259
      Rob Herring 提交于
      [ Upstream commit 68ecb5c1920c5b98b1e717fd2349fba2ee5d4031 ]
      
      dtc has new checks for SPI buses. The meson dts files have a node named
      spi' which causes false positive warnings. As the node is a pinctrl child
      node, change the node name to be 'spi-pins' to fix the warnings.
      
      arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb: Warning (spi_bus_bridge): /soc/periphs@c8834000/pinctrl@4b0/spi: incorrect #address-cells for SPI bus
      
      Cc: Carlo Caione <carlo@caione.org>
      Cc: Kevin Hilman <khilman@baylibre.com>
      Cc: linux-amlogic@lists.infradead.org
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NKevin Hilman <khilman@baylibre.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      c9398259
    • H
      arm64: fix for bad_mode() handler to always result in panic · 6d7757f0
      Hari Vyas 提交于
      [ Upstream commit e4ba15debcfd27f60d43da940a58108783bff2a6 ]
      
      The bad_mode() handler is called if we encounter an uunknown exception,
      with the expectation that the subsequent call to panic() will halt the
      system. Unfortunately, if the exception calling bad_mode() is taken from
      EL0, then the call to die() can end up killing the current user task and
      calling schedule() instead of falling through to panic().
      
      Remove the die() call altogether, since we really want to bring down the
      machine in this "impossible" case.
      Signed-off-by: NHari Vyas <hari.vyas@broadcom.com>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      6d7757f0
    • R
      ARM: dts: sun9i: Fix I2C bus warnings · 31e470f9
      Rob Herring 提交于
      [ Upstream commit 57a83c5222c1b5e7b3acc72c6e60fce00a38991a ]
      
      dtc has new checks for I2C buses. The sun9i-a80 dts file has a node named
      'i2c' which causes a false positive warning. As the node is a RSB bus,
      correct the node name to be 'rsb' to fix the warnings.
      
      arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89"
      arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745"
      arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89"
      arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745"
      
      Cc: Maxime Ripard <maxime.ripard@bootlin.com>
      Cc: Chen-Yu Tsai <wens@csie.org>
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NChen-Yu Tsai <wens@csie.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      31e470f9
    • R
      ARM: dts: sunxi: Fix I2C bus warnings · d1b9d321
      Rob Herring 提交于
      [ Upstream commit 0729b4af5753b65aa031f58c435da53dbbf56d19 ]
      
      dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
      
      arch/arm/boot/dts/sun8i-a23-gt90h-v4.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40"
      arch/arm/boot/dts/sun8i-a23-inet86dz.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40"
      arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40"
      arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40"
      arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40"
      arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property
      arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property
      arch/arm/boot/dts/sun8i-a33-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property
      arch/arm/boot/dts/sun5i-a13-utoo-p66.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: I2C bus unit address format error, expected "40"
      arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property
      arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property
      arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property
      arch/arm/boot/dts/sun5i-a13-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property
      
      Cc: Maxime Ripard <maxime.ripard@bootlin.com>
      Cc: Chen-Yu Tsai <wens@csie.org>
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NChen-Yu Tsai <wens@csie.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      d1b9d321
    • D
      ARM: dts: socfpga: Fix I2C bus unit-address error · 8ac08053
      Dinh Nguyen 提交于
      [ Upstream commit cbbc488ed85061a765cf370c3e41f383c1e0add6 ]
      
      dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
      
      arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb: Warning (i2c_bus_reg): /soc/i2c@ffc04000/adxl345@0: I2C bus unit address format error, expected "53"
      Signed-off-by: NRob Herring <robh@kernel.org>
      Signed-off-by: NDinh Nguyen <dinguyen@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      8ac08053