diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-11-01 09:44:59 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-11-01 09:44:59 +0100 |
| commit | 955268e13f8f9422e7e89ee6350ec793dddd1e94 (patch) | |
| tree | 1714aa5f8383ddf5aaaf7826c8502f686bcd8a7a /nixos/modules/kernel-patches/0015-PCI-mvebu-use-BIT-and-GENMASK-macros-instead-of-hard.patch | |
| parent | 06293bfbb5082dc636358d49f3e6fea88c4f2a67 (diff) | |
| download | nixturris-955268e13f8f9422e7e89ee6350ec793dddd1e94.tar.gz nixturris-955268e13f8f9422e7e89ee6350ec793dddd1e94.tar.bz2 nixturris-955268e13f8f9422e7e89ee6350ec793dddd1e94.zip | |
nixos: try to fix Turris Omnia PCIe on Linux 6.0
Unfortunatelly this seems to not work.
Diffstat (limited to 'nixos/modules/kernel-patches/0015-PCI-mvebu-use-BIT-and-GENMASK-macros-instead-of-hard.patch')
| -rw-r--r-- | nixos/modules/kernel-patches/0015-PCI-mvebu-use-BIT-and-GENMASK-macros-instead-of-hard.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/nixos/modules/kernel-patches/0015-PCI-mvebu-use-BIT-and-GENMASK-macros-instead-of-hard.patch b/nixos/modules/kernel-patches/0015-PCI-mvebu-use-BIT-and-GENMASK-macros-instead-of-hard.patch deleted file mode 100644 index 1e75168..0000000 --- a/nixos/modules/kernel-patches/0015-PCI-mvebu-use-BIT-and-GENMASK-macros-instead-of-hard.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4b442a1a2a4a00ae7f776bffe53e17421621c57b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> -Date: Fri, 17 Sep 2021 14:54:29 +0200 -Subject: [PATCH 15/96] PCI: mvebu: use BIT() and GENMASK() macros instead of - hardcoded hex values -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Pali Rohár <pali@kernel.org> ---- - drivers/pci/controller/pci-mvebu.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c -index d832c5135d5c..90a32db42a87 100644 ---- a/drivers/pci/controller/pci-mvebu.c -+++ b/drivers/pci/controller/pci-mvebu.c -@@ -44,7 +44,7 @@ - #define PCIE_WIN5_BASE_OFF 0x1884 - #define PCIE_WIN5_REMAP_OFF 0x188c - #define PCIE_CONF_ADDR_OFF 0x18f8 --#define PCIE_CONF_ADDR_EN 0x80000000 -+#define PCIE_CONF_ADDR_EN BIT(31) - #define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc)) - #define PCIE_CONF_BUS(b) (((b) & 0xff) << 16) - #define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11) -@@ -70,13 +70,13 @@ - #define PCIE_INT_ERR_MASK (PCIE_INT_ERR_FATAL | PCIE_INT_ERR_NONFATAL | PCIE_INT_ERR_COR) - #define PCIE_INT_ALL_MASK GENMASK(31, 0) - #define PCIE_CTRL_OFF 0x1a00 --#define PCIE_CTRL_X1_MODE 0x0001 -+#define PCIE_CTRL_X1_MODE BIT(0) - #define PCIE_CTRL_RC_MODE BIT(1) - #define PCIE_CTRL_MASTER_HOT_RESET BIT(24) - #define PCIE_STAT_OFF 0x1a04 --#define PCIE_STAT_BUS 0xff00 --#define PCIE_STAT_DEV 0x1f0000 - #define PCIE_STAT_LINK_DOWN BIT(0) -+#define PCIE_STAT_BUS GENMASK(15, 8) -+#define PCIE_STAT_DEV GENMASK(20, 16) - #define PCIE_SSPL_OFF 0x1a0c - #define PCIE_SSPL_VALUE_SHIFT 0 - #define PCIE_SSPL_VALUE_MASK GENMASK(7, 0) --- -2.37.2 - |