* [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding
@ 2014-08-20 6:53 Knut Omang
2014-08-20 8:34 ` Gonglei (Arei)
2014-08-20 8:57 ` Marcel Apfelbaum
0 siblings, 2 replies; 7+ messages in thread
From: Knut Omang @ 2014-08-20 6:53 UTC (permalink / raw)
To: qemu-devel
Cc: Marcel Apfelbaum, Alexey Kardashevskiy, Juan Quintela,
Markus Armbruster, Gonglei, Michael S.Tsirkin, Igor Mammedov,
Paolo Bonzini
Enable the PCIe capability bit that indicates that this port is able to support
and forward requests to > 8 functions for ARI capable devices.
Signed-off-by: Knut Omang <knut.omang@oracle.com>
---
hw/pci-bridge/ioh3420.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index 8f6c8b0..c14ea6b 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -92,8 +92,10 @@ static void ioh3420_reset(DeviceState *qdev)
static int ioh3420_initfn(PCIDevice *d)
{
+ PCIBridge* br = PCI_BRIDGE(d);
PCIEPort *p = PCIE_PORT(d);
PCIESlot *s = PCIE_SLOT(d);
+ uint8_t *exp_cap;
int rc;
char tmp[100];
sprintf(tmp, "pcie_port.%d", s->slot);
@@ -121,6 +123,10 @@ static int ioh3420_initfn(PCIDevice *d)
if (rc < 0) {
goto err_msi;
}
+ /* Support ARI forwarding */
+ exp_cap = d->config + d->exp.exp_cap;
+ pci_word_test_and_set_mask(exp_cap + PCI_EXP_DEVCAP2, PCI_EXP_DEVCAP2_ARI);
+
pcie_cap_deverr_init(d);
pcie_cap_slot_init(d, s->slot);
pcie_chassis_create(s->chassis);
@@ -151,6 +157,7 @@ err_bridge:
static void ioh3420_exitfn(PCIDevice *d)
{
PCIESlot *s = PCIE_SLOT(d);
+ PCIBridge* br = PCI_BRIDGE(d);
pcie_aer_exit(d);
pcie_chassis_del_slot(s);
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding
2014-08-20 6:53 [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding Knut Omang
@ 2014-08-20 8:34 ` Gonglei (Arei)
2014-08-20 8:43 ` Knut Omang
2014-08-20 8:57 ` Marcel Apfelbaum
1 sibling, 1 reply; 7+ messages in thread
From: Gonglei (Arei) @ 2014-08-20 8:34 UTC (permalink / raw)
To: Knut Omang, qemu-devel@nongnu.org
Cc: Marcel Apfelbaum, Alexey Kardashevskiy, Juan Quintela,
Markus Armbruster, Michael S.Tsirkin, Igor Mammedov,
Paolo Bonzini
Hi,
> Subject: [PATCH 3/3] ioh3420: Support ARI forwarding
>
>
> Enable the PCIe capability bit that indicates that this port is able to support
> and forward requests to > 8 functions for ARI capable devices.
>
> Signed-off-by: Knut Omang <knut.omang@oracle.com>
> ---
> hw/pci-bridge/ioh3420.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
I think you should associate patch 2/3 with patch 3/3 to
one patch, otherwise after patch 2/3 building are broken.
Best regards,
-Gonglei
> diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
> index 8f6c8b0..c14ea6b 100644
> --- a/hw/pci-bridge/ioh3420.c
> +++ b/hw/pci-bridge/ioh3420.c
> @@ -92,8 +92,10 @@ static void ioh3420_reset(DeviceState *qdev)
>
> static int ioh3420_initfn(PCIDevice *d)
> {
> + PCIBridge* br = PCI_BRIDGE(d);
> PCIEPort *p = PCIE_PORT(d);
> PCIESlot *s = PCIE_SLOT(d);
> + uint8_t *exp_cap;
> int rc;
> char tmp[100];
> sprintf(tmp, "pcie_port.%d", s->slot);
> @@ -121,6 +123,10 @@ static int ioh3420_initfn(PCIDevice *d)
> if (rc < 0) {
> goto err_msi;
> }
> + /* Support ARI forwarding */
> + exp_cap = d->config + d->exp.exp_cap;
> + pci_word_test_and_set_mask(exp_cap + PCI_EXP_DEVCAP2,
> PCI_EXP_DEVCAP2_ARI);
> +
> pcie_cap_deverr_init(d);
> pcie_cap_slot_init(d, s->slot);
> pcie_chassis_create(s->chassis);
> @@ -151,6 +157,7 @@ err_bridge:
> static void ioh3420_exitfn(PCIDevice *d)
> {
> PCIESlot *s = PCIE_SLOT(d);
> + PCIBridge* br = PCI_BRIDGE(d);
>
> pcie_aer_exit(d);
> pcie_chassis_del_slot(s);
> --
> 1.9.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding
2014-08-20 8:34 ` Gonglei (Arei)
@ 2014-08-20 8:43 ` Knut Omang
0 siblings, 0 replies; 7+ messages in thread
From: Knut Omang @ 2014-08-20 8:43 UTC (permalink / raw)
To: Gonglei (Arei)
Cc: Marcel Apfelbaum, Alexey Kardashevskiy, Juan Quintela,
Markus Armbruster, qemu-devel@nongnu.org, Michael S.Tsirkin,
Igor Mammedov, Paolo Bonzini
On Wed, 2014-08-20 at 08:34 +0000, Gonglei (Arei) wrote:
> Hi,
>
> > Subject: [PATCH 3/3] ioh3420: Support ARI forwarding
> >
> >
> > Enable the PCIe capability bit that indicates that this port is able to support
> > and forward requests to > 8 functions for ARI capable devices.
> >
> > Signed-off-by: Knut Omang <knut.omang@oracle.com>
> > ---
> > hw/pci-bridge/ioh3420.c | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
>
> I think you should associate patch 2/3 with patch 3/3 to
> one patch, otherwise after patch 2/3 building are broken.
>
> Best regards,
> -Gonglei
Thanks - just noticed - somehow I managed tp break the split of those
two changes since they are independent.
Knut
> > diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
> > index 8f6c8b0..c14ea6b 100644
> > --- a/hw/pci-bridge/ioh3420.c
> > +++ b/hw/pci-bridge/ioh3420.c
> > @@ -92,8 +92,10 @@ static void ioh3420_reset(DeviceState *qdev)
> >
> > static int ioh3420_initfn(PCIDevice *d)
> > {
> > + PCIBridge* br = PCI_BRIDGE(d);
> > PCIEPort *p = PCIE_PORT(d);
> > PCIESlot *s = PCIE_SLOT(d);
> > + uint8_t *exp_cap;
> > int rc;
> > char tmp[100];
> > sprintf(tmp, "pcie_port.%d", s->slot);
> > @@ -121,6 +123,10 @@ static int ioh3420_initfn(PCIDevice *d)
> > if (rc < 0) {
> > goto err_msi;
> > }
> > + /* Support ARI forwarding */
> > + exp_cap = d->config + d->exp.exp_cap;
> > + pci_word_test_and_set_mask(exp_cap + PCI_EXP_DEVCAP2,
> > PCI_EXP_DEVCAP2_ARI);
> > +
> > pcie_cap_deverr_init(d);
> > pcie_cap_slot_init(d, s->slot);
> > pcie_chassis_create(s->chassis);
> > @@ -151,6 +157,7 @@ err_bridge:
> > static void ioh3420_exitfn(PCIDevice *d)
> > {
> > PCIESlot *s = PCIE_SLOT(d);
> > + PCIBridge* br = PCI_BRIDGE(d);
> >
> > pcie_aer_exit(d);
> > pcie_chassis_del_slot(s);
> > --
> > 1.9.0
> >
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding
2014-08-20 6:53 [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding Knut Omang
2014-08-20 8:34 ` Gonglei (Arei)
@ 2014-08-20 8:57 ` Marcel Apfelbaum
2014-08-20 9:02 ` Gonglei (Arei)
2014-08-20 9:22 ` Knut Omang
1 sibling, 2 replies; 7+ messages in thread
From: Marcel Apfelbaum @ 2014-08-20 8:57 UTC (permalink / raw)
To: Knut Omang
Cc: Juan Quintela, Alexey Kardashevskiy, Michael S.Tsirkin,
Markus Armbruster, qemu-devel, Gonglei, Igor Mammedov,
Paolo Bonzini
On Wed, 2014-08-20 at 08:53 +0200, Knut Omang wrote:
> Enable the PCIe capability bit that indicates that this port is able to support
> and forward requests to > 8 functions for ARI capable devices.
>
> Signed-off-by: Knut Omang <knut.omang@oracle.com>
> ---
> hw/pci-bridge/ioh3420.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
> index 8f6c8b0..c14ea6b 100644
> --- a/hw/pci-bridge/ioh3420.c
> +++ b/hw/pci-bridge/ioh3420.c
> @@ -92,8 +92,10 @@ static void ioh3420_reset(DeviceState *qdev)
>
> static int ioh3420_initfn(PCIDevice *d)
> {
> + PCIBridge* br = PCI_BRIDGE(d);
> PCIEPort *p = PCIE_PORT(d);
> PCIESlot *s = PCIE_SLOT(d);
> + uint8_t *exp_cap;
> int rc;
> char tmp[100];
> sprintf(tmp, "pcie_port.%d", s->slot);
> @@ -121,6 +123,10 @@ static int ioh3420_initfn(PCIDevice *d)
> if (rc < 0) {
> goto err_msi;
> }
> + /* Support ARI forwarding */
> + exp_cap = d->config + d->exp.exp_cap;
> + pci_word_test_and_set_mask(exp_cap + PCI_EXP_DEVCAP2, PCI_EXP_DEVCAP2_ARI);
> +
Hi,
I think is better to move the implementation to a function, say pcie_cap_ari_init
and place it into hw/pci/pcie.c so other devices like downstream ports can use it.
Thanks,
Marcel
> pcie_cap_deverr_init(d);
> pcie_cap_slot_init(d, s->slot);
> pcie_chassis_create(s->chassis);
> @@ -151,6 +157,7 @@ err_bridge:
> static void ioh3420_exitfn(PCIDevice *d)
> {
> PCIESlot *s = PCIE_SLOT(d);
> + PCIBridge* br = PCI_BRIDGE(d);
>
> pcie_aer_exit(d);
> pcie_chassis_del_slot(s);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding
2014-08-20 8:57 ` Marcel Apfelbaum
@ 2014-08-20 9:02 ` Gonglei (Arei)
2014-08-20 10:18 ` Knut Omang
2014-08-20 9:22 ` Knut Omang
1 sibling, 1 reply; 7+ messages in thread
From: Gonglei (Arei) @ 2014-08-20 9:02 UTC (permalink / raw)
To: Marcel Apfelbaum, Knut Omang
Cc: Juan Quintela, Alexey Kardashevskiy, Michael S.Tsirkin,
Markus Armbruster, qemu-devel@nongnu.org, Igor Mammedov,
Paolo Bonzini
> > static int ioh3420_initfn(PCIDevice *d)
> > {
> > + PCIBridge* br = PCI_BRIDGE(d);
> > PCIEPort *p = PCIE_PORT(d);
> > PCIESlot *s = PCIE_SLOT(d);
> > + uint8_t *exp_cap;
> > int rc;
> > char tmp[100];
> > sprintf(tmp, "pcie_port.%d", s->slot);
> > @@ -121,6 +123,10 @@ static int ioh3420_initfn(PCIDevice *d)
> > if (rc < 0) {
> > goto err_msi;
> > }
> > + /* Support ARI forwarding */
> > + exp_cap = d->config + d->exp.exp_cap;
> > + pci_word_test_and_set_mask(exp_cap + PCI_EXP_DEVCAP2,
> PCI_EXP_DEVCAP2_ARI);
> > +
> Hi,
>
> I think is better to move the implementation to a function, say
> pcie_cap_ari_init
> and place it into hw/pci/pcie.c so other devices like downstream ports can use
> it.
>
Yes, good idea. And I noticed a function ioh3420_init(), but not be called.
Maybe it is useful.
Best regards,
-Gonglei
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding
2014-08-20 9:02 ` Gonglei (Arei)
@ 2014-08-20 10:18 ` Knut Omang
0 siblings, 0 replies; 7+ messages in thread
From: Knut Omang @ 2014-08-20 10:18 UTC (permalink / raw)
To: Gonglei (Arei)
Cc: Juan Quintela, Alexey Kardashevskiy, Michael S.Tsirkin,
qemu-devel@nongnu.org, Markus Armbruster, Igor Mammedov,
Paolo Bonzini, Marcel Apfelbaum, Isaku Yamahata
On Wed, 2014-08-20 at 09:02 +0000, Gonglei (Arei) wrote:
> > > static int ioh3420_initfn(PCIDevice *d)
> > > {
> > > + PCIBridge* br = PCI_BRIDGE(d);
> > > PCIEPort *p = PCIE_PORT(d);
> > > PCIESlot *s = PCIE_SLOT(d);
> > > + uint8_t *exp_cap;
> > > int rc;
> > > char tmp[100];
> > > sprintf(tmp, "pcie_port.%d", s->slot);
> > > @@ -121,6 +123,10 @@ static int ioh3420_initfn(PCIDevice *d)
> > > if (rc < 0) {
> > > goto err_msi;
> > > }
> > > + /* Support ARI forwarding */
> > > + exp_cap = d->config + d->exp.exp_cap;
> > > + pci_word_test_and_set_mask(exp_cap + PCI_EXP_DEVCAP2,
> > PCI_EXP_DEVCAP2_ARI);
> > > +
> > Hi,
> >
> > I think is better to move the implementation to a function, say
> > pcie_cap_ari_init
> > and place it into hw/pci/pcie.c so other devices like downstream ports can use
> > it.
> >
> Yes, good idea. And I noticed a function ioh3420_init(), but not be called.
> Maybe it is useful.
Yes, I noticed too - I would guess this is something left over from an
earlier stage of the qdev APIs - Isaku, should I add a patch to remove
it while at this?
> Best regards,
> -Gonglei
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding
2014-08-20 8:57 ` Marcel Apfelbaum
2014-08-20 9:02 ` Gonglei (Arei)
@ 2014-08-20 9:22 ` Knut Omang
1 sibling, 0 replies; 7+ messages in thread
From: Knut Omang @ 2014-08-20 9:22 UTC (permalink / raw)
To: Marcel Apfelbaum
Cc: Juan Quintela, Alexey Kardashevskiy, Michael S.Tsirkin,
Markus Armbruster, qemu-devel, Gonglei, Igor Mammedov,
Paolo Bonzini
On Wed, 2014-08-20 at 11:57 +0300, Marcel Apfelbaum wrote:
> On Wed, 2014-08-20 at 08:53 +0200, Knut Omang wrote:
> > Enable the PCIe capability bit that indicates that this port is able to support
> > and forward requests to > 8 functions for ARI capable devices.
> >
> > Signed-off-by: Knut Omang <knut.omang@oracle.com>
> > ---
> > hw/pci-bridge/ioh3420.c | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
> > index 8f6c8b0..c14ea6b 100644
> > --- a/hw/pci-bridge/ioh3420.c
> > +++ b/hw/pci-bridge/ioh3420.c
> > @@ -92,8 +92,10 @@ static void ioh3420_reset(DeviceState *qdev)
> >
> > static int ioh3420_initfn(PCIDevice *d)
> > {
> > + PCIBridge* br = PCI_BRIDGE(d);
> > PCIEPort *p = PCIE_PORT(d);
> > PCIESlot *s = PCIE_SLOT(d);
> > + uint8_t *exp_cap;
> > int rc;
> > char tmp[100];
> > sprintf(tmp, "pcie_port.%d", s->slot);
> > @@ -121,6 +123,10 @@ static int ioh3420_initfn(PCIDevice *d)
> > if (rc < 0) {
> > goto err_msi;
> > }
> > + /* Support ARI forwarding */
> > + exp_cap = d->config + d->exp.exp_cap;
> > + pci_word_test_and_set_mask(exp_cap + PCI_EXP_DEVCAP2, PCI_EXP_DEVCAP2_ARI);
> > +
> Hi,
>
> I think is better to move the implementation to a function, say pcie_cap_ari_init
> and place it into hw/pci/pcie.c so other devices like downstream ports can use it.
Yes, definitely - I'll fix that, thanks.
Knut
> Thanks,
> Marcel
>
> > pcie_cap_deverr_init(d);
> > pcie_cap_slot_init(d, s->slot);
> > pcie_chassis_create(s->chassis);
> > @@ -151,6 +157,7 @@ err_bridge:
> > static void ioh3420_exitfn(PCIDevice *d)
> > {
> > PCIESlot *s = PCIE_SLOT(d);
> > + PCIBridge* br = PCI_BRIDGE(d);
> >
> > pcie_aer_exit(d);
> > pcie_chassis_del_slot(s);
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-08-20 10:19 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-20 6:53 [Qemu-devel] [PATCH 3/3] ioh3420: Support ARI forwarding Knut Omang
2014-08-20 8:34 ` Gonglei (Arei)
2014-08-20 8:43 ` Knut Omang
2014-08-20 8:57 ` Marcel Apfelbaum
2014-08-20 9:02 ` Gonglei (Arei)
2014-08-20 10:18 ` Knut Omang
2014-08-20 9:22 ` Knut Omang
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).