* linux-next: build failure after merge of the crypto tree
From: Stephen Rothwell @ 2016-02-17 1:26 UTC (permalink / raw)
To: Herbert Xu; +Cc: linux-next, linux-kernel, Stephan Mueller
Hi Herbert,
After merging the crypto tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
arch/arm/crypto/aesbs-glue.c: In function 'aesbs_xts_set_key':
arch/arm/crypto/aesbs-glue.c:94:8: error: implicit declaration of function 'xts_check_key' [-Werror=implicit-function-declaration]
err = xts_check_key(tfm, in_key, key_len);
^
arch/arm/crypto/aes-ce-glue.c: In function 'xts_set_key':
arch/arm/crypto/aes-ce-glue.c:155:8: error: implicit declaration of function 'xts_check_key' [-Werror=implicit-function-declaration]
ret = xts_check_key(tfm, in_key, key_len);
^
Caused by commit
28856a9e52c7 ("crypto: xts - consolidate sanity check for keys")
Presumably a missing include.
I have used the crypto tree from next-20160216 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-02-17 0:56 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Florian Fainelli
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/bcm7xxx.c
between commit:
c6dd213abe40 ("net: phy: bcm7xxx: Fix 40nm EPHY features")
815717d1473e ("net: phy: bcm7xxx: Remove wildcard entries"
from the net tree and commit:
3125c081a593 ("net: phy: bcm7xxx: Reduce boilerplate code for 40nm EPHY")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/phy/bcm7xxx.c
index db507e3bcab9,9b311041ebfb..000000000000
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@@ -247,9 -247,13 +247,9 @@@ static int bcm7xxx_config_init(struct p
int ret;
/* Enable 64 clock MDIO */
- phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XX_64CLK_MDIO);
+ phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XXX_64CLK_MDIO);
phy_read(phydev, MII_BCM7XXX_AUX_MODE);
- /* Workaround only required for 100Mbits/sec capable PHYs */
- if (phydev->supported & PHY_GBIT_FEATURES)
- return 0;
-
/* set shadow mode 2 */
ret = phy_set_clr_bits(phydev, MII_BCM7XXX_TEST,
MII_BCM7XXX_SHD_MODE_2, MII_BCM7XXX_SHD_MODE_2);
@@@ -324,43 -348,34 +339,10 @@@ static struct phy_driver bcm7xxx_driver
BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
BCM7XXX_28NM_GPHY(PHY_ID_BCM7439_2, "Broadcom BCM7439 (2)"),
BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),
- {
- .phy_id = PHY_ID_BCM7425,
- .phy_id_mask = 0xfffffff0,
- .name = "Broadcom BCM7425",
- .features = PHY_BASIC_FEATURES |
- SUPPORTED_Pause | SUPPORTED_Asym_Pause,
- .flags = PHY_IS_INTERNAL,
- .config_init = bcm7xxx_config_init,
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .suspend = bcm7xxx_suspend,
- .resume = bcm7xxx_config_init,
- }, {
- .phy_id = PHY_ID_BCM7429,
- .phy_id_mask = 0xfffffff0,
- .name = "Broadcom BCM7429",
- .features = PHY_BASIC_FEATURES |
- SUPPORTED_Pause | SUPPORTED_Asym_Pause,
- .flags = PHY_IS_INTERNAL,
- .config_init = bcm7xxx_config_init,
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .suspend = bcm7xxx_suspend,
- .resume = bcm7xxx_config_init,
- }, {
- .phy_id = PHY_ID_BCM7435,
- .phy_id_mask = 0xfffffff0,
- .name = "Broadcom BCM7435",
- .features = PHY_BASIC_FEATURES |
- SUPPORTED_Pause | SUPPORTED_Asym_Pause,
- .flags = PHY_IS_INTERNAL,
- .config_init = bcm7xxx_config_init,
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .suspend = bcm7xxx_suspend,
- .resume = bcm7xxx_config_init,
- } };
+ BCM7XXX_40NM_EPHY(PHY_ID_BCM7425, "Broadcom BCM7425"),
+ BCM7XXX_40NM_EPHY(PHY_ID_BCM7429, "Broadcom BCM7429"),
+ BCM7XXX_40NM_EPHY(PHY_ID_BCM7435, "Broadcom BCM7435"),
-{
- .phy_id = PHY_BCM_OUI_4,
- .phy_id_mask = 0xffff0000,
- .name = "Broadcom BCM7XXX 40nm",
- .features = PHY_GBIT_FEATURES |
- SUPPORTED_Pause | SUPPORTED_Asym_Pause,
- .flags = PHY_IS_INTERNAL,
- .config_init = bcm7xxx_config_init,
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .suspend = bcm7xxx_suspend,
- .resume = bcm7xxx_config_init,
-}, {
- .phy_id = PHY_BCM_OUI_5,
- .phy_id_mask = 0xffffff00,
- .name = "Broadcom BCM7XXX 65nm",
- .features = PHY_BASIC_FEATURES |
- SUPPORTED_Pause | SUPPORTED_Asym_Pause,
- .flags = PHY_IS_INTERNAL,
- .config_init = bcm7xxx_dummy_config_init,
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .suspend = bcm7xxx_suspend,
- .resume = bcm7xxx_config_init,
-} };
++};
static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = {
{ PHY_ID_BCM7250, 0xfffffff0, },
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Linus Walleij @ 2016-02-16 14:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolas Saenz Julienne
In-Reply-To: <20160216144842.1db2a67b@canb.auug.org.au>
On Tue, Feb 16, 2016 at 4:48 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus,
>
> After merging the gpio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpio/gpio-tps65218.c: In function 'tps65218_gpio_request':
> drivers/gpio/gpio-tps65218.c:74:26: error: 'struct gpio_chip' has no member named 'desc'
> unsigned long flags = gc->desc[offset].flags;
> ^
>
> Caused by commit
>
> c366c76a2c41 ("gpio: add tps65218 gpio")
>
> interacting with commit
>
> 1c3cdb186172 ("gpio: move descriptors into gpio_device")
>
> both from the gpio tree.
What a mess. I just sent a fixup patch. I blame my ability
to manage several things at the same time.
Yours,
Linus Walleij
^ permalink raw reply
* next-20160216 build: 3 failures 14 warnings (next-20160216)
From: Build bot for Mark Brown @ 2016-02-16 10:43 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160216
Git describe: next-20160216
Commit: dfd481f728 Add linux-next specific files for 20160216
Build Time: 96 min 10 sec
Passed: 6 / 9 ( 66.67 %)
Failed: 3 / 9 ( 33.33 %)
Errors: 11
Warnings: 14
Section Mismatches: 1
Failed defconfigs:
arm64-allmodconfig
arm64-defconfig
Errors:
arm64-allmodconfig
ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
6 warnings 2 mismatches : arm64-allmodconfig
4 warnings 0 mismatches : arm-multi_v7_defconfig
7 warnings 0 mismatches : arm-allmodconfig
6 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 11
1 ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
Warnings Summary: 14
4 ../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
2 ../net/ipv4/igmp.c:1665:14: warning: unused variable 'net' [-Wunused-variable]
2 ../net/ipv4/igmp.c:1646:14: warning: unused variable 'net' [-Wunused-variable]
2 ../net/ipv4/igmp.c:1319:14: warning: unused variable 'net' [-Wunused-variable]
2 ../net/ipv4/igmp.c:1227:14: warning: unused variable 'net' [-Wunused-variable]
2 ../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
2 ../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../include/asm-generic/div64.h:224:22: warning: passing argument 1 of '__div64_32' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/asm-generic/div64.h:220:25: warning: right shift count >= width of type [-Wshift-count-overflow]
1 ../include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Section Mismatch Summary: 1
2 WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 11 errors, 6 warnings, 2 section mismatches
Errors:
ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
Warnings:
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
Section Mismatches:
WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../net/ipv4/igmp.c:1227:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1319:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1646:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1665:14: warning: unused variable 'net' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast
../include/asm-generic/div64.h:220:25: warning: right shift count >= width of type [-Wshift-count-overflow]
../include/asm-generic/div64.h:224:22: warning: passing argument 1 of '__div64_32' from incompatible pointer type [-Wincompatible-pointer-types]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
-------------------------------------------------------------------------------
arm64-defconfig : FAIL, 0 errors, 6 warnings, 0 section mismatches
Warnings:
../net/ipv4/igmp.c:1227:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1319:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1646:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1665:14: warning: unused variable 'net' [-Wunused-variable]
../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
^ permalink raw reply
* Re: [PATCH v2] arm64/efi: Make strnlen() available to the EFI namespace
From: Will Deacon @ 2016-02-16 10:32 UTC (permalink / raw)
To: Thierry Reding
Cc: Catalin Marinas, Mark Brown, linux-arm-kernel, linux-next,
Ard Biesheuvel, Rob Herring
In-Reply-To: <1455617791-4791-1-git-send-email-thierry.reding@gmail.com>
On Tue, Feb 16, 2016 at 11:16:31AM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> Changes introduced in the upstream version of libfdt pulled in by commit
> 91feabc2e224 ("scripts/dtc: Update to upstream commit b06e55c88b9b") use
> the strnlen() function, which isn't currently available to the EFI name-
> space. Add it to the EFI namespace to avoid a linker error.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Rob Herring <robh@kernel.org>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
> Changes in v2:
> - mark strnlen() position independent and refer to __pi_strnlen
Thanks, I'll queue this on the arm64 fixes branch.
Will
^ permalink raw reply
* Re: [PATCH v2] arm64/efi: Make strnlen() available to the EFI namespace
From: Ard Biesheuvel @ 2016-02-16 10:20 UTC (permalink / raw)
To: Thierry Reding
Cc: Catalin Marinas, Will Deacon, Mark Brown,
linux-arm-kernel@lists.infradead.org, linux-next, Rob Herring
In-Reply-To: <1455617791-4791-1-git-send-email-thierry.reding@gmail.com>
On 16 February 2016 at 11:16, Thierry Reding <thierry.reding@gmail.com> wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> Changes introduced in the upstream version of libfdt pulled in by commit
> 91feabc2e224 ("scripts/dtc: Update to upstream commit b06e55c88b9b") use
> the strnlen() function, which isn't currently available to the EFI name-
> space. Add it to the EFI namespace to avoid a linker error.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Rob Herring <robh@kernel.org>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> Changes in v2:
> - mark strnlen() position independent and refer to __pi_strnlen
>
> arch/arm64/kernel/image.h | 1 +
> arch/arm64/lib/strnlen.S | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h
> index 999633bd7294..352f7abd91c9 100644
> --- a/arch/arm64/kernel/image.h
> +++ b/arch/arm64/kernel/image.h
> @@ -89,6 +89,7 @@ __efistub_memcpy = KALLSYMS_HIDE(__pi_memcpy);
> __efistub_memmove = KALLSYMS_HIDE(__pi_memmove);
> __efistub_memset = KALLSYMS_HIDE(__pi_memset);
> __efistub_strlen = KALLSYMS_HIDE(__pi_strlen);
> +__efistub_strnlen = KALLSYMS_HIDE(__pi_strnlen);
> __efistub_strcmp = KALLSYMS_HIDE(__pi_strcmp);
> __efistub_strncmp = KALLSYMS_HIDE(__pi_strncmp);
> __efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area);
> diff --git a/arch/arm64/lib/strnlen.S b/arch/arm64/lib/strnlen.S
> index 2ca665711bf2..eae38da6e0bb 100644
> --- a/arch/arm64/lib/strnlen.S
> +++ b/arch/arm64/lib/strnlen.S
> @@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */
> .Lhit_limit:
> mov len, limit
> ret
> -ENDPROC(strnlen)
> +ENDPIPROC(strnlen)
> --
> 2.7.1
>
^ permalink raw reply
* Re: [PATCH] arm64/efi: Make strnlen() available to the EFI namespace
From: Thierry Reding @ 2016-02-16 10:19 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Catalin Marinas, Will Deacon, Mark Brown,
linux-arm-kernel@lists.infradead.org, linux-next, Rob Herring
In-Reply-To: <CAKv+Gu86oyHJcBhkjouLQk8FMR=0obrPpwnYvXMFSJkOa3c2pA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1674 bytes --]
On Mon, Feb 15, 2016 at 08:23:22PM +0100, Ard Biesheuvel wrote:
> Hi Thierry,
>
> On 15 February 2016 at 20:17, Thierry Reding <thierry.reding@gmail.com> wrote:
> > From: Thierry Reding <treding@nvidia.com>
> >
> > Changes introduced in the upstream version of libfdt pulled in by commit
> > 91feabc2e224 ("scripts/dtc: Update to upstream commit b06e55c88b9b") use
> > the strnlen() function, which isn't currently available to the EFI name-
> > space. Add it to the EFI namespace to avoid a linker error.
> >
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Cc: Will Deacon <will.deacon@arm.com>
> > Cc: Rob Herring <robh@kernel.org>
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> > ---
> > arch/arm64/kernel/image.h | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h
> > index c9c62cab25a4..8a1978f4a555 100644
> > --- a/arch/arm64/kernel/image.h
> > +++ b/arch/arm64/kernel/image.h
> > @@ -96,6 +96,8 @@ __efistub_strcmp = KALLSYMS_HIDE(__pi_strcmp);
> > __efistub_strncmp = KALLSYMS_HIDE(__pi_strncmp);
> > __efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area);
> >
> > +__efistub_strnlen = KALLSYMS_HIDE(strnlen);
> > +
>
> To align with the existing code, we should use __pi_strnlen here, and
> declare the asm version of strnlen with ENDPIPROC()
Yes, you're absolutely right. For some reason I had missed the ARM64
implementation of strnlen() in the grep output. Sent a v2 now which is
consistent with the existing code.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* [PATCH v2] arm64/efi: Make strnlen() available to the EFI namespace
From: Thierry Reding @ 2016-02-16 10:16 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Mark Brown, linux-next, linux-arm-kernel, Ard Biesheuvel
In-Reply-To: <1455563856-1553-1-git-send-email-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
Changes introduced in the upstream version of libfdt pulled in by commit
91feabc2e224 ("scripts/dtc: Update to upstream commit b06e55c88b9b") use
the strnlen() function, which isn't currently available to the EFI name-
space. Add it to the EFI namespace to avoid a linker error.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
Changes in v2:
- mark strnlen() position independent and refer to __pi_strnlen
arch/arm64/kernel/image.h | 1 +
arch/arm64/lib/strnlen.S | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h
index 999633bd7294..352f7abd91c9 100644
--- a/arch/arm64/kernel/image.h
+++ b/arch/arm64/kernel/image.h
@@ -89,6 +89,7 @@ __efistub_memcpy = KALLSYMS_HIDE(__pi_memcpy);
__efistub_memmove = KALLSYMS_HIDE(__pi_memmove);
__efistub_memset = KALLSYMS_HIDE(__pi_memset);
__efistub_strlen = KALLSYMS_HIDE(__pi_strlen);
+__efistub_strnlen = KALLSYMS_HIDE(__pi_strnlen);
__efistub_strcmp = KALLSYMS_HIDE(__pi_strcmp);
__efistub_strncmp = KALLSYMS_HIDE(__pi_strncmp);
__efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area);
diff --git a/arch/arm64/lib/strnlen.S b/arch/arm64/lib/strnlen.S
index 2ca665711bf2..eae38da6e0bb 100644
--- a/arch/arm64/lib/strnlen.S
+++ b/arch/arm64/lib/strnlen.S
@@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */
.Lhit_limit:
mov len, limit
ret
-ENDPROC(strnlen)
+ENDPIPROC(strnlen)
--
2.7.1
^ permalink raw reply related
* Re: linux-next: manual merge of the gpio tree with the pinctrl tree
From: Stephen Rothwell @ 2016-02-16 10:16 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Linus Walleij, Linux-Next, linux-kernel@vger.kernel.org,
Krzysztof Adamski
In-Reply-To: <CAMuHMdW2CVgzX0vvjdrLq4bFwcUvJto_a6JPfXP_NG=VGDoqjw@mail.gmail.com>
Hi Geert,
On Tue, 16 Feb 2016 09:23:48 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> That resolution looks correct to me, but doesn't match your end result
> in next-20160216:
>
> u32 set_mux = pctl->desc->irq_read_needs_mux &&
> test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
> u32 pin = offset + chip->base;
>
> I think the end result should be:
>
> bool set_mux = pctl->desc->irq_read_needs_mux &&
> gpiochip_line_is_irq(chip, offset);
> u32 pin = offset + chip->base;
Yeah, that's because the resulting tree failed to build so I undid the
merge and merged yesterday's version of the gpio tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the gpio tree with the pinctrl tree
From: Geert Uytterhoeven @ 2016-02-16 8:23 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, Linux-Next, linux-kernel@vger.kernel.org,
Krzysztof Adamski
In-Reply-To: <20160216143728.61372efa@canb.auug.org.au>
Hi Stephen,
On Tue, Feb 16, 2016 at 4:37 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the gpio tree got a conflict in:
>
> drivers/pinctrl/sunxi/pinctrl-sunxi.c
>
> between commit:
>
> be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set")
>
> from the pinctrl tree and commit:
>
> 6cee3821e4e4 ("gpio/pinctrl: sunxi: stop poking around in private vars")
>
> from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
> index 96f64a104a62,3e95bfe66a06..000000000000
> --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> @@@ -457,9 -457,8 +457,9 @@@ static int sunxi_pinctrl_gpio_get(struc
> struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);
> u32 reg = sunxi_data_reg(offset);
> u8 index = sunxi_data_offset(offset);
> - u32 set_mux = pctl->desc->irq_read_needs_mux &&
> - test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
> + bool set_mux = pctl->desc->irq_read_needs_mux &&
> + gpiochip_line_is_irq(chip, offset);
> + u32 pin = offset + chip->base;
> u32 val;
>
> if (set_mux)
That resolution looks correct to me, but doesn't match your end result
in next-20160216:
u32 set_mux = pctl->desc->irq_read_needs_mux &&
test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
u32 pin = offset + chip->base;
I think the end result should be:
bool set_mux = pctl->desc->irq_read_needs_mux &&
gpiochip_line_is_irq(chip, offset);
u32 pin = offset + chip->base;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* linux-next: Tree for Feb 16
From: Stephen Rothwell @ 2016-02-16 5:53 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160215:
The char-misc tree gained conflicts against the staging tree.
The gpio tree gained conflicts against the mfd and pinctrl trees and a
build failure so I used the version from next-20160215.
The clk tree gained conflicts against the samsung-krzk tree.
The aio tree still had a build failure so I used the version from
next-20160111.
Non-merge commits (relative to Linus' tree): 4749
4031 files changed, 170400 insertions(+), 76857 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 239 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (1926e54f1157 MAINTAINERS: Update mailing list for Renesas ARM64 SoC Development)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (e972c37459c8 ARM: 8519/1: ICST: try other dividends than 1)
Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (c777e2a8b654 powerpc/mm: Fix Multi hit ERAT cause by recent THP update)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (db92ea5d4df0 dscc4: Undefined signed int shift)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (cb27e4f99b5d ipvs: allow rescheduling after RST)
Merging wireless-drivers/master (fb724ed5c617 wlcore: Fix regression in wlcore_set_partition())
Merging mac80211/master (212c5a5e6ba6 mac80211: minstrel: Change expected throughput unit back to Kbps)
Merging sound-current/for-linus (0b8c82190c12 ALSA: hda - Cancel probe work instead of flush at remove)
Merging pci-current/for-linus (0cf1337e0b83 PCI: rcar: Add device tree support for r8a7793)
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (18558cae0272 Linux 4.5-rc4)
Merging usb-gadget-fixes/fixes (6a4290cc28be usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.)
Merging usb-serial-fixes/usb-linus (18558cae0272 Linux 4.5-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (388f7b1d6e8c Linux 4.5-rc3)
Merging char-misc.current/char-misc-linus (18558cae0272 Linux 4.5-rc4)
Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups)
Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (ed3f9fd1e865 drm/i915: fix error path in intel_setup_gmbus())
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (59e164b8d2ea ARC: clockevent: Prepare for DT based probe)
Merging arm/for-next (9bf9dc709377 Merge branches 'component', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (92e963f50fc7 Linux 4.5-rc1)
Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
Merging at91/at91-next (8129febb508f ARM: dts: at91: at91sam9n12ek: fix panel compatible string)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (5ec6f2cd8ec4 ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (92e963f50fc7 Linux 4.5-rc1)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (9519c91560f3 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (94bd511801b6 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (28151408222a Merge branch 'omap-for-v4.6/dt' into for-next)
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (305d0c411114 ARM: qcom: Drop ARCH_MSM* configs)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (e4070a146c81 Merge branches 'heads/cleanup-for-v4.6' and 'heads/dt-for-v4.6' into next)
Merging rockchip/for-next (b24b8204ad7d Merge branch 'v4.6-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (a68b15a4530d Merge branch 'next/soc64' into for-next)
Merging sunxi/sunxi/for-next (06902a8895d5 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
Merging tegra/for-next (46e98126e5a7 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (18558cae0272 Linux 4.5-rc4)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
Merging m68knommu/for-next (cf5fa23ebbec m68knommu: fix FEC platform device registration when driver is modular)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (950823465ff6 Merge branch '4.5-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (388f7b1d6e8c Linux 4.5-rc3)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (232f5dd78586 s390/oprofile: fix address range for asynchronous stack)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging btrfs-kdave/for-next (9e61250d83bf Merge branch 'for-next-4.6-20160212' into for-next-20160212)
Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
Merging cifs/for-next (4b550af51985 cifs: fix erroneous return value)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (5a9530e498ed ocfs2: Implement get_next_id())
Merging ext4/dev (b7bcb1cf0d3b ext4: remove unused parameter "newblock" in convert_initialized_extent())
Merging f2fs/dev (9fa02d4ea5ec f2fs: avoid garbage lenghs in dentries)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (00bf5636b147 GFS2: Prevent delete work from occurring on glocks used for create)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (e0fa0d0189f6 pNFS: Always set NFS_LAYOUT_RETURN_REQUESTED with lo->plh_return_iomode)
Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes)
Merging orangefs/for-next (9fc19e612155 Orangefs: remove cancelled op from list before releasing it.)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (63a1962bea7d Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
Merging hid/for-next (bc1db4af59b2 Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next)
Merging i2c/i2c/for-next (61c18aeb05c3 i2c: uniphier: add COMPILE_TEST option)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (972d7d17b6bb hwmon: Add LTC2990 sensor driver)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (f6f756ddd65f Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (a2127e400edd libata: support AHCI on OCTEON platform)
Merging pm/linux-next (fe8323e05ec8 Merge branch 'pm-cpufreq-governor' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
Merging thermal-soc/next (a53b8394ec3c thermal: cpu_cooling: fix out of bounds access in time_in_idle)
Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (bc9f904086cc Merge branch 'topic/ioatdma' into next)
Merging net-next/master (667f00630ebe Merge branch 'local-checksum-offload')
CONFLICT (content): Merge conflict in drivers/net/vxlan.c
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f87fc3ad6392 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (11e70824e75f mwifiex: firmware dump support for w8997 chipset)
Merging bluetooth/master (9a6a1c77e1fc Bluetooth: Use managed version of led_trigger_register in LED trigger)
Merging mac80211-next/master (94106d26c380 mac80211: fix VHT MU-MIMO frame processing)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
Merging rdma/for-next (34356f64ac0d IB/mlx5: Unify CQ create flags check)
Merging mtd/master (38714fbd299f MAINTAINERS: update Han's email)
Merging l2-mtd/master (3b5394a3ccff mtd: spi-nor: remove micron_quad_enable())
Merging crypto/master (f75516a81548 crypto: keys - Revert "convert public key to akcipher api")
Merging drm/drm-next (5443ce86fa37 drm: virtio-gpu: set atomic flag)
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (1db6e2e7dc27 drm/i915: Check for get_pages instead of shmem (filp))
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (15fce29da391 drm/fb_helper: Use add_one_connector in add_all_connectors.)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (cbaaee80e151 Merge branch 'topic/core-fixes' into for-next)
Merging sound-asoc/for-next (7715cc83c05a Merge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/samsung', 'asoc/topic/ssm4567', 'asoc/topic/topology' and 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (1261d013daea Input: Allow compile test of Goodix and Colibri VF50 if !GPIOLIB)
Merging block/for-next (ab3d8b3ecf77 Merge branch 'for-4.6/core' into for-next)
Merging device-mapper/for-next (aa8c484be790 dm thin metadata: remove needless newline from subtree_dec() DMERR message)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (f7011242144b Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fc2561ec0afc md-cluster: delete useless code)
Merging mfd/for-mfd-next (103d8a7bb8a2 mfd: tps65090: Set regmap config reg counts properly)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (6659b55dae09 power_supply: Add types for USB Type C and PD chargers)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (ca1e64601bd8 Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max77802', 'regulator/topic/maxim', 'regulator/topic/mt6397' and 'regulator/topic/qcom-saw' into regulator-next)
Merging security/next (8e0ee3c9faed tpm: fix the cleanup of struct tpm_chip)
Merging integrity/next (70ded691640f ima: use "ima_hooks" enum as function argument)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (1926e54f1157 MAINTAINERS: Update mailing list for Renesas ARM64 SoC Development)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (5645a717c6ee Documentation: HOWTO: remove obsolete info about regression postings)
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (6338b8a12d0a Merge branches 'dt/linus' and 'dt/next' into for-next)
Merging mailbox/mailbox-for-next (be9c09bcca03 arm64: dts: mailbox device tree node for APM X-Gene platform.)
Merging spi/for-next (fbcb15713ea3 Merge remote-tracking branch 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (61c66a442223 Merge branch 'x86/mm')
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
Merging rcu/rcu/next (0dd1befbc663 rcu: Remove expedited GP funnel-lock bypass)
Merging kvm/linux-next (bce87cce88c7 KVM: x86: consolidate different ways to test for in-kernel LAPIC)
Merging kvm-arm/next (1f4fa0c0e5bf arm/arm64: KVM: Handle out-of-RAM cache maintenance as a NOP)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (765bdb406de4 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging kvms390/next (1763f8d09d52 KVM: s390: bail out early on fatal signal in dirty logging)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (d6e022f1d207 workqueue: handle NUMA_NO_NODE for unbound pool_workqueue lookup)
Merging drivers-x86/for-next (b0c141b8f86b dell-led: use dell_smbios_send_request() for performing SMBIOS calls)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (d6a4b84e2d0e Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/irq' into regmap-next)
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (ee2e1c2d18a4 leds: leds-gpio: Fix return value check in create_gpio_led())
Merging ipmi/for-next (7f8df84ecba8 ipmi_si: Avoid a wrong long timeout on transaction done)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl)
Merging usb/usb-next (264904ccc33c usb: retry reset if a device times out)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (18558cae0272 Linux 4.5-rc4)
Merging usb-chipidea-next/ci-for-usb-next (6b8bc9c6fb26 usb: chipidea: udc: remove unused value assignment)
Merging staging/staging-next (1d427da1d7f9 Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version)
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
$ git rm -f drivers/staging/dgap/dgap.c
Merging char-misc/char-misc-next (396ec3dea3d8 ppdev: use dev_* macros)
CONFLICT (content): Merge conflict in drivers/staging/goldfish/goldfish_nand.c
CONFLICT (content): Merge conflict in drivers/platform/goldfish/goldfish_pipe.c
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (223ffb29f972 cgroup: provide cgroup_nov1= to disable controllers in v1 mounts)
Merging scsi/for-next (cef98052b16c Merge branch 'fixes' into for-next)
Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (b4f51b6f4513 Merge branch 'devel' into for-next)
Merging vhost/linux-next (481eaec37e91 tools/virtio: add ringtest utilities)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (0d5f5378d020 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
$ git reset --hard HEAD^
Merging next-20160215 version of gpio
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
Merging dma-buf/for-next (0cbb0b92689a Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (70750ff2c910 Merge tag 'v4.6-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next)
CONFLICT (content): Merge conflict in drivers/clk/samsung/Kconfig
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (92e963f50fc7 Linux 4.5-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
Merging rtc/rtc-next (599c8d596765 rtc: max77686: move initialisation of rtc regmap, irq chip locally)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
Merging akpm-current/current (b424a3e227e8 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (0512c69dbef2 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* Re: linux-next: manual merge of the clk tree with the samsung-krzk tree
From: Krzysztof Kozlowski @ 2016-02-16 4:30 UTC (permalink / raw)
To: Stephen Rothwell, Mike Turquette, Stephen Boyd
Cc: linux-next, linux-kernel, James Liao, Sylwester Nawrocki,
Arnd Bergmann
In-Reply-To: <20160216151131.3e1d4cb5@canb.auug.org.au>
On 16.02.2016 13:11, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the clk tree got a conflict in:
>
> drivers/clk/Kconfig
> drivers/clk/samsung/Kconfig
>
> between commit:
>
> fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")
>
> from the samsung-krzk tree and commit:
>
> b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
>
> from the clk tree.
>
> I fixed it up (they both had similar effects) and can carry the fix as
> necessary (no action is required).
Thanks!
Stephen, Mike,
James' b9e65ebc654d looks like a simpler approach to the same problem -
moving Samsung common clocks under COMMON_CLK.
If you agree I can rebase my patch on top of it so only COMPILE_TEST
would be added.
However my third patch in that set ("arm64: EXYNOS: Consolidate
ARCH_EXYNOS7 symbol into ARCH_EXYNOS" [0]) depends on it, so maybe you
could prepare a tag with everything? James patch + two of mine (also
"clk: samsung: Don't build ARMv8 clock drivers on ARMv7")?
Best regards,
Krzysztof
[0] http://www.spinics.net/lists/devicetree/msg111893.html
^ permalink raw reply
* linux-next: manual merge of the clk tree with the samsung-krzk tree
From: Stephen Rothwell @ 2016-02-16 4:11 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Krzysztof Kozlowski
Cc: linux-next, linux-kernel, James Liao
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/Kconfig
drivers/clk/samsung/Kconfig
between commit:
fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")
from the samsung-krzk tree and commit:
b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
from the clk tree.
I fixed it up (they both had similar effects) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the gpio tree
From: Stephen Rothwell @ 2016-02-16 3:48 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel, Nicolas Saenz Julienne
Hi Linus,
After merging the gpio tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpio/gpio-tps65218.c: In function 'tps65218_gpio_request':
drivers/gpio/gpio-tps65218.c:74:26: error: 'struct gpio_chip' has no member named 'desc'
unsigned long flags = gc->desc[offset].flags;
^
Caused by commit
c366c76a2c41 ("gpio: add tps65218 gpio")
interacting with commit
1c3cdb186172 ("gpio: move descriptors into gpio_device")
both from the gpio tree.
I have used the gpio tree from next-20160215 fro today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the gpio tree with the pinctrl tree
From: Stephen Rothwell @ 2016-02-16 3:37 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel, Krzysztof Adamski
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/pinctrl/sunxi/pinctrl-sunxi.c
between commit:
be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set")
from the pinctrl tree and commit:
6cee3821e4e4 ("gpio/pinctrl: sunxi: stop poking around in private vars")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 96f64a104a62,3e95bfe66a06..000000000000
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@@ -457,9 -457,8 +457,9 @@@ static int sunxi_pinctrl_gpio_get(struc
struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);
u32 reg = sunxi_data_reg(offset);
u8 index = sunxi_data_offset(offset);
- u32 set_mux = pctl->desc->irq_read_needs_mux &&
- test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
+ bool set_mux = pctl->desc->irq_read_needs_mux &&
+ gpiochip_line_is_irq(chip, offset);
+ u32 pin = offset + chip->base;
u32 val;
if (set_mux)
^ permalink raw reply
* linux-next: manual merge of the gpio tree with the mfd tree
From: Stephen Rothwell @ 2016-02-16 3:33 UTC (permalink / raw)
To: Linus Walleij, Lee Jones
Cc: linux-next, linux-kernel, Andrew F. Davis, Nicolas Saenz Julienne
Hi Linus,
Today's linux-next merge of the gpio tree got conflicts in:
drivers/gpio/Kconfig
drivers/gpio/Makefile
between commit:
5d8c473983fc ("gpio: tps65086: Add GPO driver for the TPS65086 PMIC")
from the mfd tree and commit:
b866526d0cfe ("gpio: Add driver for TI TPIC2810")
c366c76a2c41 ("gpio: add tps65218 gpio")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpio/Kconfig
index 2b80903965d1,ad226485a8e4..000000000000
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -844,12 -889,13 +889,19 @@@ config GPIO_TIMBERDAL
---help---
Add support for the GPIO IP in the timberdale FPGA.
+config GPIO_TPS65086
+ tristate "TI TPS65086 GPO"
+ depends on MFD_TPS65086
+ help
+ This driver supports the GPO on TI TPS65086x PMICs.
+
+ config GPIO_TPS65218
+ tristate "TPS65218 GPIO"
+ depends on MFD_TPS65218
+ help
+ Select this option to enable GPIO driver for the TPS65218
+ chip family.
+
config GPIO_TPS6586X
bool "TPS6586X GPIO"
depends on MFD_TPS6586X
diff --cc drivers/gpio/Makefile
index c759190b73fa,f1d3d823d1bc..000000000000
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -95,7 -97,8 +97,9 @@@ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc35
obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o
obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
+obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
+ obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
+ obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
^ permalink raw reply
* linux-next: manual merge of the char-misc tree with the staging tree
From: Stephen Rothwell @ 2016-02-16 3:00 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann
Cc: linux-next, linux-kernel, Amitoj Kaur Chawla, Shraddha Barke
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/staging/goldfish/goldfish_nand.c
between commit:
814625b539d3 ("staging: goldfish: goldfish_nand: Return correct error code")
from the staging tree and commit:
3e2fbc7feec4 ("Staging: goldfish: goldfish_nand: Add DMA Support using dmam_alloc_coherent")
from the char-misc tree.
I fixed it up (the latter incorporated the former) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the char-misc tree with the staging tree
From: Stephen Rothwell @ 2016-02-16 2:55 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann
Cc: linux-next, linux-kernel, Shraddha Barke, Christoffer Dall,
Jason Hu
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/platform/goldfish/goldfish_pipe.c
between commit:
1d427da1d7f9 ("Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version")
from the staging tree and commits:
2f3be88237a3 ("goldfish_pipe: Pin pages to memory while copying and other cleanups")
d62f324b0ac8 ("goldfish: Enable ACPI-based enumeration for android pipe")
from the char-misc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/platform/goldfish/goldfish_pipe.c
index 9f6734ce1873,839df4aace76..000000000000
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@@ -57,7 -58,8 +58,9 @@@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/goldfish.h>
+#include <linux/dma-mapping.h>
+ #include <linux/mm.h>
+ #include <linux/acpi.h>
/*
* IMPORTANT: The following constants must match the ones used and defined
^ permalink raw reply
* Re: Crashes in arm qemu emulations due to 'cpufreq: governor: Replace timers with utilization ...'
From: Guenter Roeck @ 2016-02-16 1:38 UTC (permalink / raw)
To: Tony Lindgren, Rafael J. Wysocki
Cc: Viresh Kumar, linux-pm@vger.kernel.org, Peter Zijlstra,
Rafael J. Wysocki, Linux Kernel Mailing List, linux-next,
linux-arm-kernel@lists.infradead.org
In-Reply-To: <20160215213606.GD19432@atomide.com>
On 02/15/2016 01:36 PM, Tony Lindgren wrote:
> * Rafael J. Wysocki <rafael@kernel.org> [160215 12:39]:
>> On Mon, Feb 15, 2016 at 8:58 PM, Tony Lindgren <tony@atomide.com> wrote:
>>> * Guenter Roeck <linux@roeck-us.net> [160215 11:41]:
>>>> On 02/15/2016 11:01 AM, Tony Lindgren wrote:
>>>>>
>>>>> https://kernelci.org/boot/all/job/next/kernel/next-20160215/
>>>>>
>>>>> The SMP ones seem to fail with some regulator issues?
>>>>>
>>>>
>>>> There is another problem, introduced with 6a0712f6f199e ("PM / OPP: Add
>>>> dev_pm_opp_set_rate()"). The kernelci boot log for next-20160212:omap3-overo-tobi
>>>> and others experience that problem.
>>>>
>>>> Essentially, the code now assumes that a CPU clock always has a voltage
>>>> regulator attached to it, which is not correct. I sent out a patch to fix
>>>> that problem a minute ago.
>>>
>>> Yes that fixed it thanks.
>>
>> Can you please also check if this alternative fix from Viresh works:
>>
>> https://patchwork.kernel.org/patch/8316611/
>
> Yes that one too seems to fix the issue on SMP systems for
> me:
>
> Tested-by: Tony Lindgren <tony@atomide.com>
>
Same here.
Tested-by: Guenter Roeck <linux@roeck-us.net>
Guenter
^ permalink raw reply
* Re: Crashes in arm qemu emulations due to 'cpufreq: governor: Replace timers with utilization ...'
From: Viresh Kumar @ 2016-02-16 1:36 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Rafael J. Wysocki, Guenter Roeck, Rafael J. Wysocki, linux-next,
Linux Kernel Mailing List, linux-arm-kernel@lists.infradead.org,
linux-pm@vger.kernel.org, Peter Zijlstra
In-Reply-To: <6826860.yxabWEoz5T@vostro.rjw.lan>
On 16-02-16, 02:27, Rafael J. Wysocki wrote:
> Yes, that's what we should be doing, but it seemed to me that we didn't.
>
> Or maybe the trace just contained the last one, because that's when the
> crash happened.
Ofcourse, it wouldn't mention the function calls that have already
finished :)
--
viresh
^ permalink raw reply
* Re: Crashes in arm qemu emulations due to 'cpufreq: governor: Replace timers with utilization ...'
From: Rafael J. Wysocki @ 2016-02-16 1:27 UTC (permalink / raw)
To: Viresh Kumar
Cc: Rafael J. Wysocki, Guenter Roeck, Rafael J. Wysocki, linux-next,
Linux Kernel Mailing List, linux-arm-kernel@lists.infradead.org,
linux-pm@vger.kernel.org, Peter Zijlstra
In-Reply-To: <20160216011335.GI6334@vireshk-i7>
On Tuesday, February 16, 2016 06:43:35 AM Viresh Kumar wrote:
> On 15-02-16, 19:41, Rafael J. Wysocki wrote:
> > On Mon, Feb 15, 2016 at 6:05 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> > > [ 1.340000] [<c0958e78>] (__cpufreq_driver_target) from [<c095ca58>] (dbs_check_cpu+0x1ac/0x1e8)
> > > [ 1.340000] [<c095ca58>] (dbs_check_cpu) from [<c095cd04>] (cpufreq_governor_dbs+0x1fc/0x608)
> > > [ 1.340000] [<c095cd04>] (cpufreq_governor_dbs) from [<c0959c5c>] (__cpufreq_governor+0x1a8/0x204)
> > > [ 1.340000] [<c0959c5c>] (__cpufreq_governor) from [<c095a2dc>] (cpufreq_init_policy+0x60/0x8c)
> > > [ 1.340000] [<c095a2dc>] (cpufreq_init_policy) from [<c095a5f0>] (cpufreq_online+0x2e8/0x708)
> > > [ 1.340000] [<c095a5f0>] (cpufreq_online) from [<c075674c>] (subsys_interface_register+0x80/0xc4)
> > > [ 1.340000] [<c075674c>] (subsys_interface_register) from [<c0959764>] (cpufreq_register_driver+0x144/0x1a0)
> >
> > This is the registration of the cpufreq driver (cpufreq-dt in this case).
> >
> > It does cpufreq_online()->cpufreq_init_policy()->__cpufreq_governor()->cpufreq_governor_dbs()->dbs_check_cpu().
> >
> > The only way that can happen is when cpufreq_set_policy() finds that
> > the "old" and the "new" policies use the same governor, so it goes and
> > calls __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS), but I'm not sure
> > how this is possible during the initialization ATM.
> >
> > Viresh, any ideas?
>
> You misread probably.
>
> During init, policy->gov is NULL and new_policy->gov is set to the
> default one, probably ondemand/conservative. And in that case, we do:
> - INIT
> - START
> - LIMITS
Yes, that's what we should be doing, but it seemed to me that we didn't.
Or maybe the trace just contained the last one, because that's when the
crash happened.
Thanks,
Rafael
^ permalink raw reply
* Re: Crashes in arm qemu emulations due to 'cpufreq: governor: Replace timers with utilization ...'
From: Viresh Kumar @ 2016-02-16 1:13 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Guenter Roeck, Rafael J. Wysocki, linux-next,
Linux Kernel Mailing List, linux-arm-kernel@lists.infradead.org,
linux-pm@vger.kernel.org, Peter Zijlstra
In-Reply-To: <CAJZ5v0gLankSuziQq25qTCyNqeOX43yD9jnJu_XXwbdyajfmKg@mail.gmail.com>
On 15-02-16, 19:41, Rafael J. Wysocki wrote:
> On Mon, Feb 15, 2016 at 6:05 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> > [ 1.340000] [<c0958e78>] (__cpufreq_driver_target) from [<c095ca58>] (dbs_check_cpu+0x1ac/0x1e8)
> > [ 1.340000] [<c095ca58>] (dbs_check_cpu) from [<c095cd04>] (cpufreq_governor_dbs+0x1fc/0x608)
> > [ 1.340000] [<c095cd04>] (cpufreq_governor_dbs) from [<c0959c5c>] (__cpufreq_governor+0x1a8/0x204)
> > [ 1.340000] [<c0959c5c>] (__cpufreq_governor) from [<c095a2dc>] (cpufreq_init_policy+0x60/0x8c)
> > [ 1.340000] [<c095a2dc>] (cpufreq_init_policy) from [<c095a5f0>] (cpufreq_online+0x2e8/0x708)
> > [ 1.340000] [<c095a5f0>] (cpufreq_online) from [<c075674c>] (subsys_interface_register+0x80/0xc4)
> > [ 1.340000] [<c075674c>] (subsys_interface_register) from [<c0959764>] (cpufreq_register_driver+0x144/0x1a0)
>
> This is the registration of the cpufreq driver (cpufreq-dt in this case).
>
> It does cpufreq_online()->cpufreq_init_policy()->__cpufreq_governor()->cpufreq_governor_dbs()->dbs_check_cpu().
>
> The only way that can happen is when cpufreq_set_policy() finds that
> the "old" and the "new" policies use the same governor, so it goes and
> calls __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS), but I'm not sure
> how this is possible during the initialization ATM.
>
> Viresh, any ideas?
You misread probably.
During init, policy->gov is NULL and new_policy->gov is set to the
default one, probably ondemand/conservative. And in that case, we do:
- INIT
- START
- LIMITS
So above sequence is guaranteed to happen rather.
--
viresh
^ permalink raw reply
* Re: Crashes in arm qemu emulations due to 'cpufreq: governor: Replace timers with utilization ...'
From: Guenter Roeck @ 2016-02-15 23:19 UTC (permalink / raw)
To: Peter Maydell
Cc: Rafael J. Wysocki, linux-next, lkml - Kernel Mailing List,
arm-mail-list, linux-pm
In-Reply-To: <CAFEAcA9Xy2L+edFAdUCpZFiO5NLGyrQPTQ6DgmuScbwEty-nzg@mail.gmail.com>
On 02/15/2016 02:29 PM, Peter Maydell wrote:
> On 15 February 2016 at 17:05, Guenter Roeck <linux@roeck-us.net> wrote:
>> I see crashes in various arm qemu tests due to 'cpufreq: governor: Replace
>> timers with utilization update callbacks' with next-20160215. An example
>> crash log and bisect results are attached below.
>>
>> Please let me know if there is anything I can do to help tracking down
>> the problem.
>>
>> Thanks,
>> Guenter
>>
>> ---
>>
>> Building arm:beagle:multi_v7_defconfig:omap3-beagle ... running ..... failed (crashed)
>> ------------
>> qemu log:
>
> You're using the QEMU beagle board emulation? Can I ask which
> QEMU you're using (qemu-linaro?). If the OMAP3 emulation is still
> actively useful to people I might have another stab at getting
> it into upstream QEMU some day...
>
Yes, I use qemu-linaro for those tests.
Is it useful ? Obviously for me, yes. It lets me test images in qemu,
and I don't need real hardware to run those tests. That means that
I don't depend on the hardware really working, and I am not hosed
if the hardware breaks down and I don't have a replacement. Plus,
of course, I don't need a lab with 90+ pieces of hardware.
Guenter
^ permalink raw reply
* Re: Crashes in arm qemu emulations due to 'cpufreq: governor: Replace timers with utilization ...'
From: Peter Maydell @ 2016-02-15 22:29 UTC (permalink / raw)
To: Guenter Roeck
Cc: Rafael J. Wysocki, linux-next, lkml - Kernel Mailing List,
arm-mail-list, linux-pm
In-Reply-To: <20160215170527.GA24453@roeck-us.net>
On 15 February 2016 at 17:05, Guenter Roeck <linux@roeck-us.net> wrote:
> I see crashes in various arm qemu tests due to 'cpufreq: governor: Replace
> timers with utilization update callbacks' with next-20160215. An example
> crash log and bisect results are attached below.
>
> Please let me know if there is anything I can do to help tracking down
> the problem.
>
> Thanks,
> Guenter
>
> ---
>
> Building arm:beagle:multi_v7_defconfig:omap3-beagle ... running ..... failed (crashed)
> ------------
> qemu log:
You're using the QEMU beagle board emulation? Can I ask which
QEMU you're using (qemu-linaro?). If the OMAP3 emulation is still
actively useful to people I might have another stab at getting
it into upstream QEMU some day...
thanks
-- PMM
^ permalink raw reply
* Re: Crashes in arm qemu emulations due to 'cpufreq: governor: Replace timers with utilization ...'
From: Tony Lindgren @ 2016-02-15 21:36 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Guenter Roeck, Viresh Kumar, linux-pm@vger.kernel.org,
Peter Zijlstra, Rafael J. Wysocki, Linux Kernel Mailing List,
linux-next, linux-arm-kernel@lists.infradead.org
In-Reply-To: <CAJZ5v0hzVB0+H4nuCun3mmrES3UQ3+Rs1uz5YGu5sv4G3XU+nQ@mail.gmail.com>
* Rafael J. Wysocki <rafael@kernel.org> [160215 12:39]:
> On Mon, Feb 15, 2016 at 8:58 PM, Tony Lindgren <tony@atomide.com> wrote:
> > * Guenter Roeck <linux@roeck-us.net> [160215 11:41]:
> >> On 02/15/2016 11:01 AM, Tony Lindgren wrote:
> >> >
> >> >https://kernelci.org/boot/all/job/next/kernel/next-20160215/
> >> >
> >> >The SMP ones seem to fail with some regulator issues?
> >> >
> >>
> >> There is another problem, introduced with 6a0712f6f199e ("PM / OPP: Add
> >> dev_pm_opp_set_rate()"). The kernelci boot log for next-20160212:omap3-overo-tobi
> >> and others experience that problem.
> >>
> >> Essentially, the code now assumes that a CPU clock always has a voltage
> >> regulator attached to it, which is not correct. I sent out a patch to fix
> >> that problem a minute ago.
> >
> > Yes that fixed it thanks.
>
> Can you please also check if this alternative fix from Viresh works:
>
> https://patchwork.kernel.org/patch/8316611/
Yes that one too seems to fix the issue on SMP systems for
me:
Tested-by: Tony Lindgren <tony@atomide.com>
Regards,
Tony
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox