public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
* linux-next: manual merge of the pci tree
@ 2008-06-25  2:57 Stephen Rothwell
  2008-06-25 19:27 ` Jesse Barnes
  0 siblings, 1 reply; 25+ messages in thread
From: Stephen Rothwell @ 2008-06-25  2:57 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Yinghai Lu, Ingo Molnar

[-- Attachment #1: Type: text/plain, Size: 572 bytes --]

Hi Jesse,

Today's linux-next merge of the pci tree got a trivial conflict in
arch/x86/kernel/setup_64.c between commit
8d76d30130dacf140f82d0441f2df74c27e8f10b ("x86: check command line when
CONFIG_X86_MPPARSE is not set, v2") from the x86 tree and commit
e3f2baebf4209b5927e23fa65d5977d31db936b3 ("PCI/x86: early dump pci conf
space v2") from the pci tree.

Just two overlapping additions.  I took both. I put the pci change
second, if that matters.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2008-06-25  3:01 Stephen Rothwell
  2008-06-25 19:28 ` Jesse Barnes
  0 siblings, 1 reply; 25+ messages in thread
From: Stephen Rothwell @ 2008-06-25  3:01 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Robert Richter, Gary Hade, Ingo Molnar

[-- Attachment #1: Type: text/plain, Size: 586 bytes --]

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
arch/x86/pci/pci.h between commit
547084aab406ea46c1b9bebb115dc86787720c11 ("x86: Move PCI IO ECS code to
x86/pci") from the x86 tree and commit
bb71ad880204b79d60331d3384103976e086cb9f ("PCI: boot parameter to avoid
expansion ROM memory allocation") from the pci tree.

Both commits wanted to use 0x40000 for a define (PCI_HAS_IO_ECS and
PCI_NOASSIGN_ROMS).  I set PCI_NOASSIGN_ROMS to 0x80000.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2008-07-01  3:53 Stephen Rothwell
  2008-07-01  5:58 ` Ingo Molnar
  0 siblings, 1 reply; 25+ messages in thread
From: Stephen Rothwell @ 2008-07-01  3:53 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Thomas Gleixner, Ingo Molnar, H. Peter Anvin

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in  between
commit d752aed810d8c038a9a65819f0ba7c7da7425178 ("x86: rename setup_32.c
to setup.c") from the x86 tree and commit
e3f2baebf4209b5927e23fa65d5977d31db936b3 ("PCI/x86: early dump pci conf
space v2") from the pci tree.

The former merges setup_64.c into setup.c while the latter adds some code
to setup_arch in setup_64.c.  I applied the patch below to setup.c.
Probably worth checking that I did it right.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index fb318ed..0d86814 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -596,6 +596,13 @@ void __init setup_arch(char **cmdline_p)
 
 	parse_early_param();
 
+#ifdef CONFIG_X86_64
+#ifdef CONFIG_PCI
+	if (pci_early_dump_regs)
+		early_dump_pci_devices();
+#endif
+#endif
+
 	if (acpi_mps_check()) {
 #ifdef CONFIG_X86_LOCAL_APIC
 		disable_apic = 1;

^ permalink raw reply related	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2008-07-03  2:10 Stephen Rothwell
  2008-07-03  2:15 ` Stephen Rothwell
  2008-07-03  3:28 ` Greg KH
  0 siblings, 2 replies; 25+ messages in thread
From: Stephen Rothwell @ 2008-07-03  2:10 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, David Howells, Greg KH

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in  between
commit 4433d5ff973e2c1ea2f923eea8935588e7b96c06 ("PCI: handle pci_name()
being const") from the driver-core tree and commit
8b285ce84bbc719e363a796f466404576b840d36 ("PCI: fix pci_setup_device()'s
sprinting into a const buffer") from the pci tree.

Jesse, since dev_set_name is now in mainline, you really should drop this
commit and replace it with the one from the driver-core tree (which Greg
has hopefully sent you by now).  Or add the equivalent on top of what you
have.

I have appended it below in case.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

commit 4433d5ff973e2c1ea2f923eea8935588e7b96c06
Author: Greg Kroah-Hartman <gregkh@suse•de>
Date:   Wed Jul 2 12:46:22 2008 -0700

    PCI: handle pci_name() being const
    
    This changes pci_setup_device to handle pci_name() now returning a
    constant string.
    
    Cc: Jesse Barns <jbarnes@virtuousgeek•org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse•de>

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 3706ce7..0e0e030 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -711,8 +711,9 @@ static int pci_setup_device(struct pci_dev * dev)
 {
 	u32 class;
 
-	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
-		dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
+		     dev->bus->number, PCI_SLOT(dev->devfn),
+		     PCI_FUNC(dev->devfn));
 
 	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
 	dev->revision = class & 0xff;

^ permalink raw reply related	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2008-07-08  1:13 Stephen Rothwell
  0 siblings, 0 replies; 25+ messages in thread
From: Stephen Rothwell @ 2008-07-08  1:13 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Greg KH

[-- Attachment #1: Type: text/plain, Size: 652 bytes --]

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
arch/sparc64/kernel/pci.c between commit
db212bde6b37e5cc60ae0f16d1872bbbcd1ae9e7 ("sparc64: fix up bus_id changes
in sparc core code") from the driver-core tree and commit
c6c4f070a61b2b6e5cd317a5fbf25255878688a2 ("PCI: make pci_name use
dev_name") from the pci tree (which also exists in the driver-core tree).

Looks like only half the update has been done (i.e. the change to use
dev_set_name is missing from the pci tree).  I took the driver-core
version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2008-10-16  3:24 Stephen Rothwell
  2008-10-16 12:32 ` Jesse Barnes
  0 siblings, 1 reply; 25+ messages in thread
From: Stephen Rothwell @ 2008-10-16  3:24 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Vincent Legoll, Sitsofe Wheeler

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pcie/aspm.c between commit
e1f4f59d1ab9ebac44830d6ae450fb358ac559d3 ("PCI: Fix pcie_aspm=force")
from Linus' tree and commit 4f56ffe4ff214284f9c92037f9ad5f389a74bb84
("PCI: probing debug message uniformization") from the pci tree.

Just context.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/pci/pcie/aspm.c
index 851f5b8,4b18b30..0000000
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@@ -527,10 -527,10 +527,10 @@@ static int pcie_aspm_sanity_check(struc
  		 */
  		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
  			&reg32);
 -		if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
 +		if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
- 			printk("Pre-1.1 PCIe device detected, "
- 				"disable ASPM for %s. It can be enabled forcedly"
- 				" with 'pcie_aspm=force'\n", pci_name(pdev));
+ 			dev_printk(KERN_INFO, &child_dev->dev, "disabling ASPM"
+ 				" on pre-1.1 PCIe device.  You can enable it"
+ 				" with 'pcie_aspm=force'\n");
  			return -EINVAL;
  		}
  	}

^ permalink raw reply	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2008-10-20  4:00 Stephen Rothwell
  2008-10-20 18:36 ` Jesse Barnes
  0 siblings, 1 reply; 25+ messages in thread
From: Stephen Rothwell @ 2008-10-20  4:00 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Thomas Petazzoni

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/quirks.c between commit
2e532d68a2b3e2aa6b19731501222069735c741c ("{pci,pnp} quirks.c: don't use
deprecated print_fn_descriptor_symbol()") from Linus' tree and commit
9a1e6932e1129d0c6b5f06ea39282b21f892a114 ("PCI: allow quirks to be
compiled out") from the pci tree.

The former commit (which matches commit
248cb30af8bd95f1af95d54c0a9558dc2ac62a55 ("PCI: use %pF instead of
print_fn_descriptor_symbol() in quirks.c") in the pci tree) updates code
that was moved by the latter.  Since the pci tree also does that update,
I just used the pci tree version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2008-12-11  0:53 Stephen Rothwell
  0 siblings, 0 replies; 25+ messages in thread
From: Stephen Rothwell @ 2008-12-11  0:53 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Rafael J. Wysocki, Greg KH, Roel Kluin

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pci-driver.c between commit
fc9f864789c8a9e3ce747765f31ee8320bb66b60 ("PM: Simplify the new
suspend/hibernation framework for devices") from the driver-core tree and
commit be74163f1a84d5e5cfecda34232afceef8eb0b93 ("PCI: Make some
functions & structures static") from the pci tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/pci/pci-driver.c
index 99d867b,20c89a1..0000000
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@@ -681,15 -668,17 +695,15 @@@ static int pci_pm_restore_noirq(struct 
  
  #endif /* !CONFIG_HIBERNATION */
  
- struct dev_pm_ops pci_dev_pm_ops = {
 -static struct pm_ext_ops pci_pm_ops = {
 -	.base = {
 -		.prepare = pci_pm_prepare,
 -		.complete = pci_pm_complete,
 -		.suspend = pci_pm_suspend,
 -		.resume = pci_pm_resume,
 -		.freeze = pci_pm_freeze,
 -		.thaw = pci_pm_thaw,
 -		.poweroff = pci_pm_poweroff,
 -		.restore = pci_pm_restore,
 -	},
++static struct dev_pm_ops pci_dev_pm_ops = {
 +	.prepare = pci_pm_prepare,
 +	.complete = pci_pm_complete,
 +	.suspend = pci_pm_suspend,
 +	.resume = pci_pm_resume,
 +	.freeze = pci_pm_freeze,
 +	.thaw = pci_pm_thaw,
 +	.poweroff = pci_pm_poweroff,
 +	.restore = pci_pm_restore,
  	.suspend_noirq = pci_pm_suspend_noirq,
  	.resume_noirq = pci_pm_resume_noirq,
  	.freeze_noirq = pci_pm_freeze_noirq,

^ permalink raw reply	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree
@ 2009-01-06  0:54 Stephen Rothwell
  0 siblings, 0 replies; 25+ messages in thread
From: Stephen Rothwell @ 2009-01-06  0:54 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, Kenji Kaneshige, Justin Chen

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/hotplug/acpiphp_glue.c between commit
b6adc1955d31515be6631e63b1fe4bcdcd41db77 ("PCI hotplug: acpiphp wants a
64-bit _SUN") from Linus' tree and commit
5a21939b5703db326c314cf30b9f2d37df6a8e1f ("PCI hotplug: introduce
functions for ACPI slot detection") from the pci tree.

Just changed context. I fixed it up (see below), but it should be
fixed by merging with Linus' tree (one way or the other).
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/pci/hotplug/acpiphp_glue.c
index 3affc64,ffa47be..0000000
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@ -255,9 -194,8 +194,8 @@@ register_slot(acpi_handle handle, u32 l
  
  		bridge->nr_slots++;
  
 -		dbg("found ACPI PCI Hotplug slot %d at PCI %04x:%02x:%02x\n",
 +		dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n",
- 				slot->sun, pci_domain_nr(bridge->pci_bus),
- 				bridge->pci_bus->number, slot->device);
+ 		    slot->sun, pci_domain_nr(pbus), pbus->number, device);
  		retval = acpiphp_register_hotplug_slot(slot);
  		if (retval) {
  			if (retval == -EBUSY)

^ permalink raw reply	[flat|nested] 25+ messages in thread
* linux-next: manual merge of the pci tree.
@ 2017-02-19 22:40 Stephen Rothwell
  0 siblings, 0 replies; 25+ messages in thread
From: Stephen Rothwell @ 2017-02-19 22:40 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-next, linux-kernel

Hi Bjorn,

Today's linux-next merge of the pci tree got conflicts in:

  drivers/pci/dwc/pcie-designware-host.c

I have no idea why? I see this file has been split out from another that
was itself moved from another directory, but that all happened in the
pci tree.

I fixed it up (I just used the pci tree version) 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.

OK, I checked again ... it may be conflicting with commit

  a782b5f986c3 ("PCI: designware: Check for iATU unroll only on platforms that use ATU")

from Linus' tree (merged into v4.10-rc5), so my resolution above may be
incorrect.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 25+ messages in thread
end of thread, other threads:[~2017-02-19 22:41 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-25  2:57 linux-next: manual merge of the pci tree Stephen Rothwell
2008-06-25 19:27 ` Jesse Barnes
  -- strict thread matches above, loose matches on Subject: below --
2008-06-25  3:01 Stephen Rothwell
2008-06-25 19:28 ` Jesse Barnes
2008-07-01  3:53 Stephen Rothwell
2008-07-01  5:58 ` Ingo Molnar
2008-07-01  6:29   ` Stephen Rothwell
2008-07-02  1:56     ` Jesse Barnes
2008-07-02  2:09       ` Yinghai Lu
2008-07-02  3:19         ` Stephen Rothwell
2008-07-03  2:10 Stephen Rothwell
2008-07-03  2:15 ` Stephen Rothwell
2008-07-03  3:28 ` Greg KH
2008-07-03 19:23   ` Jesse Barnes
2008-07-04  0:09     ` Stephen Rothwell
2008-07-04  0:13       ` Jesse Barnes
2008-07-04  0:14       ` Stephen Rothwell
2008-07-08  1:13 Stephen Rothwell
2008-10-16  3:24 Stephen Rothwell
2008-10-16 12:32 ` Jesse Barnes
2008-10-20  4:00 Stephen Rothwell
2008-10-20 18:36 ` Jesse Barnes
2008-12-11  0:53 Stephen Rothwell
2009-01-06  0:54 Stephen Rothwell
2017-02-19 22:40 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox