From: "Gabriel L. Somlo" <somlo@cmu.edu>
To: gregkh@linuxfoundation.org, robh+dt@kernel.org,
pawel.moll@arm.com, mark.rutland@arm.com,
ijc+devicetree@hellion.org.uk, galak@codeaurora.org,
arnd@arndb.de, lersek@redhat.com, ralf@linux-mips.org,
rmk+kernel@arm.linux.org.uk, eric@anholt.net,
hanjun.guo@linaro.org, zajec5@gmail.com, sudeep.holla@arm.com,
agross@codeaurora.org, linux-api@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Cc: peter.maydell@linaro.org, ehabkost@redhat.com,
ard.biesheuvel@linaro.org, matt@codeblueprint.co.uk,
stefanha@gmail.com, mst@redhat.com, qemu-devel@nongnu.org,
leif.lindholm@linaro.org, luto@amacapital.net, kraxel@redhat.com,
pbonzini@redhat.com, imammedo@redhat.com, revol@free.fr,
rth@twiddle.net
Subject: [PATCH v6 2/5] pc: fw_cfg: move ioport base constant to pc.h
Date: Wed, 27 Jan 2016 22:02:38 -0500 [thread overview]
Message-ID: <1453950161-13252-3-git-send-email-somlo@cmu.edu> (raw)
In-Reply-To: <1453950161-13252-1-git-send-email-somlo@cmu.edu>
Move BIOS_CFG_IOPORT define from pc.c to pc.h, and rename
it to FW_CFG_IO_BASE.
Cc: Marc Marí <markmb@redhat.com>
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Marc Marí <markmb@redhat.com>
---
hw/i386/pc.c | 5 ++---
include/hw/i386/pc.h | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 78cf8fa..aa79dd1 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -77,7 +77,6 @@
#define DPRINTF(fmt, ...)
#endif
-#define BIOS_CFG_IOPORT 0x510
#define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)
#define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1)
#define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2)
@@ -755,7 +754,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as)
int i, j;
unsigned int apic_id_limit = pc_apic_id_limit(max_cpus);
- fw_cfg = fw_cfg_init_io_dma(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 4, as);
+ fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, as);
/* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86:
*
@@ -1269,7 +1268,7 @@ FWCfgState *xen_load_linux(PCMachineState *pcms,
assert(MACHINE(pcms)->kernel_filename != NULL);
- fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT);
+ fw_cfg = fw_cfg_init_io(FW_CFG_IO_BASE);
rom_set_fw(fw_cfg);
load_linux(pcms, fw_cfg);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 65e8f24..0a4e0da 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -272,6 +272,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
ISADevice *pc_find_fdc0(void);
+#define FW_CFG_IO_BASE 0x510
+
/* acpi_piix.c */
I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
--
2.4.3
next prev parent reply other threads:[~2016-01-28 3:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 3:02 [PATCH v6 0/5] add ACPI node for fw_cfg on pc and arm Gabriel L. Somlo
2016-01-28 3:02 ` [PATCH v6 1/5] fw_cfg: expose control register size in fw_cfg.h Gabriel L. Somlo
2016-01-28 3:02 ` Gabriel L. Somlo [this message]
2016-01-28 3:02 ` [PATCH v6 3/5] acpi: pc: add fw_cfg device node to ssdt Gabriel L. Somlo
2016-01-28 3:02 ` [PATCH v6 4/5] acpi: arm: add fw_cfg device node to dsdt Gabriel L. Somlo
2016-01-28 3:02 ` [PATCH v6 5/5] fw_cfg: document ACPI device node information Gabriel L. Somlo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453950161-13252-3-git-send-email-somlo@cmu.edu \
--to=somlo@cmu.edu \
--cc=agross@codeaurora.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=ehabkost@redhat.com \
--cc=eric@anholt.net \
--cc=galak@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=hanjun.guo@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=leif.lindholm@linaro.org \
--cc=lersek@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mark.rutland@arm.com \
--cc=matt@codeblueprint.co.uk \
--cc=mst@redhat.com \
--cc=pawel.moll@arm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=ralf@linux-mips.org \
--cc=revol@free.fr \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=robh+dt@kernel.org \
--cc=rth@twiddle.net \
--cc=stefanha@gmail.com \
--cc=sudeep.holla@arm.com \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).