HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31870
Change subject: src: Add missing 'include <arch/io.h>' ......................................................................
src: Add missing 'include <arch/io.h>'
Change-Id: Id6565abd15d6904effbf55e5d1ea8664ef338c83 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/drivers/xgi/common/vb_init.c M src/drivers/xgi/common/vb_setmode.c M src/drivers/xgi/common/vb_util.c M src/drivers/xgi/common/xgi_coreboot.h M src/lib/debug.c M src/southbridge/via/common/early_smbus_delay.c M src/southbridge/via/common/early_smbus_is_busy.c M src/southbridge/via/common/early_smbus_read_byte.c M src/southbridge/via/common/early_smbus_reset.c M src/southbridge/via/common/early_smbus_wait_until_ready.c M src/southbridge/via/common/via_early_smbus.h 11 files changed, 19 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/31870/1
diff --git a/src/drivers/xgi/common/vb_init.c b/src/drivers/xgi/common/vb_init.c index 0d25e25..59bf566 100644 --- a/src/drivers/xgi/common/vb_init.c +++ b/src/drivers/xgi/common/vb_init.c @@ -17,14 +17,16 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #include "xgi_coreboot.h" #include "vstruct.h" - #include "XGIfb.h" #include "vb_def.h" #include "vb_util.h" #include "vb_setmode.h" #include "vb_init.h" + static const unsigned short XGINew_DDRDRAM_TYPE340[4][2] = { { 16, 0x45}, { 8, 0x35}, diff --git a/src/drivers/xgi/common/vb_setmode.c b/src/drivers/xgi/common/vb_setmode.c index e80bc35..e0ac3fe 100644 --- a/src/drivers/xgi/common/vb_setmode.c +++ b/src/drivers/xgi/common/vb_setmode.c @@ -14,11 +14,11 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #include "xgi_coreboot.h" #include "vstruct.h" - #include "XGIfb.h" - #include "vb_def.h" #include "vb_init.h" #include "vb_util.h" diff --git a/src/drivers/xgi/common/vb_util.c b/src/drivers/xgi/common/vb_util.c index f71ad56..239b835 100644 --- a/src/drivers/xgi/common/vb_util.c +++ b/src/drivers/xgi/common/vb_util.c @@ -14,8 +14,9 @@ * GNU General Public License for more details. */
-#include "xgi_coreboot.h" +#include <arch/io.h>
+#include "xgi_coreboot.h" #include "vgatypes.h" #include "vb_util.h"
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h index 39e74d1..2245409 100644 --- a/src/drivers/xgi/common/xgi_coreboot.h +++ b/src/drivers/xgi/common/xgi_coreboot.h @@ -23,9 +23,7 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> -#include <arch/io.h> #include <device/mmio.h> - #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/lib/debug.c b/src/lib/debug.c index 80ee416..40eb1e1 100644 --- a/src/lib/debug.c +++ b/src/lib/debug.c @@ -14,6 +14,8 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + static void print_debug_pci_dev(unsigned int dev) { printk(BIOS_DEBUG, "PCI: %02x:%02x.%x", diff --git a/src/southbridge/via/common/early_smbus_delay.c b/src/southbridge/via/common/early_smbus_delay.c index 0c04112..c441b46 100644 --- a/src/southbridge/via/common/early_smbus_delay.c +++ b/src/southbridge/via/common/early_smbus_delay.c @@ -14,6 +14,8 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_is_busy.c b/src/southbridge/via/common/early_smbus_is_busy.c index f719cb9..9fc2d5c 100644 --- a/src/southbridge/via/common/early_smbus_is_busy.c +++ b/src/southbridge/via/common/early_smbus_is_busy.c @@ -14,6 +14,8 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_read_byte.c b/src/southbridge/via/common/early_smbus_read_byte.c index cc137cb..2266706 100644 --- a/src/southbridge/via/common/early_smbus_read_byte.c +++ b/src/southbridge/via/common/early_smbus_read_byte.c @@ -14,6 +14,8 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_reset.c b/src/southbridge/via/common/early_smbus_reset.c index 6145ab8..8199cde 100644 --- a/src/southbridge/via/common/early_smbus_reset.c +++ b/src/southbridge/via/common/early_smbus_reset.c @@ -14,6 +14,8 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_wait_until_ready.c b/src/southbridge/via/common/early_smbus_wait_until_ready.c index 879bc23..c513701 100644 --- a/src/southbridge/via/common/early_smbus_wait_until_ready.c +++ b/src/southbridge/via/common/early_smbus_wait_until_ready.c @@ -14,6 +14,8 @@ * GNU General Public License for more details. */
+#include <arch/io.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/via_early_smbus.h b/src/southbridge/via/common/via_early_smbus.h index 5f66822..f538577 100644 --- a/src/southbridge/via/common/via_early_smbus.h +++ b/src/southbridge/via/common/via_early_smbus.h @@ -50,4 +50,3 @@ #define SMBUS_TIMEOUT (100*1000*10)
#include <device/early_smbus.h> -#include <arch/io.h>
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31870 )
Change subject: src: Add missing 'include <arch/io.h>' ......................................................................
Patch Set 1:
(9 comments)
https://review.coreboot.org/#/c/31870/1/src/drivers/xgi/common/vb_init.c File src/drivers/xgi/common/vb_init.c:
https://review.coreboot.org/#/c/31870/1/src/drivers/xgi/common/vb_init.c@112... PS1, Line 1125: outb(0x67, pVBInfo->P3c2); include <> added for this one
https://review.coreboot.org/#/c/31870/1/src/drivers/xgi/common/vb_setmode.c File src/drivers/xgi/common/vb_setmode.c:
https://review.coreboot.org/#/c/31870/1/src/drivers/xgi/common/vb_setmode.c@... PS1, Line 136: inb(pVBInfo->P3da); /* reset 3da */ : outb(i, pVBInfo->P3c0); /* set index */ : outb(ARdata, pVBInfo->P3c0); /* set data */ : } : : inb(pVBInfo->P3da); /* reset 3da */ : outb(0x14, pVBInfo->P3c0); /* set index */ : outb(0x00, pVBInfo->P3c0); /* set data */ : inb(pVBInfo->P3da); /* Enable Attribute */ : outb(0x20, pVBInfo->P3c0); include<> added for those
https://review.coreboot.org/#/c/31870/1/src/drivers/xgi/common/vb_util.c File src/drivers/xgi/common/vb_util.c:
https://review.coreboot.org/#/c/31870/1/src/drivers/xgi/common/vb_util.c@25 PS1, Line 25: outb(index, port); : outb(da added for 'outb'
https://review.coreboot.org/#/c/31870/1/src/lib/debug.c File src/lib/debug.c:
https://review.coreboot.org/#/c/31870/1/src/lib/debug.c@92 PS1, Line 92: inb(port); added for this one
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... File src/southbridge/via/common/early_smbus_delay.c:
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... PS1, Line 26: inb(0x80); for this one
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... File src/southbridge/via/common/early_smbus_is_busy.c:
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... PS1, Line 29: inb needs include 'io.h'
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... File src/southbridge/via/common/early_smbus_read_byte.c:
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... PS1, Line 35: outb(0x00, SMBHSTDAT0(smbus_dev)); needs arch/io.h
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... File src/southbridge/via/common/early_smbus_reset.c:
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... PS1, Line 28: outb here also it needs io.h
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... File src/southbridge/via/common/early_smbus_wait_until_ready.c:
https://review.coreboot.org/#/c/31870/1/src/southbridge/via/common/early_smb... PS1, Line 40: inb <arch/io.h>
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31870 )
Change subject: src: Add missing 'include <arch/io.h>' ......................................................................
Patch Set 1:
oops, 'src/lib/debug.c' is removed here :https://review.coreboot.org/#/c/coreboot/+/31871/
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31870 )
Change subject: src: Add missing 'include <arch/io.h>' ......................................................................
Patch Set 1:
CL:31871 lib/debug.c removed
I think you should do xgi and via separately, I think there is more indirect includes there to be fixed.
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31870 )
Change subject: src: Add missing 'include <arch/io.h>' ......................................................................
Patch Set 1:
Patch Set 1:
CL:31871 lib/debug.c removed
I think you should do xgi and via separately, I think there is more indirect includes there to be fixed.
lets's try CB:31871
Hello Kyösti Mälkki, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31870
to look at the new patch set (#2).
Change subject: sb/via/common: Add missing 'include <arch/io.h>' ......................................................................
sb/via/common: Add missing 'include <arch/io.h>'
Change-Id: Id6565abd15d6904effbf55e5d1ea8664ef338c83 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/southbridge/via/common/early_smbus_delay.c M src/southbridge/via/common/early_smbus_is_busy.c M src/southbridge/via/common/early_smbus_print_error.c M src/southbridge/via/common/early_smbus_read_byte.c M src/southbridge/via/common/early_smbus_reset.c M src/southbridge/via/common/early_smbus_wait_until_ready.c M src/southbridge/via/common/via_early_smbus.h 7 files changed, 17 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/31870/2
Hello Kyösti Mälkki, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31870
to look at the new patch set (#3).
Change subject: sb/via/common: Fix indirect includes ......................................................................
sb/via/common: Fix indirect includes
Change-Id: Id6565abd15d6904effbf55e5d1ea8664ef338c83 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/southbridge/via/common/early_smbus_delay.c M src/southbridge/via/common/early_smbus_is_busy.c M src/southbridge/via/common/early_smbus_print_error.c M src/southbridge/via/common/early_smbus_read_byte.c M src/southbridge/via/common/early_smbus_reset.c M src/southbridge/via/common/early_smbus_wait_until_ready.c M src/southbridge/via/common/via_early_smbus.h 7 files changed, 17 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/31870/3
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31870 )
Change subject: sb/via/common: Fix indirect includes ......................................................................
Patch Set 3: Code-Review+2
Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31870 )
Change subject: sb/via/common: Fix indirect includes ......................................................................
sb/via/common: Fix indirect includes
Change-Id: Id6565abd15d6904effbf55e5d1ea8664ef338c83 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/31870 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/southbridge/via/common/early_smbus_delay.c M src/southbridge/via/common/early_smbus_is_busy.c M src/southbridge/via/common/early_smbus_print_error.c M src/southbridge/via/common/early_smbus_read_byte.c M src/southbridge/via/common/early_smbus_reset.c M src/southbridge/via/common/early_smbus_wait_until_ready.c M src/southbridge/via/common/via_early_smbus.h 7 files changed, 17 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved
diff --git a/src/southbridge/via/common/early_smbus_delay.c b/src/southbridge/via/common/early_smbus_delay.c index 0c04112..c75152c 100644 --- a/src/southbridge/via/common/early_smbus_delay.c +++ b/src/southbridge/via/common/early_smbus_delay.c @@ -14,7 +14,8 @@ * GNU General Public License for more details. */
-#include "via_early_smbus.h" +#include <arch/io.h> +#include <device/early_smbus.h>
/** * \brief Brief delay for SMBus transactions diff --git a/src/southbridge/via/common/early_smbus_is_busy.c b/src/southbridge/via/common/early_smbus_is_busy.c index f719cb9..8321a55 100644 --- a/src/southbridge/via/common/early_smbus_is_busy.c +++ b/src/southbridge/via/common/early_smbus_is_busy.c @@ -14,6 +14,9 @@ * GNU General Public License for more details. */
+#include <arch/io.h> +#include <device/early_smbus.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_print_error.c b/src/southbridge/via/common/early_smbus_print_error.c index 8a59193..cf65b2e 100644 --- a/src/southbridge/via/common/early_smbus_print_error.c +++ b/src/southbridge/via/common/early_smbus_print_error.c @@ -14,6 +14,8 @@ * GNU General Public License for more details. */
+#include <device/early_smbus.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_read_byte.c b/src/southbridge/via/common/early_smbus_read_byte.c index cc137cb..4f6e29e 100644 --- a/src/southbridge/via/common/early_smbus_read_byte.c +++ b/src/southbridge/via/common/early_smbus_read_byte.c @@ -14,6 +14,9 @@ * GNU General Public License for more details. */
+#include <arch/io.h> +#include <device/early_smbus.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_reset.c b/src/southbridge/via/common/early_smbus_reset.c index 6145ab8..4497540 100644 --- a/src/southbridge/via/common/early_smbus_reset.c +++ b/src/southbridge/via/common/early_smbus_reset.c @@ -14,6 +14,9 @@ * GNU General Public License for more details. */
+#include <arch/io.h> +#include <device/early_smbus.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/early_smbus_wait_until_ready.c b/src/southbridge/via/common/early_smbus_wait_until_ready.c index 879bc23..6b18936 100644 --- a/src/southbridge/via/common/early_smbus_wait_until_ready.c +++ b/src/southbridge/via/common/early_smbus_wait_until_ready.c @@ -14,6 +14,9 @@ * GNU General Public License for more details. */
+#include <arch/io.h> +#include <device/early_smbus.h> + #include "via_early_smbus.h"
/** diff --git a/src/southbridge/via/common/via_early_smbus.h b/src/southbridge/via/common/via_early_smbus.h index 5f66822..1dce9b6 100644 --- a/src/southbridge/via/common/via_early_smbus.h +++ b/src/southbridge/via/common/via_early_smbus.h @@ -35,6 +35,7 @@ /** * \brief SMBus IO ports in relation to the base IO port */ + #define SMBHSTSTAT(base) ((u16)base + 0x0) #define SMBSLVSTAT(base) ((u16)base + 0x1) #define SMBHSTCTL(base) ((u16)base + 0x2) @@ -48,6 +49,3 @@ #define SMBSLVDATA (base) ((u16)base + 0xa)
#define SMBUS_TIMEOUT (100*1000*10) - -#include <device/early_smbus.h> -#include <arch/io.h>
-
HAOUAS Elyes (Code Review) -
Kyösti Mälkki (Code Review)