Re: [PowerPC] [PASEMI] Issue with the identification of ATA drives after the of/irq updates 2024-05-29

[Michael Ellerman <mpe@ellerman.id.au>]

Christian Zigotzky <chzigotzky@xenosoft.de> writes:
> On 04.07.24 20:27, Christian Zigotzky wrote:
>> On 04.07.24 13:53, Michael Ellerman wrote:
>>> Christian Zigotzky <chzigotzky@xenosoft.de> writes:
...
>>>
>>> Instead of that patch, can you try the one below. AFAICS the device tree
>>> fixups done in early boot mean the interrupt-map is not needed, and also
>>> has the wrong content, so if we can remove it entirely that might avoid
>>> the problems in the parsing code.
>>>
>>> I don't know if your firmware actually implements those methods, I
>>> couldn't find anything online to confirm or deny it. Seems the only
>>> option is to test it.
...
>
> Unfortunately, the kernel 6.10-rc6 doesn't compile with your patch. "rc" 
> is undeclared.

Right, I had some debug code that I removed before posting.

This version should compile :}

cheers

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index fbb68fc28ed3..965d58c54fab 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -3123,6 +3123,7 @@ static void __init fixup_device_tree_pasemi(void)
 	u32 interrupts[2], parent, rval, val = 0;
 	char *name, *pci_name;
 	phandle iob, node;
+	int rc;
 
 	/* Find the root pci node */
 	name = "/pxp@0,e0000000";
@@ -3138,6 +3139,14 @@ static void __init fixup_device_tree_pasemi(void)
 
 	prom_setprop(iob, name, "interrupt-controller", &val, 0);
 
+	prom_printf("nemo: deleting interrupt-map properties\n");
+	rc = call_prom("interpret", 1, 1,
+		      " s\" /pxp@0,e0000000\" find-device"
+		      " s\" interrupt-map\" delete-property"
+		      " s\" interrupt-map-mask\" delete-property"
+		      " device-end");
+	prom_printf("nemo: interpret returned %d\n", rc);
+
 	pci_name = "/pxp@0,e0000000/pci@11";
 	node = call_prom("finddevice", 1, 1, ADDR(pci_name));
 	parent = ADDR(iob);