From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Helgaas <bhelgaas@google•com>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Maciej W. Rozycki" <macro@orcam•me.uk>,
Palmer Dabbelt <palmer@rivosinc•com>,
Stafford Horne <shorne@gmail•com>
Subject: linux-next: manual merge of the pci tree with the risc-v tree
Date: Mon, 25 Jul 2022 10:22:21 +1000 [thread overview]
Message-ID: <20220725102221.20fe2ca2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1664 bytes --]
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
arch/riscv/include/asm/pci.h
between commit:
bb356ddb78b2 ("RISC-V: PCI: Avoid handing out address 0 to devices")
from the risc-v tree and commit:
a2912b45b082 ("asm-generic: Add new pci.h and use it")
from the pci tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/riscv/include/asm/pci.h
index 830ac621dbbc,6ef4a1426194..000000000000
--- a/arch/riscv/include/asm/pci.h
+++ b/arch/riscv/include/asm/pci.h
@@@ -12,31 -12,7 +12,10 @@@
#include <asm/io.h>
+#define PCIBIOS_MIN_IO 4
+#define PCIBIOS_MIN_MEM 16
+
- /* RISC-V shim does not initialize PCI bus */
- #define pcibios_assign_all_busses() 1
-
- #define ARCH_GENERIC_PCI_MMAP_RESOURCE 1
-
- extern int isa_dma_bridge_buggy;
-
- #ifdef CONFIG_PCI
- static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
- {
- /* no legacy IRQ on risc-v */
- return -ENODEV;
- }
-
- static inline int pci_proc_domain(struct pci_bus *bus)
- {
- /* always show the domain in /proc */
- return 1;
- }
-
- #ifdef CONFIG_NUMA
-
+ #if defined(CONFIG_PCI) && defined(CONFIG_NUMA)
static inline int pcibus_to_node(struct pci_bus *bus)
{
return dev_to_node(&bus->dev);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-07-25 0:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-25 0:22 Stephen Rothwell [this message]
2022-07-25 0:59 ` linux-next: manual merge of the pci tree with the risc-v tree Stafford Horne
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=20220725102221.20fe2ca2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhelgaas@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=macro@orcam$(echo .)me.uk \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=shorne@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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