Merge tag 'mhi-fixes-for-v6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-linus

gregkh · gregkh · commit e16ebd9d839d · 2024-12-16T16:30:58.000+01:00
Manivannan writes:

MHI Host
========

- Fix the MHI BAR mapping by passing BAR number to pcim_iomap_region() API
  instead of BAR mask. This fixes a regression for Qualcomm MHI modems.

* tag 'mhi-fixes-for-v6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi:
  bus: mhi: host: pci_generic: fix MHI BAR mapping
diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c
@@ -917,7 +917,7 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl,
 		return err;
 	}
 
-	mhi_cntrl->regs = pcim_iomap_region(pdev, 1 << bar_num, pci_name(pdev));
+	mhi_cntrl->regs = pcim_iomap_region(pdev, bar_num, pci_name(pdev));
 	if (IS_ERR(mhi_cntrl->regs)) {
 		err = PTR_ERR(mhi_cntrl->regs);
 		dev_err(&pdev->dev, "failed to map pci region: %d\n", err);

Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,7 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl,`
`917`	`917`	`return err;`
`918`	`918`	`}`
`919`	`919`
`920`		`- mhi_cntrl->regs = pcim_iomap_region(pdev, 1 << bar_num, pci_name(pdev));`
	`920`	`+ mhi_cntrl->regs = pcim_iomap_region(pdev, bar_num, pci_name(pdev));`
`921`	`921`	`if (IS_ERR(mhi_cntrl->regs)) {`
`922`	`922`	`err = PTR_ERR(mhi_cntrl->regs);`
`923`	`923`	`dev_err(&pdev->dev, "failed to map pci region: %d\n", err);`