diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-09 16:15:41 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-09 16:15:41 +0100 |
| commit | 834e8bd9d05943ab6fc77350543efff66e5e34d9 (patch) | |
| tree | da2b8368e7767bfea515114c7c52ab1367d5743b | |
| parent | aa69257b98b28defb5fb924774b5710efc449047 (diff) | |
| parent | 6ad55050a16907515e0220cd00cdac239df7f652 (diff) | |
| download | kernel-4.10.0-0.rc3.git0.1.vanilla.knurd.1.fc24.tar.gz kernel-4.10.0-0.rc3.git0.1.vanilla.knurd.1.fc24.tar.xz kernel-4.10.0-0.rc3.git0.1.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc3.git0.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc3.git0.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc3.git0.1.vanilla.knurd.1.fc24
35 files changed, 158 insertions, 77 deletions
diff --git a/baseconfig/CONFIG_ARM_PSCI_CHECKER b/baseconfig/CONFIG_ARM_PSCI_CHECKER deleted file mode 100644 index dce78572b..000000000 --- a/baseconfig/CONFIG_ARM_PSCI_CHECKER +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ARM_PSCI_CHECKER=y diff --git a/baseconfig/CONFIG_MLXSW_CORE_I2C b/baseconfig/CONFIG_MLXSW_I2C index 57927c23e..57927c23e 100644 --- a/baseconfig/CONFIG_MLXSW_CORE_I2C +++ b/baseconfig/CONFIG_MLXSW_I2C diff --git a/baseconfig/CONFIG_QCOM_CLK_RPM b/baseconfig/CONFIG_QCOM_CLK_RPM deleted file mode 100644 index 49d6fe218..000000000 --- a/baseconfig/CONFIG_QCOM_CLK_RPM +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_QCOM_CLK_RPM is not set diff --git a/baseconfig/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/CONFIG_QCOM_CLK_SMD_RPM deleted file mode 100644 index f84e24848..000000000 --- a/baseconfig/CONFIG_QCOM_CLK_SMD_RPM +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_QCOM_CLK_SMD_RPM is not set diff --git a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER index dce78572b..8d66ce36a 100644 --- a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER +++ b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER @@ -1 +1 @@ -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM new file mode 100644 index 000000000..5650c8603 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM @@ -0,0 +1 @@ +CONFIG_QCOM_CLK_RPM=m diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM new file mode 100644 index 000000000..d355533c9 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM @@ -0,0 +1 @@ +CONFIG_QCOM_CLK_SMD_RPM=m diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS b/baseconfig/arm/arm64/CONFIG_QCOM_TSENS index a781c024e..0d43fc907 100644 --- a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS +++ b/baseconfig/arm/arm64/CONFIG_QCOM_TSENS @@ -1 +1 @@ -# CONFIG_QCOM_TSENS is not set +CONFIG_QCOM_TSENS=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM new file mode 100644 index 000000000..5650c8603 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM @@ -0,0 +1 @@ +CONFIG_QCOM_CLK_RPM=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM new file mode 100644 index 000000000..d355533c9 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM @@ -0,0 +1 @@ +CONFIG_QCOM_CLK_SMD_RPM=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS index a781c024e..0d43fc907 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS +++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS @@ -1 +1 @@ -# CONFIG_QCOM_TSENS is not set +CONFIG_QCOM_TSENS=m diff --git a/bcm283x-mmc-imp-speed.patch b/bcm283x-mmc-imp-speed.patch new file mode 100644 index 000000000..bad003a3c --- /dev/null +++ b/bcm283x-mmc-imp-speed.patch @@ -0,0 +1,107 @@ +From patchwork Fri Dec 30 15:24:32 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [1/2] mmc: sdhci-iproc: Apply caps from bcm2835-mmc driver +From: Stefan Wahren <stefan.wahren@i2se.com> +X-Patchwork-Id: 9492281 +Message-Id: <1483111474-29907-2-git-send-email-stefan.wahren@i2se.com> +To: Eric Anholt <eric@anholt.net>, Gerd Hoffmann <kraxel@redhat.com>, + Adrian Hunter <adrian.hunter@intel.com>, + Ulf Hansson <ulf.hansson@linaro.org> +Cc: Stefan Wahren <stefan.wahren@i2se.com>, + Scott Branden <sbranden@broadcom.com>, Jon Mason <jonmason@broadcom.com>, + Ray Jui <rjui@broadcom.com>, linux-mmc@vger.kernel.org, + bcm-kernel-feedback-list@broadcom.com, + linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org +Date: Fri, 30 Dec 2016 15:24:32 +0000 + +Since the mmc module on bcm2835 neither provide a capabilities register nor +free documentation we must rely on the downstream implementation [1]. + +So enable the following capabilities for bcm2835: + +MMC_CAP_MMC_HIGHSPEED +MMC_CAP_SD_HIGHSPEED +MMC_CAP_DRIVER_TYPE_A +MMC_CAP_DRIVER_TYPE_C + +[1] - https://github.com/raspberrypi/linux/blob/rpi-4.4.y/drivers/mmc/host/bcm2835-mmc.c + +Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> +Reviewed-by: Eric Anholt <eric@anholt.net> +Acked-by: Adrian Hunter <adrian.hunter@intel.com> +--- + drivers/mmc/host/sdhci-iproc.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c +index d7046d6..30b3fdf 100644 +--- a/drivers/mmc/host/sdhci-iproc.c ++++ b/drivers/mmc/host/sdhci-iproc.c +@@ -211,14 +211,17 @@ static void sdhci_iproc_writeb(struct sdhci_host *host, u8 val, int reg) + static const struct sdhci_pltfm_data sdhci_bcm2835_pltfm_data = { + .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | + SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | +- SDHCI_QUIRK_MISSING_CAPS, ++ SDHCI_QUIRK_MISSING_CAPS | ++ SDHCI_QUIRK_NO_HISPD_BIT, + .ops = &sdhci_iproc_32only_ops, + }; + + static const struct sdhci_iproc_data bcm2835_data = { + .pdata = &sdhci_bcm2835_pltfm_data, +- .caps = SDHCI_CAN_VDD_330, +- .caps1 = 0x00000000, ++ .caps = SDHCI_CAN_VDD_330 | ++ SDHCI_CAN_DO_HISPD, ++ .caps1 = SDHCI_DRIVER_TYPE_A | ++ SDHCI_DRIVER_TYPE_C, + .mmc_caps = 0x00000000, + }; + +From patchwork Fri Dec 30 15:24:33 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [2/2] mmc: sdhci-iproc: Increase max_blk_size for bcm2835 +From: Stefan Wahren <stefan.wahren@i2se.com> +X-Patchwork-Id: 9492273 +Message-Id: <1483111474-29907-3-git-send-email-stefan.wahren@i2se.com> +To: Eric Anholt <eric@anholt.net>, Gerd Hoffmann <kraxel@redhat.com>, + Adrian Hunter <adrian.hunter@intel.com>, + Ulf Hansson <ulf.hansson@linaro.org> +Cc: Stefan Wahren <stefan.wahren@i2se.com>, + Scott Branden <sbranden@broadcom.com>, Jon Mason <jonmason@broadcom.com>, + Ray Jui <rjui@broadcom.com>, linux-mmc@vger.kernel.org, + bcm-kernel-feedback-list@broadcom.com, + linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org +Date: Fri, 30 Dec 2016 15:24:33 +0000 + +According to the BCM2835 datasheet the maximum block size for the +eMMC module is restricted to the internal data FIFO which is 1024 byte. +But this is still an improvement to the default of 512 byte. + +Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> +Reviewed-by: Eric Anholt <eric@anholt.net> +Acked-by: Scott Branden <scott.branden@broadcom.com> +Acked-by: Adrian Hunter <adrian.hunter@intel.com> +--- + drivers/mmc/host/sdhci-iproc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c +index 30b3fdf..3275d49 100644 +--- a/drivers/mmc/host/sdhci-iproc.c ++++ b/drivers/mmc/host/sdhci-iproc.c +@@ -218,7 +218,9 @@ static void sdhci_iproc_writeb(struct sdhci_host *host, u8 val, int reg) + + static const struct sdhci_iproc_data bcm2835_data = { + .pdata = &sdhci_bcm2835_pltfm_data, +- .caps = SDHCI_CAN_VDD_330 | ++ .caps = ((0x1 << SDHCI_MAX_BLOCK_SHIFT) ++ & SDHCI_MAX_BLOCK_MASK) | ++ SDHCI_CAN_VDD_330 | + SDHCI_CAN_DO_HISPD, + .caps1 = SDHCI_DRIVER_TYPE_A | + SDHCI_DRIVER_TYPE_C, @@ -1 +1 @@ -c433eb70f37de2514f3ae3d43dd7e4a75493fe48 +a121103c922847ba5010819a3f250f1f7fc84ab8 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index ae593743c..aa63b78aa 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -293,7 +293,7 @@ CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_MHU=m CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set CONFIG_ARM_PSCI=y # CONFIG_ARM_PTDUMP is not set CONFIG_ARM_RK3399_DMC_DEVFREQ=m @@ -4029,8 +4029,8 @@ CONFIG_PWM=y # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=y -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set +CONFIG_QCOM_CLK_RPM=m +CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m @@ -4047,7 +4047,7 @@ CONFIG_QCOM_SMSM=m CONFIG_QCOM_SPMI_IADC=m CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_QCOM_SPMI_VADC=m -# CONFIG_QCOM_TSENS is not set +CONFIG_QCOM_TSENS=m CONFIG_QCOM_WCNSS_CTRL=m # CONFIG_QCOM_WCNSS_PIL is not set CONFIG_QCOM_WDT=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c17686377..76ddc11a9 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -293,7 +293,7 @@ CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_MHU=m CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set CONFIG_ARM_PSCI=y # CONFIG_ARM_PTDUMP is not set CONFIG_ARM_RK3399_DMC_DEVFREQ=m @@ -4007,8 +4007,8 @@ CONFIG_PWM=y # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=y -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set +CONFIG_QCOM_CLK_RPM=m +CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m @@ -4025,7 +4025,7 @@ CONFIG_QCOM_SMSM=m CONFIG_QCOM_SPMI_IADC=m CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_QCOM_SPMI_VADC=m -# CONFIG_QCOM_TSENS is not set +CONFIG_QCOM_TSENS=m CONFIG_QCOM_WCNSS_CTRL=m # CONFIG_QCOM_WCNSS_PIL is not set CONFIG_QCOM_WDT=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 9429caef9..ecf4c160b 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -321,7 +321,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set CONFIG_ARM_PSCI=y # CONFIG_ARM_PTDUMP is not set CONFIG_ARM_RK3399_DMC_DEVFREQ=m @@ -4371,8 +4371,8 @@ CONFIG_PXA_DMA=y # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set +CONFIG_QCOM_CLK_RPM=m +CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set @@ -4390,7 +4390,7 @@ CONFIG_QCOM_SMSM=m CONFIG_QCOM_SPMI_IADC=m # CONFIG_QCOM_SPMI_TEMP_ALARM is not set CONFIG_QCOM_SPMI_VADC=m -# CONFIG_QCOM_TSENS is not set +CONFIG_QCOM_TSENS=m CONFIG_QCOM_WCNSS_CTRL=m # CONFIG_QCOM_WCNSS_PIL is not set CONFIG_QCOM_WDT=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 575fbedd6..46bc4cf24 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -311,7 +311,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set CONFIG_ARM_PSCI=y # CONFIG_ARM_PTDUMP is not set CONFIG_ARM_RK3399_DMC_DEVFREQ=m @@ -4146,8 +4146,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 25d775193..7abbd9af2 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -311,7 +311,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set CONFIG_ARM_PSCI=y # CONFIG_ARM_PTDUMP is not set CONFIG_ARM_RK3399_DMC_DEVFREQ=m @@ -4125,8 +4125,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 70f4762ad..bf2b2ad70 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -321,7 +321,7 @@ CONFIG_ARM_MVEBU_V7_CPUIDLE=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set CONFIG_ARM_PSCI=y # CONFIG_ARM_PTDUMP is not set CONFIG_ARM_RK3399_DMC_DEVFREQ=m @@ -4350,8 +4350,8 @@ CONFIG_PXA_DMA=y # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set +CONFIG_QCOM_CLK_RPM=m +CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set @@ -4369,7 +4369,7 @@ CONFIG_QCOM_SMSM=m CONFIG_QCOM_SPMI_IADC=m # CONFIG_QCOM_SPMI_TEMP_ALARM is not set CONFIG_QCOM_SPMI_VADC=m -# CONFIG_QCOM_TSENS is not set +CONFIG_QCOM_TSENS=m CONFIG_QCOM_WCNSS_CTRL=m # CONFIG_QCOM_WCNSS_PIL is not set CONFIG_QCOM_WDT=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 616404f8c..5a3efa25e 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -226,7 +226,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -3880,8 +3879,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index a506651fa..2a315af9b 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -226,7 +226,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -3900,8 +3899,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 38d4bebe0..93c8deaf3 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -226,7 +226,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -3900,8 +3899,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-i686.config b/kernel-i686.config index 8b979a8d9..209050f06 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -226,7 +226,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -3880,8 +3879,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index a2a926b1c..925841147 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -188,7 +188,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3766,8 +3765,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index e5b0c01dd..4fdd77aad 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -188,7 +188,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3744,8 +3743,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 32986ada2..9d8019bce 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -182,7 +182,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3706,8 +3705,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 89062a1cd..a260cf6ee 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -182,7 +182,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3684,8 +3683,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 63ce50889..7c4290b2c 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -182,7 +182,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3705,8 +3704,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 3b6cccc3b..94b75be1e 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -182,7 +182,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3683,8 +3682,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index cf8f414d5..9cae5b0bf 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -184,7 +184,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3592,8 +3591,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index a1b69e8a2..ec0f67b53 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -184,7 +184,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -3570,8 +3569,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 108e3bc0a..9ca124896 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -225,7 +225,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -3921,8 +3920,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index b00e23319..6f8c127b4 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -225,7 +225,6 @@ CONFIG_AR5523=m # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM_PSCI_CHECKER=y # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_AS3935 is not set CONFIG_ASUS_LAPTOP=m @@ -3901,8 +3900,6 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m -# CONFIG_QCOM_CLK_RPM is not set -# CONFIG_QCOM_CLK_SMD_RPM is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel.spec b/kernel.spec index d13d1e525..14b251edc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 2 +%global rcrev 3 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -534,6 +534,9 @@ Patch430: ARM-tegra-usb-no-reset.patch Patch431: bcm2837-initial-support.patch +# http://www.spinics.net/lists/linux-mmc/msg41151.html +Patch432: bcm283x-mmc-imp-speed.patch + Patch433: AllWinner-net-emac.patch Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch @@ -1666,7 +1669,7 @@ BuildKernel %make_target %kernel_image %endif %global perf_make \ - make -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} + make -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 NO_JVMTI=1 prefix=%{_prefix} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2172,6 +2175,22 @@ fi # # %changelog +* Mon Jan 09 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc3.git0.1 +- Disable debugging options. +- Linux v4.10-rc3 + +* Mon Jan 9 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Add patch to improve MMC/SD speed on Raspberry Pi (bcm283x) + +* Fri Jan 06 2017 Laura Abbott <labbott@fedoraproject.org> +- Disable JVMTI for perf (rhbz 1410296) + +* Fri Jan 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git4.1 +- Linux v4.10-rc2-207-g88ba6ca + +* Fri Jan 6 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM config updates + * Thu Jan 05 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git3.1 - Linux v4.10-rc2-183-gc433eb7 @@ -1,4 +1,4 @@ SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99 -SHA512 (patch-4.10-rc2.xz) = 45ec25c586aa89e4e8dd53cf01a88e25331e379a2532a7059eb182a634279c92e23d057c71df10ceb374fcc51c3a4eed6769261a7e2b9c5cd0112a81161ff597 -SHA512 (patch-4.10-rc2-git3.xz) = 3599932ecfdde2e4ed3122ee641634720a86eb801357923962a0110bed814e0038fba8a49bbba66ee8f0812732ebdaa19111ebcb01d08978910304627ca7ce5e +SHA512 (patch-4.10-rc2-git4.xz) = 21db860af8b18f440835d46aa33901d602b2a23ae6195225d6535f3ddb5a6386342d85068772cf006ef8f9c1af37ca77c926b468637f5e47fff724221c09a7c0 +SHA512 (patch-4.10-rc3.xz) = 3573b198b6ee488d6c573dd09c534548a08bcf8a017a94f74d127a58a018c9e97056006fccd555aa49513cc3f98ad5c1cb6545a7e261d3ccaea21456b53f2dd5 |