From: Pierre Morel <pmorel@linux.ibm.com>
To: Matthew Rosato <mjrosato@linux.ibm.com>, linux-s390@vger.kernel.org
Cc: alex.williamson@redhat.com, cohuck@redhat.com,
schnelle@linux.ibm.com, farman@linux.ibm.com,
borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com,
gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com,
frankja@linux.ibm.com, david@redhat.com, imbrenda@linux.ibm.com,
vneethv@linux.ibm.com, oberpar@linux.ibm.com,
freude@linux.ibm.com, thuth@redhat.com, pasic@linux.ibm.com,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Christian Borntraeger <borntraeger@de.ibm.com>
Subject: Re: [PATCH v2 08/30] s390/pci: stash associated GISA designation
Date: Mon, 24 Jan 2022 15:08:21 +0100 [thread overview]
Message-ID: <8bef8c96-219e-3c40-246b-b974c45a5315@linux.ibm.com> (raw)
In-Reply-To: <20220114203145.242984-9-mjrosato@linux.ibm.com>
On 1/14/22 21:31, Matthew Rosato wrote:
> For passthrough devices, we will need to know the GISA designation of the
> guest if interpretation facilities are to be used. Setup to stash this in
> the zdev and set a default of 0 (no GISA designation) for now; a subsequent
> patch will set a valid GISA designation for passthrough devices.
> Also, extend mpcific routines to specify this stashed designation as part
> of the mpcific command.
>
> Reviewed-by: Niklas Schnelle <schnelle@linux.ibm.com>
> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Reviewed-by: Eric Farman <farman@linux.ibm.com>
> Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
> ---
> arch/s390/include/asm/pci.h | 1 +
> arch/s390/include/asm/pci_clp.h | 3 ++-
> arch/s390/pci/pci.c | 6 ++++++
> arch/s390/pci/pci_clp.c | 1 +
> arch/s390/pci/pci_irq.c | 5 +++++
> 5 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
> index 90824be5ce9a..2474b8d30f2a 100644
> --- a/arch/s390/include/asm/pci.h
> +++ b/arch/s390/include/asm/pci.h
> @@ -123,6 +123,7 @@ struct zpci_dev {
> enum zpci_state state;
> u32 fid; /* function ID, used by sclp */
> u32 fh; /* function handle, used by insn's */
> + u32 gd; /* GISA designation for passthrough */
I already gave my R-B, and do not want to remove it, but wouldn't it be
possible to use more explicit names like gisa_designation instead of
just gd.
It would not change anything to the functionality but would facilitate
the maintenance?
> u16 vfn; /* virtual function number */
> u16 pchid; /* physical channel ID */
> u8 pfgid; /* function group ID */
> diff --git a/arch/s390/include/asm/pci_clp.h b/arch/s390/include/asm/pci_clp.h
> index 1f4b666e85ee..3af8d196da74 100644
> --- a/arch/s390/include/asm/pci_clp.h
> +++ b/arch/s390/include/asm/pci_clp.h
> @@ -173,7 +173,8 @@ struct clp_req_set_pci {
> u16 reserved2;
> u8 oc; /* operation controls */
> u8 ndas; /* number of dma spaces */
> - u64 reserved3;
> + u32 reserved3;
> + u32 gd; /* GISA designation */
here too.
> } __packed;
>
> /* Set PCI function response */
> diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
> index 792f8e0f2178..0c9879dae752 100644
> --- a/arch/s390/pci/pci.c
> +++ b/arch/s390/pci/pci.c
> @@ -119,6 +119,7 @@ int zpci_register_ioat(struct zpci_dev *zdev, u8 dmaas,
> fib.pba = base;
> fib.pal = limit;
> fib.iota = iota | ZPCI_IOTA_RTTO_FLAG;
> + fib.gd = zdev->gd;
> cc = zpci_mod_fc(req, &fib, &status);
> if (cc)
> zpci_dbg(3, "reg ioat fid:%x, cc:%d, status:%d\n", zdev->fid, cc, status);
> @@ -132,6 +133,8 @@ int zpci_unregister_ioat(struct zpci_dev *zdev, u8 dmaas)
> struct zpci_fib fib = {0};
> u8 cc, status;
>
> + fib.gd = zdev->gd;
> +
> cc = zpci_mod_fc(req, &fib, &status);
> if (cc)
> zpci_dbg(3, "unreg ioat fid:%x, cc:%d, status:%d\n", zdev->fid, cc, status);
> @@ -159,6 +162,7 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev)
> atomic64_set(&zdev->unmapped_pages, 0);
>
> fib.fmb_addr = virt_to_phys(zdev->fmb);
> + fib.gd = zdev->gd;
> cc = zpci_mod_fc(req, &fib, &status);
> if (cc) {
> kmem_cache_free(zdev_fmb_cache, zdev->fmb);
> @@ -177,6 +181,8 @@ int zpci_fmb_disable_device(struct zpci_dev *zdev)
> if (!zdev->fmb)
> return -EINVAL;
>
> + fib.gd = zdev->gd;
> +
> /* Function measurement is disabled if fmb address is zero */
> cc = zpci_mod_fc(req, &fib, &status);
> if (cc == 3) /* Function already gone. */
> diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
> index be077b39da33..e9ed0e4a5cf0 100644
> --- a/arch/s390/pci/pci_clp.c
> +++ b/arch/s390/pci/pci_clp.c
> @@ -240,6 +240,7 @@ static int clp_set_pci_fn(struct zpci_dev *zdev, u32 *fh, u8 nr_dma_as, u8 comma
> rrb->request.fh = zdev->fh;
> rrb->request.oc = command;
> rrb->request.ndas = nr_dma_as;
> + rrb->request.gd = zdev->gd;
>
> rc = clp_req(rrb, CLP_LPS_PCI);
> if (rrb->response.hdr.rsp == CLP_RC_SETPCIFN_BUSY) {
> diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c
> index 2f675355fd0c..17e5adfe1273 100644
> --- a/arch/s390/pci/pci_irq.c
> +++ b/arch/s390/pci/pci_irq.c
> @@ -43,6 +43,7 @@ static int zpci_set_airq(struct zpci_dev *zdev)
> fib.fmt0.aibvo = 0; /* each zdev has its own interrupt vector */
> fib.fmt0.aisb = virt_to_phys(zpci_sbv->vector) + (zdev->aisb / 64) * 8;
> fib.fmt0.aisbo = zdev->aisb & 63;
> + fib.gd = zdev->gd;
>
> return zpci_mod_fc(req, &fib, &status) ? -EIO : 0;
> }
> @@ -54,6 +55,8 @@ static int zpci_clear_airq(struct zpci_dev *zdev)
> struct zpci_fib fib = {0};
> u8 cc, status;
>
> + fib.gd = zdev->gd;
> +
> cc = zpci_mod_fc(req, &fib, &status);
> if (cc == 3 || (cc == 1 && status == 24))
> /* Function already gone or IRQs already deregistered. */
> @@ -72,6 +75,7 @@ static int zpci_set_directed_irq(struct zpci_dev *zdev)
> fib.fmt = 1;
> fib.fmt1.noi = zdev->msi_nr_irqs;
> fib.fmt1.dibvo = zdev->msi_first_bit;
> + fib.gd = zdev->gd;
>
> return zpci_mod_fc(req, &fib, &status) ? -EIO : 0;
> }
> @@ -84,6 +88,7 @@ static int zpci_clear_directed_irq(struct zpci_dev *zdev)
> u8 cc, status;
>
> fib.fmt = 1;
> + fib.gd = zdev->gd;
> cc = zpci_mod_fc(req, &fib, &status);
> if (cc == 3 || (cc == 1 && status == 24))
> /* Function already gone or IRQs already deregistered. */
>
--
Pierre Morel
IBM Lab Boeblingen
next prev parent reply other threads:[~2022-01-24 14:06 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 20:31 [PATCH v2 00/30] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 01/30] s390/sclp: detect the zPCI load/store interpretation facility Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 02/30] s390/sclp: detect the AISII facility Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 03/30] s390/sclp: detect the AENI facility Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 04/30] s390/sclp: detect the AISI facility Matthew Rosato
2022-01-17 7:57 ` Thomas Huth
2022-01-14 20:31 ` [PATCH v2 05/30] s390/airq: pass more TPI info to airq handlers Matthew Rosato
2022-01-17 8:27 ` Thomas Huth
2022-01-14 20:31 ` [PATCH v2 06/30] s390/airq: allow for airq structure that uses an input vector Matthew Rosato
2022-01-17 12:29 ` Claudio Imbrenda
2022-01-18 18:52 ` Matthew Rosato
2022-01-18 9:50 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 07/30] s390/pci: externalize the SIC operation controls and routine Matthew Rosato
2022-01-17 16:19 ` Niklas Schnelle
2022-01-26 10:07 ` Claudio Imbrenda
2022-01-27 9:57 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 08/30] s390/pci: stash associated GISA designation Matthew Rosato
2022-01-24 14:08 ` Pierre Morel [this message]
2022-01-24 15:12 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 09/30] s390/pci: export some routines related to RPCIT processing Matthew Rosato
2022-01-18 9:51 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 10/30] s390/pci: stash dtsm and maxstbl Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 11/30] s390/pci: add helper function to find device by handle Matthew Rosato
2022-01-18 9:53 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 12/30] s390/pci: get SHM information from list pci Matthew Rosato
2022-01-18 10:36 ` Pierre Morel
2022-01-26 10:13 ` Claudio Imbrenda
2022-01-27 13:41 ` Pierre Morel
2022-01-27 15:14 ` Matthew Rosato
2022-01-27 10:29 ` Niklas Schnelle
2022-01-14 20:31 ` [PATCH v2 13/30] s390/pci: return status from zpci_refresh_trans Matthew Rosato
2022-01-19 18:13 ` Pierre Morel
2022-01-26 10:45 ` Claudio Imbrenda
2022-01-27 10:30 ` Niklas Schnelle
2022-01-14 20:31 ` [PATCH v2 14/30] KVM: s390: pci: add basic kvm_zdev structure Matthew Rosato
2022-01-17 16:25 ` Pierre Morel
2022-01-18 17:32 ` Pierre Morel
2022-01-18 18:39 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 15/30] KVM: s390: pci: do initial setup for AEN interpretation Matthew Rosato
2022-01-19 18:06 ` Pierre Morel
2022-01-19 20:19 ` Matthew Rosato
2022-01-25 12:23 ` Pierre Morel
2022-01-25 14:57 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 16/30] KVM: s390: pci: enable host forwarding of Adapter Event Notifications Matthew Rosato
2022-01-17 17:38 ` Pierre Morel
2022-01-18 17:25 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 17/30] KVM: s390: mechanism to enable guest zPCI Interpretation Matthew Rosato
2022-01-24 14:24 ` Pierre Morel
2022-01-24 15:28 ` Matthew Rosato
2022-01-24 17:15 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 18/30] KVM: s390: pci: provide routines for enabling/disabling interpretation Matthew Rosato
2022-01-24 14:36 ` Pierre Morel
2022-01-24 15:14 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 19/30] KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding Matthew Rosato
2022-01-25 12:41 ` Pierre Morel
2022-01-25 15:44 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 20/30] KVM: s390: pci: provide routines for enabling/disabling IOAT assist Matthew Rosato
2022-01-25 13:29 ` Pierre Morel
2022-01-25 14:47 ` Matthew Rosato
2022-01-26 8:30 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 21/30] KVM: s390: pci: handle refresh of PCI translations Matthew Rosato
2022-01-19 9:29 ` Pierre Morel
2022-01-19 16:39 ` Matthew Rosato
2022-01-19 18:25 ` Pierre Morel
2022-01-19 20:02 ` Matthew Rosato
2022-01-20 9:47 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 22/30] KVM: s390: intercept the rpcit instruction Matthew Rosato
2022-01-18 11:05 ` Pierre Morel
2022-01-18 17:27 ` Matthew Rosato
2022-01-18 17:54 ` Pierre Morel
2022-01-19 14:06 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 23/30] vfio/pci: re-introduce CONFIG_VFIO_PCI_ZDEV Matthew Rosato
2022-01-18 17:20 ` Pierre Morel
2022-01-18 17:32 ` Matthew Rosato
2022-01-18 17:45 ` Pierre Morel
2022-01-18 18:05 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 24/30] vfio-pci/zdev: wire up group notifier Matthew Rosato
2022-01-18 17:34 ` Pierre Morel
2022-01-18 18:37 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 25/30] vfio-pci/zdev: wire up zPCI interpretive execution support Matthew Rosato
2022-01-25 13:01 ` Pierre Morel
2022-01-25 14:21 ` Matthew Rosato
2022-01-14 20:31 ` [PATCH v2 26/30] vfio-pci/zdev: wire up zPCI adapter interrupt forwarding support Matthew Rosato
2022-01-19 17:10 ` Pierre Morel
2022-01-19 17:20 ` Matthew Rosato
2022-01-25 12:36 ` Pierre Morel
2022-01-25 14:16 ` Matthew Rosato
2022-01-26 8:24 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 27/30] vfio-pci/zdev: wire up zPCI IOAT assist support Matthew Rosato
2022-01-19 14:03 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 28/30] vfio-pci/zdev: add DTSM to clp group capability Matthew Rosato
2022-01-19 13:48 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 29/30] KVM: s390: introduce CPU feature for zPCI Interpretation Matthew Rosato
2022-01-19 13:39 ` Pierre Morel
2022-01-14 20:31 ` [PATCH v2 30/30] MAINTAINERS: additional files related kvm s390 pci passthrough Matthew Rosato
2022-01-14 20:49 ` [PATCH v2 00/30] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
2022-01-19 18:10 ` Pierre Morel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8bef8c96-219e-3c40-246b-b974c45a5315@linux.ibm.com \
--to=pmorel@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=freude@linux.ibm.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=oberpar@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=schnelle@linux.ibm.com \
--cc=thuth@redhat.com \
--cc=vneethv@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).