From: Jakub Kicinski Date: Thu, 10 Nov 2022 20:07:18 +0000 (-0800) Subject: Merge branch 'mana-shared-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v6.6.17~5932^2~242 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79b0872b1075abd36b3c141f510ff7ec1878c22f;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'mana-shared-6.2' of https://git./linux/kernel/git/rdma/rdma Long Li says: ==================== Introduce Microsoft Azure Network Adapter (MANA) RDMA driver [netdev prep] The first 11 patches which modify the MANA Ethernet driver to support RDMA driver. * 'mana-shared-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: net: mana: Define data structures for protection domain and memory registration net: mana: Define data structures for allocating doorbell page from GDMA net: mana: Define and process GDMA response code GDMA_STATUS_MORE_ENTRIES net: mana: Define max values for SGL entries net: mana: Move header files to a common location net: mana: Record port number in netdev net: mana: Export Work Queue functions for use by RDMA driver net: mana: Set the DMA device max segment size net: mana: Handle vport sharing between devices net: mana: Record the physical address for doorbell page region net: mana: Add support for auxiliary device ==================== Link: https://lore.kernel.org/all/1667502990-2559-1-git-send-email-longli@linuxonhyperv.com/ Signed-off-by: Jakub Kicinski --- 79b0872b1075abd36b3c141f510ff7ec1878c22f diff --cc include/net/mana/gdma.h index db340f3,221adc9..28d0687 --- a/include/net/mana/gdma.h +++ b/include/net/mana/gdma.h @@@ -352,8 -367,8 +367,9 @@@ struct gdma_context void __iomem *bar0_va; void __iomem *shm_base; void __iomem *db_page_base; + phys_addr_t phys_db_page_base; u32 db_page_size; + int numa_node; /* Shared memory chanenl (used to bootstrap HWC) */ struct shm_channel shm_channel;