| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <2ced3174-b70c-02c9-7096-57721640a9f4@suse.de>
Date: Thu, 9 Feb 2023 10:07:46 +0100
From: Thomas Zimmermann <tzimmermann@...e.de>
To: Zeno Davatz <zdavatz@...il.com>, David Airlie <airlied@...hat.com>
Cc: linux-fbdev@...r.kernel.org, linux-kernel@...r.kernel.org,
dri-devel@...ts.freedesktop.org,
Bjorn Helgaas <helgaas@...nel.org>,
Bjorn Helgaas <bjorn@...gaas.com>
Subject: Re: [PATCH] nvidiafb: detect the hardware support before removing
console.
Hi
Am 06.02.23 um 09:54 schrieb Zeno Davatz:
> Dear Dave
>
> On Mon, Feb 6, 2023 at 9:40 AM David Airlie <airlied@...hat.com> wrote:
>>
>> On Mon, Feb 6, 2023 at 6:38 PM Zeno Davatz <zdavatz@...il.com> wrote:
>>>
>>> Dear Dave
>>>
>>> On Mon, Feb 6, 2023 at 9:10 AM Dave Airlie <airlied@...il.com> wrote:
>>>>
>>>> On Mon, 6 Feb 2023 at 18:01, Zeno Davatz <zdavatz@...il.com> wrote:
>>>>>
>>>>> Dear Dave
>>>>>
>>>>> On Mon, Feb 6, 2023 at 8:54 AM Dave Airlie <airlied@...il.com> wrote:
>>>>>>
>>>>>> On Mon, 6 Feb 2023 at 17:52, Zeno Davatz <zdavatz@...il.com> wrote:
>>>>>>>
>>>>>>> Dear Dave
>>>>>>>
>>>>>>> Thank you for your patch.
>>>>>>>
>>>>>>> On Sun, Feb 5, 2023 at 10:07 PM Dave Airlie <airlied@...il.com> wrote:
>>>>>>>>
>>>>>>>> From: Dave Airlie <airlied@...hat.com>
>>>>>>>>
>>>>>>>> This driver removed the console, but hasn't yet decided if it could
>>>>>>>> take over the console yet. Instead of doing that, probe the hw for
>>>>>>>> support and then remove the console afterwards.
>>>>>>>>
>>>>>>>> Signed-off-by: Dave Airlie <airlied@...hat.com>
>>>>>>>> Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=216859
>>>>>>>> Reported-by: Zeno Davatz <zdavatz@...il.com>
>>>>>>>> ---
>>>>>>>> drivers/video/fbdev/nvidia/nvidia.c | 81 +++++++++++++++--------------
>>>>>>>> 1 file changed, 42 insertions(+), 39 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
>>>>>>>> index 1960916098d4..e60a276b4855 100644
>>>>>>>> --- a/drivers/video/fbdev/nvidia/nvidia.c
>>>>>>>> +++ b/drivers/video/fbdev/nvidia/nvidia.c
>>>>>>>> @@ -1197,17 +1197,17 @@ static int nvidia_set_fbinfo(struct fb_info *info)
>>>>>>>> return nvidiafb_check_var(&info->var, info);
>>>>>>>> }
>>>>>>>>
>>>>>>>> -static u32 nvidia_get_chipset(struct fb_info *info)
>>>>>>>> +static u32 nvidia_get_chipset(struct pci_dev *pci_dev,
>>>>>>>> + volatile u32 __iomem *REGS)
>>>>>>>> {
>>>>>>>> - struct nvidia_par *par = info->par;
>>>>>>>> - u32 id = (par->pci_dev->vendor << 16) | par->pci_dev->device;
>>>>>>>> + u32 id = (pci_dev->vendor << 16) | pci_dev->device;
>>>>>>>>
>>>>>>>> printk(KERN_INFO PFX "Device ID: %x \n", id);
>>>>>>>>
>>>>>>>> if ((id & 0xfff0) == 0x00f0 ||
>>>>>>>> (id & 0xfff0) == 0x02e0) {
>>>>>>>> /* pci-e */
>>>>>>>> - id = NV_RD32(par->REGS, 0x1800);
>>>>>>>> + id = NV_RD32(REGS, 0x1800);
>>>>>>>>
>>>>>>>> if ((id & 0x0000ffff) == 0x000010DE)
>>>>>>>> id = 0x10DE0000 | (id >> 16);
>>>>>>>> @@ -1220,12 +1220,11 @@ static u32 nvidia_get_chipset(struct fb_info *info)
>>>>>>>> return id;
>>>>>>>> }
>>>>>>>>
>>>>>>>> -static u32 nvidia_get_arch(struct fb_info *info)
>>>>>>>> +static u32 nvidia_get_arch(u32 Chipset)
>>>>>>>> {
>>>>>>>> - struct nvidia_par *par = info->par;
>>>>>>>> u32 arch = 0;
>>>>>>>>
>>>>>>>> - switch (par->Chipset & 0x0ff0) {
>>>>>>>> + switch (Chipset & 0x0ff0) {
>>>>>>>> case 0x0100: /* GeForce 256 */
>>>>>>>> case 0x0110: /* GeForce2 MX */
>>>>>>>> case 0x0150: /* GeForce2 */
>>>>>>>> @@ -1278,16 +1277,44 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
>>>>>>>> struct fb_info *info;
>>>>>>>> unsigned short cmd;
>>>>>>>> int ret;
>>>>>>>> + volatile u32 __iomem *REGS;
>>>>>>>> + int Chipset;
>>>>>>>> + u32 Architecture;
>>>>>>>>
>>>>>>>> NVTRACE_ENTER();
>>>>>>>> assert(pd != NULL);
>>>>>>>>
>>>>>>>> + if (pci_enable_device(pd)) {
>>>>>>>> + printk(KERN_ERR PFX "cannot enable PCI device\n");
>>>>>>>> + return -ENODEV;
>>>>>>>> + }
>>>>>>>> +
>>>>>>>> + /* enable IO and mem if not already done */
>>>>>>>> + pci_read_config_word(pd, PCI_COMMAND, &cmd);
>>>>>>>> + cmd |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
>>>>>>>> + pci_write_config_word(pd, PCI_COMMAND, cmd);
>>>>>>>> +
>>>>>>>> + nvidiafb_fix.mmio_start = pci_resource_start(pd, 0);
>>>>>>>> + nvidiafb_fix.mmio_len = pci_resource_len(pd, 0);
>>>>>>>> +
>>>>>>>> + REGS = ioremap(nvidiafb_fix.mmio_start, nvidiafb_fix.mmio_len);
>>>>>>>> + if (!REGS) {
>>>>>>>> + printk(KERN_ERR PFX "cannot ioremap MMIO base\n");
>>>>>>>> + return -ENODEV;
>>>>>>>> + }
>>>>>>>> +
>>>>>>>> + Chipset = nvidia_get_chipset(pd, REGS);
>>>>>>>> + Architecture = nvidia_get_arch(Chipset);
>>>>>>>> + if (Architecture == 0) {
>>>>>>>> + printk(KERN_ERR PFX "unknown NV_ARCH\n");
>>>>>>>> + goto err_out;
>>>>>>>> + }
>>>>>>>> +
>>>>>>>> ret = aperture_remove_conflicting_pci_devices(pd, "nvidiafb");
>>>>>>>> if (ret)
>>>>>>>> - return ret;
>>>>>>>> + goto err_out;
>>>>>>>>
>>>>>>>> info = framebuffer_alloc(sizeof(struct nvidia_par), &pd->dev);
>>>>>>>> -
>>>>>>>> if (!info)
>>>>>>>> goto err_out;
>>>>>>>>
>>>>>>>> @@ -1298,11 +1325,6 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
>>>>>>>> if (info->pixmap.addr == NULL)
>>>>>>>> goto err_out_kfree;
>>>>>>>>
>>>>>>>> - if (pci_enable_device(pd)) {
>>>>>>>> - printk(KERN_ERR PFX "cannot enable PCI device\n");
>>>>>>>> - goto err_out_enable;
>>>>>>>> - }
>>>>>>>> -
>>>>>>>> if (pci_request_regions(pd, "nvidiafb")) {
>>>>>>>> printk(KERN_ERR PFX "cannot request PCI regions\n");
>>>>>>>> goto err_out_enable;
>>>>>>>> @@ -1318,34 +1340,17 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
>>>>>>>> par->paneltweak = paneltweak;
>>>>>>>> par->reverse_i2c = reverse_i2c;
>>>>>>>>
>>>>>>>> - /* enable IO and mem if not already done */
>>>>>>>> - pci_read_config_word(pd, PCI_COMMAND, &cmd);
>>>>>>>> - cmd |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
>>>>>>>> - pci_write_config_word(pd, PCI_COMMAND, cmd);
>>>>>>>> -
>>>>>>>> - nvidiafb_fix.mmio_start = pci_resource_start(pd, 0);
>>>>>>>> nvidiafb_fix.smem_start = pci_resource_start(pd, 1);
>>>>>>>> - nvidiafb_fix.mmio_len = pci_resource_len(pd, 0);
>>>>>>>> -
>>>>>>>> - par->REGS = ioremap(nvidiafb_fix.mmio_start, nvidiafb_fix.mmio_len);
>>>>>>>>
>>>>>>>> - if (!par->REGS) {
>>>>>>>> - printk(KERN_ERR PFX "cannot ioremap MMIO base\n");
>>>>>>>> - goto err_out_free_base0;
>>>>>>>> - }
>>>>>>>> + par->REGS = REGS;
>>>>>>>>
>>>>>>>> - par->Chipset = nvidia_get_chipset(info);
>>>>>>>> - par->Architecture = nvidia_get_arch(info);
>>>>>>>> -
>>>>>>>> - if (par->Architecture == 0) {
>>>>>>>> - printk(KERN_ERR PFX "unknown NV_ARCH\n");
>>>>>>>> - goto err_out_arch;
>>>>>>>> - }
>>>>>>>> + par->Chipset = Chipset;
>>>>>>>> + par->Architecture = Architecture;
>>>>>>>>
>>>>>>>> sprintf(nvidiafb_fix.id, "NV%x", (pd->device & 0x0ff0) >> 4);
>>>>>>>>
>>>>>>>> if (NVCommonSetup(info))
>>>>>>>> - goto err_out_arch;
>>>>>>>> + goto err_out_free_base0;
>>>>>>>>
>>>>>>>> par->FbAddress = nvidiafb_fix.smem_start;
>>>>>>>> par->FbMapSize = par->RamAmountKBytes * 1024;
>>>>>>>> @@ -1401,7 +1406,6 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
>>>>>>>> goto err_out_iounmap_fb;
>>>>>>>> }
>>>>>>>>
>>>>>>>> -
>>>>>>>> printk(KERN_INFO PFX
>>>>>>>> "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",
>>>>>>>> info->fix.id,
>>>>>>>> @@ -1415,15 +1419,14 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
>>>>>>>> err_out_free_base1:
>>>>>>>> fb_destroy_modedb(info->monspecs.modedb);
>>>>>>>> nvidia_delete_i2c_busses(par);
>>>>>>>> -err_out_arch:
>>>>>>>> - iounmap(par->REGS);
>>>>>>>> - err_out_free_base0:
>>>>>>>> +err_out_free_base0:
>>>>>>>> pci_release_regions(pd);
>>>>>>>> err_out_enable:
>>>>>>>> kfree(info->pixmap.addr);
>>>>>>>> err_out_kfree:
>>>>>>>> framebuffer_release(info);
>>>>>>>> err_out:
>>>>>>>> + iounmap(REGS);
>>>>>>>> return -ENODEV;
>>>>>>>> }
>>>>>>>>
>>>>>>>> --
>>>>>>>> 2.38.1
>>>>>>>
>>>>>>> This patch fails for me.
>>>>>>
>>>>>> I've based the patch on 6.2-rc7, please make sure to not have the
>>>>>> previous revert committed, this is to replace that patch.
>>>>>
>>>>> Can you guide me through the steps please?
>>>>>
>>>>> I done:
>>>>>
>>>>> 1. cd /usr/src/linux
>>>>> 2. sudo git pull
>>>>> 3. then I applied your patch.
>>>>>
>>>>> Am I doing something wrong?
>>>>
>>>> What is your top of tree commit? (git log)
>>>>
>>>> have you got any commits on top?
>>>>
>>>> git reset --hard origin/master should reset your tree to Linus top.
>>>
>>> 1. git log shows "d2d11f342b179f1894a901f143ec7c008caba43e"
>>> 2. No, no patches on top.
>>> 3. I am doing the following steps:
>>> /usr/src/linux> sudo git reset --hard origin/master
>>> Passwort:
>>> HEAD ist jetzt bei d2d11f342b17 Merge branch 'fixes' of
>>> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
>>> /usr/src/linux> sudo patch -p1 < /tmp/patch
>>> patching file drivers/video/fbdev/nvidia/nvidia.c
>>> Hunk #1 FAILED at 1197.
>>> Hunk #2 FAILED at 1220.
>>> Hunk #3 FAILED at 1278.
>>> Hunk #4 FAILED at 1298.
>>> Hunk #5 FAILED at 1318.
>>> Hunk #6 FAILED at 1401.
>>> Hunk #7 FAILED at 1415.
>>> 7 out of 7 hunks FAILED -- saving rejects to file
>>> drivers/video/fbdev/nvidia/nvidia.c.rej
>>>
>> Are you pulling the patch from email? I guess your email service or
>> something is mangling it.
>>
>> I've attached it to see if that helps.
>
> Thank you! This patch works and I am booting perfectly well now!
>
> ~/.backup> uname -a
> Linux zenogentoo 6.2.0-rc7-00002-gd2d11f342b17-dirty #144 SMP
> PREEMPT_DYNAMIC Mon Feb 6 09:42:58 CET 2023 x86_64 Intel(R) Core(TM)
> i7 CPU 960 @ 3.20GHz GenuineIntel GNU/Linux
>
> Please let me know if the patch makes it into mainline for the 6.2 release ;).
Queued up in drm-misc-fixes. The patch should be in 6.1 and 6.2 soon.
Best regards
Thomas
>
> Best
> Zeno
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
Download attachment "OpenPGP_signature" of type "application/pgp-signature" (841 bytes)
Powered by blists - more mailing lists