Received-SPF: pass (google.com: domain of linux-kernel+bounces-57556-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <vbpzr7uqpfemb3qa6xy2fxioct44l5vugg2wkywyolfpzqcmau@jgrrhmk2scaj> <7559d940-f191-4fe0-e147-17ffa6c1dfc4@gmail.com>
In-Reply-To: <7559d940-f191-4fe0-e147-17ffa6c1dfc4@gmail.com>
From: Andrey Melnikov <temnota.am@gmail.com>
Date: Thu, 8 Feb 2024 10:27:11 +0300
Message-ID: <CA+PODjpOE=LGPi1G1ebvEwGeXAfpuZ+s_k4uMUwu3i6st9y--g@mail.gmail.com>
Subject: Re: [PATCH] ahci: asm1064: correct count of reported ports
To: Sergei Shtylyov <sergei.shtylyov@gmail.com>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, 
	dlemoal@kernel.org, hdegoede@redhat.com
Content-Type: text/plain; charset="UTF-8"

> On 2/7/24 12:58 PM, Andrey Jr. Melnikov wrote:
>
> > The ASM1064 SATA host controller always reports wrongly,
> > that it has 24 ports. But in reality, it only has four ports.
> >
> > before:
> > ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
> > ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xffff0f impl SATA mode
> > ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst
> >
> > after:
> > ahci 0000:04:00.0: ASM1064 has only four ports
> > ahci 0000:04:00.0: forcing port_map 0xffff0f -> 0xf
> > ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
> > ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xf impl SATA mode
> > ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst
> >
> >
> > Signed-off-by: Andrey Jr. Melnikov <temnota.am@gmail.com>
> >
> > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> > index da2e74fce2d9..ec30d8330d16 100644
> > --- a/drivers/ata/ahci.c
> > +++ b/drivers/ata/ahci.c
> > @@ -671,9 +671,14 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");
> >  static void ahci_pci_save_initial_config(struct pci_dev *pdev,
> >                                        struct ahci_host_priv *hpriv)
> >  {
> > -     if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == 0x1166) {
> > -             dev_info(&pdev->dev, "ASM1166 has only six ports\n");
> > -             hpriv->saved_port_map = 0x3f;
> > +     if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA) {
> > +             if (pdev->device == 0x1166) {
>
>    Maybe *switch* instead?

Ok.
Can someone explain to me - which method I should use here - override
portmap via hpriv->saved_port_map or mask it via hpriv->mask_port_map
?

> > +                     dev_info(&pdev->dev, "ASM1166 has only six ports\n");
> > +                     hpriv->saved_port_map = 0x3f;
> > +             } else if (pdev->device == 0x1064) {
> > +                     dev_info(&pdev->dev, "ASM1064 has only four ports\n");
> > +                     hpriv->saved_port_map = 0xf;
> > +             }
> >       }
> >
> >       if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361) {