[+cc Kumar, Gavin, Ben, Paul] On Mon, Nov 04, 2013 at 09:36:35AM +0800, Yijing Wang wrote: > > Yijing Wang (17): > > PCI: Use pci_is_pcie() to simplify code > > x86/pci: Use cached pci_dev->pcie_cap to simplify code > > [SCSI] bfa: Use pcie_set()/get_readrq() to simplify code > > [SCSI] csiostor: Use pcie_capability_clear_and_set_word() to simplify code > > [SCSI] qla2xxx: Use pcie_is_pcie() to simplify code > > powerpc/pci: Use pci_is_pcie() to simplify code > > Hi Bjorn, > Can you help update the patch "powerpc/pci: Use pci_is_pcie() to simplify code" by using the latest version v3 ? > Because Benjamin Herrenschmidt found that "cap" in this patch is stale variable after applied this patch. > Here is the link, https://patchwork.kernel.org/patch/3021121/ I merged the following additional patch, which should get make this up-to-date. Sorry I missed this. powerpc/pci: Use pci_is_pcie() to simplify code [fix] From: Yijing Wang <wangyijing@xxxxxxxxxx> Fix f0308261b1 ("powerpc/pci: Use pci_is_pcie() to simplify code"). I accidentally merged v2 instead of v3, so this adds the difference. Without this, "cap" is the left-over PCI-X capability offset, and we're using it as the PCIe capability offset. [bhelgaas: extracted v2->v3 diff] Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> --- arch/powerpc/kernel/eeh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 6ebbe54..db86f97 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -195,7 +195,7 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len) "EEH: PCI-E capabilities and status follow:\n"); for (i=0; i<=8; i++) { - eeh_ops->read_config(dn, cap+4*i, 4, &cfg); + eeh_ops->read_config(dn, dev->pcie_cap+4*i, 4, &cfg); n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg); printk(KERN_WARNING "EEH: PCI-E %02x: %08x\n", i, cfg); } -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
