diff for duplicates of <20140520002208.GA11073@shangw> diff --git a/a/1.txt b/N1/1.txt index 4686443..9beff1f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -258,7 +258,7 @@ The IOCTL command handler return 3 values: >> + } >> + >> + /* 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); @@ -300,8 +300,8 @@ The IOCTL command handler return 3 values: >> + * 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; >> + } @@ -380,7 +380,7 @@ The IOCTL command handler return 3 values: >> + * 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; @@ -506,7 +506,7 @@ Yep. I'll change all pr_warn() to pr_debug() in next revision. >> + * 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); @@ -523,7 +523,7 @@ Yep. I'll change all pr_warn() to pr_debug() in next revision. >> + * 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 102954c..376db17 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\01400538790.3289.305.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 00:22:08 +0000\0" + "Date\0Tue, 20 May 2014 10:22:08 +1000\0" "To\0Alex Williamson <alex.williamson@redhat.com>\0" "Cc\0aik@ozlabs.ru" Gavin Shan <gwshan@linux.vnet.ibm.com> @@ -273,7 +273,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" @@ -315,8 +315,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" @@ -395,7 +395,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" @@ -521,7 +521,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" @@ -538,7 +538,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" @@ -834,4 +834,4 @@ "Thanks,\n" Gavin -359872d3576737154c52804e2ee044c1d6817e67cc5269b89d094a47db6cf8ea +e78f2788babb7f1355e3dd3998fe65dbb4d65a8a5e568959c6bf88f8282dc152
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.