diff for duplicates of <20060111202123.GC4367@kroah.com> diff --git a/a/1.txt b/N1/1.txt index d0b9540..4f5ca23 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ Ah, much better, just a few more minor comments below: > Signed-off-by: Mark Maule <maule@sgi.com> > > Index: linux-maule/drivers/pci/msi.c -> =================================> --- linux-maule.orig/drivers/pci/msi.c 2006-01-10 11:48:01.000000000 -0800 +> =================================================================== +> --- linux-maule.orig/drivers/pci/msi.c 2006-01-10 11:48:01.000000000 -0800 > +++ linux-maule/drivers/pci/msi.c 2006-01-10 13:40:45.000000000 -0800 > @@ -23,8 +23,6 @@ > #include "pci.h" @@ -75,9 +76,11 @@ Ah, much better, just a few more minor comments below: > { > - int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + > - PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET; -> + int offset_hi > + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + +> + int offset_hi = +> + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + > + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET; -> + int offset_lo > + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + +> + int offset_lo = +> + entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + > + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET; > + > + address_hi = readl(entry->mask_base + offset_hi); @@ -225,7 +228,8 @@ Ah, much better, just a few more minor comments below: > /* Configure MSI-X capability structure */ > - msi_address_init(&address); > - msi_data_init(&data, vector); -> - entry->msi_attrib.current_cpu > - ((address.lo_address.u.dest_id >> +> - entry->msi_attrib.current_cpu = +> - ((address.lo_address.u.dest_id >> > - MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK); > - writel(address.lo_address.value, > + status = msi_ops->setup(dev, vector, @@ -257,7 +261,8 @@ Ah, much better, just a few more minor comments below: > entry = msi_desc[vector]; > if (!entry || entry->dev != dev) { > Index: linux-maule/include/asm-i386/msi.h -> =================================> --- linux-maule.orig/include/asm-i386/msi.h 2006-01-10 11:47:42.000000000 -0800 +> =================================================================== +> --- linux-maule.orig/include/asm-i386/msi.h 2006-01-10 11:47:42.000000000 -0800 > +++ linux-maule/include/asm-i386/msi.h 2006-01-10 11:58:55.000000000 -0800 > @@ -12,4 +12,11 @@ > #define LAST_DEVICE_VECTOR 232 diff --git a/a/content_digest b/N1/content_digest index 0178087..84c6d23 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020060111155256.12460.26048.32596@attica.americas.sgi.com\0" "From\0Greg KH <greg@kroah.com>\0" "Subject\0Re: [PATCH 1/3] msi vector targeting abstractions\0" - "Date\0Wed, 11 Jan 2006 20:21:23 +0000\0" + "Date\0Wed, 11 Jan 2006 12:21:23 -0800\0" "To\0Mark Maule <maule@sgi.com>\0" "Cc\0linuxppc64-dev@ozlabs.org" linux-pci@atrey.karlin.mff.cuni.cz @@ -25,7 +25,8 @@ "> Signed-off-by: Mark Maule <maule@sgi.com>\n" "> \n" "> Index: linux-maule/drivers/pci/msi.c\n" - "> =================================> --- linux-maule.orig/drivers/pci/msi.c\t2006-01-10 11:48:01.000000000 -0800\n" + "> ===================================================================\n" + "> --- linux-maule.orig/drivers/pci/msi.c\t2006-01-10 11:48:01.000000000 -0800\n" "> +++ linux-maule/drivers/pci/msi.c\t2006-01-10 13:40:45.000000000 -0800\n" "> @@ -23,8 +23,6 @@\n" "> #include \"pci.h\"\n" @@ -89,9 +90,11 @@ "> \t{\n" "> -\t\tint offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "> -\t\t\tPCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;\n" - "> +\t\tint offset_hi > +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" + "> +\t\tint offset_hi =\n" + "> +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "> +\t\t\t\tPCI_MSIX_ENTRY_UPPER_ADDR_OFFSET;\n" - "> +\t\tint offset_lo > +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" + "> +\t\tint offset_lo =\n" + "> +\t\t\tentry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +\n" "> +\t\t\t\tPCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;\n" "> +\n" "> +\t\taddress_hi = readl(entry->mask_base + offset_hi);\n" @@ -239,7 +242,8 @@ "> \t\t/* Configure MSI-X capability structure */\n" "> -\t\tmsi_address_init(&address);\n" "> -\t\tmsi_data_init(&data, vector);\n" - "> -\t\tentry->msi_attrib.current_cpu > -\t\t\t((address.lo_address.u.dest_id >>\n" + "> -\t\tentry->msi_attrib.current_cpu =\n" + "> -\t\t\t((address.lo_address.u.dest_id >>\n" "> -\t\t\tMSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);\n" "> -\t\twritel(address.lo_address.value,\n" "> +\t\tstatus = msi_ops->setup(dev, vector,\n" @@ -271,7 +275,8 @@ "> \tentry = msi_desc[vector];\n" "> \tif (!entry || entry->dev != dev) {\n" "> Index: linux-maule/include/asm-i386/msi.h\n" - "> =================================> --- linux-maule.orig/include/asm-i386/msi.h\t2006-01-10 11:47:42.000000000 -0800\n" + "> ===================================================================\n" + "> --- linux-maule.orig/include/asm-i386/msi.h\t2006-01-10 11:47:42.000000000 -0800\n" "> +++ linux-maule/include/asm-i386/msi.h\t2006-01-10 11:58:55.000000000 -0800\n" "> @@ -12,4 +12,11 @@\n" "> #define LAST_DEVICE_VECTOR\t\t232\n" @@ -311,4 +316,4 @@ "\n" greg k-h -3e462abca123410a9b22df4ea7d55245c6b545a496028437938d23f396773b1e +344b48e48529b435a8f49281f6eb352ca8c0d3bd1fea2619ca0555cd575ba1c3
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.