diff for duplicates of <20140520082856.GA16050@shangw> diff --git a/a/1.txt b/N1/1.txt index 4fb196f..a2f67e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -273,7 +273,7 @@ Good idea and will apply it to next revision. Thanks. >> >> + } >> >> + >> >> + /* Option "enable" uses PCI config address */ ->> >> + if (opcode = EEH_OPT_ENABLE) { +>> >> + if (opcode == EEH_OPT_ENABLE) { >> >> + addr.buid = info->option.buid; >> >> + addr.config_addr = (info->option.addr >> 8) & 0xFFFF; >> >> + edev = eeh_vfio_dev_get(&addr); @@ -315,8 +315,8 @@ Good idea and will apply it to next revision. Thanks. >> >> + * However, the guest isn't expected to disable that >> >> + * at all. >> >> + */ ->> >> + if (opcode = EEH_OPT_DISABLE || ->> >> + opcode = EEH_OPT_ENABLE) { +>> >> + if (opcode == EEH_OPT_DISABLE || +>> >> + opcode == EEH_OPT_ENABLE) { >> >> + ret = 0; >> >> + goto out; >> >> + } @@ -395,7 +395,7 @@ Good idea and will apply it to next revision. Thanks. >> >> + * Fill result according to opcode. We don't differentiate >> >> + * PCI bus and device sensitive PE here. >> >> + */ ->> >> + if (opcode = 0) +>> >> + if (opcode == 0) >> >> + info->addr.ret = edev->pe->guest_addr.pe_addr; >> >> + else >> >> + info->addr.ret = 1; @@ -521,7 +521,7 @@ Good idea and will apply it to next revision. Thanks. >> >> + * to clear that to avoid recrusive error, which fails the >> >> + * recovery eventually. >> >> + */ ->> >> + if (opcode = EEH_RESET_DEACTIVATE) +>> >> + if (opcode == EEH_RESET_DEACTIVATE) >> >> + opal_pci_reset(phb->opal_id, >> >> + OPAL_PHB_ERROR, >> >> + OPAL_ASSERT_RESET); @@ -538,7 +538,7 @@ Good idea and will apply it to next revision. Thanks. >> >> + * messy IO access during reset, which might cause recrusive >> >> + * frozen PE. >> >> + */ ->> >> + if (opcode = EEH_RESET_DEACTIVATE) { +>> >> + if (opcode == EEH_RESET_DEACTIVATE) { >> >> + if (phb->eeh_ops->set_option(pe, EEH_OPT_THAW_MMIO) || >> >> + phb->eeh_ops->set_option(pe, EEH_OPT_THAW_DMA)) { >> >> + pr_warn("%s: Cannot clear frozen state\n", diff --git a/a/content_digest b/N1/content_digest index cc329f1..b72bf05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\01400546244.3289.341.camel@ul30vt.home\0" "From\0Gavin Shan <gwshan@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH 3/8] drivers/vfio: New IOCTL command VFIO_EEH_INFO\0" - "Date\0Tue, 20 May 2014 08:28:57 +0000\0" + "Date\0Tue, 20 May 2014 18:28:57 +1000\0" "To\0Alex Williamson <alex.williamson@redhat.com>\0" "Cc\0aik@ozlabs.ru" Gavin Shan <gwshan@linux.vnet.ibm.com> @@ -290,7 +290,7 @@ ">> >> +\t}\n" ">> >> +\n" ">> >> +\t/* Option \"enable\" uses PCI config address */\n" - ">> >> +\tif (opcode = EEH_OPT_ENABLE) {\n" + ">> >> +\tif (opcode == EEH_OPT_ENABLE) {\n" ">> >> +\t\taddr.buid = info->option.buid;\n" ">> >> +\t\taddr.config_addr = (info->option.addr >> 8) & 0xFFFF;\n" ">> >> +\t\tedev = eeh_vfio_dev_get(&addr);\n" @@ -332,8 +332,8 @@ ">> >> +\t * However, the guest isn't expected to disable that\n" ">> >> +\t * at all.\n" ">> >> +\t */\n" - ">> >> +\tif (opcode = EEH_OPT_DISABLE ||\n" - ">> >> +\t opcode = EEH_OPT_ENABLE) {\n" + ">> >> +\tif (opcode == EEH_OPT_DISABLE ||\n" + ">> >> +\t opcode == EEH_OPT_ENABLE) {\n" ">> >> +\t\tret = 0;\n" ">> >> +\t\tgoto out;\n" ">> >> +\t}\n" @@ -412,7 +412,7 @@ ">> >> +\t * Fill result according to opcode. We don't differentiate\n" ">> >> +\t * PCI bus and device sensitive PE here.\n" ">> >> +\t */\n" - ">> >> +\tif (opcode = 0)\n" + ">> >> +\tif (opcode == 0)\n" ">> >> +\t\tinfo->addr.ret = edev->pe->guest_addr.pe_addr;\n" ">> >> +\telse\n" ">> >> +\t\tinfo->addr.ret = 1;\n" @@ -538,7 +538,7 @@ ">> >> +\t\t * to clear that to avoid recrusive error, which fails the\n" ">> >> +\t\t * recovery eventually.\n" ">> >> +\t\t */\n" - ">> >> +\t\tif (opcode = EEH_RESET_DEACTIVATE)\n" + ">> >> +\t\tif (opcode == EEH_RESET_DEACTIVATE)\n" ">> >> +\t\t\topal_pci_reset(phb->opal_id,\n" ">> >> +\t\t\t\t OPAL_PHB_ERROR,\n" ">> >> +\t\t\t\t OPAL_ASSERT_RESET);\n" @@ -555,7 +555,7 @@ ">> >> +\t\t * messy IO access during reset, which might cause recrusive\n" ">> >> +\t\t * frozen PE.\n" ">> >> +\t\t */\n" - ">> >> +\t\tif (opcode = EEH_RESET_DEACTIVATE) {\n" + ">> >> +\t\tif (opcode == EEH_RESET_DEACTIVATE) {\n" ">> >> +\t\t\tif (phb->eeh_ops->set_option(pe, EEH_OPT_THAW_MMIO) ||\n" ">> >> +\t\t\t phb->eeh_ops->set_option(pe, EEH_OPT_THAW_DMA)) {\n" ">> >> +\t\t\t\tpr_warn(\"%s: Cannot clear frozen state\\n\",\n" @@ -860,4 +860,4 @@ "Gavin\n" > -20a811dd4971eedb65cb1ef8e84823564c0aa7648feda5540d34a691037c8304 +a90494186e6c933c0d0a4de32c56918764b2b8d0e0bb03ad59ab1a2281ec9c3e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.