From patchwork Mon Dec 11 14:46:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 10105319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D2D5C602A7 for ; Mon, 11 Dec 2017 14:46:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C2C929673 for ; Mon, 11 Dec 2017 14:46:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80D9F2969A; Mon, 11 Dec 2017 14:46:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 062CD29673 for ; Mon, 11 Dec 2017 14:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751729AbdLKOq6 (ORCPT ); Mon, 11 Dec 2017 09:46:58 -0500 Received: from mout.gmx.net ([212.227.17.20]:58200 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750759AbdLKOq6 (ORCPT ); Mon, 11 Dec 2017 09:46:58 -0500 Received: from [10.95.171.110] ([155.56.40.73]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M4o41-1fGUTO0YM1-00yvwF; Mon, 11 Dec 2017 15:46:51 +0100 Subject: Re: Have my PA8800 back online... To: John David Anglin Cc: Frank Scheiner , debian-hppa@lists.debian.org, linux-parisc References: <2ADB5C8A-DFEB-4CA5-92BA-96E459A3575E@bell.net> <8314a5d6-7df7-3282-0d91-a9b414a122e0@web.de> <526274E4-88D8-4DF8-8F74-5B775186BBEC@bell.net> <48320506-f7fa-822b-fb45-40eab1dbda02@bell.net> <17707adb-4f71-1d66-2a19-3cdfaff047f3@gmx.de> <53815372-58e8-70e2-bab4-1777e848cf5e@web.de> <79c110ec-2975-a827-4b9d-1351ab77779b@gmx.de> <897B27DE-04A1-4906-8DF2-C037393139C3@bell.net> From: Helge Deller Message-ID: Date: Mon, 11 Dec 2017 15:46:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <897B27DE-04A1-4906-8DF2-C037393139C3@bell.net> Content-Language: en-US X-Provags-ID: V03:K0:N40zJ1T2dllPmBBDlNFqrfLdiVNDzLeomefUeLjbifLIFZ7LbDN eRBbRi5O0GP/BThAPfOnFC5jUAczefHeIldzxT+hphX8LYg4T/3kfZtF3IvsSEeE9uyS/of yBkYIEY85ZKD3Zrq2cMnZyH9glHS8uHbxpGjpWHKBKwknASv8ui0ip2YQTbceWLMGZ+pgak tve29/I+P80Mli7sMdZKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:K4a59BnBKcw=:lkeJc7tNcE3Z1IljONiPRt a6QD5dsuJvuBfoNKa+/Q5o+Zh+MvMvIITAHFHbLiSnRORDc+RYFFRF2MZfKdqw888bTCzdv5h mKtgrZSCFoLyZEH1pwoyJ6iOrwc4IosWlLEjzWnIrRcDXlQbOukLZb1yJrwA3MxQ6FDoOZUoi IyLZQMwP3nTDDxV2k5vfo1VnrrIqb0blKpXkIvshBU92lgKWbwPODwDaZPg56u8R4epHWpbsQ RHhc8ApEgUnHye076ckXv0OIw5eh5P4wqAk/qN6hFoyc8HBMQtWbPhFlhzPwcs81L+Uw/bDf9 1uYj1dlVE5hjDYVL8lCcsNZgQBUPyEDeD1XOWbgFeriH3Rwn8bfjnI8eTVxJeM2MLgUafzhwE AfzUCMeiy57OyfRHRk4FrAqTlzEqvk9XhKgep27fiZ8nK21e/ul9Qx4CtX04n7Mu7OSbxpJpT IvCaYNGA4mJgm/BtN+Zgs/UQ+30WybFejd2saBGniSotxpJ9Uefd+EKcOF/W8wL0UyscJkxxe o5W60L276uMdXRt129VKKcCJLmwIQusWwcb0Bybt+NMUxJzQBertg3D1SXgrca+xDObwbIgQn kAROXlHxE/lIlkHOT4+1t+B0g89Tl9Dafsn8SP2qjg81N7aKiYmUuYBhO7eaRwksBqYiKCvqf MUNxVN8EKI1IGSQBpq5CZmXiU6xRL647AYj567gm0pAxL+GOkScKy7vTYwHO6YnH7a5Ptms5w S3mS8KJ+w3W33LdAl5cNdrG0rQmPzVrffX50g3FiG2U6X5XRGp4fV7Of5NcBPw+oOKMjLuKOC zpqEP4INm66wGvVQJXgvOO9PtZ3pA== Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 10.12.2017 00:49, John David Anglin wrote: > On 2017-12-09, at 4:03 PM, Helge Deller wrote: > >> Can you please try attached patch which disables the serial MUX and ATI card? >> If it works for you and if we backport it to all kernels and if we revert palo to use ttyS0 for all machines we might be good. > > I hacked on the change but I couldn't get it to work. As far as I can tell, the quirks aren't being called. > Tried EARLY, HEADER and FINAL. I think the ids are correct. Strange. The attached patch does work for me on panama up until boot. Haven't tested what lspci reports afterwards... [ 1.832294] LBA 0:7: PCI host bridge to bus 0000:e0 [ 1.832497] pci_bus 0000:e0: root bus resource [io 0x60000-0x6ffff] (bus address [0x0000-0xffff]) [ 1.833005] pci_bus 0000:e0: root bus resource [mem 0xfffffffff0000000-0xfffffffffe77ffff] (bus address [0xf0000000-0xfe77ffff]) [ 1.840028] pci_bus 0000:e0: root bus resource [bus e0-e7] 1.844276] subsystem_vendor = 0x103c, subsystem_device =0x1291 [ 1.848022] pci 0000:e0:01.0: Hiding Diva built-in AUX serial device 1.849136] subsystem_vendor = 0x103c, subsystem_device =0x1292 [ 1.852023] pci 0000:e0:02.0: Hiding Diva built-in ATI card. .... Helge diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index a25fed52f7e9..dbb4158cf098 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -1692,3 +1692,45 @@ void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask) iounmap(base_addr); } + +/* + * The design of the Diva management card in rp34x0 machines (rp3410, rp3440) + * seems rushed, so that many built-in components simply don't work. + * The following quirks disable the serial AUX port and the built-in ATI RV100 + * Radeon 7000 graphics card which both don't have any external connectors and + * thus are useless, and even worse, e.g. the AUX ports occupies ttyS0 and + * as such makes those machines the only PARISC machines on which we can't + * use ttyS0 as boot console. + */ +static void quirk_diva_ati_card(struct pci_dev *dev) +{ + printk("subsystem_vendor = 0x%x, subsystem_device =0x%x\n", + dev->subsystem_vendor, dev->subsystem_device); + + /* subsystem IDs are from Diva */ + if (dev->subsystem_vendor != PCI_VENDOR_ID_HP || + dev->subsystem_device != 0x1292) + return; + + dev_info(&dev->dev, "Hiding Diva built-in ATI card."); + dev->device = 0; +} +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QY, + quirk_diva_ati_card); + +static void quirk_diva_aux_disable(struct pci_dev *dev) +{ + printk("subsystem_vendor = 0x%x, subsystem_device =0x%x\n", + dev->subsystem_vendor, dev->subsystem_device); + + /* subsystem IDs are from Diva */ + if (dev->subsystem_vendor != PCI_VENDOR_ID_HP || + dev->subsystem_device != 0x1291) + return; + + dev_info(&dev->dev, "Hiding Diva built-in AUX serial device"); + dev->device = 0; +} +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_AUX, + quirk_diva_aux_disable); +