Commit 02d03667 authored by Seblu's avatar Seblu
Browse files

Bump 5.15.0

parent 32ad0c24

PKGBUILD

+5 −7
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Customized version of linux for seblu computers



pkgname=linux-seblu

pkgver=5.14.14

pkgrel=3

pkgver=5.15.0

pkgrel=1

pkgdesc='The Linux Kernel cooked by Seblu'

arch=('x86_64')

license=('GPL2')
@@ -18,12 +18,10 @@ optdepends=( 
install=linux-seblu.install

_main=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

_stable=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git

source=("git+$_stable#tag=v5.14.14"

        "config.$CARCH"

        'fix-iTCO_wdt.patch')

source=("git+$_main#tag=v5.15"

        "config.$CARCH")

sha256sums=('SKIP'

            '02ad39779449a9d3443889f1de68af129759b28fc513e3e9b8016d48622f1bf9'

            'df6fb7b3468e66b443a80d7f61144cdd8602b13f36490996c0dc79bbc175be45')

            '6a912d9e2bddeaa01dd8d91910339396f39b3b50102a8c3e6dba4cf6e6158b9f')



prepare() {

  [[ -d linux-stable ]] && ln -snf linux-stable linux

config.x86_64

+167 −105

File changed.

Preview size limit exceeded, changes collapsed.

fix-iTCO_wdt.patch

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c

index 643c6c2d0b72..ced2fc0deb8c 100644

--- a/drivers/watchdog/iTCO_wdt.c

+++ b/drivers/watchdog/iTCO_wdt.c

@@ -71,8 +71,6 @@

 #define TCOBASE(p)	((p)->tco_res->start)

 /* SMI Control and Enable Register */

 #define SMI_EN(p)	((p)->smi_res->start)

-#define TCO_EN		(1 << 13)

-#define GBL_SMI_EN	(1 << 0)

 

 #define TCO_RLD(p)	(TCOBASE(p) + 0x00) /* TCO Timer Reload/Curr. Value */

 #define TCOv1_TMR(p)	(TCOBASE(p) + 0x01) /* TCOv1 Timer Initial Value*/

@@ -357,12 +355,8 @@ static int iTCO_wdt_set_timeout(struct watchdog_device *wd_dev, unsigned int t)

 

 	tmrval = seconds_to_ticks(p, t);

 

-	/*

-	 * If TCO SMIs are off, the timer counts down twice before rebooting.

-	 * Otherwise, the BIOS generally reboots when the SMI triggers.

-	 */

-	if (p->smi_res &&

-	    (inl(SMI_EN(p)) & (TCO_EN | GBL_SMI_EN)) != (TCO_EN | GBL_SMI_EN))

+	/* For TCO v1 the timer counts down twice before rebooting */

+	if (p->iTCO_version == 1)

 		tmrval /= 2;

 

 	/* from the specs: */

@@ -527,7 +521,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)

 		 * Disables TCO logic generating an SMI#

 		 */

 		val32 = inl(SMI_EN(p));

-		val32 &= ~TCO_EN;	/* Turn off SMI clearing watchdog */

+		val32 &= 0xffffdfff;	/* Turn off SMI clearing watchdog */

 		outl(val32, SMI_EN(p));

 	}