Merge remote-tracking branch 'up/f41' into f41-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
abd1fd4988
GPG Key ID:
7A5F42FAF91FACC3
@ -1,3 +1,11 @@
|
||||
* Thu Nov 14 2024 Augusto Caringi <acaringi@redhat.com> [6.11.8-0]
|
||||
- Linux v6.11.8
|
||||
Resolves:
|
||||
|
||||
* Fri Nov 08 2024 Augusto Caringi <acaringi@redhat.com> [6.11.7-0]
|
||||
- Linux v6.11.7
|
||||
Resolves:
|
||||
|
||||
* Fri Nov 01 2024 Augusto Caringi <acaringi@redhat.com> [6.11.6-0]
|
||||
- Linux v6.11.6
|
||||
Resolves:
|
||||
|
||||
16
kernel.spec
16
kernel.spec
@ -160,18 +160,18 @@ Summary: The Linux kernel
|
||||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 1
|
||||
# define buildid .local
|
||||
%define specrpmversion 6.11.6
|
||||
%define specversion 6.11.6
|
||||
%define specrpmversion 6.11.8
|
||||
%define specversion 6.11.8
|
||||
%define patchversion 6.11
|
||||
%define pkgrelease 300
|
||||
%define kversion 6
|
||||
%define tarfile_release 6.11.6
|
||||
%define tarfile_release 6.11.8
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 11
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 300%{?buildid}.0.riscv64%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.11.6
|
||||
%define kabiversion 6.11.8
|
||||
|
||||
# If this variable is set to 1, a bpf selftests build failure will cause a
|
||||
# fatal kernel package build error
|
||||
@ -4128,9 +4128,15 @@ fi\
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Nov 04 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.11.6-0.0.riscv64]
|
||||
* Fri Nov 15 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.11.8-0.0.riscv64]
|
||||
- Update for riscv64
|
||||
|
||||
* Thu Nov 14 2024 Augusto Caringi <acaringi@redhat.com> [6.11.8-0]
|
||||
- Linux v6.11.8
|
||||
|
||||
* Fri Nov 08 2024 Augusto Caringi <acaringi@redhat.com> [6.11.7-0]
|
||||
- Linux v6.11.7
|
||||
|
||||
* Fri Nov 01 2024 Augusto Caringi <acaringi@redhat.com> [6.11.6-0]
|
||||
- Linux v6.11.6
|
||||
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++
|
||||
drivers/input/rmi4/rmi_driver.c | 124 +++++----
|
||||
drivers/iommu/iommu.c | 22 ++
|
||||
drivers/net/wireless/realtek/rtw89/pci.c | 48 +++-
|
||||
drivers/pci/quirks.c | 24 ++
|
||||
drivers/scsi/sd.c | 10 +
|
||||
drivers/usb/core/hub.c | 7 +
|
||||
@ -45,10 +44,10 @@
|
||||
security/lockdown/Kconfig | 13 +
|
||||
security/lockdown/lockdown.c | 1 +
|
||||
security/security.c | 12 +
|
||||
47 files changed, 1020 insertions(+), 240 deletions(-)
|
||||
46 files changed, 979 insertions(+), 233 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 318a5d60088e0..11471699fb194 100644
|
||||
index b8641dde171ff..0f03b97ae87f2 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||
@ -126,7 +125,7 @@ index 84c08b46519da..c281697142b1a 100644
|
||||
reg = <0x40000000 0x100>;
|
||||
interrupt-controller;
|
||||
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
|
||||
index 89b331575ed49..1934eeb898044 100644
|
||||
index 402ae0297993c..bdfabc559adc6 100644
|
||||
--- a/arch/arm64/Kconfig
|
||||
+++ b/arch/arm64/Kconfig
|
||||
@@ -1366,7 +1366,7 @@ endchoice
|
||||
@ -1706,90 +1705,6 @@ index ed6c5cb60c5ae..70cb770b78bb3 100644
|
||||
/**
|
||||
* iommu_setup_default_domain - Set the default_domain for the group
|
||||
* @group: Group to change
|
||||
diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
|
||||
index 02afeb3acce46..5aef7fa378788 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw89/pci.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
|
||||
@@ -3026,24 +3026,54 @@ static void rtw89_pci_declaim_device(struct rtw89_dev *rtwdev,
|
||||
pci_disable_device(pdev);
|
||||
}
|
||||
|
||||
-static void rtw89_pci_cfg_dac(struct rtw89_dev *rtwdev)
|
||||
+static bool rtw89_pci_chip_is_manual_dac(struct rtw89_dev *rtwdev)
|
||||
{
|
||||
- struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
|
||||
const struct rtw89_chip_info *chip = rtwdev->chip;
|
||||
|
||||
- if (!rtwpci->enable_dac)
|
||||
- return;
|
||||
-
|
||||
switch (chip->chip_id) {
|
||||
case RTL8852A:
|
||||
case RTL8852B:
|
||||
case RTL8851B:
|
||||
case RTL8852BT:
|
||||
- break;
|
||||
+ return true;
|
||||
default:
|
||||
- return;
|
||||
+ return false;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static bool rtw89_pci_is_dac_compatible_bridge(struct rtw89_dev *rtwdev)
|
||||
+{
|
||||
+ struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
|
||||
+ struct pci_dev *bridge = pci_upstream_bridge(rtwpci->pdev);
|
||||
+
|
||||
+ if (!rtw89_pci_chip_is_manual_dac(rtwdev))
|
||||
+ return true;
|
||||
+
|
||||
+ if (!bridge)
|
||||
+ return false;
|
||||
+
|
||||
+ switch (bridge->vendor) {
|
||||
+ case PCI_VENDOR_ID_INTEL:
|
||||
+ return true;
|
||||
+ case PCI_VENDOR_ID_ASMEDIA:
|
||||
+ if (bridge->device == 0x2806)
|
||||
+ return true;
|
||||
+ break;
|
||||
}
|
||||
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+static void rtw89_pci_cfg_dac(struct rtw89_dev *rtwdev)
|
||||
+{
|
||||
+ struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
|
||||
+
|
||||
+ if (!rtwpci->enable_dac)
|
||||
+ return;
|
||||
+
|
||||
+ if (!rtw89_pci_chip_is_manual_dac(rtwdev))
|
||||
+ return;
|
||||
+
|
||||
rtw89_pci_config_byte_set(rtwdev, RTW89_PCIE_L1_CTRL, RTW89_PCIE_BIT_EN_64BITS);
|
||||
}
|
||||
|
||||
@@ -3061,6 +3091,9 @@ static int rtw89_pci_setup_mapping(struct rtw89_dev *rtwdev,
|
||||
goto err;
|
||||
}
|
||||
|
||||
+ if (!rtw89_pci_is_dac_compatible_bridge(rtwdev))
|
||||
+ goto no_dac;
|
||||
+
|
||||
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(36));
|
||||
if (!ret) {
|
||||
rtwpci->enable_dac = true;
|
||||
@@ -3073,6 +3106,7 @@ static int rtw89_pci_setup_mapping(struct rtw89_dev *rtwdev,
|
||||
goto err_release_regions;
|
||||
}
|
||||
}
|
||||
+no_dac:
|
||||
|
||||
resource_len = pci_resource_len(pdev, bar_id);
|
||||
rtwpci->mmap = pci_iomap(pdev, bar_id, resource_len);
|
||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||
index dccb60c1d9cc3..c7ec62f076c31 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-6.11.6.tar.xz) = e882861b01e3808879d42fc6b3190fbcf27b5eba438a77b71a2f29de31af2fe9f048c50cbfc6c7fb92a717fe55f91cf3af951ffebc9af7d36b1e5ac42b8ec0b3
|
||||
SHA512 (kernel-abi-stablelists-6.11.6.tar.xz) = c36397ab093af834160327860b8a3140ae08d5f0d1d3d0a29c576a561200fc7984563d216acad4efc9cc757fc6984d41476bc60b0f2ba8a4a2a4d8d9ed8579d1
|
||||
SHA512 (kernel-kabi-dw-6.11.6.tar.xz) = de8f531db663d6c1dee2f1924b7f08872f65f133a893b964d5bc59269381ad77957af8cd3d2a06c59935128a49bdd4a74c987a63b32acba8acaf96fcbbb925c7
|
||||
SHA512 (linux-6.11.8.tar.xz) = 5760c5970b7e29a16fff9e19b6dc71d157cb372b51fc935b21fbfc0c4d52305a8d54c30d3c1be1c7c4442319ebaec9fbf2e277b490fff40dbac90a843669f249
|
||||
SHA512 (kernel-abi-stablelists-6.11.8.tar.xz) = d2137c0d1d2674e76dd831f860c307c78281f0682da1aa131229d08f153e7e5efc70ba703fd417f289cabb11ad5b96950acd1f3b2b9521598ea566bbfca55903
|
||||
SHA512 (kernel-kabi-dw-6.11.8.tar.xz) = 0852a975738b78abf992651684ecf49f187bc91ee71e34f308053289ae845e19560135cfe114c077af6c422f60bc438042725523b21c30fad2e1086dd40693a4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user