sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel: Get rid of device_t

Browse Source 
Use of device_t is deprecated.

Change-Id: Ic29891d78514db3b7eed48414a14e4ff579436c0
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/30004
Reviewed-by: David Guckian
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Elyes HAOUAS
2018-12-05 10:56:30 +01:00
committed by Patrick Georgi
parent 096833fef4
commit 6f01f4307c
9 changed files with 141 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/soc/intel/quark/include/soc/reg_access.h
View File

@@ -16,8 +16,6 @@
#ifndef _QUARK_REG_ACCESS_H_
#define _QUARK_REG_ACCESS_H_
#define __SIMPLE_DEVICE__
#include <arch/io.h>
#include <cpu/x86/cr.h>
#include <cpu/x86/msr.h>

17
src/soc/intel/quark/include/soc/storage_test.h
View File

@@ -22,16 +22,19 @@
#include <timer.h>
#ifdef __SIMPLE_DEVICE__
#define dev_t uintptr_t
#else
#define dev_t device_t
#endif /* __SIMPLE_DEVICE__ */
uint32_t storage_test_init(dev_t dev, uint32_t *previous_bar,
uint32_t storage_test_init(pci_devfn_t dev, uint32_t *previous_bar,
uint16_t *previous_command);
void storage_test(uint32_t bar, int full_initialization);
void storage_test_complete(dev_t dev, uint32_t previous_bar,
void storage_test_complete(pci_devfn_t dev, uint32_t previous_bar,
uint16_t previous_command);
#else
uint32_t storage_test_init(struct device *dev, uint32_t *previous_bar,
uint16_t *previous_command);
void storage_test(uint32_t bar, int full_initialization);
void storage_test_complete(struct device *dev, uint32_t previous_bar,
uint16_t previous_command);
#endif
/* Logging support */
struct log_entry {

2
src/soc/intel/quark/romstage/fsp2_0.c
View File

@@ -38,7 +38,7 @@ asmlinkage void *car_stage_c_entry(void)
if (IS_ENABLED(CONFIG_STORAGE_TEST)) {
uint32_t bar;
dev_t dev;
pci_devfn_t dev;
uint32_t previous_bar;
uint16_t previous_command;

14
src/soc/intel/quark/storage_test.c
View File

@@ -39,8 +39,13 @@ extern uint8_t _car_drivers_storage_end;
#define STORAGE_DEBUG BIOS_DEBUG
#define LOG_DEBUG (IS_ENABLED(CONFIG_STORAGE_LOG) ? STORAGE_DEBUG : BIOS_NEVER)
uint32_t storage_test_init(dev_t dev, uint32_t *previous_bar,
#ifdef __SIMPLE_DEVICE__
uint32_t storage_test_init(pci_devfn_t dev, uint32_t *previous_bar,
uint16_t *previous_command)
#else
uint32_t storage_test_init(struct device *dev, uint32_t *previous_bar,
uint16_t *previous_command)
#endif
{
uint32_t bar;
@@ -67,8 +72,13 @@ uint32_t storage_test_init(dev_t dev, uint32_t *previous_bar,
return bar;
}
void storage_test_complete(dev_t dev, uint32_t previous_bar,
#ifdef __SIMPLE_DEVICE__
void storage_test_complete(pci_devfn_t dev, uint32_t previous_bar,
uint16_t previous_command)
#else
void storage_test_complete(struct device *dev, uint32_t previous_bar,
uint16_t previous_command)
#endif
{
pci_write_config16(dev, PCI_COMMAND, previous_command);
pci_write_config32(dev, PCI_BASE_ADDRESS_0, previous_bar);