Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git

Browse Source
This commit is contained in:
Stephen Rothwell 2024-12-20 14:48:27 +11:00
commit c977cc3606
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -16750,7 +16750,6 @@ F: Documentation/core-api/symbol-namespaces.rst
F: scripts/nsdeps F: scripts/nsdeps
NTB AMD DRIVER NTB AMD DRIVER
M: Sanjay R Mehta <sanju.mehta@amd.com>
M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
L: ntb@lists.linux.dev L: ntb@lists.linux.dev
S: Supported S: Supported

3
drivers/ntb/hw/intel/ntb_hw_gen3.c
View File

@ -215,6 +215,9 @@ static int gen3_init_ntb(struct intel_ntb_dev *ndev)
} }
ndev->db_valid_mask = BIT_ULL(ndev->db_count) - 1; ndev->db_valid_mask = BIT_ULL(ndev->db_count) - 1;
/* Make sure we are not using DB's used for link status */
if (ndev->hwerr_flags & NTB_HWERR_MSIX_VECTOR32_BAD)
ndev->db_valid_mask &= ~ndev->db_link_mask;
ndev->reg->db_iowrite(ndev->db_valid_mask, ndev->reg->db_iowrite(ndev->db_valid_mask,
ndev->self_mmio + ndev->self_mmio +

2
drivers/ntb/hw/mscc/ntb_hw_switchtec.c
View File

@ -288,7 +288,7 @@ static int switchtec_ntb_mw_set_trans(struct ntb_dev *ntb, int pidx, int widx,
if (size != 0 && xlate_pos < 12) if (size != 0 && xlate_pos < 12)
return -EINVAL; return -EINVAL;
if (!IS_ALIGNED(addr, BIT_ULL(xlate_pos))) { if (xlate_pos >= 0 && !IS_ALIGNED(addr, BIT_ULL(xlate_pos))) {
/* /*
* In certain circumstances we can get a buffer that is * In certain circumstances we can get a buffer that is
* not aligned to its size. (Most of the time * not aligned to its size. (Most of the time