From: Sinan Kaya <okaya@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Sinan Kaya <okaya@kernel.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v11 2/7] ACPI / OSL: Stub out acpi_os_(read/write)_pci_configurations()
Date: Tue, 18 Dec 2018 02:56:01 +0000 [thread overview]
Message-ID: <20181218025606.32668-3-okaya@kernel.org> (raw)
In-Reply-To: <20181218025606.32668-1-okaya@kernel.org>
Getting ready to allow CONFIG_PCI to be unset with ACPI enabled. Stub out
acpi_os_read_pci_configuration and acpi_os_write_pci_configuration
functions when CONFIG_PCI is not defined.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/acpi/osl.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index b48874b8e1ea..524fd5f33ea4 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -773,6 +773,7 @@ acpi_status
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
u64 *value, u32 width)
{
+#ifdef CONFIG_PCI
int result, size;
u32 value32;
@@ -799,12 +800,19 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
*value = value32;
return (result ? AE_ERROR : AE_OK);
+#else
+ int rc;
+
+ rc = pr_warn_once("PCI configuration space access is not supported\n");
+ return rc ? AE_SUPPORT : AE_OK;
+#endif
}
acpi_status
acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
u64 value, u32 width)
{
+#ifdef CONFIG_PCI
int result, size;
switch (width) {
@@ -826,6 +834,12 @@ acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
reg, size, value);
return (result ? AE_ERROR : AE_OK);
+#else
+ int rc;
+
+ rc = pr_warn_once("PCI configuration space access is not supported\n");
+ return rc ? AE_SUPPORT : AE_OK;
+#endif
}
static void acpi_os_execute_deferred(struct work_struct *work)
--
2.19.0
next prev parent reply other threads:[~2018-12-18 2:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181218025606.32668-1-okaya@kernel.org>
2018-12-18 2:56 ` [PATCH v11 1/7] ACPI: Allow CONFIG_PCI to be unset for reboot Sinan Kaya
2018-12-18 7:31 ` Christoph Hellwig
2018-12-19 22:21 ` Sinan Kaya
2018-12-18 2:56 ` Sinan Kaya [this message]
2018-12-18 7:32 ` [PATCH v11 2/7] ACPI / OSL: Stub out acpi_os_(read/write)_pci_configurations() Christoph Hellwig
2018-12-19 22:22 ` Sinan Kaya
2018-12-18 2:56 ` [PATCH v11 3/7] PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set Sinan Kaya
2018-12-18 2:56 ` [PATCH v11 4/7] ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset Sinan Kaya
2018-12-18 2:56 ` [PATCH v11 5/7] arm64: select ACPI PCI code only both features are enabled Sinan Kaya
2018-12-18 2:56 ` [PATCH v11 6/7] ACPI/IORT: Stub out ACS functions when CONFIG_PCI is not set Sinan Kaya
2018-12-18 7:44 ` Hanjun Guo
2018-12-18 12:00 ` Lorenzo Pieralisi
2018-12-18 2:56 ` [PATCH v11 7/7] ACPI: Make PCI slot detection driver depend on PCI Sinan Kaya
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=20181218025606.32668-3-okaya@kernel.org \
--to=okaya@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/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).