From patchwork Tue Nov 29 20:11:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 700712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3tSvp53YHCz9t1Q; Wed, 30 Nov 2016 07:11:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="kj1G6xNq"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cBokX-0000GT-G5; Tue, 29 Nov 2016 20:11:33 +0000 Received: from mail-io0-f182.google.com ([209.85.223.182]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1cBokS-0000AW-Ag for kernel-team@lists.ubuntu.com; Tue, 29 Nov 2016 20:11:28 +0000 Received: by mail-io0-f182.google.com with SMTP id m5so172538032ioe.3 for ; Tue, 29 Nov 2016 12:11:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=dg+eCHgUhwS1ObHF4OXuoPHUin9AWhGFjNysiooh4OM=; b=kj1G6xNqTHT6l8ETQ0/MytzbdyfFk56wUmjYFMoYGk4aSw8cvP7VpAKSY09P/bsjH9 DC4K6okJv9SroUShuINFH+a4KZR6Yr6frwYG6VsfN+71MW1/1Zd5HhA+HM23rL/Wu2sp xlx3jE89Y8K9nEwouGrkCprpOig+rftjcBIYBIotKD9obYjYQWxd9ZeyHbHghhswxHLL I+jLaojxtR30edvd66g89z49eQ1VJE8Ke+nzQmZMI0HIuDgqzv/24Sxd7gUSzuqJradk vAqZdC0keh9jlJsRCmlZfObJePHBX6v+8QFgnlHLa+DhhZzvL4z3BlFY7jBPf+xdRw5q hJBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=dg+eCHgUhwS1ObHF4OXuoPHUin9AWhGFjNysiooh4OM=; b=gihW6c95X1s8Y5csljEmVRIb/isHqlIiw5dhu3JqwYqdWUpOtz0+Upjt3xjzocMMkQ XmljyTxghUuaZ5t62qIcnlgsjBSZ3t+IUGmNxUHjMxUaPi2b8TCErTyf20WQXVRLrEUD yGjfzFRwNDfMtNozC4j1vCTSOz/GFdrgu6xrlnliKgaZhVNR+/AnMi7m3cWXkbk3bB5t WVYa+4lTJWp/63Lfp2wZllwM2/Ktc+qG0DwIeCz2JrMo1mRAg8WcOTlsubdxTo3SoaVl MvwCn/gEFI0fTcZRX4k0+PURXnqIT0iDm1PoJskjwIU+yJqnoVjQQMyLGnGMvvVdyjep 388Q== X-Gm-Message-State: AKaTC01OJI1ls8sQzzjNInYzoVfT4m93ARgv9PbbZpQa6IlCTjSErZrfl2CRnB5oNweyq/2Y X-Received: by 10.36.43.147 with SMTP id h141mr25199332ita.47.1480450286967; Tue, 29 Nov 2016 12:11:26 -0800 (PST) Received: from localhost.localdomain (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id p20sm1390319itc.8.2016.11.29.12.11.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Nov 2016 12:11:26 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Xenial SRU] UBUNTU: SAUCE: powerpc/eeh: Remove EEH_PE_PRI_BUS in full hotplug recovery Date: Tue, 29 Nov 2016 13:11:22 -0700 Message-Id: <1480450282-18860-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Gavin Shan BugLink: http://bugs.launchpad.net/bugs/1645826 commit 59ae8c6d5b45 ("powerpc/eeh: Fix invalid cached PE primary bus") was wrongly backporting upstream commit a3aa256b7258: It should clear the PE's flag (EEH_PE_PRI_BUS) in full hotplug instead of partial hotplug scenario. This fixes the issue by clearing EEH_PE_PRI_BUS in full hotplug scenario only. Fixes: 59ae8c6d5b45 ("powerpc/eeh: Fix invalid cached PE primary bus") Signed-off-by: Gavin Shan Signed-off-by: Tim Gardner --- arch/powerpc/kernel/eeh_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index fdd6269..25d4a84 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -630,13 +630,13 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus) * rebuilt when adding PCI devices. */ eeh_pe_traverse(pe, eeh_pe_detach_dev, NULL); + eeh_pe_state_clear(pe, EEH_PE_PRI_BUS); pcibios_add_pci_devices(bus); } else if (frozen_bus && removed) { pr_info("EEH: Sleep 5s ahead of partial hotplug\n"); ssleep(5); eeh_pe_traverse(pe, eeh_pe_detach_dev, NULL); - eeh_pe_state_clear(pe, EEH_PE_PRI_BUS); pcibios_add_pci_devices(frozen_bus); } eeh_pe_state_clear(pe, EEH_PE_KEEP);