diff --git a/0001-add-acs-overrides.patch b/0001-add-acs-overrides.patch index 91a562b..712c0eb 100644 --- a/0001-add-acs-overrides.patch +++ b/0001-add-acs-overrides.patch @@ -139,10 +139,10 @@ index 285acc4aaccc..7ad267e87c34 100644 /* * Decoding should be disabled for a PCI device during BAR sizing to avoid * conflict. But doing so may cause problems on host bridge and perhaps other -@@ -4980,6 +5080,8 @@ static const struct pci_dev_acs_enabled { - { PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs }, - /* Zhaoxin Root/Downstream Ports */ +@@ -5002,6 +5102,8 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, + /* Wangxun nics */ + { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs }, + /* allow acs for any */ + { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, { 0 } diff --git a/PKGBUILD b/PKGBUILD index 59f29bf..a4e179b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux-eirene -pkgver=6.2.2.arch1 +pkgver=6.2.12.arch1 pkgrel=1 pkgdesc='Linux' _srctag=v${pkgver%.*}-${pkgver##*.} @@ -10,7 +10,7 @@ arch=(x86_64) license=(GPL2) makedepends=( bc libelf pahole cpio perl tar xz gettext - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra + xmlto python-sphinx graphviz imagemagick texlive-latexextra git ) options=('!strip') @@ -28,8 +28,8 @@ validpgpkeys=( 'C7E7849466FE2358343588377258734B41C31549' # David Runge ) sha256sums=('SKIP' - 'f7905cc26857a31ecf8fa4ea6964a4c7d56217dd8bb19a416f278ccdb78a1906' - 'b8f977aa923aa6076703b88262e395c56ce9df2943a52448d8a0e32cc90b1a70' + 'c16920da137fc99ad5ec379d9be60546fc2c50fd9fbbb506d944f012d11b032d' + 'd61f77fad364ca02b14d04ace86c149c40350db4c803e5a5045139fa7eede2cb' '750c57539f17332cafe01a978a0133fc9500dbe37a411b823dad2eee66652cfc') export KBUILD_BUILD_HOST=archlinux diff --git a/linux/PKGBUILD b/linux/PKGBUILD index e4e312e..786ba0e 100644 --- a/linux/PKGBUILD +++ b/linux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux -pkgver=6.2.2.arch1 +pkgver=6.2.12.arch1 pkgrel=1 pkgdesc='Linux' _srctag=v${pkgver%.*}-${pkgver##*.} @@ -10,7 +10,7 @@ arch=(x86_64) license=(GPL2) makedepends=( bc libelf pahole cpio perl tar xz gettext - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra + xmlto python-sphinx graphviz imagemagick texlive-latexextra git ) options=('!strip') @@ -26,7 +26,7 @@ validpgpkeys=( 'C7E7849466FE2358343588377258734B41C31549' # David Runge ) sha256sums=('SKIP' - '9fd08d03cf2de3325ca2c52282560a0b6ea63ee7801dc71d199e40c7a616d655') + 'c8b3fbb7664801bebc2d2d1fdf624524865a7817d0021c55c98523cb58dee201') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/linux/config b/linux/config index cf7fddd..71fc1ca 100644 --- a/linux/config +++ b/linux/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.2.2-arch1 Kernel Configuration +# Linux/x86 6.2.8-arch1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201" CONFIG_CC_IS_GCC=y @@ -1804,7 +1804,6 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -3332,6 +3331,7 @@ CONFIG_MICROSOFT_MANA=m CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y @@ -4494,7 +4494,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_FSL_LINFLEXUART=m CONFIG_SERIAL_MEN_Z135=m CONFIG_SERIAL_SPRD=m @@ -6651,7 +6650,6 @@ CONFIG_DRM_I915_FORCE_PROBE="*" CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y -CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_PXP=y CONFIG_DRM_I915_REQUEST_TIMEOUT=20000 @@ -6663,6 +6661,7 @@ CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500 CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 CONFIG_DRM_I915_STOP_TIMEOUT=100 CONFIG_DRM_I915_TIMESLICE_DURATION=1 +CONFIG_DRM_I915_GVT=y CONFIG_DRM_VGEM=m CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX=m @@ -7027,6 +7026,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y +# CONFIG_SND_HDA_CTL_DEV_ID is not set # end of HD-Audio CONFIG_SND_HDA_CORE=m