linux-kernel - Re: [PATCH] SDHCI: Change AMD SDHCI quirk application scope

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAKT61h8E3=gvO=ZfFDPhBuWsWuPnGCxtxYa-izSOJk=RWKyUtQ@mail.gmail.com>
Date:	Fri, 5 Jun 2015 09:37:09 +0800
From:	Wan ZongShun <mcuos.com@...il.com>
To:	Borislav Petkov <bp@...en8.de>
Cc:	Wan ZongShun <Vincent.Wan@....com>,
	Ulf Hansson <ulf.hansson@...aro.org>,
	"linux-mmc@...r.kernel.org" <linux-mmc@...r.kernel.org>,
	linux-kernel <linux-kernel@...r.kernel.org>,
	Wan ZongShun <linux@...os.com>
Subject: Re: [PATCH] SDHCI: Change AMD SDHCI quirk application scope

2015-06-04 23:32 GMT+08:00 Borislav Petkov <bp@...en8.de>:
> On Thu, Jun 04, 2015 at 10:33:57PM +0800, Wan ZongShun wrote:
>> From: Vincent Wan <vincent.wan@....com>
>>
>> Change this quirk to apply to AMD Carrizo platform.
>>
>> Signed-off-by: Vincent Wan <vincent.wan@....com>
>> Signed-off-by: Wan ZongShun <mcuos.com@...il.com>
>> Signed-off-by: Wan ZongShun <linux@...os.com>
>>
>> Tested-by: Nath, Arindam <Arindam.Nath@....com>
>> Tested-by: Ramesh, Ramya <Ramya.Ramesh@....com>
>> ---
>>  drivers/mmc/host/sdhci-pci.c | 25 ++++++++++++++++++++++++-
>>  include/linux/pci_ids.h      |  1 +
>>  2 files changed, 25 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
>> index f208f20..94f54d2 100644
>> --- a/drivers/mmc/host/sdhci-pci.c
>> +++ b/drivers/mmc/host/sdhci-pci.c
>> @@ -724,14 +724,37 @@ static const struct sdhci_pci_fixes sdhci_rtsx = {
>>       .probe_slot     = rtsx_probe_slot,
>>  };
>>
>> +/*AMD chipset generation*/
>> +enum amd_chipset_gen {
>> +     AMD_CHIPSET_BEFORE_ML,
>> +     AMD_CHIPSET_CZ,
>> +     AMD_CHIPSET_NL,
>> +     AMD_CHIPSET_UNKNOWN,
>> +};
>> +
>>  static int amd_probe(struct sdhci_pci_chip *chip)
>>  {
>>       struct pci_dev  *smbus_dev;
>> +     enum amd_chipset_gen gen;
>>
>>       smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
>>                       PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, NULL);
>> +     if (smbus_dev) {
>> +             gen = AMD_CHIPSET_BEFORE_ML;
>> +     } else {
>> +             smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
>> +                             PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
>> +             if (smbus_dev) {
>> +                     if (smbus_dev->revision < 0x51)
>> +                             gen = AMD_CHIPSET_CZ;
>> +                     else
>> +                             gen = AMD_CHIPSET_NL;
>> +             } else {
>> +                     gen = AMD_CHIPSET_UNKNOWN;
>> +             }
>> +     }
>>
>> -     if (smbus_dev && (smbus_dev->revision < 0x51)) {
>> +     if ((gen == AMD_CHIPSET_BEFORE_ML) || (gen == AMD_CHIPSET_CZ)) {
>>               chip->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
>>               chip->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
>>       }
>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index 2f7b9a4..cb63a7b 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -579,6 +579,7 @@
>>  #define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE   0x7800
>>  #define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS              0x780b
>>  #define PCI_DEVICE_ID_AMD_HUDSON2_IDE                0x780c
>> +#define PCI_DEVICE_ID_AMD_KERNCZ_SMBUS  0x790b
>
> KERNCZ?
>
> Also, that device id is used only in sdhci-pci.c so it should be defined
> there. Only when multiple drivers/compilation units need it, then it
> should go to pci_ids.h.

Boris, I means I put this KERCZ Mircro in pci_ids.h, and I also will
send the other patch to instead the following '0x790b' of codes. I
think it is reasonable, right?

    /* Determine the address of the SMBus areas */
    if ((PIIX4_dev->vendor == PCI_VENDOR_ID_AMD &&
         PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS &&
         PIIX4_dev->revision >= 0x41) ||
        (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD &&
         PIIX4_dev->device == 0x790b &&
         PIIX4_dev->revision >= 0x49))

>
> --
> Regards/Gruss,
>     Boris.
>
> ECO tip #101: Trim your mails when you reply.
> --



-- 
Wan ZongShun.
www.mcuos.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/