* [PATCH v3 1/3] IB/qib: add acounting for MTRR
[not found] <1429648676-17755-1-git-send-email-mcgrof@do-not-panic.com>
@ 2015-04-21 20:37 ` Luis R. Rodriguez
2015-04-21 20:37 ` [PATCH v3 2/3] IB/qib: use arch_phys_wc_add() Luis R. Rodriguez
2015-04-21 20:37 ` [PATCH v3 3/3] IB/ipath: add counting for MTRR Luis R. Rodriguez
2 siblings, 0 replies; 8+ messages in thread
From: Luis R. Rodriguez @ 2015-04-21 20:37 UTC (permalink / raw)
To: infinipath, roland, sean.hefty, hal.rosenstock, linux-rdma
Cc: luto, mst, cocci, Luis R. Rodriguez, Toshi Kani, Suresh Siddha,
Ingo Molnar, Thomas Gleixner, Juergen Gross, Daniel Vetter,
Dave Airlie, Antonino Daplas, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, linux-fbdev, linux-kernel
From: "Luis R. Rodriguez" <mcgrof@suse.com>
There is no good reason not to, we eventually delete it as well.
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Mike Marciniszyn <infinipath@intel.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: linux-rdma@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
drivers/infiniband/hw/qib/qib_wc_x86_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/qib/qib_wc_x86_64.c b/drivers/infiniband/hw/qib/qib_wc_x86_64.c
index 81b225f..fe0850a 100644
--- a/drivers/infiniband/hw/qib/qib_wc_x86_64.c
+++ b/drivers/infiniband/hw/qib/qib_wc_x86_64.c
@@ -118,7 +118,7 @@ int qib_enable_wc(struct qib_devdata *dd)
if (!ret) {
int cookie;
- cookie = mtrr_add(pioaddr, piolen, MTRR_TYPE_WRCOMB, 0);
+ cookie = mtrr_add(pioaddr, piolen, MTRR_TYPE_WRCOMB, 1);
if (cookie < 0) {
{
qib_devinfo(dd->pcidev,
--
2.3.2.209.gd67f9d5.dirty
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/3] IB/qib: use arch_phys_wc_add()
[not found] <1429648676-17755-1-git-send-email-mcgrof@do-not-panic.com>
2015-04-21 20:37 ` [PATCH v3 1/3] IB/qib: add acounting for MTRR Luis R. Rodriguez
@ 2015-04-21 20:37 ` Luis R. Rodriguez
2015-04-21 20:57 ` Jason Gunthorpe
2015-04-21 20:37 ` [PATCH v3 3/3] IB/ipath: add counting for MTRR Luis R. Rodriguez
2 siblings, 1 reply; 8+ messages in thread
From: Luis R. Rodriguez @ 2015-04-21 20:37 UTC (permalink / raw)
To: infinipath, roland, sean.hefty, hal.rosenstock, linux-rdma
Cc: luto, mst, cocci, Luis R. Rodriguez, Toshi Kani,
Rickard Strandqvist, Mike Marciniszyn, Roland Dreier,
Dennis Dalessandro, Suresh Siddha, Ingo Molnar, Thomas Gleixner,
Juergen Gross, Daniel Vetter, Dave Airlie, Bjorn Helgaas,
Antonino Daplas, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, Dave Hansen, Arnd Bergmann, Stefan Bader,
konrad.wilk, ville.syrjala, david.vrabel, jbeulich,
Roger Pau Monné,
linux-fbdev, linux-kernel, xen-devel
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This driver already makes use of ioremap_wc() on PIO buffers,
so convert it to use arch_phys_wc_add().
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
Cc: Roland Dreier <roland@purestorage.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: Dennis Dalessandro <dennis.dalessandro@intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Stefan Bader <stefan.bader@canonical.com>
Cc: konrad.wilk@oracle.com
Cc: ville.syrjala@linux.intel.com
Cc: david.vrabel@citrix.com
Cc: jbeulich@suse.com
Cc: Roger Pau Monné <roger.pau@citrix.com>
Cc: infinipath@intel.com
Cc: linux-rdma@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xensource.com
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
drivers/infiniband/hw/qib/qib_wc_x86_64.c | 31 ++++---------------------------
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/drivers/infiniband/hw/qib/qib_wc_x86_64.c b/drivers/infiniband/hw/qib/qib_wc_x86_64.c
index fe0850a..6d61ef9 100644
--- a/drivers/infiniband/hw/qib/qib_wc_x86_64.c
+++ b/drivers/infiniband/hw/qib/qib_wc_x86_64.c
@@ -116,21 +116,9 @@ int qib_enable_wc(struct qib_devdata *dd)
}
if (!ret) {
- int cookie;
-
- cookie = mtrr_add(pioaddr, piolen, MTRR_TYPE_WRCOMB, 1);
- if (cookie < 0) {
- {
- qib_devinfo(dd->pcidev,
- "mtrr_add() WC for PIO bufs failed (%d)\n",
- cookie);
- ret = -EINVAL;
- }
- } else {
- dd->wc_cookie = cookie;
- dd->wc_base = (unsigned long) pioaddr;
- dd->wc_len = (unsigned long) piolen;
- }
+ dd->wc_cookie = arch_phys_wc_add(pioaddr, piolen);
+ if (dd->wc_cookie < 0)
+ ret = -EINVAL;
}
return ret;
@@ -142,18 +130,7 @@ int qib_enable_wc(struct qib_devdata *dd)
*/
void qib_disable_wc(struct qib_devdata *dd)
{
- if (dd->wc_cookie) {
- int r;
-
- r = mtrr_del(dd->wc_cookie, dd->wc_base,
- dd->wc_len);
- if (r < 0)
- qib_devinfo(dd->pcidev,
- "mtrr_del(%lx, %lx, %lx) failed: %d\n",
- dd->wc_cookie, dd->wc_base,
- dd->wc_len, r);
- dd->wc_cookie = 0; /* even on failure */
- }
+ arch_phys_wc_del(dd->wc_cookie);
}
/**
--
2.3.2.209.gd67f9d5.dirty
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 3/3] IB/ipath: add counting for MTRR
[not found] <1429648676-17755-1-git-send-email-mcgrof@do-not-panic.com>
2015-04-21 20:37 ` [PATCH v3 1/3] IB/qib: add acounting for MTRR Luis R. Rodriguez
2015-04-21 20:37 ` [PATCH v3 2/3] IB/qib: use arch_phys_wc_add() Luis R. Rodriguez
@ 2015-04-21 20:37 ` Luis R. Rodriguez
2 siblings, 0 replies; 8+ messages in thread
From: Luis R. Rodriguez @ 2015-04-21 20:37 UTC (permalink / raw)
To: infinipath, roland, sean.hefty, hal.rosenstock, linux-rdma
Cc: luto, mst, cocci, Luis R. Rodriguez, Toshi Kani, Suresh Siddha,
Ingo Molnar, Thomas Gleixner, Juergen Gross, Daniel Vetter,
Dave Airlie, Antonino Daplas, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, linux-fbdev, linux-kernel
From: "Luis R. Rodriguez" <mcgrof@suse.com>
There is no good reason not to, we eventually delete it as well.
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: infinipath@intel.com
Cc: linux-rdma@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
drivers/infiniband/hw/ipath/ipath_wc_x86_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c b/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c
index 4ad0b93..70c1f3a 100644
--- a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c
+++ b/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c
@@ -127,7 +127,7 @@ int ipath_enable_wc(struct ipath_devdata *dd)
"(addr %llx, len=0x%llx)\n",
(unsigned long long) pioaddr,
(unsigned long long) piolen);
- cookie = mtrr_add(pioaddr, piolen, MTRR_TYPE_WRCOMB, 0);
+ cookie = mtrr_add(pioaddr, piolen, MTRR_TYPE_WRCOMB, 1);
if (cookie < 0) {
{
dev_info(&dd->pcidev->dev,
--
2.3.2.209.gd67f9d5.dirty
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/3] IB/qib: use arch_phys_wc_add()
2015-04-21 20:37 ` [PATCH v3 2/3] IB/qib: use arch_phys_wc_add() Luis R. Rodriguez
@ 2015-04-21 20:57 ` Jason Gunthorpe
2015-04-21 20:59 ` Marciniszyn, Mike
0 siblings, 1 reply; 8+ messages in thread
From: Jason Gunthorpe @ 2015-04-21 20:57 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: infinipath, roland, sean.hefty, hal.rosenstock, linux-rdma, luto,
mst, cocci, Luis R. Rodriguez, Toshi Kani, Rickard Strandqvist,
Mike Marciniszyn, Roland Dreier, Dennis Dalessandro,
Suresh Siddha, Ingo Molnar, Thomas Gleixner, Juergen Gross,
Daniel Vetter, Dave Airlie, Bjorn Helgaas, Antonino Daplas,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Dave Hansen,
Arnd Bergmann, Stefan Bader, konrad.wilk, ville.syrjala,
david.vrabel, jbeulich, Roger Pau Monné,
linux-fbdev, linux-kernel, xen-devel
On Tue, Apr 21, 2015 at 01:37:55PM -0700, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <mcgrof@suse.com>
>
> This driver already makes use of ioremap_wc() on PIO buffers,
> so convert it to use arch_phys_wc_add().
This is probably OK, but I think you should also remove the qib_wc_pat
module parameter.
Jason
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH v3 2/3] IB/qib: use arch_phys_wc_add()
2015-04-21 20:57 ` Jason Gunthorpe
@ 2015-04-21 20:59 ` Marciniszyn, Mike
2015-04-21 21:09 ` Luis R. Rodriguez
0 siblings, 1 reply; 8+ messages in thread
From: Marciniszyn, Mike @ 2015-04-21 20:59 UTC (permalink / raw)
To: Jason Gunthorpe, Luis R. Rodriguez
Cc: infinipath, roland, Hefty, Sean, hal.rosenstock, linux-rdma,
luto, mst, cocci, Luis R. Rodriguez, Toshi Kani,
Rickard Strandqvist, Roland Dreier, Dalessandro, Dennis,
Suresh Siddha, Ingo Molnar, Thomas Gleixner, Juergen Gross,
Daniel Vetter, Dave Airlie, Bjorn Helgaas, Antonino Daplas,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Dave Hansen,
Arnd Bergmann, Stefan Bader, konrad.wilk, ville.syrjala,
david.vrabel, jbeulich, Roger Pau Monné,
linux-fbdev, linux-kernel, xen-devel
> > This driver already makes use of ioremap_wc() on PIO buffers, so
> > convert it to use arch_phys_wc_add().
>
> This is probably OK, but I think you should also remove the qib_wc_pat module
> parameter.
>
> Jason
Revise based on Jason's request and I will do some testing.
Mike
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/3] IB/qib: use arch_phys_wc_add()
2015-04-21 20:59 ` Marciniszyn, Mike
@ 2015-04-21 21:09 ` Luis R. Rodriguez
2015-04-21 21:12 ` Andy Lutomirski
0 siblings, 1 reply; 8+ messages in thread
From: Luis R. Rodriguez @ 2015-04-21 21:09 UTC (permalink / raw)
To: Marciniszyn, Mike
Cc: Jason Gunthorpe, infinipath, roland, Hefty, Sean, hal.rosenstock,
linux-rdma, luto, mst, cocci, Toshi Kani, Rickard Strandqvist,
Roland Dreier, Dalessandro, Dennis, Suresh Siddha, Ingo Molnar,
Thomas Gleixner, Juergen Gross, Daniel Vetter, Dave Airlie,
Bjorn Helgaas, Antonino Daplas, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, Dave Hansen, Arnd Bergmann, Stefan Bader,
konrad.wilk, ville.syrjala, david.vrabel, jbeulich,
Roger Pau Monné,
linux-fbdev, linux-kernel, xen-devel
On Tue, Apr 21, 2015 at 1:59 PM, Marciniszyn, Mike
<mike.marciniszyn@intel.com> wrote:
>> > This driver already makes use of ioremap_wc() on PIO buffers, so
>> > convert it to use arch_phys_wc_add().
>>
>> This is probably OK, but I think you should also remove the qib_wc_pat module
>> parameter.
>>
>> Jason
>
> Revise based on Jason's request and I will do some testing.
I did thiink about this -- but removal of module parameters can often
times break users of the module parameter, I figured its best to leave
it to you guys to decide what to do with that, so this leaves it as a
no-op. Can this series be applied and then you can decide what to do
to not affect your users on top of this?
Luis
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/3] IB/qib: use arch_phys_wc_add()
2015-04-21 21:09 ` Luis R. Rodriguez
@ 2015-04-21 21:12 ` Andy Lutomirski
2015-04-21 21:14 ` Luis R. Rodriguez
0 siblings, 1 reply; 8+ messages in thread
From: Andy Lutomirski @ 2015-04-21 21:12 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: Marciniszyn, Mike, Jason Gunthorpe, infinipath, roland, Hefty,
Sean, hal.rosenstock, linux-rdma, mst, cocci, Toshi Kani,
Rickard Strandqvist, Roland Dreier, Dalessandro, Dennis,
Suresh Siddha, Ingo Molnar, Thomas Gleixner, Juergen Gross,
Daniel Vetter, Dave Airlie, Bjorn Helgaas, Antonino Daplas,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Dave Hansen,
Arnd Bergmann, Stefan Bader, konrad.wilk, ville.syrjala,
david.vrabel, jbeulich, Roger Pau Monné,
linux-fbdev, linux-kernel, xen-devel
On Tue, Apr 21, 2015 at 2:09 PM, Luis R. Rodriguez
<mcgrof@do-not-panic.com> wrote:
> On Tue, Apr 21, 2015 at 1:59 PM, Marciniszyn, Mike
> <mike.marciniszyn@intel.com> wrote:
>>> > This driver already makes use of ioremap_wc() on PIO buffers, so
>>> > convert it to use arch_phys_wc_add().
>>>
>>> This is probably OK, but I think you should also remove the qib_wc_pat module
>>> parameter.
>>>
>>> Jason
>>
>> Revise based on Jason's request and I will do some testing.
>
> I did thiink about this -- but removal of module parameters can often
> times break users of the module parameter, I figured its best to leave
> it to you guys to decide what to do with that, so this leaves it as a
> no-op. Can this series be applied and then you can decide what to do
> to not affect your users on top of this?
As of a few kernel versions ago, unrecognized module parameters no
longer cause the module to refuse to load.
--Andy
>
> Luis
--
Andy Lutomirski
AMA Capital Management, LLC
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/3] IB/qib: use arch_phys_wc_add()
2015-04-21 21:12 ` Andy Lutomirski
@ 2015-04-21 21:14 ` Luis R. Rodriguez
0 siblings, 0 replies; 8+ messages in thread
From: Luis R. Rodriguez @ 2015-04-21 21:14 UTC (permalink / raw)
To: Andy Lutomirski
Cc: Marciniszyn, Mike, Jason Gunthorpe, infinipath, roland, Hefty,
Sean, hal.rosenstock, linux-rdma, mst, cocci, Toshi Kani,
Rickard Strandqvist, Roland Dreier, Dalessandro, Dennis,
Suresh Siddha, Ingo Molnar, Thomas Gleixner, Juergen Gross,
Daniel Vetter, Dave Airlie, Bjorn Helgaas, Antonino Daplas,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Dave Hansen,
Arnd Bergmann, Stefan Bader, konrad.wilk, ville.syrjala,
david.vrabel, jbeulich, Roger Pau Monné,
linux-fbdev, linux-kernel, xen-devel
On Tue, Apr 21, 2015 at 2:12 PM, Andy Lutomirski <luto@amacapital.net> wrote:
> On Tue, Apr 21, 2015 at 2:09 PM, Luis R. Rodriguez
> <mcgrof@do-not-panic.com> wrote:
>> On Tue, Apr 21, 2015 at 1:59 PM, Marciniszyn, Mike
>> <mike.marciniszyn@intel.com> wrote:
>>>> > This driver already makes use of ioremap_wc() on PIO buffers, so
>>>> > convert it to use arch_phys_wc_add().
>>>>
>>>> This is probably OK, but I think you should also remove the qib_wc_pat module
>>>> parameter.
>>>>
>>>> Jason
>>>
>>> Revise based on Jason's request and I will do some testing.
>>
>> I did thiink about this -- but removal of module parameters can often
>> times break users of the module parameter, I figured its best to leave
>> it to you guys to decide what to do with that, so this leaves it as a
>> no-op. Can this series be applied and then you can decide what to do
>> to not affect your users on top of this?
>
> As of a few kernel versions ago, unrecognized module parameters no
> longer cause the module to refuse to load.
Sexy, I'll respin the changes only to the qib driver. Can the changes
to ipath still be applied?
Luis
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-04-21 21:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1429648676-17755-1-git-send-email-mcgrof@do-not-panic.com>
2015-04-21 20:37 ` [PATCH v3 1/3] IB/qib: add acounting for MTRR Luis R. Rodriguez
2015-04-21 20:37 ` [PATCH v3 2/3] IB/qib: use arch_phys_wc_add() Luis R. Rodriguez
2015-04-21 20:57 ` Jason Gunthorpe
2015-04-21 20:59 ` Marciniszyn, Mike
2015-04-21 21:09 ` Luis R. Rodriguez
2015-04-21 21:12 ` Andy Lutomirski
2015-04-21 21:14 ` Luis R. Rodriguez
2015-04-21 20:37 ` [PATCH v3 3/3] IB/ipath: add counting for MTRR Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).