diff for duplicates of <1400539919.3986.80.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index 531779f..3929002 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -246,7 +246,7 @@ Ben. > > + } > > + > > + /* 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); @@ -288,8 +288,8 @@ Ben. > > + * 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; > > + } @@ -368,7 +368,7 @@ Ben. > > + * 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; @@ -491,7 +491,7 @@ Ben. > > + * 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); @@ -508,7 +508,7 @@ Ben. > > + * 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 3eff997..0e666a3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\01400538790.3289.305.camel@ul30vt.home\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 3/8] drivers/vfio: New IOCTL command VFIO_EEH_INFO\0" - "Date\0Mon, 19 May 2014 22:51:59 +0000\0" + "Date\0Tue, 20 May 2014 08:51:59 +1000\0" "To\0Alex Williamson <alex.williamson@redhat.com>\0" "Cc\0aik@ozlabs.ru" Gavin Shan <gwshan@linux.vnet.ibm.com> @@ -261,7 +261,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" @@ -303,8 +303,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" @@ -383,7 +383,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" @@ -506,7 +506,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" @@ -523,7 +523,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" @@ -803,4 +803,4 @@ "> \n" > -10600bfdecad98cb527671541878cf5aaa1811b8a482ad0200b8a234559152f1 +e4265f51f6c2c160ba2be684fc2d7731073b29d124238d52a99acf5710b2dd77
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.