coreboot-gerrit August 2014

coreboot-gerrit@coreboot.org

1 participants
1011 discussions

New patch to review for coreboot: 6d5294c southbridge fsp_rangeley: Add missing header guard for irq_helper.h
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6447 -gerrit commit 6d5294c7c3a734c2773a09d58540176d060c24dd Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 13:54:08 2014 +0200 southbridge fsp_rangeley: Add missing header guard for irq_helper.h Change-Id: I385a53b5e320c1d50aa33e80415e4a68d8ca8ab7 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h b/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h index 4a298d3..b05ad8c 100644 --- a/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h +++ b/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h @@ -24,6 +24,10 @@ * This method uses #defines in irqroute.h along with the macros contained * in this file to generate an IRQ routing for each PCI device in the system. */ + +#ifndef IRQ_HELPER_H +#define IRQ_HELPER_H + #undef PCI_DEV_PIRQ_ROUTES #undef ACPI_DEV_IRQ #undef PCI_DEV_PIRQ_ROUTE @@ -53,3 +57,5 @@ /* Include the mainboard irq route definition */ #include "irqroute.h" + +#endif /* IRQ_HELPER_H */

1 0

New patch to review for coreboot: 36fea45 intel 'gma.h': Add missing header guards
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6446 -gerrit commit 36fea45e62e02a6e3c30337d5c87961b98bcd67b Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 13:45:36 2014 +0200 intel 'gma.h': Add missing header guards Change-Id: I2b712e7ed5c9244a813aa601574e992ce26792e9 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/northbridge/intel/fsp_sandybridge/gma.h | 5 +++++ src/northbridge/intel/haswell/gma.h | 5 +++++ src/northbridge/intel/sandybridge/gma.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/northbridge/intel/fsp_sandybridge/gma.h b/src/northbridge/intel/fsp_sandybridge/gma.h index cdf5d91..3c893f8 100644 --- a/src/northbridge/intel/fsp_sandybridge/gma.h +++ b/src/northbridge/intel/fsp_sandybridge/gma.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef GMA_H +#define GMA_H + /* mailbox 0: header */ typedef struct { u8 signature[16]; @@ -165,3 +168,5 @@ typedef struct { } __attribute__((packed)) optionrom_vbt_t; #define VBT_SIGNATURE 0x54425624 + +#endif /* GMA_H */ diff --git a/src/northbridge/intel/haswell/gma.h b/src/northbridge/intel/haswell/gma.h index 29281ba..254d804 100644 --- a/src/northbridge/intel/haswell/gma.h +++ b/src/northbridge/intel/haswell/gma.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef GMA_H +#define GMA_H + /* mailbox 0: header */ typedef struct { u8 signature[16]; @@ -165,3 +168,5 @@ typedef struct { } __attribute__((packed)) optionrom_vbt_t; #define VBT_SIGNATURE 0x54425624 + +#endif /* GMA_H */ diff --git a/src/northbridge/intel/sandybridge/gma.h b/src/northbridge/intel/sandybridge/gma.h index bc5d986..72bb601 100644 --- a/src/northbridge/intel/sandybridge/gma.h +++ b/src/northbridge/intel/sandybridge/gma.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef GMA_H +#define GMA_H + /* mailbox 0: header */ typedef struct { u8 signature[16]; @@ -170,3 +173,5 @@ struct northbridge_intel_sandybridge_config; int i915lightup(const struct northbridge_intel_sandybridge_config *info, u32 physbase, u16 pio, u32 mmio, u32 lfb); + +#endif /* GMA_H */

1 0

New patch to review for coreboot: f026837 'irqroute.h': Add missing header guards
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6445 -gerrit commit f026837b0dd6f643f570fdab7956b1940636e934 Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 13:40:06 2014 +0200 'irqroute.h': Add missing header guards Change-Id: I2f8327632f82510be657ddcf0e0d4ef8df3b98a8 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/mainboard/google/rambi/irqroute.h | 5 +++++ src/mainboard/intel/bayleybay_fsp/irqroute.h | 5 +++++ src/mainboard/intel/mohonpeak/irqroute.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/mainboard/google/rambi/irqroute.h b/src/mainboard/google/rambi/irqroute.h index 7339793..1fba2f7 100644 --- a/src/mainboard/google/rambi/irqroute.h +++ b/src/mainboard/google/rambi/irqroute.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef IRQROUTE_H +#define IRQROUTE_H + #include <soc/intel/baytrail/baytrail/irq.h> #include <soc/intel/baytrail/baytrail/pci_devs.h> @@ -61,3 +64,5 @@ #define CODEC_IRQ_OFFSET 0 /* Corresponding SUS GPIO pins */ #define CODEC_IRQ_GPIO 9 + +#endif /* IRQROUTE_H */ diff --git a/src/mainboard/intel/bayleybay_fsp/irqroute.h b/src/mainboard/intel/bayleybay_fsp/irqroute.h index 4a29b20..08552c5 100644 --- a/src/mainboard/intel/bayleybay_fsp/irqroute.h +++ b/src/mainboard/intel/bayleybay_fsp/irqroute.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef IRQROUTE_H +#define IRQROUTE_H + #include <soc/intel/fsp_baytrail/baytrail/irq.h> #include <soc/intel/fsp_baytrail/baytrail/pci_devs.h> @@ -70,3 +73,5 @@ PIRQ_PIC(F, 12), \ PIRQ_PIC(G, 14), \ PIRQ_PIC(H, 15) + +#endif /* IRQROUTE_H */ diff --git a/src/mainboard/intel/mohonpeak/irqroute.h b/src/mainboard/intel/mohonpeak/irqroute.h index 0e71a88..f3bc42c 100644 --- a/src/mainboard/intel/mohonpeak/irqroute.h +++ b/src/mainboard/intel/mohonpeak/irqroute.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef IRQROUTE_H +#define IRQROUTE_H + #include <southbridge/intel/fsp_rangeley/irq.h> #include <southbridge/intel/fsp_rangeley/pci_devs.h> @@ -66,3 +69,5 @@ PIRQ_PIC(F, 15), \ PIRQ_PIC(G, 14), \ PIRQ_PIC(H, 15) + +#endif /* IRQROUTE_H */

1 0

New patch to review for coreboot: 3c0071c 'i915io.h': Add missing header guardsAdd missing header guards
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6444 -gerrit commit 3c0071cfda7ffc13810a8d19975c0adc2ff68698 Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 13:35:15 2014 +0200 'i915io.h': Add missing header guardsAdd missing header guards Change-Id: I2198cdb773c623afee22ecaa79b2f32bfafa0382 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/mainboard/google/link/i915io.h | 5 +++++ src/mainboard/lenovo/x60/i915io.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/mainboard/google/link/i915io.h b/src/mainboard/google/link/i915io.h index 6533c81..ec77f70 100644 --- a/src/mainboard/google/link/i915io.h +++ b/src/mainboard/google/link/i915io.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef I915IO_H +#define I915IO_H + #include "i915_reg.h" #include "drm_dp_helper.h" @@ -84,3 +87,5 @@ u32 pack_aux(u32 *src, int src_bytes); void unpack_aux(u32 src, u32 *dst, int dst_bytes); int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes, u32 *recv, int recv_size); + +#endif /* I915IO_H */ diff --git a/src/mainboard/lenovo/x60/i915io.h b/src/mainboard/lenovo/x60/i915io.h index 8f37d9b..e45b1dd 100644 --- a/src/mainboard/lenovo/x60/i915io.h +++ b/src/mainboard/lenovo/x60/i915io.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef I915IO_H +#define I915IO_H + #include "i915_reg.h" #include "drm_dp_helper.h" @@ -84,3 +87,5 @@ u32 pack_aux(u32 *src, int src_bytes); void unpack_aux(u32 src, u32 *dst, int dst_bytes); int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes, u32 *recv, int recv_size); + +#endif /* I915IO_H */

1 0

New patch to review for coreboot: 3df8893 qemu-i440fx: Add missing header guards
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6443 -gerrit commit 3df88937d24cca2a53487e4c6761e02758c6abd0 Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 13:30:36 2014 +0200 qemu-i440fx: Add missing header guards Change-Id: Id7e333136b02bc7cc8e4ee4933d7bab6f5c4eb7a Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/mainboard/emulation/qemu-i440fx/fw_cfg.h | 5 +++++ src/mainboard/emulation/qemu-i440fx/fw_cfg_if.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.h b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h index 5ab024f..d40215a 100644 --- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.h +++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h @@ -15,8 +15,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef FW_CFG_H +#define FW_CFG_H + void fw_cfg_get(int entry, void *dst, int dstlen); int fw_cfg_check_file(const char *name); void fw_cfg_load_file(const char *name, void *dst); int fw_cfg_max_cpus(void); unsigned long fw_cfg_acpi_tables(unsigned long start); + +#endif /* FW_CFG_H */ diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg_if.h b/src/mainboard/emulation/qemu-i440fx/fw_cfg_if.h index 2d27245..f53bafa 100644 --- a/src/mainboard/emulation/qemu-i440fx/fw_cfg_if.h +++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg_if.h @@ -3,6 +3,9 @@ * Copyed over from qemu soure tree, include/hw/nvram/fw_cfg.h */ +#ifndef FW_CFG_IF_H +#define FW_CFG_IF_H + #define FW_CFG_SIGNATURE 0x00 #define FW_CFG_ID 0x01 #define FW_CFG_UUID 0x02 @@ -74,3 +77,5 @@ typedef struct FwCfgSmbios { uint8_t tabletype; uint16_t fieldoffset; } FwCfgSmbios; + +#endif /* FW_CFG_IF_H */

1 0

New patch to review for coreboot: bb0493e mainboard 'hda_verb.h': Add missing header guards
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6442 -gerrit commit bb0493eb2f4b98836cf5856727f9eda3e5ce028a Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 13:26:25 2014 +0200 mainboard 'hda_verb.h': Add missing header guards Change-Id: I904b45bcb34e358d23daebbfc75c419c5d2983c4 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/mainboard/asus/m2n-e/hda_verb.h | 5 +++++ src/mainboard/dmp/vortex86ex/hda_verb.h | 5 +++++ src/mainboard/getac/p470/hda_verb.h | 5 +++++ src/mainboard/google/bolt/hda_verb.h | 5 +++++ src/mainboard/google/butterfly/hda_verb.h | 5 ++++- src/mainboard/google/falco/hda_verb.h | 5 +++++ src/mainboard/google/link/hda_verb.h | 5 +++++ src/mainboard/google/parrot/hda_verb.h | 5 +++++ src/mainboard/google/peppy/hda_verb.h | 5 +++++ src/mainboard/google/slippy/hda_verb.h | 5 +++++ src/mainboard/google/stout/hda_verb.h | 5 +++++ src/mainboard/intel/baskingridge/hda_verb.h | 5 +++++ src/mainboard/intel/cougar_canyon2/hda_verb.h | 5 +++++ src/mainboard/intel/emeraldlake2/hda_verb.h | 5 +++++ src/mainboard/intel/wtm2/hda_verb.h | 5 +++++ src/mainboard/iwave/iWRainbowG6/hda_verb.h | 5 +++++ src/mainboard/kontron/ktqm77/hda_verb.h | 6 ++++++ src/mainboard/lenovo/t520/hda_verb.h | 4 ++++ src/mainboard/lenovo/t530/hda_verb.h | 4 ++++ src/mainboard/lenovo/x201/hda_verb.h | 5 +++++ src/mainboard/lenovo/x230/hda_verb.h | 4 ++++ src/mainboard/nvidia/l1_2pvv/hda_verb.h | 5 +++++ src/mainboard/packardbell/ms2290/hda_verb.h | 5 +++++ src/mainboard/roda/rk9/hda_verb.h | 5 +++++ src/mainboard/samsung/lumpy/hda_verb.h | 5 +++++ src/mainboard/samsung/stumpy/hda_verb.h | 5 +++++ 26 files changed, 127 insertions(+), 1 deletion(-) diff --git a/src/mainboard/asus/m2n-e/hda_verb.h b/src/mainboard/asus/m2n-e/hda_verb.h index ec288ba..6d9ed7e 100644 --- a/src/mainboard/asus/m2n-e/hda_verb.h +++ b/src/mainboard/asus/m2n-e/hda_verb.h @@ -24,6 +24,9 @@ * http://www.analog.com/static/imported-files/data_sheets/AD1988A_1988B.pdf */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x11d4198b, /* Codec Vendor / Device ID: Analog Devices AD1988B */ @@ -120,3 +123,5 @@ static const u32 mainboard_cim_verb_data[] = { extern const u32 *cim_verb_data; extern u32 cim_verb_data_size; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/dmp/vortex86ex/hda_verb.h b/src/mainboard/dmp/vortex86ex/hda_verb.h index 0556315..91018f6 100644 --- a/src/mainboard/dmp/vortex86ex/hda_verb.h +++ b/src/mainboard/dmp/vortex86ex/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0262, // Codec Vendor / Device ID: Realtek ALC262 @@ -105,3 +108,5 @@ static const u32 mainboard_cim_verb_data[] = { extern const u32 *cim_verb_data; extern u32 cim_verb_data_size; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/getac/p470/hda_verb.h b/src/mainboard/getac/p470/hda_verb.h index b7578cc..6b6daba 100644 --- a/src/mainboard/getac/p470/hda_verb.h +++ b/src/mainboard/getac/p470/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0262, // Codec Vendor / Device ID: Realtek ALC262 @@ -106,3 +109,5 @@ static const u32 mainboard_cim_verb_data[] = { extern const u32 *cim_verb_data; extern u32 cim_verb_data_size; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/bolt/hda_verb.h b/src/mainboard/google/bolt/hda_verb.h index f27480d..a45511c 100644 --- a/src/mainboard/google/bolt/hda_verb.h +++ b/src/mainboard/google/bolt/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0283, // Codec Vendor / Device ID: Realtek ALC283 @@ -92,3 +95,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x02171f03, // connector, left panel }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/butterfly/hda_verb.h b/src/mainboard/google/butterfly/hda_verb.h index 89a81fe..0c01749 100644 --- a/src/mainboard/google/butterfly/hda_verb.h +++ b/src/mainboard/google/butterfly/hda_verb.h @@ -23,7 +23,8 @@ * Revision ID : 0x100303 */ - +#ifndef HDA_VERB_H +#define HDA_VERB_H static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x111D76E5, // Codec Vendor / Device ID: IDT 92HD99 @@ -262,3 +263,5 @@ static const u32 mainboard_pc_beep_verbs[] = { static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/falco/hda_verb.h b/src/mainboard/google/falco/hda_verb.h index f27480d..a45511c 100644 --- a/src/mainboard/google/falco/hda_verb.h +++ b/src/mainboard/google/falco/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0283, // Codec Vendor / Device ID: Realtek ALC283 @@ -92,3 +95,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x02171f03, // connector, left panel }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/link/hda_verb.h b/src/mainboard/google/link/hda_verb.h index ed18d63..f190434 100644 --- a/src/mainboard/google/link/hda_verb.h +++ b/src/mainboard/google/link/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x11020011, // Codec Vendor / Device ID: Creative CA0132 @@ -179,3 +182,5 @@ static const u32 mainboard_pc_beep_verbs[] = { }; static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/parrot/hda_verb.h b/src/mainboard/google/parrot/hda_verb.h index ca68ad3..6756daf 100644 --- a/src/mainboard/google/parrot/hda_verb.h +++ b/src/mainboard/google/parrot/hda_verb.h @@ -32,6 +32,9 @@ * HDMI PatherPoint */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269 @@ -167,3 +170,5 @@ static const u32 mainboard_pc_beep_verbs[] = { static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/peppy/hda_verb.h b/src/mainboard/google/peppy/hda_verb.h index d3a63bf..149d333 100644 --- a/src/mainboard/google/peppy/hda_verb.h +++ b/src/mainboard/google/peppy/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0283, // Codec Vendor / Device ID: Realtek ALC283 @@ -97,3 +100,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x02171f03, // connector, left panel }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/slippy/hda_verb.h b/src/mainboard/google/slippy/hda_verb.h index f27480d..a45511c 100644 --- a/src/mainboard/google/slippy/hda_verb.h +++ b/src/mainboard/google/slippy/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0283, // Codec Vendor / Device ID: Realtek ALC283 @@ -92,3 +95,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x02171f03, // connector, left panel }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/google/stout/hda_verb.h b/src/mainboard/google/stout/hda_verb.h index 08fc10c..5310633 100644 --- a/src/mainboard/google/stout/hda_verb.h +++ b/src/mainboard/google/stout/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0269, // Codec Vendor / Device ID: Realtek @@ -137,3 +140,5 @@ static const u32 mainboard_pc_beep_verbs[] = { }; static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/intel/baskingridge/hda_verb.h b/src/mainboard/intel/baskingridge/hda_verb.h index 52e5a3d..c91e578 100644 --- a/src/mainboard/intel/baskingridge/hda_verb.h +++ b/src/mainboard/intel/baskingridge/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10134210, // Codec Vendor / Device ID: Cirrus Logic CS4210 @@ -96,3 +99,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x30771e56, 0x30771f18 }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/intel/cougar_canyon2/hda_verb.h b/src/mainboard/intel/cougar_canyon2/hda_verb.h index f8e83b4..14dea57 100644 --- a/src/mainboard/intel/cougar_canyon2/hda_verb.h +++ b/src/mainboard/intel/cougar_canyon2/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x80862805, // Codec Vendor / Device ID: Intel CougarPoint HDMI @@ -47,3 +50,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x30771e56, 0x30771f18 }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/intel/emeraldlake2/hda_verb.h b/src/mainboard/intel/emeraldlake2/hda_verb.h index 52e5a3d..c91e578 100644 --- a/src/mainboard/intel/emeraldlake2/hda_verb.h +++ b/src/mainboard/intel/emeraldlake2/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10134210, // Codec Vendor / Device ID: Cirrus Logic CS4210 @@ -96,3 +99,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x30771e56, 0x30771f18 }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/intel/wtm2/hda_verb.h b/src/mainboard/intel/wtm2/hda_verb.h index cb33add..c39b613 100644 --- a/src/mainboard/intel/wtm2/hda_verb.h +++ b/src/mainboard/intel/wtm2/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10134210, // Codec Vendor / Device ID: Cirrus Logic CS4210 @@ -96,3 +99,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x30771e56, 0x30771f18 }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/iwave/iWRainbowG6/hda_verb.h b/src/mainboard/iwave/iWRainbowG6/hda_verb.h index 80ed21d..f440e41 100644 --- a/src/mainboard/iwave/iWRainbowG6/hda_verb.h +++ b/src/mainboard/iwave/iWRainbowG6/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x111d76d5, // Codec Vendor / Device ID: IDT 92HD81 @@ -92,3 +95,5 @@ static u32 mainboard_cim_verb_data[] = { extern const u32 *cim_verb_data; extern u32 cim_verb_data_size; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/kontron/ktqm77/hda_verb.h b/src/mainboard/kontron/ktqm77/hda_verb.h index 53b3fc9..f96999d 100644 --- a/src/mainboard/kontron/ktqm77/hda_verb.h +++ b/src/mainboard/kontron/ktqm77/hda_verb.h @@ -24,6 +24,10 @@ * Port-Con. Location Def.-Dev. Con.-Type Color Misc Def.-Aso. Seq * 31..30 29..24 23..20 19..16 15..12 11..00 07..04 03..00 */ + +#ifndef HDA_VERB_H +#define HDA_VERB_H + #define PIN_CFG(pin, val) \ (pin << 20) | ( 0x71c << 8) | (val & 0xff), \ (pin << 20) | ( 0x71d << 8) | ((val >> 8) & 0xff), \ @@ -140,3 +144,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x30771e56, 0x30771f18 }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/lenovo/t520/hda_verb.h b/src/mainboard/lenovo/t520/hda_verb.h index 7d5e75a..e51b02f 100644 --- a/src/mainboard/lenovo/t520/hda_verb.h +++ b/src/mainboard/lenovo/t520/hda_verb.h @@ -24,6 +24,8 @@ * Revision ID : 0x100303 */ +#ifndef HDA_VERB_H +#define HDA_VERB_H static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ @@ -313,3 +315,5 @@ static const u32 mainboard_pc_beep_verbs[] = { static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/lenovo/t530/hda_verb.h b/src/mainboard/lenovo/t530/hda_verb.h index cc280a1..3545c0a 100644 --- a/src/mainboard/lenovo/t530/hda_verb.h +++ b/src/mainboard/lenovo/t530/hda_verb.h @@ -24,6 +24,8 @@ * Revision ID : 0x100303 */ +#ifndef HDA_VERB_H +#define HDA_VERB_H static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ @@ -313,3 +315,5 @@ static const u32 mainboard_pc_beep_verbs[] = { static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/lenovo/x201/hda_verb.h b/src/mainboard/lenovo/x201/hda_verb.h index d5a8e7c..539d6fb 100644 --- a/src/mainboard/lenovo/x201/hda_verb.h +++ b/src/mainboard/lenovo/x201/hda_verb.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x14F15069, /* Codec Vendor / Device ID: Conexant CX20585 */ @@ -118,3 +121,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x30671E56, 0x30671F58, }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/lenovo/x230/hda_verb.h b/src/mainboard/lenovo/x230/hda_verb.h index cc280a1..3545c0a 100644 --- a/src/mainboard/lenovo/x230/hda_verb.h +++ b/src/mainboard/lenovo/x230/hda_verb.h @@ -24,6 +24,8 @@ * Revision ID : 0x100303 */ +#ifndef HDA_VERB_H +#define HDA_VERB_H static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ @@ -313,3 +315,5 @@ static const u32 mainboard_pc_beep_verbs[] = { static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/nvidia/l1_2pvv/hda_verb.h b/src/mainboard/nvidia/l1_2pvv/hda_verb.h index 763840b..9a80526 100644 --- a/src/mainboard/nvidia/l1_2pvv/hda_verb.h +++ b/src/mainboard/nvidia/l1_2pvv/hda_verb.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0880, // Codec Vendor / Device ID: Realtek ALC880 @@ -106,3 +109,5 @@ static u32 mainboard_cim_verb_data[] = { extern u32 *cim_verb_data; extern u32 cim_verb_data_size; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/packardbell/ms2290/hda_verb.h b/src/mainboard/packardbell/ms2290/hda_verb.h index 1e3ccc4..5a14636 100644 --- a/src/mainboard/packardbell/ms2290/hda_verb.h +++ b/src/mainboard/packardbell/ms2290/hda_verb.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10ec0272, /* Codec Vendor / Device ID: Realtek ALC272X */ @@ -88,3 +91,5 @@ static const u32 mainboard_cim_verb_data[] = { 0x30671E56, 0x30671F58, }; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/roda/rk9/hda_verb.h b/src/mainboard/roda/rk9/hda_verb.h index f99d097..0b14012 100644 --- a/src/mainboard/roda/rk9/hda_verb.h +++ b/src/mainboard/roda/rk9/hda_verb.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + #define PIN_CFG(pin, val) \ (pin << 20) | ( 0x71c << 8) | (val & 0xff), \ (pin << 20) | ( 0x71d << 8) | ((val >> 8) & 0xff), \ @@ -72,3 +75,5 @@ static const u32 mainboard_pc_beep_verbs[] = { }; extern const u32 * pc_beep_verbs; extern u32 pc_beep_verbs_size; + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/samsung/lumpy/hda_verb.h b/src/mainboard/samsung/lumpy/hda_verb.h index dfadf55..9f1a036 100644 --- a/src/mainboard/samsung/lumpy/hda_verb.h +++ b/src/mainboard/samsung/lumpy/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10134210, // Codec Vendor / Device ID: Realtek ALC262 @@ -79,3 +82,5 @@ static const u32 mainboard_pc_beep_verbs[] = { }; static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */ diff --git a/src/mainboard/samsung/stumpy/hda_verb.h b/src/mainboard/samsung/stumpy/hda_verb.h index b263fbe..f13a519 100644 --- a/src/mainboard/samsung/stumpy/hda_verb.h +++ b/src/mainboard/samsung/stumpy/hda_verb.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef HDA_VERB_H +#define HDA_VERB_H + static const u32 mainboard_cim_verb_data[] = { /* coreboot specific header */ 0x10134210, // Codec Vendor / Device ID: Cirrus Logic CS4210 @@ -106,3 +109,5 @@ static const u32 mainboard_pc_beep_verbs[] = { }; static const u32 mainboard_pc_beep_verbs_size = ARRAY_SIZE(mainboard_pc_beep_verbs); + +#endif /* HDA_VERB_H */

1 0

New patch to review for coreboot: a44c7fc Remove unnecessary mappings in cbfs_media
by Naman Govil 01 Aug '14

01 Aug '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6441 -gerrit commit a44c7fc774b7796170af3abbf8f2361c61a8b921 Author: Naman Govil <namangov(a)gmail.com> Date: Fri Aug 1 16:11:50 2014 +0530 Remove unnecessary mappings in cbfs_media Reducing the sram usage while booting by removing unwanted map()s by creating a structure to replace it with appropriate read()s Change-Id: Ibf045ffeb759c988f2c8b3fc749684d8da9899dc Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/include/cbfs_core.h | 9 +- src/lib/cbfs.c | 2 +- src/lib/cbfs_core.c | 167 +++++++++++++++------------------- src/lib/loaders/cbfs_payload_loader.c | 2 +- 4 files changed, 80 insertions(+), 100 deletions(-) diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 7c94be0..11de0ee 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -235,12 +235,17 @@ int cbfs_decompress(int algo, void *src, void *dst, int len); return 0 on success and <0 if header not found */ int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header); -/* Returns success (0) on finding the file requested by verifying name/type; +/* Returns success (0) on finding the file requested by verifying name; -1 if file not found The absolute data_offset to the file is stored */ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, - const char *name, int type); + const char *name); +/* Returns success (0) on finding the file requested by verifying name and type; + -1 if file not found + The absolute data_offset to the file is stored */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type); /* returns pointer to file content inside CBFS after verifying if type is correct */ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index e6c9afa..5442ddc 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -135,7 +135,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) } } - c = cbfs_find_file(media, &f, name, CBFS_TYPE_STAGE); + c = cbfs_find_file_by_type(media, &f, name, CBFS_TYPE_STAGE); if (c < 0) { ERROR("Stage not loaded\n"); diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index d3f8efb..164473e 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -103,10 +103,10 @@ int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header) /* public API starts here*/ /* This functions finds the absolute data_offset of a file searched for by - name/type. Returns 0 on success and -1 on failure + name. Returns 0 on success and -1 on failure */ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, - const char *name, int type) + const char *name) { uint32_t offset, align, romsize,name_len; struct cbfs_media default_media; @@ -156,25 +156,22 @@ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, continue; } - if (f->file.type == type) { - - name_len = f->file.offset - sizeof(f->file); - DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset,name_len); - file_name = (const char *)media->map(media, offset + sizeof(f->file), - name_len); - if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); - } else if (strcmp(file_name, name) == 0) { - f->data_offset = offset + f->file.offset; - f->data_len = f->file.len; - media->unmap(media, file_name); - DEBUG("Found file:offset = 0x%x, len=%d\n", - f->data_offset, f->data_len); - return 0; - } else { - DEBUG("unmatched file offset = 0x%x : %s\n", offset, file_name); - media->unmap(media,file_name); - } + name_len = f->file.offset - sizeof(f->file); + DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset,name_len); + file_name = (const char *)media->map(media, offset + sizeof(f->file), + name_len); + if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); + } else if (strcmp(file_name, name) == 0) { + f->data_offset = offset + f->file.offset; + f->data_len = f->file.len; + media->unmap(media, file_name); + DEBUG("Found file:offset = 0x%x, len=%d\n", + f->data_offset, f->data_len); + return 0; + } else { + DEBUG("unmatched file offset = 0x%x : %s\n", offset, file_name); + media->unmap(media,file_name); } // Move to next file. offset += f->file.len + f->file.offset; @@ -188,13 +185,45 @@ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, } +/* This functions finds the absolute data_offset of a file searched for by + name and type using cbfs_find_file(). Returns 0 on success and -1 on failure + */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type) +{ + struct cbfs_media default_media; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize default media/\n"); + return -1; + } + } + + if (cbfs_find_file(media, f, name) < 0) { + ERROR("Failed to find file\n"); + return -1; + } + + if (f->file.type == type) { + DEBUG("File of matching type has been found\n"); + return 0; + } + else + { + ERROR("File of matching type not found\n"); + return -1; + } +} + + /*Returns pointer to file content inside CBFS after verifying type */ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, int type, size_t *sz) { struct cbfs_file_handle f; - int c; struct cbfs_media default_media; void *content; @@ -208,9 +237,8 @@ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, return NULL; } } - c = cbfs_find_file(media, &f, name, type); - if (c < 0) { + if (cbfs_find_file_by_type(media, &f, name, type) < 0) { ERROR("File not found\n"); return NULL; } @@ -219,91 +247,38 @@ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, if (sz) *sz = f.data_len; + content = media->map(media, f.data_offset, f.data_len); + if (content == CBFS_MEDIA_INVALID_MAP_ADDRESS) return NULL; else return content; } +/* returns pointer to file entry inside the CBFS or NULL +*/ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) { - const char *file_name; - uint32_t offset, align, romsize, name_len; - struct cbfs_header header; - struct cbfs_file file, *file_ptr; - struct cbfs_media default_media; - - if (media == CBFS_DEFAULT_MEDIA) { - media = &default_media; - if (init_default_cbfs_media(media) != 0) { - ERROR("Failed to initialize default media.\n"); - return NULL; - } + struct cbfs_file_handle f; + struct cbfs_media default_media; + struct cbfs_file *fileptr; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize media\n"); + return NULL; + } } - if (cbfs_get_header(media, &header)) + if (cbfs_find_file(media, &f, name) < 0) { + ERROR("Failed to find file\n"); return NULL; + } - // Logical offset (for source media) of first file. - offset = header.offset; - align = header.align; - romsize = header.romsize; - - // TODO Add a "size" in CBFS header for a platform independent way to - // determine the end of CBFS data. -#if defined(CONFIG_ARCH_X86) && CONFIG_ARCH_X86 - romsize -= header.bootblocksize; -#endif - DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align); - - DEBUG("Looking for '%s' starting from 0x%x.\n", name, offset); - media->open(media); - while (offset < romsize && - media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { - if (memcmp(CBFS_FILE_MAGIC, file.magic, - sizeof(file.magic)) != 0) { - uint32_t new_align = align; - if (offset % align) - new_align += align - (offset % align); - ERROR("ERROR: No file header found at 0x%x - " - "try next aligned address: 0x%x.\n", offset, - offset + new_align); - offset += new_align; - continue; - } - name_len = ntohl(file.offset) - sizeof(file); - DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset, - name_len); - - // load file name (arbitrary length). - file_name = (const char *)media->map( - media, offset + sizeof(file), name_len); - if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); - } else if (strcmp(file_name, name) == 0) { - int file_offset = ntohl(file.offset), - file_len = ntohl(file.len); - DEBUG("Found file (offset=0x%x, len=%d).\n", - offset + file_offset, file_len); - media->unmap(media, file_name); - file_ptr = media->map(media, offset, - file_offset + file_len); - media->close(media); - return file_ptr; - } else { - DEBUG(" (unmatched file @0x%x: %s)\n", offset, - file_name); - media->unmap(media, file_name); - } - // Move to next file. - offset += ntohl(file.len) + ntohl(file.offset); - if (offset % align) - offset += align - (offset % align); - } - media->close(media); - LOG("WARNING: '%s' not found.\n", name); - return NULL; + fileptr = media->map(media, f.data_offset, f.data_len); + return fileptr; } int cbfs_decompress(int algo, void *src, void *dst, int len) diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index f0b5bbc..d1ebd84 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -31,7 +31,7 @@ static int cbfs_locate_payload(struct payload *payload) if (init_default_cbfs_media(m) != 0) return -1; - if (cbfs_find_file(m, &payload->f, payload->name, type) < 0) + if (cbfs_find_file_by_type(m, &payload->f, payload->name, type) < 0) return -1; payload->media = CBFS_DEFAULT_MEDIA;

1 0

New patch to review for coreboot: 92ab3cb amd/torpedo/Oem.h: Add missing header guard
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6440 -gerrit commit 92ab3cb78ad948b754472b41ec1c37cb8f255d56 Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 13:06:44 2014 +0200 amd/torpedo/Oem.h: Add missing header guard Change-Id: I7abc44ee855769eca044ccc17ce612dcee388627 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/mainboard/amd/torpedo/Oem.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mainboard/amd/torpedo/Oem.h b/src/mainboard/amd/torpedo/Oem.h index 915182e..d7fd2ce 100644 --- a/src/mainboard/amd/torpedo/Oem.h +++ b/src/mainboard/amd/torpedo/Oem.h @@ -16,6 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#ifndef OEM_H +#define OEM_H + #ifndef BIOS_SIZE #define BIOS_SIZE 0x04 //04 - 1MB #endif @@ -221,3 +225,5 @@ * */ #define PCIB_SSID 0x780F1022 + +#endif /* OEM_H */

1 0

New patch to review for coreboot: b6fec72 mainboard 'spd_table.h': Add missing header guards
by HAOUAS Elyes 01 Aug '14

01 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6439 -gerrit commit b6fec722bd26cbbd29e758c85329ccae501a1b6c Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Fri Aug 1 12:54:44 2014 +0200 mainboard 'spd_table.h': Add missing header guards Change-Id: I791db00560a62d3b051fa0730aa0ab56fac29e4c Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/mainboard/artecgroup/dbe61/spd_table.h | 5 +++++ src/mainboard/rca/rm4100/spd_table.h | 5 +++++ src/mainboard/thomson/ip1000/spd_table.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/mainboard/artecgroup/dbe61/spd_table.h b/src/mainboard/artecgroup/dbe61/spd_table.h index 3d45b6f..f135a24 100644 --- a/src/mainboard/artecgroup/dbe61/spd_table.h +++ b/src/mainboard/artecgroup/dbe61/spd_table.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SPD_TABLE_H +#define SPD_TABLE_H + #include <spd.h> struct spd_entry { @@ -51,3 +54,5 @@ const struct spd_entry spd_table [] = {SPD_tRC, 0x37}, /* SDRAM Device Minimum Active to Active/Auto Refresh Time (tRC) */ {SPD_tRFC, 0x46} /* SDRAM Device Minimum Auto Refresh to Active/Auto Refresh (tRFC) */ }; + +#endif /* SPD_TABLE_H */ diff --git a/src/mainboard/rca/rm4100/spd_table.h b/src/mainboard/rca/rm4100/spd_table.h index 050bf72..c34aa42 100644 --- a/src/mainboard/rca/rm4100/spd_table.h +++ b/src/mainboard/rca/rm4100/spd_table.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SPD_TABLE_H +#define SPD_TABLE_H + #include <spd.h> struct spd_entry { @@ -38,3 +41,5 @@ const struct spd_entry spd_table [] = { {SPD_ACCESS_TIME_FROM_CLOCK, 0x54}, /* SDRAM access time from clock (highest CAS latency), CAS access time (Tac, tCAC) */ {SPD_DENSITY_OF_EACH_ROW_ON_MODULE, 0x20}, /* Density of each row on module */ }; + +#endif /* SPD_TABLE_H */ diff --git a/src/mainboard/thomson/ip1000/spd_table.h b/src/mainboard/thomson/ip1000/spd_table.h index a92a6cb..d5f91f0 100644 --- a/src/mainboard/thomson/ip1000/spd_table.h +++ b/src/mainboard/thomson/ip1000/spd_table.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SPD_TABLE_H +#define SPD_TABLE_H + #include <spd.h> #if CONFIG_ONBOARD_MEMORY_64MB @@ -48,3 +51,5 @@ const struct spd_entry spd_table [] = { {SPD_ACCESS_TIME_FROM_CLOCK, 0x54}, /* SDRAM access time from clock (highest CAS latency), CAS access time (Tac, tCAC) */ {SPD_DENSITY_OF_EACH_ROW_ON_MODULE, DENSITY}, /* Density of each row on module */ }; + +#endif /* SPD_TABLE_H */

1 0

New patch to review for coreboot: 3d48e94 Remove unnecessary mappings in cbfs_media
by Naman Govil 01 Aug '14

01 Aug '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6438 -gerrit commit 3d48e94004807ff1d21cc487e2037cd5586bcadf Author: Naman Govil <namangov(a)gmail.com> Date: Fri Aug 1 16:11:50 2014 +0530 Remove unnecessary mappings in cbfs_media Reducing the sram usage while booting by removing unwanted map()s by creating a structure to replace it with appropriate read()s Change-Id: I5207345ca4e7ae08d288f0dbb480de7520728ccd Changed-Id: If503368553308a2fdd3ecc1a312a11f14c7a707f Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/include/cbfs_core.h | 7 +- src/lib/cbfs.c | 2 +- src/lib/cbfs_core.c | 167 +++++++++++++++------------------- src/lib/loaders/cbfs_payload_loader.c | 2 +- 4 files changed, 79 insertions(+), 99 deletions(-) diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 7c94be0..2e166b6 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -235,12 +235,17 @@ int cbfs_decompress(int algo, void *src, void *dst, int len); return 0 on success and <0 if header not found */ int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header); -/* Returns success (0) on finding the file requested by verifying name/type; +/* Returns success (0) on finding the file requested by verifying name; -1 if file not found The absolute data_offset to the file is stored */ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name, int type); +/* Returns success (0) on finding the file requested by verifying name and type; + -1 if file not found + The absolute data_offset to the file is stored */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type); /* returns pointer to file content inside CBFS after verifying if type is correct */ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index e6c9afa..5442ddc 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -135,7 +135,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) } } - c = cbfs_find_file(media, &f, name, CBFS_TYPE_STAGE); + c = cbfs_find_file_by_type(media, &f, name, CBFS_TYPE_STAGE); if (c < 0) { ERROR("Stage not loaded\n"); diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index d3f8efb..164473e 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -103,10 +103,10 @@ int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header) /* public API starts here*/ /* This functions finds the absolute data_offset of a file searched for by - name/type. Returns 0 on success and -1 on failure + name. Returns 0 on success and -1 on failure */ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, - const char *name, int type) + const char *name) { uint32_t offset, align, romsize,name_len; struct cbfs_media default_media; @@ -156,25 +156,22 @@ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, continue; } - if (f->file.type == type) { - - name_len = f->file.offset - sizeof(f->file); - DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset,name_len); - file_name = (const char *)media->map(media, offset + sizeof(f->file), - name_len); - if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); - } else if (strcmp(file_name, name) == 0) { - f->data_offset = offset + f->file.offset; - f->data_len = f->file.len; - media->unmap(media, file_name); - DEBUG("Found file:offset = 0x%x, len=%d\n", - f->data_offset, f->data_len); - return 0; - } else { - DEBUG("unmatched file offset = 0x%x : %s\n", offset, file_name); - media->unmap(media,file_name); - } + name_len = f->file.offset - sizeof(f->file); + DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset,name_len); + file_name = (const char *)media->map(media, offset + sizeof(f->file), + name_len); + if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); + } else if (strcmp(file_name, name) == 0) { + f->data_offset = offset + f->file.offset; + f->data_len = f->file.len; + media->unmap(media, file_name); + DEBUG("Found file:offset = 0x%x, len=%d\n", + f->data_offset, f->data_len); + return 0; + } else { + DEBUG("unmatched file offset = 0x%x : %s\n", offset, file_name); + media->unmap(media,file_name); } // Move to next file. offset += f->file.len + f->file.offset; @@ -188,13 +185,45 @@ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, } +/* This functions finds the absolute data_offset of a file searched for by + name and type using cbfs_find_file(). Returns 0 on success and -1 on failure + */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type) +{ + struct cbfs_media default_media; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize default media/\n"); + return -1; + } + } + + if (cbfs_find_file(media, f, name) < 0) { + ERROR("Failed to find file\n"); + return -1; + } + + if (f->file.type == type) { + DEBUG("File of matching type has been found\n"); + return 0; + } + else + { + ERROR("File of matching type not found\n"); + return -1; + } +} + + /*Returns pointer to file content inside CBFS after verifying type */ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, int type, size_t *sz) { struct cbfs_file_handle f; - int c; struct cbfs_media default_media; void *content; @@ -208,9 +237,8 @@ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, return NULL; } } - c = cbfs_find_file(media, &f, name, type); - if (c < 0) { + if (cbfs_find_file_by_type(media, &f, name, type) < 0) { ERROR("File not found\n"); return NULL; } @@ -219,91 +247,38 @@ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, if (sz) *sz = f.data_len; + content = media->map(media, f.data_offset, f.data_len); + if (content == CBFS_MEDIA_INVALID_MAP_ADDRESS) return NULL; else return content; } +/* returns pointer to file entry inside the CBFS or NULL +*/ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) { - const char *file_name; - uint32_t offset, align, romsize, name_len; - struct cbfs_header header; - struct cbfs_file file, *file_ptr; - struct cbfs_media default_media; - - if (media == CBFS_DEFAULT_MEDIA) { - media = &default_media; - if (init_default_cbfs_media(media) != 0) { - ERROR("Failed to initialize default media.\n"); - return NULL; - } + struct cbfs_file_handle f; + struct cbfs_media default_media; + struct cbfs_file *fileptr; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize media\n"); + return NULL; + } } - if (cbfs_get_header(media, &header)) + if (cbfs_find_file(media, &f, name) < 0) { + ERROR("Failed to find file\n"); return NULL; + } - // Logical offset (for source media) of first file. - offset = header.offset; - align = header.align; - romsize = header.romsize; - - // TODO Add a "size" in CBFS header for a platform independent way to - // determine the end of CBFS data. -#if defined(CONFIG_ARCH_X86) && CONFIG_ARCH_X86 - romsize -= header.bootblocksize; -#endif - DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align); - - DEBUG("Looking for '%s' starting from 0x%x.\n", name, offset); - media->open(media); - while (offset < romsize && - media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { - if (memcmp(CBFS_FILE_MAGIC, file.magic, - sizeof(file.magic)) != 0) { - uint32_t new_align = align; - if (offset % align) - new_align += align - (offset % align); - ERROR("ERROR: No file header found at 0x%x - " - "try next aligned address: 0x%x.\n", offset, - offset + new_align); - offset += new_align; - continue; - } - name_len = ntohl(file.offset) - sizeof(file); - DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset, - name_len); - - // load file name (arbitrary length). - file_name = (const char *)media->map( - media, offset + sizeof(file), name_len); - if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); - } else if (strcmp(file_name, name) == 0) { - int file_offset = ntohl(file.offset), - file_len = ntohl(file.len); - DEBUG("Found file (offset=0x%x, len=%d).\n", - offset + file_offset, file_len); - media->unmap(media, file_name); - file_ptr = media->map(media, offset, - file_offset + file_len); - media->close(media); - return file_ptr; - } else { - DEBUG(" (unmatched file @0x%x: %s)\n", offset, - file_name); - media->unmap(media, file_name); - } - // Move to next file. - offset += ntohl(file.len) + ntohl(file.offset); - if (offset % align) - offset += align - (offset % align); - } - media->close(media); - LOG("WARNING: '%s' not found.\n", name); - return NULL; + fileptr = media->map(media, f.data_offset, f.data_len); + return fileptr; } int cbfs_decompress(int algo, void *src, void *dst, int len) diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index f0b5bbc..d1ebd84 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -31,7 +31,7 @@ static int cbfs_locate_payload(struct payload *payload) if (init_default_cbfs_media(m) != 0) return -1; - if (cbfs_find_file(m, &payload->f, payload->name, type) < 0) + if (cbfs_find_file_by_type(m, &payload->f, payload->name, type) < 0) return -1; payload->media = CBFS_DEFAULT_MEDIA;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2014