diff options
| author | Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> | 2012-05-28 08:52:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-29 17:30:07 -0400 |
| commit | a0c6ffbcfe600606b2d913dded4dc6b37b3bbbfd (patch) | |
| tree | 9ac2c85b2d78b0377a49319cd93ba1f498ba7a89 /net/rds | |
| parent | c51ce49735c183ef2592db70f918ee698716276b (diff) | |
| download | kernel_goldelico_gta04-a0c6ffbcfe600606b2d913dded4dc6b37b3bbbfd.zip kernel_goldelico_gta04-a0c6ffbcfe600606b2d913dded4dc6b37b3bbbfd.tar.gz kernel_goldelico_gta04-a0c6ffbcfe600606b2d913dded4dc6b37b3bbbfd.tar.bz2 | |
rds_rdma: don't assume infiniband device is PCI
RDS code assumes that the struct ib_device dma_device member, which is a
pointer, points to a struct device embedded in a struct pci_dev.
This is not the case for ehca, for example, which is a OF driver, and
makes dma_device point to a struct device embedded in a struct
platform_device.
This will make the system crash when rds_rdma is loaded in a system
with ehca, since it will try to access the bus member of a non-existent
struct pci_dev.
The only reason rds_rdma uses the struct pci_dev is to get the NUMA node
the device is attached to. Using dev_to_node for that is much better,
since it won't assume which bus the infiniband is attached to.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Cc: dledford@redhat.com
Cc: Jes.Sorensen@redhat.com
Cc: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Acked-by: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/ib.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/rds/ib.h b/net/rds/ib.h index edfaaaf..8d2b3d5 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h @@ -186,8 +186,7 @@ struct rds_ib_device { struct work_struct free_work; }; -#define pcidev_to_node(pcidev) pcibus_to_node(pcidev->bus) -#define ibdev_to_node(ibdev) pcidev_to_node(to_pci_dev(ibdev->dma_device)) +#define ibdev_to_node(ibdev) dev_to_node(ibdev->dma_device) #define rdsibdev_to_node(rdsibdev) ibdev_to_node(rdsibdev->dev) /* bits for i_ack_flags */ |