Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1277a22 authored by Christian König's avatar Christian König Committed by Bjorn Helgaas
Browse files

PCI: Cleanup PCI_REBAR_CTRL_BAR_SHIFT handling 



Cleanup PCI_REBAR_CTRL_BAR_SHIFT handling.  That was hard coded instead of
properly defined in the header for some reason.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent d3252ace

drivers/pci/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static void pci_restore_rebar_state(struct pci_dev *pdev) 
		res = pdev->resource + bar_idx;

		size = order_base_2((resource_size(res) >> 20) | 1) - 1;

		ctrl &= ~PCI_REBAR_CTRL_BAR_SIZE;

		ctrl |= size << 8;

		ctrl |= size << PCI_REBAR_CTRL_BAR_SHIFT;

		pci_write_config_dword(pdev, pos + PCI_REBAR_CTRL, ctrl);

	}

}
@@ -3098,7 +3098,7 @@ int pci_rebar_get_current_size(struct pci_dev *pdev, int bar) 
		return pos;



	pci_read_config_dword(pdev, pos + PCI_REBAR_CTRL, &ctrl);

	return (ctrl & PCI_REBAR_CTRL_BAR_SIZE) >> 8;

	return (ctrl & PCI_REBAR_CTRL_BAR_SIZE) >> PCI_REBAR_CTRL_BAR_SHIFT;

}



/**
@@ -3121,7 +3121,7 @@ int pci_rebar_set_size(struct pci_dev *pdev, int bar, int size) 


	pci_read_config_dword(pdev, pos + PCI_REBAR_CTRL, &ctrl);

	ctrl &= ~PCI_REBAR_CTRL_BAR_SIZE;

	ctrl |= size << 8;

	ctrl |= size << PCI_REBAR_CTRL_BAR_SHIFT;

	pci_write_config_dword(pdev, pos + PCI_REBAR_CTRL, ctrl);

	return 0;

}

include/uapi/linux/pci_regs.h

+2 −1
Original line number Diff line number Diff line
@@ -962,6 +962,7 @@ 
#define  PCI_REBAR_CTRL_NBAR_MASK	0x000000E0  /* # of resizable BARs */

#define  PCI_REBAR_CTRL_NBAR_SHIFT	5	    /* shift for # of BARs */

#define  PCI_REBAR_CTRL_BAR_SIZE	0x00001F00  /* BAR size */

#define  PCI_REBAR_CTRL_BAR_SHIFT	8	    /* shift for BAR size */



/* Dynamic Power Allocation */

#define PCI_DPA_CAP		4	/* capability register */