openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

chipset_enable.c: Use PCI_ACCESS_ECAM to access pci register

Browse Source 
In the latest pciutils(v3.13.0), it supports accessing pci registers
by ecam. This patch uses libpci version check to decide whether
flashrom calls libpci and use 0xcf8/0xcfc or ecam to access pci
registers.

BUG=b:359813524
TEST=with libpci >= 3.13.0, flashrom is working with ECAM access

Change-Id: I4549f87c8b01da0a1d3d8ce0b3b75c1f5fa2cbab
Signed-off-by: Kane Chen <kane.chen@intel.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/83896
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Hsuan-ting Chen <roccochen@google.com>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
This commit is contained in:
Kane Chen 2024-08-13 16:40:08 +08:00 committed by Peter Marheine
parent 33dda3387c
commit 1197f0832d
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chipset_enable.c
View File

@ -938,7 +938,13 @@ static int enable_flash_pch100_or_c620(const struct programmer_cfg *cfg,
msg_perr("Can't allocate PCI accessor.\n");
return ret;
}
#if CONFIG_USE_LIBPCI_ECAM == 1
pci_acc->method = PCI_ACCESS_ECAM;
msg_pdbg("Using libpci PCI_ACCESS_ECAM\n");
#else
pci_acc->method = PCI_ACCESS_I386_TYPE1;
msg_pdbg("Using libpci PCI_ACCESS_I386_TYPE1\n");
#endif
pci_init(pci_acc);
register_shutdown(enable_flash_pch100_shutdown, pci_acc);

10
doc/release_notes/devel.rst
View File

@ -22,4 +22,12 @@ Build only supported with Meson
As documented in the :doc:`v1.4 release notes <v_1_4>`, support for building
flashrom with make has been removed; all Makefiles have been deleted. Meson is
now the only supported tool for building flashrom from source.
now the only supported tool for building flashrom from source.
New Feature
===========
Libpci 3.13.0 and onwards support ECAM to access pci registers. Flashrom will
be moved to ECAM from IO port 0xcf8/0xcfc if the libpci version is >= 3.13.0.
The ECAM has been supported for a very long time, most platforms should support
it. For those platforms don't support ECAM, libpci will terminate the process by
exit.

7
meson.build
View File

@ -165,6 +165,13 @@ libusb1 = dependency('libusb-1.0', required : group_usb)
libftdi1 = dependency('libftdi1', required : group_ftdi)
libjaylink = dependency('libjaylink', required : group_jlink, version : '>=0.3.0')
# ECAM is supported in libpci after 3.13.0
if libpci.version().version_compare('>=3.13.0')
add_project_arguments('-DCONFIG_USE_LIBPCI_ECAM=1', language: 'c')
else
add_project_arguments('-DCONFIG_USE_LIBPCI_ECAM=0', language: 'c')
endif
if host_machine.system() == 'windows'
# Specifying an include_path that doesn't exist is an error,
# but we only use this if the library is found in the same directory.