MMCONF_SUPPORT: Drop redundant logging
Resource is actually stored even before read_resources, but that's where we currently log this resource. For Intel, use PCI config register offset as the resource index, while AMD side uses MSR address. Change-Id: I6eeef1883c5d1ee5bbcebd1731c0e356af3fd781 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/17696 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
e25b5ef39f
commit
27198ac2e3
|
@ -537,11 +537,6 @@ static void amdfam10_set_resources(device_t dev)
|
||||||
assign_resources(bus);
|
assign_resources(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
res = find_resource(dev, 0xc0010058);
|
|
||||||
if (res) {
|
|
||||||
report_resource_stored(dev, res, " <mmconfig>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mcf0_control_init(struct device *dev)
|
static void mcf0_control_init(struct device *dev)
|
||||||
|
|
|
@ -662,13 +662,9 @@ static void cpu_bus_read_resources(device_t dev)
|
||||||
|
|
||||||
static void cpu_bus_set_resources(device_t dev)
|
static void cpu_bus_set_resources(device_t dev)
|
||||||
{
|
{
|
||||||
struct resource *resource = find_resource(dev, 0xc0010058);
|
|
||||||
|
|
||||||
printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);
|
printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, " <mmconfig>");
|
|
||||||
}
|
|
||||||
pci_dev_set_resources(dev);
|
pci_dev_set_resources(dev);
|
||||||
|
|
||||||
printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__);
|
printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -412,12 +412,6 @@ static void nb_set_resources(device_t dev)
|
||||||
assign_resources(bus);
|
assign_resources(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print the MMCONF region if it has been reserved. */
|
|
||||||
res = find_resource(dev, 0xc0010058);
|
|
||||||
if (res) {
|
|
||||||
report_resource_stored(dev, res, " <mmconfig>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Domain/Root Complex related code */
|
/* Domain/Root Complex related code */
|
||||||
|
|
|
@ -429,12 +429,6 @@ static void nb_set_resources(device_t dev)
|
||||||
assign_resources(bus);
|
assign_resources(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print the MMCONF region if it has been reserved. */
|
|
||||||
res = find_resource(dev, 0xc0010058);
|
|
||||||
if (res) {
|
|
||||||
report_resource_stored(dev, res, " <mmconfig>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void scan_chains(device_t dev)
|
static void scan_chains(device_t dev)
|
||||||
|
|
|
@ -429,12 +429,6 @@ static void set_resources(struct device *dev)
|
||||||
assign_resources(bus);
|
assign_resources(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print the MMCONF region if it has been reserved. */
|
|
||||||
res = find_resource(dev, 0xc0010058);
|
|
||||||
if (res) {
|
|
||||||
report_resource_stored(dev, res, " <mmconfig>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned long acpi_fill_hest(acpi_hest_t *hest)
|
static unsigned long acpi_fill_hest(acpi_hest_t *hest)
|
||||||
|
|
|
@ -428,12 +428,6 @@ static void nb_set_resources(device_t dev)
|
||||||
assign_resources(bus);
|
assign_resources(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print the MMCONF region if it has been reserved. */
|
|
||||||
res = find_resource(dev, 0xc0010058);
|
|
||||||
if (res) {
|
|
||||||
report_resource_stored(dev, res, " <mmconfig>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -428,12 +428,6 @@ static void set_resources(device_t dev)
|
||||||
assign_resources(bus);
|
assign_resources(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print the MMCONF region if it has been reserved. */
|
|
||||||
res = find_resource(dev, 0xc0010058);
|
|
||||||
if (res) {
|
|
||||||
report_resource_stored(dev, res, " <mmconfig>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1957,10 +1957,6 @@ static void cpu_bus_init(device_t dev)
|
||||||
|
|
||||||
static void cpu_bus_set_resources(struct device *dev)
|
static void cpu_bus_set_resources(struct device *dev)
|
||||||
{
|
{
|
||||||
struct resource *resource = find_resource(dev, 0xc0010058);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, " <mmconfig>");
|
|
||||||
}
|
|
||||||
pci_dev_set_resources(dev);
|
pci_dev_set_resources(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -431,12 +431,6 @@ static void set_resources(device_t dev)
|
||||||
assign_resources(bus);
|
assign_resources(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print the MMCONF region if it has been reserved. */
|
|
||||||
res = find_resource(dev, 0xc0010058);
|
|
||||||
if (res) {
|
|
||||||
report_resource_stored(dev, res, " <mmconfig>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned long acpi_fill_hest(acpi_hest_t *hest)
|
static unsigned long acpi_fill_hest(acpi_hest_t *hest)
|
||||||
|
|
|
@ -1094,10 +1094,6 @@ static void cpu_bus_read_resources(device_t dev)
|
||||||
|
|
||||||
static void cpu_bus_set_resources(device_t dev)
|
static void cpu_bus_set_resources(device_t dev)
|
||||||
{
|
{
|
||||||
struct resource *resource = find_resource(dev, 0xc0010058);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, " <mmconfig>");
|
|
||||||
}
|
|
||||||
pci_dev_set_resources(dev);
|
pci_dev_set_resources(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1095,10 +1095,6 @@ static void cpu_bus_read_resources(device_t dev)
|
||||||
|
|
||||||
static void cpu_bus_set_resources(device_t dev)
|
static void cpu_bus_set_resources(device_t dev)
|
||||||
{
|
{
|
||||||
struct resource *resource = find_resource(dev, 0xc0010058);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, " <mmconfig>");
|
|
||||||
}
|
|
||||||
pci_dev_set_resources(dev);
|
pci_dev_set_resources(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1114,10 +1114,6 @@ static void cpu_bus_read_resources(device_t dev)
|
||||||
|
|
||||||
static void cpu_bus_set_resources(device_t dev)
|
static void cpu_bus_set_resources(device_t dev)
|
||||||
{
|
{
|
||||||
struct resource *resource = find_resource(dev, 0xc0010058);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, " <mmconfig>");
|
|
||||||
}
|
|
||||||
pci_dev_set_resources(dev);
|
pci_dev_set_resources(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -244,28 +244,13 @@ static void mc_read_resources(device_t dev)
|
||||||
|
|
||||||
pci_dev_read_resources(dev);
|
pci_dev_read_resources(dev);
|
||||||
|
|
||||||
/* We use 0xcf as an unused index for our PCIe bar so that we find it again */
|
|
||||||
buses = get_pcie_bar(&pcie_config_base);
|
buses = get_pcie_bar(&pcie_config_base);
|
||||||
if (buses) {
|
if (buses) {
|
||||||
struct resource *resource = new_resource(dev, 0xcf);
|
struct resource *resource = new_resource(dev, PCIEXBAR);
|
||||||
mmconf_resource_init(resource, pcie_config_base, buses);
|
mmconf_resource_init(resource, pcie_config_base, buses);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mc_set_resources(device_t dev)
|
|
||||||
{
|
|
||||||
struct resource *resource;
|
|
||||||
|
|
||||||
/* Report the PCIe BAR */
|
|
||||||
resource = find_resource(dev, 0xcf);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, "<mmconfig>");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* And call the normal set_resources */
|
|
||||||
pci_dev_set_resources(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
||||||
{
|
{
|
||||||
if (!vendor || !device) {
|
if (!vendor || !device) {
|
||||||
|
@ -319,7 +304,7 @@ static struct pci_operations intel_pci_ops = {
|
||||||
|
|
||||||
static struct device_operations mc_ops = {
|
static struct device_operations mc_ops = {
|
||||||
.read_resources = mc_read_resources,
|
.read_resources = mc_read_resources,
|
||||||
.set_resources = mc_set_resources,
|
.set_resources = pci_dev_set_resources,
|
||||||
.enable_resources = pci_dev_enable_resources,
|
.enable_resources = pci_dev_enable_resources,
|
||||||
.init = northbridge_init,
|
.init = northbridge_init,
|
||||||
.scan_bus = 0,
|
.scan_bus = 0,
|
||||||
|
|
|
@ -138,18 +138,7 @@ static void mc_read_resources(device_t dev)
|
||||||
{
|
{
|
||||||
pci_dev_read_resources(dev);
|
pci_dev_read_resources(dev);
|
||||||
|
|
||||||
mmconf_resource(dev, 0xcf);
|
mmconf_resource(dev, EXPECBASE);
|
||||||
}
|
|
||||||
|
|
||||||
static void mc_set_resources(device_t dev)
|
|
||||||
{
|
|
||||||
struct resource *resource;
|
|
||||||
|
|
||||||
resource = find_resource(dev, 0xcf);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, "<mmconfig>");
|
|
||||||
}
|
|
||||||
pci_dev_set_resources(dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
||||||
|
@ -188,7 +177,7 @@ static struct pci_operations intel_pci_ops = {
|
||||||
|
|
||||||
static struct device_operations mc_ops = {
|
static struct device_operations mc_ops = {
|
||||||
.read_resources = mc_read_resources,
|
.read_resources = mc_read_resources,
|
||||||
.set_resources = mc_set_resources,
|
.set_resources = pci_dev_set_resources,
|
||||||
.enable_resources = pci_dev_enable_resources,
|
.enable_resources = pci_dev_enable_resources,
|
||||||
.init = 0,
|
.init = 0,
|
||||||
.scan_bus = 0,
|
.scan_bus = 0,
|
||||||
|
|
|
@ -157,28 +157,13 @@ static void mc_read_resources(device_t dev)
|
||||||
|
|
||||||
pci_dev_read_resources(dev);
|
pci_dev_read_resources(dev);
|
||||||
|
|
||||||
/* We use 0xcf as an unused index for our PCIe bar so that we find it again */
|
|
||||||
buses = get_pcie_bar(&pcie_config_base);
|
buses = get_pcie_bar(&pcie_config_base);
|
||||||
if (buses) {
|
if (buses) {
|
||||||
struct resource *resource = new_resource(dev, 0xcf);
|
struct resource *resource = new_resource(dev, PCIEXBAR);
|
||||||
mmconf_resource_init(resource, pcie_config_base, buses);
|
mmconf_resource_init(resource, pcie_config_base, buses);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mc_set_resources(device_t dev)
|
|
||||||
{
|
|
||||||
struct resource *resource;
|
|
||||||
|
|
||||||
/* Report the PCIe BAR */
|
|
||||||
resource = find_resource(dev, 0xcf);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, "<mmconfig>");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* And call the normal set_resources */
|
|
||||||
pci_dev_set_resources(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
||||||
{
|
{
|
||||||
if (!vendor || !device) {
|
if (!vendor || !device) {
|
||||||
|
@ -216,7 +201,7 @@ static struct pci_operations intel_pci_ops = {
|
||||||
|
|
||||||
static struct device_operations mc_ops = {
|
static struct device_operations mc_ops = {
|
||||||
.read_resources = mc_read_resources,
|
.read_resources = mc_read_resources,
|
||||||
.set_resources = mc_set_resources,
|
.set_resources = pci_dev_set_resources,
|
||||||
.enable_resources = pci_dev_enable_resources,
|
.enable_resources = pci_dev_enable_resources,
|
||||||
.acpi_fill_ssdt_generator = generate_cpu_entries,
|
.acpi_fill_ssdt_generator = generate_cpu_entries,
|
||||||
#if CONFIG_HAVE_ACPI_RESUME
|
#if CONFIG_HAVE_ACPI_RESUME
|
||||||
|
|
|
@ -264,28 +264,13 @@ static void mc_read_resources(device_t dev)
|
||||||
|
|
||||||
pci_dev_read_resources(dev);
|
pci_dev_read_resources(dev);
|
||||||
|
|
||||||
/* We use 0xcf as an unused index for our PCIe bar so that we find it again */
|
|
||||||
buses = get_pcie_bar(&pcie_config_base);
|
buses = get_pcie_bar(&pcie_config_base);
|
||||||
if (buses) {
|
if (buses) {
|
||||||
struct resource *resource = new_resource(dev, 0xcf);
|
struct resource *resource = new_resource(dev, PCIEXBAR);
|
||||||
mmconf_resource_init(resource, pcie_config_base, buses);
|
mmconf_resource_init(resource, pcie_config_base, buses);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mc_set_resources(device_t dev)
|
|
||||||
{
|
|
||||||
struct resource *resource;
|
|
||||||
|
|
||||||
/* Report the PCIe BAR */
|
|
||||||
resource = find_resource(dev, 0xcf);
|
|
||||||
if (resource) {
|
|
||||||
report_resource_stored(dev, resource, "<mmconfig>");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* And call the normal set_resources */
|
|
||||||
pci_dev_set_resources(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
||||||
{
|
{
|
||||||
if (!vendor || !device) {
|
if (!vendor || !device) {
|
||||||
|
@ -474,7 +459,7 @@ static struct pci_operations intel_pci_ops = {
|
||||||
|
|
||||||
static struct device_operations mc_ops = {
|
static struct device_operations mc_ops = {
|
||||||
.read_resources = mc_read_resources,
|
.read_resources = mc_read_resources,
|
||||||
.set_resources = mc_set_resources,
|
.set_resources = pci_dev_set_resources,
|
||||||
.enable_resources = pci_dev_enable_resources,
|
.enable_resources = pci_dev_enable_resources,
|
||||||
.init = northbridge_init,
|
.init = northbridge_init,
|
||||||
.scan_bus = 0,
|
.scan_bus = 0,
|
||||||
|
|
|
@ -201,19 +201,6 @@ static void mc_read_resources(device_t dev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mc_set_resources(device_t dev)
|
|
||||||
{
|
|
||||||
struct resource *resource;
|
|
||||||
|
|
||||||
/* Report the PCIe BAR. */
|
|
||||||
resource = find_resource(dev, 0xcf);
|
|
||||||
if (resource)
|
|
||||||
report_resource_stored(dev, resource, "<mmconfig>");
|
|
||||||
|
|
||||||
/* And call the normal set_resources. */
|
|
||||||
pci_dev_set_resources(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device)
|
||||||
{
|
{
|
||||||
if (!vendor || !device) {
|
if (!vendor || !device) {
|
||||||
|
@ -231,7 +218,7 @@ static struct pci_operations intel_pci_ops = {
|
||||||
|
|
||||||
static struct device_operations mc_ops = {
|
static struct device_operations mc_ops = {
|
||||||
.read_resources = mc_read_resources,
|
.read_resources = mc_read_resources,
|
||||||
.set_resources = mc_set_resources,
|
.set_resources = pci_dev_set_resources,
|
||||||
.enable_resources = pci_dev_enable_resources,
|
.enable_resources = pci_dev_enable_resources,
|
||||||
.acpi_fill_ssdt_generator = generate_cpu_entries,
|
.acpi_fill_ssdt_generator = generate_cpu_entries,
|
||||||
.scan_bus = 0,
|
.scan_bus = 0,
|
||||||
|
|
Loading…
Reference in New Issue