From 1353758acf702ad74f7e390499b4f891bb96a373 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Wed, 26 Sep 2018 12:17:37 +0200 Subject: [PATCH] Update to 4.19-rc5 This updates the changelogs and removes patches that have been applied upstream. --- debian/changelog | 2 +- ...tree-asciidoctor-man-page-generation.patch | 24 ---- ...d-timeout-support-in-the-SEV-command.patch | 115 ------------------ debian/patches/series | 2 - 4 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 debian/patches/bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch delete mode 100644 debian/patches/bugfix/x86/crypto-ccp-add-timeout-support-in-the-SEV-command.patch diff --git a/debian/changelog b/debian/changelog index 1d00aa587..3e0b03ccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (4.19~rc4-1~exp2) UNRELEASED; urgency=medium +linux (4.19~rc5-1~exp1) UNRELEASED; urgency=medium * [ppc64el] udeb: Fix relative #include filenames in kernel-image module list (really fixes FTBFS?) diff --git a/debian/patches/bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch b/debian/patches/bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch deleted file mode 100644 index d3604812a..000000000 --- a/debian/patches/bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Ben Hutchings -Date: Fri, 06 Jul 2018 23:22:10 +0100 -Subject: perf Documentation: Fix out-of-tree asciidoctor man page generation -Forwarded: https://lore.kernel.org/lkml/20180916151704.GF4765@decadent.org.uk/T/#u - -The dependency for the man page rule using asciidoctor incorrectly -specifies a source file in $(OUTPUT). When building out-of-tree, the -source file is not found, resulting in a fall-back to the following -rule which uses xmlto. - -Fixes: ffef80ecf89f ("perf Documentation: Support for asciidoctor") -Signed-off-by: Ben Hutchings ---- ---- a/tools/perf/Documentation/Makefile -+++ b/tools/perf/Documentation/Makefile -@@ -285,7 +285,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt - mv $@+ $@ - - ifdef USE_ASCIIDOCTOR --$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.txt -+$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : %.txt - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(ASCIIDOC) -b manpage -d manpage \ - $(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) -o $@+ $< && \ diff --git a/debian/patches/bugfix/x86/crypto-ccp-add-timeout-support-in-the-SEV-command.patch b/debian/patches/bugfix/x86/crypto-ccp-add-timeout-support-in-the-SEV-command.patch deleted file mode 100644 index a7441707c..000000000 --- a/debian/patches/bugfix/x86/crypto-ccp-add-timeout-support-in-the-SEV-command.patch +++ /dev/null @@ -1,115 +0,0 @@ -From: Brijesh Singh -Date: Wed, 15 Aug 2018 16:11:25 -0500 -Subject: crypto: ccp - add timeout support in the SEV command -Origin: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git/commit?id=3702a0585e64d70d5bf73bf3e943b8d6005b72c1 - -Currently, the CCP driver assumes that the SEV command issued to the PSP -will always return (i.e. it will never hang). But recently, firmware bugs -have shown that a command can hang. Since of the SEV commands are used -in probe routines, this can cause boot hangs and/or loss of virtualization -capabilities. - -To protect against firmware bugs, add a timeout in the SEV command -execution flow. If a command does not complete within the specified -timeout then return -ETIMEOUT and stop the driver from executing any -further commands since the state of the SEV firmware is unknown. - -Cc: Tom Lendacky -Cc: Gary Hook -Cc: Herbert Xu -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Brijesh Singh -Signed-off-by: Herbert Xu ---- - drivers/crypto/ccp/psp-dev.c | 46 ++++++++++++++++++++++++++++++++---- - 1 file changed, 41 insertions(+), 5 deletions(-) - ---- a/drivers/crypto/ccp/psp-dev.c -+++ b/drivers/crypto/ccp/psp-dev.c -@@ -38,6 +38,17 @@ static DEFINE_MUTEX(sev_cmd_mutex); - static struct sev_misc_dev *misc_dev; - static struct psp_device *psp_master; - -+static int psp_cmd_timeout = 100; -+module_param(psp_cmd_timeout, int, 0644); -+MODULE_PARM_DESC(psp_cmd_timeout, " default timeout value, in seconds, for PSP commands"); -+ -+static int psp_probe_timeout = 5; -+module_param(psp_probe_timeout, int, 0644); -+MODULE_PARM_DESC(psp_probe_timeout, " default timeout value, in seconds, during PSP device probe"); -+ -+static bool psp_dead; -+static int psp_timeout; -+ - static struct psp_device *psp_alloc_struct(struct sp_device *sp) - { - struct device *dev = sp->dev; -@@ -82,10 +93,19 @@ done: - return IRQ_HANDLED; - } - --static void sev_wait_cmd_ioc(struct psp_device *psp, unsigned int *reg) -+static int sev_wait_cmd_ioc(struct psp_device *psp, -+ unsigned int *reg, unsigned int timeout) - { -- wait_event(psp->sev_int_queue, psp->sev_int_rcvd); -+ int ret; -+ -+ ret = wait_event_timeout(psp->sev_int_queue, -+ psp->sev_int_rcvd, timeout * HZ); -+ if (!ret) -+ return -ETIMEDOUT; -+ - *reg = ioread32(psp->io_regs + psp->vdata->cmdresp_reg); -+ -+ return 0; - } - - static int sev_cmd_buffer_len(int cmd) -@@ -133,12 +153,15 @@ static int __sev_do_cmd_locked(int cmd, - if (!psp) - return -ENODEV; - -+ if (psp_dead) -+ return -EBUSY; -+ - /* Get the physical address of the command buffer */ - phys_lsb = data ? lower_32_bits(__psp_pa(data)) : 0; - phys_msb = data ? upper_32_bits(__psp_pa(data)) : 0; - -- dev_dbg(psp->dev, "sev command id %#x buffer 0x%08x%08x\n", -- cmd, phys_msb, phys_lsb); -+ dev_dbg(psp->dev, "sev command id %#x buffer 0x%08x%08x timeout %us\n", -+ cmd, phys_msb, phys_lsb, psp_timeout); - - print_hex_dump_debug("(in): ", DUMP_PREFIX_OFFSET, 16, 2, data, - sev_cmd_buffer_len(cmd), false); -@@ -154,7 +177,18 @@ static int __sev_do_cmd_locked(int cmd, - iowrite32(reg, psp->io_regs + psp->vdata->cmdresp_reg); - - /* wait for command completion */ -- sev_wait_cmd_ioc(psp, ®); -+ ret = sev_wait_cmd_ioc(psp, ®, psp_timeout); -+ if (ret) { -+ if (psp_ret) -+ *psp_ret = 0; -+ -+ dev_err(psp->dev, "sev command %#x timed out, disabling PSP \n", cmd); -+ psp_dead = true; -+ -+ return ret; -+ } -+ -+ psp_timeout = psp_cmd_timeout; - - if (psp_ret) - *psp_ret = reg & PSP_CMDRESP_ERR_MASK; -@@ -888,6 +922,8 @@ void psp_pci_init(void) - - psp_master = sp->psp_data; - -+ psp_timeout = psp_probe_timeout; -+ - if (sev_get_api_version()) - goto err; - diff --git a/debian/patches/series b/debian/patches/series index 7928f796c..5cbc7766e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -71,7 +71,6 @@ bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch bugfix/x86/mmap-remember-the-map_fixed-flag-as-vm_fixed.patch bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch -bugfix/x86/crypto-ccp-add-timeout-support-in-the-SEV-command.patch bugfix/powerpc/powerpc-lib-sstep-fix-building-for-powerpcspe.patch bugfix/powerpc/powerpc-lib-makefile-don-t-pull-in-quad.o-for-32-bit.patch bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch @@ -141,7 +140,6 @@ bugfix/all/tools-perf-man-date.patch bugfix/all/tools-perf-remove-shebangs.patch bugfix/all/tools-lib-traceevent-use-ldflags.patch bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch -bugfix/all/perf-documentation-fix-out-of-tree-asciidoctor-man-page-generation.patch bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch bugfix/all/cpupower-bump-soname-version.patch bugfix/all/cpupower-fix-checks-for-cpu-existence.patch