mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-09 12:28:30 +08:00
kernel 4.16.6
This commit is contained in:
AlmAck
parent
d7afb2c6c9
commit
9bea1eab4b
@ -2,12 +2,11 @@
|
||||
source ../linux.conf
|
||||
|
||||
pkgname=acpi_call
|
||||
_pkgname=acpi_call
|
||||
pkgver=1.1.0
|
||||
pkgrel=45
|
||||
pkgrel=46
|
||||
pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
|
||||
arch=('x86_64')
|
||||
url=("http://github.com/mkottman/acpi_call")
|
||||
url="http://github.com/mkottman/acpi_call"
|
||||
license=('GPL')
|
||||
depends=("linux=${_kernelver}")
|
||||
makedepends=("linux-headers=${_kernelver}")
|
||||
@ -41,7 +40,7 @@ package() {
|
||||
install -dm 755 "${pkgdir}"/usr/share/${pkgname}
|
||||
cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/
|
||||
|
||||
ln -s /usr/share/$_pkgname/examples/turn_off_gpu.sh \
|
||||
ln -s /usr/share/$pkgname/examples/turn_off_gpu.sh \
|
||||
${pkgdir}/usr/bin/turn_off_gpu.sh
|
||||
|
||||
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
|
||||
|
||||
@ -3,10 +3,10 @@ source ../linux.conf
|
||||
|
||||
pkgname=bbswitch
|
||||
pkgver=0.8
|
||||
pkgrel=39
|
||||
pkgrel=40
|
||||
pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
|
||||
arch=('x86_64')
|
||||
url=("http://github.com/Bumblebee-Project/bbswitch")
|
||||
url="http://github.com/Bumblebee-Project/bbswitch"
|
||||
license=('GPL')
|
||||
install=bbswitch.install
|
||||
depends=("linux=${_kernelver}")
|
||||
|
||||
@ -3,7 +3,7 @@ source ../linux.conf
|
||||
|
||||
pkgname=broadcom-wl
|
||||
pkgver=6.30.223.271
|
||||
pkgrel=21
|
||||
pkgrel=22
|
||||
pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
|
||||
url='http://www.broadcom.com/support/802.11/linux_sta.php'
|
||||
arch=('x86_64')
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=4.16
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc='Btrfs filesystem utilities'
|
||||
arch=('x86_64')
|
||||
depends=('glibc' 'util-linux' 'e2fsprogs' 'lzo2' 'zlib' 'zstd')
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -13,7 +13,7 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-${pkgver%.*}.tar.{xz,
|
||||
https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign})
|
||||
sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
|
||||
'SKIP'
|
||||
'bad271dbda2d024daf4a2ab6e122b95b262ea80508ac8018bc61e8aa44f40cfe'
|
||||
'634d3fd97e5d9d90262db0a9d62ed0a40043eb691d68bd4a545f907079610b56'
|
||||
'SKIP')
|
||||
validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
'647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman
|
||||
|
||||
@ -29,7 +29,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/linux-${pkgver}.tar.xz"
|
||||
'cpupower.systemd'
|
||||
'cpupower.service'
|
||||
'usbipd.service')
|
||||
sha256sums=('9ab56da21230da8d9455aaf108f0e9c95fa9213bc2bd5d3b9aceaf1dea26896c'
|
||||
sha256sums=('fa919108d37f6b5dec85ce3fde3bc76eabdfc93b0b8c8386878ad8fb46168a4b'
|
||||
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
|
||||
'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
|
||||
'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# These are the "basic variables" appliable for the normal kernel group
|
||||
|
||||
_kernelname="-CHAKRA"
|
||||
_kernelver=4.16.4
|
||||
_kernelver=4.16.6
|
||||
_basekernel=4.16
|
||||
|
||||
_extramodules=extramodules-${_basekernel}${_kernelname}
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
From fb08717dc5ecf3ada73f93663b528d9d4ce4380b Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <fb08717dc5ecf3ada73f93663b528d9d4ce4380b.1524129246.git.jan.steffens@gmail.com>
|
||||
In-Reply-To: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
|
||||
References: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
|
||||
From: Igor Russkikh <igor.russkikh@aquantia.com>
|
||||
Date: Wed, 11 Apr 2018 15:23:24 +0300
|
||||
Subject: [PATCH 6/6] net: aquantia: Regression on reset with 1.x firmware
|
||||
|
||||
On ASUS XG-C100C with 1.5.44 firmware a special mode called "dirty wake"
|
||||
is active. With this mode when motherboard gets powered (but no poweron
|
||||
happens yet), NIC automatically enables powersave link and watches
|
||||
for WOL packet.
|
||||
This normally allows to powerup the PC after AC power failures.
|
||||
|
||||
Not all motherboards or bios settings gives power to PCI slots,
|
||||
so this mode is not enabled on all the hardware.
|
||||
|
||||
4.16 linux driver introduced full hardware reset sequence
|
||||
This is required since before that we had no NIC hardware
|
||||
reset implemented and there were side effects of "not clean start".
|
||||
|
||||
But this full reset is incompatible with "dirty wake" WOL feature
|
||||
it keeps the PHY link in a special mode forever. As a consequence,
|
||||
driver sees no link and no traffic.
|
||||
|
||||
To fix this we forcibly change FW state to idle state before doing
|
||||
the full reset. This makes FW to restore link state.
|
||||
|
||||
Fixes: c8c82eb net: aquantia: Introduce global AQC hardware reset sequence
|
||||
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
.../aquantia/atlantic/hw_atl/hw_atl_utils.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
|
||||
index d3b847ec7465..c58b2c227260 100644
|
||||
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
|
||||
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
|
||||
@@ -48,6 +48,8 @@
|
||||
#define FORCE_FLASHLESS 0
|
||||
|
||||
static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);
|
||||
+static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,
|
||||
+ enum hal_atl_utils_fw_state_e state);
|
||||
|
||||
int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)
|
||||
{
|
||||
@@ -247,6 +249,20 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)
|
||||
|
||||
self->rbl_enabled = (boot_exit_code != 0);
|
||||
|
||||
+ /* FW 1.x may bootup in an invalid POWER state (WOL feature).
|
||||
+ * We should work around this by forcing its state back to DEINIT
|
||||
+ */
|
||||
+ if (!hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,
|
||||
+ aq_hw_read_reg(self,
|
||||
+ HW_ATL_MPI_FW_VERSION))) {
|
||||
+ int err = 0;
|
||||
+
|
||||
+ hw_atl_utils_mpi_set_state(self, MPI_DEINIT);
|
||||
+ AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) &
|
||||
+ HW_ATL_MPI_STATE_MSK) == MPI_DEINIT,
|
||||
+ 10, 1000U);
|
||||
+ }
|
||||
+
|
||||
if (self->rbl_enabled)
|
||||
return hw_atl_utils_soft_reset_rbl(self);
|
||||
else
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -22,21 +22,19 @@ source=(
|
||||
0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
|
||||
0003-Partially-revert-swiotlb-remove-various-exports.patch
|
||||
0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
|
||||
0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
|
||||
)
|
||||
sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
|
||||
'SKIP'
|
||||
'bad271dbda2d024daf4a2ab6e122b95b262ea80508ac8018bc61e8aa44f40cfe'
|
||||
'634d3fd97e5d9d90262db0a9d62ed0a40043eb691d68bd4a545f907079610b56'
|
||||
'SKIP'
|
||||
'9128c28a2bfe76fc90bd18dc6864839200e8b9ab941496c878313091b2a70023'
|
||||
'c3bb5ce947d8fbde8e6ff0f2a482e3fd00ee6cf73200b6a343d94286fa67ceff'
|
||||
'287b43e83535d0aba2797b8fe4c1527788995cbfd858097be37214345e781a25'
|
||||
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
|
||||
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
||||
'113b1fe603f61b749c4cb3902a4f5d4fbec9d1e5081f008bac485cc345defa5f'
|
||||
'9db235c5edfc9a81a0f5866f9942e74d896243c37d50298288fbbe2f79169fd3'
|
||||
'd57665a468f93c94b92924fdbdc72ea50def74d9c8999104c9594e64fb196328'
|
||||
'079180ceaae87a4851eb56e80f6e33b0199dad3343c73275ddb710e0824feb73'
|
||||
'f1c751e29bc1bcfe634c49873eb34a5418db3dfbd1f6d789e738dee78071d3dd')
|
||||
'079180ceaae87a4851eb56e80f6e33b0199dad3343c73275ddb710e0824feb73')
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
|
||||
@ -64,9 +62,6 @@ prepare() {
|
||||
# https://bugs.archlinux.org/task/58153
|
||||
patch -Np1 -i ../0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
|
||||
|
||||
# https://bugs.archlinux.org/task/58174
|
||||
patch -Np1 -i ../0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
|
||||
|
||||
cat "${srcdir}/config.x86_64" > ./.config
|
||||
|
||||
if [ "${_kernelname}" != "" ]; then
|
||||
@ -74,8 +69,10 @@ prepare() {
|
||||
sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
|
||||
fi
|
||||
|
||||
# set extraversion to pkgrel
|
||||
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
|
||||
# set extraversion to pkgrel and empty localversion
|
||||
sed -e "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" \
|
||||
-e "/^EXTRAVERSION =/aLOCALVERSION =" \
|
||||
-i Makefile
|
||||
|
||||
# don't run depmod on 'make install'. We'll do this ourselves in packaging
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
@ -113,6 +110,11 @@ package_linux() {
|
||||
install=linux.install
|
||||
|
||||
cd ${_srcname}
|
||||
|
||||
# get kernel version
|
||||
_kernver="$(make kernelrelease)"
|
||||
_basekernel=${_kernver%%-*}
|
||||
_basekernel=${_basekernel%.*}
|
||||
|
||||
mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
|
||||
make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
|
||||
@ -120,28 +122,28 @@ package_linux() {
|
||||
|
||||
# make room for external modules
|
||||
#local _extramodules="extramodules-${_basekernel}${_kernelname:--CHAKRA}"
|
||||
ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernelver}/extramodules"
|
||||
ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
|
||||
|
||||
# add real version for building modules and running depmod from hook
|
||||
echo "${_kernelver}" |
|
||||
echo "${_kernver}" |
|
||||
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modules/${_extramodules}/version"
|
||||
|
||||
# remove build and source links
|
||||
rm -f "${pkgdir}"/usr/lib/modules/${_kernelver}/{source,build}
|
||||
rm -f "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build}
|
||||
|
||||
# gzip -9 all modules to save 100MB of space
|
||||
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
|
||||
|
||||
# now we call depmod...
|
||||
depmod -b "${pkgdir}/usr" -F System.map "${_kernelver}"
|
||||
depmod -b "${pkgdir}/usr" -F System.map "${_kernver}"
|
||||
|
||||
# add vmlinux
|
||||
install -Dt "${pkgdir}/usr/lib/modules/${_kernelver}/build" -m644 vmlinux
|
||||
install -Dt "${pkgdir}/usr/lib/modules/${_kernver}/build" -m644 vmlinux
|
||||
|
||||
# sed expression for following substitutions
|
||||
local _subst="
|
||||
s|%PKGBASE%|${pkgbase}/|g
|
||||
s|%KERNVER%|${_kernelver}|g
|
||||
s|%KERNVER%|${_kernver}|g
|
||||
s|%EXTRAMODULES%|${_extramodules}|g
|
||||
"
|
||||
|
||||
@ -164,7 +166,7 @@ package_linux-headers() {
|
||||
pkgdesc="Header files and scripts for building modules for linux kernel"
|
||||
|
||||
cd ${_srcname}
|
||||
local _builddir="${pkgdir}/usr/lib/modules/${_kernelver}/build"
|
||||
local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build"
|
||||
|
||||
install -Dt "${_builddir}" -m644 Makefile .config Module.symvers
|
||||
install -Dt "${_builddir}/kernel" -m644 kernel/Makefile
|
||||
@ -231,8 +233,8 @@ package_linux-docs() {
|
||||
|
||||
cd $_srcname
|
||||
|
||||
mkdir -p "${pkgdir}/usr/lib/modules/${_kernelver}/build"
|
||||
cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernelver}/build"
|
||||
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build"
|
||||
cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
|
||||
find "${pkgdir}" -type f -exec chmod 444 {} \;
|
||||
find "${pkgdir}" -type d -exec chmod 755 {} \;
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.16.4-1 Kernel Configuration
|
||||
# Linux/x86 4.16.6-1 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
@ -560,7 +560,7 @@ CONFIG_AMD_NUMA=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_NODES_SPAN_OTHER_NODES=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
CONFIG_NODES_SHIFT=6
|
||||
CONFIG_NODES_SHIFT=5
|
||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
||||
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
|
||||
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
|
||||
|
||||
@ -3,7 +3,7 @@ source ../linux.conf
|
||||
|
||||
pkgname=ndiswrapper
|
||||
pkgver=1.61
|
||||
pkgrel=11
|
||||
pkgrel=12
|
||||
pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
|
||||
license=('GPL')
|
||||
arch=('x86_64')
|
||||
|
||||
@ -4,7 +4,7 @@ source ../linux.conf
|
||||
pkgbase=nvidia-304xx
|
||||
pkgname=('nvidia-304xx' 'chd-nvidia-304xx' 'nvidia-304xx-dkms')
|
||||
pkgver=304.137
|
||||
pkgrel=7
|
||||
pkgrel=8
|
||||
arch=('x86_64')
|
||||
url="http://www.nvidia.com/"
|
||||
makedepends=("linux-headers=${_kernelver}")
|
||||
|
||||
@ -4,7 +4,7 @@ source ../linux.conf
|
||||
pkgbase=nvidia-340xx
|
||||
pkgname=('nvidia-340xx' 'chd-nvidia-340xx' 'nvidia-340xx-dkms')
|
||||
pkgver=340.106
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
arch=('x86_64')
|
||||
url="http://www.nvidia.com/"
|
||||
makedepends=("linux-headers=${_kernelver}")
|
||||
|
||||
@ -3,7 +3,7 @@ source ../linux.conf
|
||||
|
||||
pkgname=(nvidia nvidia-dkms chd-nvidia)
|
||||
pkgver=390.48
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
arch=('x86_64')
|
||||
url="http://www.nvidia.com/"
|
||||
makedepends=("linux-headers=${_kernelver}" "nvidia-utils=${pkgver}")
|
||||
|
||||
@ -2,7 +2,7 @@ source ../linux.conf
|
||||
|
||||
pkgname=r8168
|
||||
pkgver=8.045.08
|
||||
pkgrel=7
|
||||
pkgrel=8
|
||||
pkgdesc="A kernel module for Realtek 8168 network cards"
|
||||
url="http://www.realtek.com.tw"
|
||||
license=("GPL")
|
||||
|
||||
@ -3,7 +3,7 @@ source ../linux.conf
|
||||
|
||||
pkgname=vhba-module
|
||||
pkgver=20170610
|
||||
pkgrel=9
|
||||
pkgrel=10
|
||||
pkgdesc="Kernel module that emulates SCSI devices"
|
||||
arch=('x86_64')
|
||||
url="http://cdemu.sourceforge.net/"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user