From 0a4a4f7ae4188bccf4147196f08620453ef0633c Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Sat, 29 Apr 2017 18:39:32 +0200 Subject: [PATCH] mb/*/mainboard.c: Get rid of SPI AFC register MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The AFC—Additional Flash Control Register is set by southbridge code. Remove redundant calls and get rid of it in autoport. Change-Id: I627082e09dd055e3b3c4dd8e0b90965a9fcb4342 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/19493 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/apple/macbookair4_2/mainboard.c | 1 - src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c | 1 - src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c | 1 - src/mainboard/lenovo/l520/mainboard.c | 1 - src/mainboard/lenovo/s230u/mainboard.c | 1 - src/mainboard/lenovo/t420/mainboard.c | 1 - src/mainboard/lenovo/t420s/mainboard.c | 1 - src/mainboard/lenovo/t430s/mainboard.c | 1 - src/mainboard/lenovo/t520/mainboard.c | 1 - src/mainboard/lenovo/t530/mainboard.c | 1 - src/mainboard/lenovo/x201/mainboard.c | 1 - src/mainboard/lenovo/x220/mainboard.c | 1 - src/mainboard/lenovo/x230/mainboard.c | 1 - src/mainboard/packardbell/ms2290/mainboard.c | 1 - src/mainboard/sapphire/pureplatinumh61/mainboard.c | 1 - util/autoport/bd82x6x.go | 2 +- 16 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/mainboard/apple/macbookair4_2/mainboard.c b/src/mainboard/apple/macbookair4_2/mainboard.c index 2a0e45c182..68e12fe003 100644 --- a/src/mainboard/apple/macbookair4_2/mainboard.c +++ b/src/mainboard/apple/macbookair4_2/mainboard.c @@ -21,7 +21,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00800000; - RCBA32(0x38c0) = 0x00000007; } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c index 7b1c5065d3..d1fcfbca8b 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c @@ -36,7 +36,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; RCBA32(0x2240) = 0x00330e71; RCBA32(0x2244) = 0x003f0eb1; RCBA32(0x2248) = 0x002102cd; diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c index 7b1c5065d3..d1fcfbca8b 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c @@ -36,7 +36,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; RCBA32(0x2240) = 0x00330e71; RCBA32(0x2244) = 0x003f0eb1; RCBA32(0x2248) = 0x002102cd; diff --git a/src/mainboard/lenovo/l520/mainboard.c b/src/mainboard/lenovo/l520/mainboard.c index d10283c50a..f7332256c4 100644 --- a/src/mainboard/lenovo/l520/mainboard.c +++ b/src/mainboard/lenovo/l520/mainboard.c @@ -24,7 +24,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00000000; RCBA32(0x38c4) = 0x00000000; - RCBA32(0x38c0) = 0x00000000; } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/lenovo/s230u/mainboard.c b/src/mainboard/lenovo/s230u/mainboard.c index 9ed2a4b14f..ace72e531b 100644 --- a/src/mainboard/lenovo/s230u/mainboard.c +++ b/src/mainboard/lenovo/s230u/mainboard.c @@ -32,7 +32,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } static u8 mainboard_fill_ec_version(char *buf, u8 buf_len) diff --git a/src/mainboard/lenovo/t420/mainboard.c b/src/mainboard/lenovo/t420/mainboard.c index e2e02d46d5..8e050562dc 100644 --- a/src/mainboard/lenovo/t420/mainboard.c +++ b/src/mainboard/lenovo/t420/mainboard.c @@ -25,7 +25,6 @@ static void mainboard_init(device_t dev) /* init spi */ RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/lenovo/t420s/mainboard.c b/src/mainboard/lenovo/t420s/mainboard.c index 1262ec1b0a..059f8e6c4e 100644 --- a/src/mainboard/lenovo/t420s/mainboard.c +++ b/src/mainboard/lenovo/t420s/mainboard.c @@ -34,7 +34,6 @@ static void mainboard_init(device_t dev) /* init spi */ RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/lenovo/t430s/mainboard.c b/src/mainboard/lenovo/t430s/mainboard.c index a36a418833..77f39f0f07 100644 --- a/src/mainboard/lenovo/t430s/mainboard.c +++ b/src/mainboard/lenovo/t430s/mainboard.c @@ -34,7 +34,6 @@ static void mainboard_init(device_t dev) /* init spi */ RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c index 25abb27899..f9a614d082 100644 --- a/src/mainboard/lenovo/t520/mainboard.c +++ b/src/mainboard/lenovo/t520/mainboard.c @@ -38,7 +38,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } /* mainboard_enable is executed as first thing after diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c index c68354c674..358dbed0f4 100644 --- a/src/mainboard/lenovo/t530/mainboard.c +++ b/src/mainboard/lenovo/t530/mainboard.c @@ -38,7 +38,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } // mainboard_enable is executed as first thing after diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index 6c5f9c957f..5998a21f78 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -78,7 +78,6 @@ static void mainboard_init(device_t dev) RCBA32(0x38b4) = 0x03040002; RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; RCBA32(0x3804) = 0x3f04e008; printk(BIOS_SPEW, "SPI configured\n"); diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c index f674720fa6..a28a5a30d1 100644 --- a/src/mainboard/lenovo/x220/mainboard.c +++ b/src/mainboard/lenovo/x220/mainboard.c @@ -33,7 +33,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } // mainboard_enable is executed as first thing after diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c index 157fd3ab5c..a9b6392a81 100644 --- a/src/mainboard/lenovo/x230/mainboard.c +++ b/src/mainboard/lenovo/x230/mainboard.c @@ -34,7 +34,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; - RCBA32(0x38c0) = 0x00000007; } // mainboard_enable is executed as first thing after diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c index 813715f7cd..52d7144e5c 100644 --- a/src/mainboard/packardbell/ms2290/mainboard.c +++ b/src/mainboard/packardbell/ms2290/mainboard.c @@ -74,7 +74,6 @@ static void mainboard_enable(device_t dev) RCBA32(0x389c) = 0x0601209f; RCBA32(0x38b0) = 0x00000004; RCBA32(0x38b4) = 0x03040002; - RCBA32(0x38c0) = 0x00000007; RCBA32(0x38c8) = 0x00002005; RCBA32(0x38c4) = 0x00802005; RCBA32(0x3804) = 0x3f04e008; diff --git a/src/mainboard/sapphire/pureplatinumh61/mainboard.c b/src/mainboard/sapphire/pureplatinumh61/mainboard.c index 926031da5b..8e93ff58e1 100644 --- a/src/mainboard/sapphire/pureplatinumh61/mainboard.c +++ b/src/mainboard/sapphire/pureplatinumh61/mainboard.c @@ -22,7 +22,6 @@ static void mainboard_init(device_t dev) { RCBA32(0x38c8) = 0x00002009; RCBA32(0x38c4) = 0x00802009; - RCBA32(0x38c0) = 0x00000007; } static void mainboard_enable(device_t dev) diff --git a/util/autoport/bd82x6x.go b/util/autoport/bd82x6x.go index ed94df7798..026ae51f81 100644 --- a/util/autoport/bd82x6x.go +++ b/util/autoport/bd82x6x.go @@ -180,7 +180,7 @@ func (b bd82x6x) Scan(ctx Context, addr PCIDevData) { /* SPI init */ MainboardIncludes = append(MainboardIncludes, "southbridge/intel/bd82x6x/pch.h") /* FIXME:XX Move this to runtime. */ - for _, addr := range []uint16{0x38c8, 0x38c4, 0x38c0} { + for _, addr := range []uint16{0x38c8, 0x38c4} { MainboardInit += fmt.Sprintf("\tRCBA32(0x%04x) = 0x%08x;\n", addr, inteltool.RCBA[addr]) }