lkml.org 
[lkml]   [2011]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [Xen-devel] [PATCH 2/3] xen-pcifront: Sanity check the MSI/MSI-X values
    On Fri, Feb 18, 2011 at 09:08:45AM -0500, Konrad Rzeszutek Wilk wrote:
    > On Thu, Feb 17, 2011 at 08:53:40AM +0000, Ian Campbell wrote:
    > > On Wed, 2011-02-16 at 22:17 +0000, Konrad Rzeszutek Wilk wrote:
    > > > Check the returned vector values for any values that are
    > > > odd or plain incorrect (say vector value zero), and if so
    > > > print a warning. Also fixup the return values.
    > > >
    >
    > How about this one (and there is a cleanup patch shortly following for the *(vector)...)
    >
    The cleanup patch:

    From ee7eb70ab9c56a005b6023664c65da1305e3aa56 Mon Sep 17 00:00:00 2001
    From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Date: Thu, 17 Feb 2011 12:02:23 -0500
    Subject: [PATCH 4/5] pci/xen: Cleanup: convert int** to int[]

    Cleanup code. Cosmetic change to make the code look easier
    to read.

    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    ---
    arch/x86/include/asm/xen/pci.h | 8 ++++----
    arch/x86/pci/xen.c | 4 ++--
    drivers/pci/xen-pcifront.c | 12 ++++++------
    3 files changed, 12 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
    index 2329b3e..aa86209 100644
    --- a/arch/x86/include/asm/xen/pci.h
    +++ b/arch/x86/include/asm/xen/pci.h
    @@ -27,16 +27,16 @@ static inline void __init xen_setup_pirqs(void)
    * its own functions.
    */
    struct xen_pci_frontend_ops {
    - int (*enable_msi)(struct pci_dev *dev, int **vectors);
    + int (*enable_msi)(struct pci_dev *dev, int vectors[]);
    void (*disable_msi)(struct pci_dev *dev);
    - int (*enable_msix)(struct pci_dev *dev, int **vectors, int nvec);
    + int (*enable_msix)(struct pci_dev *dev, int vectors[], int nvec);
    void (*disable_msix)(struct pci_dev *dev);
    };

    extern struct xen_pci_frontend_ops *xen_pci_frontend;

    static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev,
    - int **vectors)
    + int vectors[])
    {
    if (xen_pci_frontend && xen_pci_frontend->enable_msi)
    return xen_pci_frontend->enable_msi(dev, vectors);
    @@ -48,7 +48,7 @@ static inline void xen_pci_frontend_disable_msi(struct pci_dev *dev)
    xen_pci_frontend->disable_msi(dev);
    }
    static inline int xen_pci_frontend_enable_msix(struct pci_dev *dev,
    - int **vectors, int nvec)
    + int vectors[], int nvec)
    {
    if (xen_pci_frontend && xen_pci_frontend->enable_msix)
    return xen_pci_frontend->enable_msix(dev, vectors, nvec);
    diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
    index 6432f75..30fdd09 100644
    --- a/arch/x86/pci/xen.c
    +++ b/arch/x86/pci/xen.c
    @@ -150,9 +150,9 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
    return -ENOMEM;

    if (type == PCI_CAP_ID_MSIX)
    - ret = xen_pci_frontend_enable_msix(dev, &v, nvec);
    + ret = xen_pci_frontend_enable_msix(dev, v, nvec);
    else
    - ret = xen_pci_frontend_enable_msi(dev, &v);
    + ret = xen_pci_frontend_enable_msi(dev, v);
    if (ret)
    goto error;
    i = 0;
    diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
    index d9fd1e0..27dae44 100644
    --- a/drivers/pci/xen-pcifront.c
    +++ b/drivers/pci/xen-pcifront.c
    @@ -243,7 +243,7 @@ struct pci_ops pcifront_bus_ops = {

    #ifdef CONFIG_PCI_MSI
    static int pci_frontend_enable_msix(struct pci_dev *dev,
    - int **vector, int nvec)
    + int vector[], int nvec)
    {
    int err;
    int i;
    @@ -283,10 +283,10 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
    " is invalid: %d!\n", i,
    op.msix_entries[i].vector);
    err = -EINVAL;
    - *(*vector+i) = -1;
    + vector[i] = -1;
    continue;
    }
    - *(*vector+i) = op.msix_entries[i].vector;
    + vector[i] = op.msix_entries[i].vector;
    }
    } else {
    printk(KERN_DEBUG "enable msix get value %x\n",
    @@ -317,7 +317,7 @@ static void pci_frontend_disable_msix(struct pci_dev *dev)
    dev_err(&dev->dev, "pci_disable_msix get err %x\n", err);
    }

    -static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector)
    +static int pci_frontend_enable_msi(struct pci_dev *dev, int vector[])
    {
    int err;
    struct xen_pci_op op = {
    @@ -331,12 +331,12 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector)

    err = do_pci_op(pdev, &op);
    if (likely(!err)) {
    - *(*vector) = op.value;
    + vector[0] = op.value;
    if (op.value <= 0) {
    dev_warn(&dev->dev, "MSI entry is invalid: %d!\n",
    op.value);
    err = -EINVAL;
    - *(*vector) = -1;
    + vector[0] = -1;
    }
    } else {
    dev_err(&dev->dev, "pci frontend enable msi failed for dev "
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-02-18 15:25    [W:0.025 / U:60.848 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site