* [PATCH v3 10/16] s390: add pci_iomap_range [not found] <1421256142-11512-1-git-send-email-mst@redhat.com> @ 2015-01-14 17:27 ` Michael S. Tsirkin 2015-01-16 10:11 ` Sebastian Ott 0 siblings, 1 reply; 3+ messages in thread From: Michael S. Tsirkin @ 2015-01-14 17:27 UTC (permalink / raw) To: linux-kernel, virtualization Cc: Rusty Russell, cornelia.huck, Bjorn Helgaas, linux-pci, Martin Schwidefsky, Heiko Carstens, linux390, Sebastian Ott, Gerald Schaefer, linux-s390 Virtio drivers should map the part of the range they need, not necessarily all of it. To this end, support mapping ranges within BAR on s390. Since multiple ranges can now be mapped within a BAR, we keep track of the number of mappings created, and only clear out the mapping for a BAR when this number reaches 0. Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: linux-pci@vger.kernel.org Tested-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- Heiko, Martin, can you please ack merging this through the virtio tree? This was lightly tested by Sebastian Ott. arch/s390/include/asm/pci_io.h | 1 + arch/s390/pci/pci.c | 34 +++++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h index f664e96..1a9a98d 100644 --- a/arch/s390/include/asm/pci_io.h +++ b/arch/s390/include/asm/pci_io.h @@ -16,6 +16,7 @@ struct zpci_iomap_entry { u32 fh; u8 bar; + u16 count; }; extern struct zpci_iomap_entry *zpci_iomap_start; diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 3290f11..753a567 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -259,7 +259,10 @@ void __iowrite64_copy(void __iomem *to, const void *from, size_t count) } /* Create a virtual mapping cookie for a PCI BAR */ -void __iomem *pci_iomap(struct pci_dev *pdev, int bar, unsigned long max) +void __iomem *pci_iomap_range(struct pci_dev *pdev, + int bar, + unsigned long offset, + unsigned long max) { struct zpci_dev *zdev = get_zdev(pdev); u64 addr; @@ -270,14 +273,27 @@ void __iomem *pci_iomap(struct pci_dev *pdev, int bar, unsigned long max) idx = zdev->bars[bar].map_idx; spin_lock(&zpci_iomap_lock); - zpci_iomap_start[idx].fh = zdev->fh; - zpci_iomap_start[idx].bar = bar; + if (zpci_iomap_start[idx].count++) { + BUG_ON(zpci_iomap_start[idx].fh != zdev->fh || + zpci_iomap_start[idx].bar != bar); + } else { + zpci_iomap_start[idx].fh = zdev->fh; + zpci_iomap_start[idx].bar = bar; + } + /* Detect overrun */ + BUG_ON(!zpci_iomap_start[idx].count); spin_unlock(&zpci_iomap_lock); addr = ZPCI_IOMAP_ADDR_BASE | ((u64) idx << 48); - return (void __iomem *) addr; + return (void __iomem *) addr + offset; } -EXPORT_SYMBOL_GPL(pci_iomap); +EXPORT_SYMBOL_GPL(pci_iomap_range); + +void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) +{ + return pci_iomap_range(dev, bar, 0, maxlen); +} +EXPORT_SYMBOL(pci_iomap); void pci_iounmap(struct pci_dev *pdev, void __iomem *addr) { @@ -285,8 +301,12 @@ void pci_iounmap(struct pci_dev *pdev, void __iomem *addr) idx = (((__force u64) addr) & ~ZPCI_IOMAP_ADDR_BASE) >> 48; spin_lock(&zpci_iomap_lock); - zpci_iomap_start[idx].fh = 0; - zpci_iomap_start[idx].bar = 0; + /* Detect underrun */ + BUG_ON(!zpci_iomap_start[idx].count); + if (!--zpci_iomap_start[idx].count) { + zpci_iomap_start[idx].fh = 0; + zpci_iomap_start[idx].bar = 0; + } spin_unlock(&zpci_iomap_lock); } EXPORT_SYMBOL_GPL(pci_iounmap); -- MST ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 10/16] s390: add pci_iomap_range 2015-01-14 17:27 ` [PATCH v3 10/16] s390: add pci_iomap_range Michael S. Tsirkin @ 2015-01-16 10:11 ` Sebastian Ott 2015-01-21 0:43 ` Rusty Russell 0 siblings, 1 reply; 3+ messages in thread From: Sebastian Ott @ 2015-01-16 10:11 UTC (permalink / raw) To: Michael S. Tsirkin Cc: linux-kernel, virtualization, Rusty Russell, Cornelia Huck, Bjorn Helgaas, linux-pci, Martin Schwidefsky, Heiko Carstens, linux390, Gerald Schaefer, linux-s390 On Wed, 14 Jan 2015, Michael S. Tsirkin wrote: > Virtio drivers should map the part of the range they need, not > necessarily all of it. > To this end, support mapping ranges within BAR on s390. > Since multiple ranges can now be mapped within a BAR, we keep track of > the number of mappings created, and only clear out the mapping for a BAR > when this number reaches 0. > > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: linux-pci@vger.kernel.org > Tested-by: Sebastian Ott <sebott@linux.vnet.ibm.com> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > > Heiko, Martin, can you please ack merging this through the virtio tree? > This was lightly tested by Sebastian Ott. > > arch/s390/include/asm/pci_io.h | 1 + > arch/s390/pci/pci.c | 34 +++++++++++++++++++++++++++------- > 2 files changed, 28 insertions(+), 7 deletions(-) > > diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h > index f664e96..1a9a98d 100644 > --- a/arch/s390/include/asm/pci_io.h > +++ b/arch/s390/include/asm/pci_io.h > @@ -16,6 +16,7 @@ > struct zpci_iomap_entry { > u32 fh; > u8 bar; > + u16 count; > }; > > extern struct zpci_iomap_entry *zpci_iomap_start; > diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c > index 3290f11..753a567 100644 > --- a/arch/s390/pci/pci.c > +++ b/arch/s390/pci/pci.c > @@ -259,7 +259,10 @@ void __iowrite64_copy(void __iomem *to, const void *from, size_t count) > } > > /* Create a virtual mapping cookie for a PCI BAR */ > -void __iomem *pci_iomap(struct pci_dev *pdev, int bar, unsigned long max) > +void __iomem *pci_iomap_range(struct pci_dev *pdev, > + int bar, > + unsigned long offset, > + unsigned long max) > { > struct zpci_dev *zdev = get_zdev(pdev); > u64 addr; > @@ -270,14 +273,27 @@ void __iomem *pci_iomap(struct pci_dev *pdev, int bar, unsigned long max) > > idx = zdev->bars[bar].map_idx; > spin_lock(&zpci_iomap_lock); > - zpci_iomap_start[idx].fh = zdev->fh; > - zpci_iomap_start[idx].bar = bar; > + if (zpci_iomap_start[idx].count++) { > + BUG_ON(zpci_iomap_start[idx].fh != zdev->fh || > + zpci_iomap_start[idx].bar != bar); > + } else { > + zpci_iomap_start[idx].fh = zdev->fh; > + zpci_iomap_start[idx].bar = bar; > + } > + /* Detect overrun */ > + BUG_ON(!zpci_iomap_start[idx].count); > spin_unlock(&zpci_iomap_lock); > > addr = ZPCI_IOMAP_ADDR_BASE | ((u64) idx << 48); > - return (void __iomem *) addr; > + return (void __iomem *) addr + offset; > } > -EXPORT_SYMBOL_GPL(pci_iomap); > +EXPORT_SYMBOL_GPL(pci_iomap_range); > + > +void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) > +{ > + return pci_iomap_range(dev, bar, 0, maxlen); > +} > +EXPORT_SYMBOL(pci_iomap); As discussed earlier, could you please leave that as EXPORT_SYMBOL_GPL. If there's a reason to have these interfaces as EXPORT_SYMBOL, we could change all of them in an extra patch. With this change integrated you can add Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Regards, Sebastian > > void pci_iounmap(struct pci_dev *pdev, void __iomem *addr) > { > @@ -285,8 +301,12 @@ void pci_iounmap(struct pci_dev *pdev, void __iomem *addr) > > idx = (((__force u64) addr) & ~ZPCI_IOMAP_ADDR_BASE) >> 48; > spin_lock(&zpci_iomap_lock); > - zpci_iomap_start[idx].fh = 0; > - zpci_iomap_start[idx].bar = 0; > + /* Detect underrun */ > + BUG_ON(!zpci_iomap_start[idx].count); > + if (!--zpci_iomap_start[idx].count) { > + zpci_iomap_start[idx].fh = 0; > + zpci_iomap_start[idx].bar = 0; > + } > spin_unlock(&zpci_iomap_lock); > } > EXPORT_SYMBOL_GPL(pci_iounmap); > -- > MST > > ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3 10/16] s390: add pci_iomap_range 2015-01-16 10:11 ` Sebastian Ott @ 2015-01-21 0:43 ` Rusty Russell 0 siblings, 0 replies; 3+ messages in thread From: Rusty Russell @ 2015-01-21 0:43 UTC (permalink / raw) To: Sebastian Ott, Michael S. Tsirkin Cc: linux-kernel, virtualization, Cornelia Huck, Bjorn Helgaas, linux-pci, Martin Schwidefsky, Heiko Carstens, linux390, Gerald Schaefer, linux-s390 Sebastian Ott <sebott@linux.vnet.ibm.com> writes: > On Wed, 14 Jan 2015, Michael S. Tsirkin wrote: >> } >> -EXPORT_SYMBOL_GPL(pci_iomap); >> +EXPORT_SYMBOL_GPL(pci_iomap_range); >> + >> +void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) >> +{ >> + return pci_iomap_range(dev, bar, 0, maxlen); >> +} >> +EXPORT_SYMBOL(pci_iomap); > > As discussed earlier, could you please leave that as EXPORT_SYMBOL_GPL. > If there's a reason to have these interfaces as EXPORT_SYMBOL, we could > change all of them in an extra patch. > > With this change integrated you can add > Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com> OK, I've gone back and rebased virtio-next to fix this (I don't really want to think too hard about the legal consequences of having a version which isn't EXPORT_SYMBOL_GPL). Thanks, Rusty. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-21 0:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1421256142-11512-1-git-send-email-mst@redhat.com>
2015-01-14 17:27 ` [PATCH v3 10/16] s390: add pci_iomap_range Michael S. Tsirkin
2015-01-16 10:11 ` Sebastian Ott
2015-01-21 0:43 ` Rusty Russell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox